diff --git a/po/be.po b/po/be.po
index 0ca00da0842db58e72e1d77af696065623f6727e..267f81951817c075d040b1dafc1fa67024ee1b4f 100644
--- a/po/be.po
+++ b/po/be.po
@@ -3,11 +3,15 @@
 # This file is distributed under the same license as Gajim.
 #
 # Ihar Hrachyshka <ihar.hrachyshka@gmail.com>, 2006, 2009.
+#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.10.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 11:28+0200\n"
+"POT-Creation-Date: 2010-10-01 20:39+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"
@@ -27,7 +31,7 @@ msgstr "Удзельнічаць у _групавой размове"
 msgid "_Add Contact..."
 msgstr "_Дадаць чалавека..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:17
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
 msgid "_Discover Services"
 msgstr "_Пошук сервісаў"
 
@@ -49,7 +53,7 @@ msgstr "_Адкрыць уваходную пошту Gmail"
 msgid "_Personal Events"
 msgstr "Асабістыя звесткі"
 
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:23
+#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
 #, fuzzy
 msgid "_Start Chat..."
 msgstr "_Пачаць размову"
@@ -84,76 +88,72 @@ msgid "<b>Please select a server</b>"
 msgstr ""
 
 #: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid "@"
-msgstr ""
-
-#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
 msgstr ""
 
-#: ../data/gui/account_creation_wizard_window.ui.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:10
 #, fuzzy
 msgid "Anon_ymous authentication"
 msgstr "Аўтарызацыя"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Connect when I press Finish"
 msgstr "Злучыцца па націску кнопкі \"Скончыць\""
 
-#: ../data/gui/account_creation_wizard_window.ui.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Стварэнне рахунка"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 #, fuzzy
 msgid "I already have an account I want to _use"
 msgstr "Я ўжо маю патрэбны рахунак"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I want to _register for a new account"
 msgstr "_Зарэгістраваць новы рахунак"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:16
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 #: ../data/gui/accounts_window.ui.h:28
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Калі гэтая опцыя ўключаная, Gajim запомніць пароль для гэтага рахунка"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:17
+#: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Кіраванне..."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:18
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
 #: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2263 ../src/config.py:2342
-#: ../src/config.py:2355 ../src/config.py:3596 ../src/config.py:3671
-#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513
-#: ../src/dialogs.py:526 ../src/roster_window.py:2890
-#: ../src/roster_window.py:2896 ../src/roster_window.py:2901
+#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
+#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
+#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
+#: ../src/dialogs.py:527 ../src/roster_window.py:2956
+#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
 msgid "None"
 msgstr "Ніякі"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:19
+#: ../data/gui/account_creation_wizard_window.ui.h:18
 #, fuzzy
 msgid "Prox_y:"
 msgstr "Проксі:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #: ../data/gui/accounts_window.ui.h:48
 msgid "Save pass_word"
 msgstr "Захоўваць па_роль"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:21
+#: ../data/gui/account_creation_wizard_window.ui.h:20
 msgid "Set my profile when I connect"
 msgstr "Абнавіць профіль па злучэнні"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:22
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Use custom hostname/port"
 msgstr "Адмысловы вузел / порт"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:23
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -161,35 +161,35 @@ msgstr ""
 "Трэба зарэгістраваць рахунак, каб далучыцца да\n"
 "сеткі Jabber."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-#: ../data/gui/roster_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:16
 msgid "_Advanced"
 msgstr "_Адмысловыя"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:25
 msgid "_Finish"
 msgstr "_Скончыць"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:27
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 #, fuzzy
 msgid "_Hostname:"
 msgstr "Назва вузла: "
 
-#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #: ../data/gui/accounts_window.ui.h:62
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:28
 #: ../data/gui/accounts_window.ui.h:64
 msgid "_Password:"
 msgstr "_Пароль:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:29
 msgid "_Port:"
 msgstr "_Порт:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:31
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Server:"
 msgstr "_Сервер:"
 
@@ -300,17 +300,17 @@ msgstr "Імя:"
 #. No configured account
 #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
 #: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592
-#: ../src/notify.py:608
+#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
+#: ../src/notify.py:616
 msgid "Gajim"
 msgstr "Gajim"
 
 #. FIXME: Ugly workaround.
 #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
 #. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:61
-#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121
-#: ../src/roster_window.py:2832 ../src/roster_window.py:5379
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
+#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
 msgid "General"
 msgstr "Агульная"
 
@@ -367,7 +367,7 @@ msgstr "Звесткі аб Вас, якія захоўваюцца на сер
 
 #: ../data/gui/accounts_window.ui.h:35
 #: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:830
+#: ../src/dialogs.py:831
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -381,7 +381,7 @@ msgid "Mer_ge accounts"
 msgstr "_Аб'яднаць рахункі"
 
 #: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2356
+#: ../src/config.py:2358
 msgid "No key selected"
 msgstr "Ключ не выбраны"
 
@@ -408,7 +408,7 @@ msgid "Priority will change automatically according to your status."
 msgstr "Прыярытэт будзе змяняцца згодна з станам."
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5329
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
 msgid "Re_name"
 msgstr "_Змяніць імя"
 
@@ -642,40 +642,45 @@ msgstr "Выдаліць паведамленне дня"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
 #, fuzzy
+msgid "Edit Archi_ving Preferences"
+msgstr "_Настаўленні"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#, fuzzy
 msgid "Edit _Privacy Lists..."
 msgstr "_Спісы прыватнасці"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sends a message to users currently connected to this server"
 msgstr "Адправіць паведамленне ўсім далучаным людзям з гэтага сервера"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 #, fuzzy
 msgid "Set MOTD..."
 msgstr "Вызначыць MOTD"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Вызначыць паведамленне дня"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Show _XML Console"
 msgstr "Паказаць _кансоль XML"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "Абнавіць MOTD"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "Абнавіць паведамленне дня"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:11
 msgid "_Administrator"
 msgstr "_Адміністратар"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:11
+#: ../data/gui/advanced_menuitem_menu.ui.h:12
 #, fuzzy
 msgid "_Send Server Message..."
 msgstr "Ад_правіць паведамленне серверу"
@@ -710,7 +715,7 @@ msgid "All statuses"
 msgstr "Усе станы"
 
 #: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:233
+#: ../src/common/commands.py:106 ../src/common/helpers.py:239
 #: ../src/tooltips.py:193
 msgid "Away"
 msgstr "Сышоў"
@@ -763,7 +768,7 @@ msgid "Have "
 msgstr "Мае "
 
 #: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:249
 msgid "Invisible"
 msgstr "Нябачны"
 
@@ -772,7 +777,7 @@ msgid "Launch a command"
 msgstr "Выканаць загад"
 
 #: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:216 ../src/tooltips.py:197
+#: ../src/common/helpers.py:222 ../src/tooltips.py:197
 msgid "Not Available"
 msgstr "Мяне няма"
 
@@ -817,12 +822,13 @@ msgid "_Disable existing sound for this event"
 msgstr "_Адключыць гук для гэтай падзеі"
 
 #: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in roster"
+#, fuzzy
+msgid "_Disable showing event in notification area"
 msgstr "_Не паказваць падзею ў галоўным вакне"
 
 #: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in systray"
-msgstr "_Не паказваць падзею ў прасторы паведамленняў"
+msgid "_Disable showing event in roster"
+msgstr "_Не паказваць падзею ў галоўным вакне"
 
 #: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
@@ -833,12 +839,13 @@ msgid "_Open chat window with user"
 msgstr "_Адкрыць вакно размовы з карыстальнікам"
 
 #: ../data/gui/advanced_notifications_window.ui.h:35
-msgid "_Show event in roster"
+#, fuzzy
+msgid "_Show event in notification area"
 msgstr "_Паказваць падзею ў галоўным вакне"
 
 #: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in systray"
-msgstr "_Паказваць падзею ў прасторы паведамленняў"
+msgid "_Show event in roster"
+msgstr "_Паказваць падзею ў галоўным вакне"
 
 #: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
@@ -866,6 +873,45 @@ msgstr "Група"
 msgid "when I'm in"
 msgstr "калі я ў"
 
+#: ../data/gui/archiving_preferences_window.ui.h:1
+msgid "<i>Method Auto</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "<i>Method Local</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:3
+msgid "<i>Method Manual</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:4
+#, fuzzy
+msgid "Auto"
+msgstr "Аўтаматычна далучацца"
+
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Concede"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "Forbid"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:7
+#, fuzzy
+msgid "No"
+msgstr "Ніякі"
+
+#: ../data/gui/archiving_preferences_window.ui.h:8
+#, fuzzy
+msgid "Prefer"
+msgstr "Уласцівасці"
+
+#: ../data/gui/archiving_preferences_window.ui.h:9
+msgid "Yes"
+msgstr ""
+
 #: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Уваход:"
@@ -893,8 +939,8 @@ msgstr "Людзі"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5348
-#: ../src/roster_window.py:5476 ../src/roster_window.py:5609
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
+#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
 msgid "_Unblock"
 msgstr ""
 
@@ -988,7 +1034,7 @@ msgid "_Start Chat"
 msgstr "_Пачаць размову"
 
 #. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4184
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
 msgid "#"
 msgstr "â„–"
 
@@ -1036,13 +1082,55 @@ msgstr ""
 msgid "9"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:13
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Дадаць чалавека ў спіс"
+
 #: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
+msgid "Browse the chat history (Ctrl+H)"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:15
+#, fuzzy
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "сочыць за размовай"
+
+#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+#, fuzzy
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Пстрыкніце, каб уставіць сымболік (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
+#, fuzzy
+msgid "Show a list of formattings"
+msgstr "Пстрыкніце, каб уставіць сымболік (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Пстрыкніце, каб уставіць сымболік (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:19
+#, fuzzy
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr "Дадаць чалавека ў спіс"
+
+#: ../data/gui/chat_control.ui.h:20
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:21
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
 #: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "Ад_правіць"
 
-#: ../data/gui/chat_control.ui.h:15 ../data/gui/groupchat_control.ui.h:3
+#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
 msgid "label"
 msgstr ""
 
@@ -1096,8 +1184,8 @@ msgstr "Змяніць _групы"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5284
-#: ../src/roster_window.py:5444
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
+#: ../src/roster_window.py:5516
 msgid "In_vite to"
 msgstr "За_прасіць"
 
@@ -1111,8 +1199,8 @@ msgstr "Людзі"
 msgid "Remo_ve"
 msgstr "Вы_даліць"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5294
-#: ../src/roster_window.py:5533
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
+#: ../src/roster_window.py:5605
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Адправіць асаблівы XML"
@@ -1148,8 +1236,8 @@ msgid "_Allow him/her to see my status"
 msgstr "Дазволіць чалавеку _бачыць змены майго стану"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5482 ../src/roster_window.py:5612
+#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
+#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
 msgid "_Block"
 msgstr ""
 
@@ -1159,8 +1247,8 @@ msgstr "_Забараніць праглядаць змены майго ста
 
 #: ../data/gui/contact_context_menu.ui.h:20
 #: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:21
-#: ../src/roster_window.py:5683
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
+#: ../src/roster_window.py:5755
 msgid "_History"
 msgstr "_Журнал"
 
@@ -1298,7 +1386,7 @@ msgstr "<b>Колер картак</b>"
 msgid "Account row"
 msgstr "Рахунак"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:925
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
 msgid "Bold"
 msgstr "Тлусты"
 
@@ -1336,7 +1424,7 @@ msgstr "Група"
 msgid "Inactive"
 msgstr "Неактыўны"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:926
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
 msgid "Italic"
 msgstr "Нахілены"
 
@@ -1387,7 +1475,7 @@ msgstr "Змяніць _тэму"
 msgid "Configure _Room..."
 msgstr "Настаўленні _пакоя"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1782
+#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
 #, fuzzy
 msgid "_Bookmark"
 msgstr "_Змясціць у закладках"
@@ -1451,19 +1539,33 @@ msgstr "Ад_правіць прыватнае паведамленне"
 msgid "_Voice"
 msgstr "_Голас"
 
+#: ../data/gui/groupchat_control.ui.h:1
+#, fuzzy
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "_Змясціць у закладках"
+
+#: ../data/gui/groupchat_control.ui.h:3
+msgid "Change the room's subject (Alt+T)"
+msgstr ""
+
+#: ../data/gui/groupchat_control.ui.h:4
+#, fuzzy
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Змяніць м_янушку"
+
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Стварыць новы допіс"
 
-#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
-msgid "From"
-msgstr "Ад"
+#: ../data/gui/groups_post_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:2
+msgid "From:"
+msgstr "Ад:"
 
-#. holds subject
-#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
-#: ../src/history_manager.py:219
-msgid "Subject"
-msgstr "Тэма"
+#: ../data/gui/groups_post_window.ui.h:3
+#: ../data/gui/single_message_window.ui.h:7
+msgid "Subject:"
+msgstr "Тэма:"
 
 #: ../data/gui/history_manager.ui.h:1
 #, fuzzy
@@ -1487,8 +1589,8 @@ msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Gajim - Кіраўнік журналаў размоў"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3208
-#: ../src/dialogs.py:3305
+#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
+#: ../src/dialogs.py:3321
 msgid "Delete"
 msgstr "Выдаліць"
 
@@ -1542,12 +1644,75 @@ msgstr "Пошук"
 msgid "_Log conversation history"
 msgstr "_Весці журнал размоў"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
+msgid "approve"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:2
+msgid "body"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:3
+msgid "concede"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:4
+msgid "expire"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:5
+msgid "false"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:6
+msgid "forbid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:7
+#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+msgid "jid"
+msgstr "jid"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:8
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
+#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
+msgid "message"
+msgstr "паведамленне"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
+msgid "oppose"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
+#, fuzzy
+msgid "otr"
+msgstr "_Вузел:"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:11
+msgid "prefer"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:12
+msgid "require"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:13
+msgid "save"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:14
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
 msgid "Bro_wse Rooms"
 msgstr "_Праглядзець"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2180
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
 msgid "Join Group Chat"
 msgstr "Удзельнічаць у групавой размове"
 
@@ -1585,8 +1750,8 @@ msgstr "Сервер:"
 msgid "_Bookmark this room"
 msgstr "_Змясціць у закладках"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1341
-#: ../src/disco.py:1786
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../src/disco.py:1804
 msgid "_Join"
 msgstr "_Далучыцца"
 
@@ -1697,6 +1862,75 @@ msgstr "_Імя карыстальніка:"
 msgid "Passphrase"
 msgstr "Пароль"
 
+#: ../data/gui/plugins_window.ui.h:1
+msgid "&lt;empty&gt;"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:2
+msgid "<empty>"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:3
+#, fuzzy
+msgid "Authors:"
+msgstr "А_ўтарызаваць"
+
+#: ../data/gui/plugins_window.ui.h:4
+#, fuzzy
+msgid "Available"
+msgstr "_Тут"
+
+#: ../data/gui/plugins_window.ui.h:5
+#, fuzzy
+msgid "Configure"
+msgstr "_Працягнуць"
+
+#: ../data/gui/plugins_window.ui.h:6
+#, fuzzy
+msgid "Descrition:"
+msgstr "Апісанне: %s"
+
+#: ../data/gui/plugins_window.ui.h:7
+#, fuzzy
+msgid "Homepage:"
+msgstr "У Сеціве:"
+
+#: ../data/gui/plugins_window.ui.h:8
+msgid "Install"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:9
+#, fuzzy
+msgid "Installed"
+msgstr "Марнаванне часу"
+
+#: ../data/gui/plugins_window.ui.h:10
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:11
+msgid "Plugins"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:12
+msgid "Uninstall"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:13
+#, fuzzy
+msgid "Version:"
+msgstr "Версія GTK+:"
+
+#: ../data/gui/plugins_window.ui.h:14
+msgid "button"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:15
+msgid "homepage url"
+msgstr ""
+
 #: ../data/gui/popup_notification_window.ui.h:1
 #, fuzzy
 msgid "Event Type"
@@ -1833,128 +2067,111 @@ msgid "Always"
 msgstr "Сышоў"
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Always use GNOME default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:32
-msgid "Always use KDE default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:33
-msgid "Always use Xfce default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Запытацца аб паведамленні змены стану, калі я:"
 
-#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
 msgid "Audio / Video"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:33
 msgid "Audio input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Audio output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:38
-#, fuzzy
-msgid "Autodetect on every Gajim startup"
-msgstr "_Злучацца па старце Gajim"
-
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:35
 #, fuzzy
 msgid "Chat message:"
 msgstr "П_аведамленне стану:"
 
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:36
 #, fuzzy
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr ""
 "Заўсёды пры запуску спраўджваць, ці з'яўляецца Gajim _прадвызначанай Jabber-"
 "праграмай"
 
-#: ../data/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:37
 #, fuzzy
 msgid "Composing only"
 msgstr "Піша"
 
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:38
 msgid "Configure color and font of the interface"
 msgstr "Настаўленні колераў і шрыфтаў"
 
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
 msgid "Contact's message:"
 msgstr "П_аведамленне стану:"
 
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Імя чалавека"
 
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:41
 #, fuzzy
 msgid "Custom"
 msgstr "<b>Адмысловы</b>"
 
-#: ../data/gui/preferences_window.ui.h:46
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Detached roster with chat grouped by account"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Detached roster with detached chats"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:45
 msgid "Detached roster with single chat"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
-#: ../src/config.py:671
+#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
+#: ../src/config.py:665
 msgid "Disabled"
 msgstr "Адключана"
 
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:47
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Паказваць _малюнкі ў галоўным вакне"
 
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:48
 msgid "Display _extra email details"
 msgstr "Паказаць _падрабязнасці пошты"
 
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:49
 #, fuzzy
 msgid "Display _location of contacts in roster"
 msgstr "Паказваць _малюнкі ў галоўным вакне"
 
-#: ../data/gui/preferences_window.ui.h:54
+#: ../data/gui/preferences_window.ui.h:50
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Паказваць _малюнкі ў галоўным вакне"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display a_vatars of contacts in roster"
 msgstr "Паказваць _малюнкі ў галоўным вакне"
 
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:52
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Паказваць _малюнкі ў галоўным вакне"
 
-#: ../data/gui/preferences_window.ui.h:57
+#: ../data/gui/preferences_window.ui.h:53
 msgid "Display status _messages of contacts in roster"
 msgstr "Паказваць _стан у галоўным вакне"
 
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:54
 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 "
@@ -1963,7 +2180,7 @@ msgstr ""
 "Gajim можа адпраўляць і атрымліваць метазвесткі размоў з пэўным чалавекам. "
 "Вызначце, аб якіх зменах стану Вы хочаце ведаць."
 
-#: ../data/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:55
 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 "
@@ -1972,7 +2189,7 @@ msgstr ""
 "Gajim можа адпраўляць і атрымліваць метазвесткі размоў з пэўным чалавекам. "
 "Вызначце, аб якіх зменах стану Вы хочаце паведамляць суразмоўцу."
 
-#: ../data/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:56
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1980,12 +2197,12 @@ msgstr ""
 "Gajim будзе паведамляць Вам аб сышоўшых людзях у выплыўным вакне ў правым "
 "верхнім куце экрана"
 
-#: ../data/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:58
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "Схаваць кнопкі групавой размовы."
 
-#: ../data/gui/preferences_window.ui.h:63
+#: ../data/gui/preferences_window.ui.h:59
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
@@ -1994,7 +2211,7 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim далучыцца да гэтай групавой размовы пры "
 "запуску"
 
-#: ../data/gui/preferences_window.ui.h:64
+#: ../data/gui/preferences_window.ui.h:60
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -2002,18 +2219,18 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim таксама дадасць звесткі аб адпраўніку "
 "новых лістоў"
 
-#: ../data/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:61
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:66
+#: ../data/gui/preferences_window.ui.h:62
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -2021,7 +2238,7 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim паказвае аватары ў галоўным вакне і ў "
 "групавых размовах"
 
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -2029,7 +2246,7 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim паказвае паведамленні аб зменах стану для "
 "кожнага чалавека ў галоўным вакне і ў групавых размовах"
 
-#: ../data/gui/preferences_window.ui.h:69
+#: ../data/gui/preferences_window.ui.h:65
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -2037,7 +2254,7 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim паказвае аватары ў галоўным вакне і ў "
 "групавых размовах"
 
-#: ../data/gui/preferences_window.ui.h:70
+#: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the location of contacts in the roster window"
@@ -2045,7 +2262,7 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim паказвае аватары ў галоўным вакне і ў "
 "групавых размовах"
 
-#: ../data/gui/preferences_window.ui.h:71
+#: ../data/gui/preferences_window.ui.h:67
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -2053,7 +2270,7 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim паказвае аватары ў галоўным вакне і ў "
 "групавых размовах"
 
-#: ../data/gui/preferences_window.ui.h:72
+#: ../data/gui/preferences_window.ui.h:68
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -2061,14 +2278,14 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim паказвае аватары ў галоўным вакне і ў "
 "групавых размовах"
 
-#: ../data/gui/preferences_window.ui.h:73
+#: ../data/gui/preferences_window.ui.h:69
 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/gui/preferences_window.ui.h:74
+#: ../data/gui/preferences_window.ui.h:70
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -2080,14 +2297,14 @@ msgstr ""
 "зважайце, што ў такім разе ніхто з людзей, якіх няма ў Вашым спісе, не зможа "
 "адправіць Вам паведамленне"
 
-#: ../data/gui/preferences_window.ui.h:75
+#: ../data/gui/preferences_window.ui.h:71
 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/gui/preferences_window.ui.h:76
+#: ../data/gui/preferences_window.ui.h:72
 #, fuzzy
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
@@ -2096,7 +2313,7 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim таксама дадасць звесткі аб адпраўніку "
 "новых лістоў"
 
-#: ../data/gui/preferences_window.ui.h:77
+#: ../data/gui/preferences_window.ui.h:73
 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, "
@@ -2106,13 +2323,13 @@ msgstr ""
 "пратаколаў. (напр., чалавек з MSN будзе мець адпаведныя значкі злучанасці, "
 "адсутнасці, занятасці і г.д. для MSN-карыстальнікаў)"
 
-#: ../data/gui/preferences_window.ui.h:78
+#: ../data/gui/preferences_window.ui.h:74
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:79
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2120,104 +2337,104 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim заменіць ascii-сымболікі (напр., ':)' ) "
 "адпаведнай значкай"
 
-#: ../data/gui/preferences_window.ui.h:80
+#: ../data/gui/preferences_window.ui.h:76
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:81
+#: ../data/gui/preferences_window.ui.h:77
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "_Вакно для аднаго паведамлення:"
 
-#: ../data/gui/preferences_window.ui.h:82
+#: ../data/gui/preferences_window.ui.h:78
 msgid "Ma_nage..."
 msgstr "Кі_раванне..."
 
-#: ../data/gui/preferences_window.ui.h:83
+#: ../data/gui/preferences_window.ui.h:79
 #, fuzzy
 msgid "Never"
 msgstr "_Ніколі"
 
-#: ../data/gui/preferences_window.ui.h:84
+#: ../data/gui/preferences_window.ui.h:80
 #, fuzzy
 msgid "Notifications"
 msgstr "Змяненне рахунка"
 
-#: ../data/gui/preferences_window.ui.h:85
+#: ../data/gui/preferences_window.ui.h:81
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Паведамляць мне аб людзях, якія: "
 
-#: ../data/gui/preferences_window.ui.h:86
+#: ../data/gui/preferences_window.ui.h:82
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Паведамляць мне аб людзях, якія: "
 
-#: ../data/gui/preferences_window.ui.h:87
+#: ../data/gui/preferences_window.ui.h:83
 #, fuzzy
 msgid "Notify me about it"
 msgstr "_Паведамляць мне пра гэта"
 
-#: ../data/gui/preferences_window.ui.h:88
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notify on new _GMail email"
 msgstr "Паведамляць аб новай пошце на _Gmail"
 
-#: ../data/gui/preferences_window.ui.h:89
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Only when pending events"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:90
+#: ../data/gui/preferences_window.ui.h:86
 #, fuzzy
 msgid "Personal Events"
 msgstr "Асабістыя звесткі"
 
-#: ../data/gui/preferences_window.ui.h:91
+#: ../data/gui/preferences_window.ui.h:87
 msgid "Play _sounds"
 msgstr "Граць _гук"
 
-#: ../data/gui/preferences_window.ui.h:92
+#: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
 msgid "Pop it up"
 msgstr "_Вынырваць"
 
-#: ../data/gui/preferences_window.ui.h:93
+#: ../data/gui/preferences_window.ui.h:89
 msgid "Preferences"
 msgstr "Уласцівасці"
 
-#: ../data/gui/preferences_window.ui.h:94
+#: ../data/gui/preferences_window.ui.h:90
 msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:96
+#: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
 msgid "STUN server:"
 msgstr "Сервер:"
 
-#: ../data/gui/preferences_window.ui.h:97
+#: ../data/gui/preferences_window.ui.h:93
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Паказваць толькі ў _галоўным вакне"
+msgid "Show notification area icon:"
+msgstr "_Значка панэлі паведамленняў"
 
-#: ../data/gui/preferences_window.ui.h:98
+#: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
-msgid "Show systray:"
-msgstr "_Паказваць падзею ў прасторы паведамленняў"
+msgid "Show only in roster"
+msgstr "Паказваць толькі ў _галоўным вакне"
 
-#: ../data/gui/preferences_window.ui.h:99
+#: ../data/gui/preferences_window.ui.h:95
 msgid "Sign _in"
 msgstr "_Злучыцца"
 
-#: ../data/gui/preferences_window.ui.h:100
+#: ../data/gui/preferences_window.ui.h:96
 msgid "Sign _out"
 msgstr "З_ысці"
 
-#: ../data/gui/preferences_window.ui.h:101
+#: ../data/gui/preferences_window.ui.h:97
 msgid "Single window for everything"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:102
+#: ../data/gui/preferences_window.ui.h:98
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2225,30 +2442,30 @@ msgstr ""
 "Некаторыя паведамленні ўключаюць афармленне (фармат, колеры і г.д.). Калі "
 "гэтая опцыя ўключаная, Gajim будзе паказваць нефарматаваны тэкст."
 
-#: ../data/gui/preferences_window.ui.h:103
+#: ../data/gui/preferences_window.ui.h:99
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "_Упарадкаваць людзей па стане"
 
-#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
 msgid "Status"
 msgstr "Стан"
 
-#: ../data/gui/preferences_window.ui.h:105
+#: ../data/gui/preferences_window.ui.h:101
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "Прадвызначаны набор _значак стану:"
 
-#: ../data/gui/preferences_window.ui.h:106
+#: ../data/gui/preferences_window.ui.h:102
 #, fuzzy
 msgid "Style"
 msgstr "Марнаванне часу"
 
-#: ../data/gui/preferences_window.ui.h:107
+#: ../data/gui/preferences_window.ui.h:103
 msgid "T_heme:"
 msgstr "Т_эма:"
 
-#: ../data/gui/preferences_window.ui.h:108
+#: ../data/gui/preferences_window.ui.h:104
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2256,7 +2473,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:111
+#: ../data/gui/preferences_window.ui.h:107
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2264,131 +2481,135 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:114
+#: ../data/gui/preferences_window.ui.h:110
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Ужыць _значкі транспартаў"
 
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:111
+msgid "Use default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:112
 msgid "Use system _default"
 msgstr "Ужыць _сістэмны"
 
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:113
 msgid "Video framerate"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:117
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Video input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:118
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Video output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:119
+#: ../data/gui/preferences_window.ui.h:116
 msgid "Video size"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:120
+#: ../data/gui/preferences_window.ui.h:117
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Па атрыманні новай падзеі"
 
-#: ../data/gui/preferences_window.ui.h:121
+#: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
 msgid "Your message:"
 msgstr "Памылка: %s"
 
-#: ../data/gui/preferences_window.ui.h:122
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your nickname:"
 msgstr "П_ерад мянушкай:"
 
-#: ../data/gui/preferences_window.ui.h:123
+#: ../data/gui/preferences_window.ui.h:120
 #, fuzzy
 msgid "_Away after:"
 msgstr "Аўтаматычна змяняць стан на \"_сышоў\" праз:"
 
-#: ../data/gui/preferences_window.ui.h:124
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Гартач:"
 
-#: ../data/gui/preferences_window.ui.h:125
+#: ../data/gui/preferences_window.ui.h:122
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "_Паказваць нагадванні стану размовы:"
 
-#: ../data/gui/preferences_window.ui.h:126
+#: ../data/gui/preferences_window.ui.h:123
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Сымболікі:"
 
-#: ../data/gui/preferences_window.ui.h:127
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_File manager:"
 msgstr "_Кіраўнік файлаў:"
 
-#: ../data/gui/preferences_window.ui.h:128
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_Highlight misspelled words"
 msgstr "_Фарбаваць няправільна напісаныя словы"
 
-#: ../data/gui/preferences_window.ui.h:129
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ігнараваць падзеі ад людзей, якіх няма ў кантактным лісце"
 
-#: ../data/gui/preferences_window.ui.h:130
+#: ../data/gui/preferences_window.ui.h:127
 #, fuzzy
 msgid "_Ignore rich content in incoming messages"
 msgstr "Ігнараваць афармленне ўваходных паведамленняў"
 
-#: ../data/gui/preferences_window.ui.h:131
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Log status changes of contacts"
 msgstr "_Пісаць у журнал паведамленні аб змене стану чалавека"
 
-#: ../data/gui/preferences_window.ui.h:132
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Mail client:"
 msgstr "_Паштовая праграма:"
 
-#: ../data/gui/preferences_window.ui.h:133
+#: ../data/gui/preferences_window.ui.h:130
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Аўтаматычна змяняць стан на \"_недаступны\" праз:"
 
-#: ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Open..."
 msgstr "_Адкрыць..."
 
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Reset to Default Colors"
 msgstr "_Вярнуць звычайныя колеры"
 
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:133
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "_Паказваць нагадванні стану размовы:"
 
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Status message:"
 msgstr "П_аведамленне стану:"
 
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:140
+#: ../data/gui/preferences_window.ui.h:137
 #, fuzzy
 msgid "in _group chats"
 msgstr "Удзельнічаць у _групавой размове"
 
-#: ../data/gui/preferences_window.ui.h:141
+#: ../data/gui/preferences_window.ui.h:138
 #, fuzzy
 msgid "in _roster"
 msgstr "Няма ў спісе"
 
-#: ../data/gui/preferences_window.ui.h:142
+#: ../data/gui/preferences_window.ui.h:139
 msgid "minutes"
 msgstr "хвіліны"
 
@@ -2441,7 +2662,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Парадак:"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3436
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
 msgid "Privacy List"
 msgstr "Спіс прыватнасці"
 
@@ -2676,8 +2897,8 @@ msgstr "Выдаліць рахунак для Gajim і на _серверы"
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5492 ../src/roster_window.py:5622
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
+#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
 msgid "_Remove"
 msgstr "Вы_даліць"
 
@@ -2723,59 +2944,63 @@ msgid "Help online"
 msgstr "Дапамога ў Сеціве"
 
 #: ../data/gui/roster_window.ui.h:8
+msgid "P_lugins"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:9
 msgid "Profile, A_vatar"
 msgstr "Профіль, а_ватар"
 
-#: ../data/gui/roster_window.ui.h:9
+#: ../data/gui/roster_window.ui.h:10
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "Паказаць _адлучаных людзей"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
 msgid "Show Trans_ports"
 msgstr "Паказаць _транспарты"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
 msgid "Show _Offline Contacts"
 msgstr "Паказаць _адлучаных людзей"
 
-#: ../data/gui/roster_window.ui.h:12 ../src/statusicon.py:326
+#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
 msgid "Show _Roster"
 msgstr "Паказаць _галоўнае вакно"
 
-#: ../data/gui/roster_window.ui.h:13
+#: ../data/gui/roster_window.ui.h:14
 #, 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/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
 #: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Дзеянні"
 
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
 msgid "_Contents"
 msgstr "_Змест"
 
-#: ../data/gui/roster_window.ui.h:18 ../src/disco.py:1502
+#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
 msgid "_Edit"
 msgstr "_Змяніць"
 
-#: ../data/gui/roster_window.ui.h:19
+#: ../data/gui/roster_window.ui.h:20
 msgid "_FAQ"
 msgstr "_Частыя пытанні"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Help"
 msgstr "_Даведка"
 
-#: ../data/gui/roster_window.ui.h:22
+#: ../data/gui/roster_window.ui.h:23
 #, fuzzy
 msgid "_Send Single Message..."
 msgstr "Адправіць _асобнае паведамленне..."
 
-#: ../data/gui/roster_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:25
 msgid "_View"
 msgstr "_Выгляд"
 
@@ -2794,12 +3019,12 @@ msgid "_Add contact"
 msgstr "Дадаць _чалавека"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5634
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
 #, fuzzy
 msgid "_Information"
 msgstr "Асабістыя звесткі"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1353
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
 msgid "_Search"
 msgstr "П_ошук"
 
@@ -2819,10 +3044,6 @@ msgstr "Зарэгістравацца"
 msgid "_Cancel"
 msgstr "_Скасаваць"
 
-#: ../data/gui/single_message_window.ui.h:2
-msgid "From:"
-msgstr "Ад:"
-
 #: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Адказаць на гэтае паведамленне"
@@ -2839,10 +3060,6 @@ msgstr "Адправіць паведамленне"
 msgid "Send message and close window"
 msgstr "Адправіць паведамленне і закрыць вакно"
 
-#: ../data/gui/single_message_window.ui.h:7
-msgid "Subject:"
-msgstr "Тэма:"
-
 #: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Каму:"
@@ -3061,26 +3278,36 @@ msgstr "Імгненны паведамляльнік Gajim"
 msgid "Jabber IM Client"
 msgstr "Jabber-праграма"
 
-#: ../src/adhoc_commands.py:314
+#: ../src/adhoc_commands.py:323
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Асабістыя звесткі"
 
-#: ../src/adhoc_commands.py:315
+#: ../src/adhoc_commands.py:324
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:351 ../src/adhoc_commands.py:374
+#: ../src/adhoc_commands.py:370
+#, fuzzy
+msgid "Invalid Form"
+msgstr "Няправільны элемент"
+
+#: ../src/adhoc_commands.py:371
+#, fuzzy
+msgid "The form is not filled correctly."
+msgstr "Jabber ID групавой размовы ўтрымлівае няправільныя знакі."
+
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:360
+#: ../src/adhoc_commands.py:399
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:471
+#: ../src/adhoc_commands.py:513
 msgid "Service returned an error."
 msgstr ""
 
@@ -3105,7 +3332,7 @@ msgstr "Цэлы лік"
 msgid "Text"
 msgstr "Тэкставае"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:945
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
 msgid "Color"
 msgstr "Колер"
 
@@ -3143,237 +3370,237 @@ msgstr[2] "Вы атрымалі новае паведамленне:"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "English"
 msgstr "Ангельская"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Belarusian"
 msgstr "Беларуская"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Bulgarian"
 msgstr "Балгарская"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Breton"
 msgstr "Брытонская"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Czech"
 msgstr "Чэшская"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "German"
 msgstr "Нямецкая"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Greek"
 msgstr "Грэцкая"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "British"
 msgstr "Брытанская"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Esperanto"
 msgstr "Эсперанта"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Spanish"
 msgstr "Іспанская"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Basque"
 msgstr "Басцкая"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "French"
 msgstr "Французская"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Croatian"
 msgstr "Харвацкая"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Italian"
 msgstr "Італійская"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian (b)"
 msgstr "Нарвежская (бокмал)"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Dutch"
 msgstr "Галандская"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian"
 msgstr "Нарвежская"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Polish"
 msgstr "Польская"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Portuguese"
 msgstr "Партугальская"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Brazilian Portuguese"
 msgstr "Бразільская партугальская"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Russian"
 msgstr "Расейская"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Serbian"
 msgstr "Нямецкая"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Slovak"
 msgstr "Славацкая"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Swedish"
 msgstr "Шведская"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Chinese (Ch)"
 msgstr "Кітайская (Ch)"
 
-#: ../src/chat_control.py:479
+#: ../src/chat_control.py:496
 msgid "Spelling language"
 msgstr "Мова правапісу"
 
 #. we are not connected
-#: ../src/chat_control.py:511 ../src/chat_control.py:720
+#: ../src/chat_control.py:528 ../src/chat_control.py:737
 msgid "A connection is not available"
 msgstr "Няма злучэння"
 
-#: ../src/chat_control.py:512 ../src/chat_control.py:721
+#: ../src/chat_control.py:529 ../src/chat_control.py:738
 msgid "Your message can not be sent until you are connected."
 msgstr "Вы не можаце адпраўляць паведамленні без злучэння."
 
-#: ../src/chat_control.py:927
+#: ../src/chat_control.py:944
 #, fuzzy
 msgid "Underline"
 msgstr "дзевяць"
 
-#: ../src/chat_control.py:928
+#: ../src/chat_control.py:945
 #, fuzzy
 msgid "Strike"
 msgstr "Мянушка"
 
-#: ../src/chat_control.py:951
+#: ../src/chat_control.py:968
 #, fuzzy
 msgid "Font"
 msgstr "_Шрыфт:"
 
-#: ../src/chat_control.py:960
+#: ../src/chat_control.py:977
 #, fuzzy
 msgid "Clear formating"
 msgstr "Асабістыя звесткі"
 
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1055
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:1039
+#: ../src/chat_control.py:1056
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1503 ../src/chat_control.py:1987
+#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Шыфраванне дзейнічае"
 
 #. Add to roster
-#: ../src/chat_control.py:1528 ../src/common/contacts.py:158
+#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
 #: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:245 ../src/dialogs.py:1064 ../src/dialogs.py:2078
-#: ../src/dialogs.py:2107 ../src/gui_interface.py:674
+#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
+#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
 #: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1610 ../src/roster_window.py:1612
-#: ../src/roster_window.py:1942 ../src/roster_window.py:3289
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
+#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
+#: ../src/roster_window.py:3382
 msgid "Not in Roster"
 msgstr "Няма ў спісе"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1575
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Спіс актыўных, скончаных і спыненых перадачаў файлаў"
 
-#: ../src/chat_control.py:1561
+#: ../src/chat_control.py:1578
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1656
+#: ../src/chat_control.py:1677
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:1869
 #, 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:1967 ../src/dialogs.py:4866
+#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1968
+#: ../src/chat_control.py:1991
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1977
+#: ../src/chat_control.py:2000
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Шыфраванне адключанае"
 
-#: ../src/chat_control.py:2003
+#: ../src/chat_control.py:2026
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:2028
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2051
 #, fuzzy
 msgid "and authenticated"
 msgstr "Аўтарызацыя"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2032
+#: ../src/chat_control.py:2055
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Аўтарызацыя"
@@ -3381,58 +3608,66 @@ 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:2039
+#: ../src/chat_control.py:2062
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2182
+#: ../src/chat_control.py:2205
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2191
+#: ../src/chat_control.py:2215
+msgid "This session WILL be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2217
+msgid "This session WILL NOT be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2226
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Гэтае паведамленне зашыфраванае]"
 
-#: ../src/chat_control.py:2194
+#: ../src/chat_control.py:2229
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2196
+#: ../src/chat_control.py:2231
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2201
+#: ../src/chat_control.py:2236
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2203
+#: ../src/chat_control.py:2238
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Шыфраванне адключанае"
 
-#: ../src/chat_control.py:2241 ../src/chat_control.py:2254
+#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Гэтае паведамленне зашыфраванае]"
 
-#: ../src/chat_control.py:2247
+#: ../src/chat_control.py:2288
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Гэтае паведамленне зашыфраванае]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2519
+#: ../src/chat_control.py:2566
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Вам адправіў паведамленне \"%s\""
 
-#: ../src/chat_control.py:2520
+#: ../src/chat_control.py:2567
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3440,22 +3675,20 @@ msgstr ""
 "Калі Вы закрыеце гэтую картку з адключаным вядзеннем журналаў, гэтае "
 "паведамленне згубіцца."
 
-#: ../src/chat_control.py:2663 ../src/common/connection_handlers.py:1635
-#: ../src/common/connection_handlers.py:1758
-#: ../src/common/connection_handlers.py:1960
-#: ../src/common/connection_handlers.py:2110 ../src/common/connection.py:452
+#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
 #: ../src/gajim.py:159 ../src/session.py:138
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2664
+#: ../src/chat_control.py:2714
 #, 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:2906
+#: ../src/chat_control.py:2962
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s цяпер %(status)s"
@@ -3469,28 +3702,28 @@ msgstr "стварэнне базы журналаў"
 msgid "creating cache database"
 msgstr "стварэнне базы журналаў"
 
-#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
-#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
-#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
-#: ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s з'яўляецца файлам, але павінна быць дырэкторыя"
 
-#: ../src/common/check_paths.py:275 ../src/common/check_paths.py:282
-#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
-#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
-#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:333
+#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
+#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
+#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
 msgid "Gajim will now exit"
 msgstr "Gajim сканчвае работу"
 
-#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
+#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s з'яўляецца дырэкторыяй, але павінны быць файл"
 
-#: ../src/common/check_paths.py:342
+#: ../src/common/check_paths.py:351
 #, python-format
 msgid "creating %s directory"
 msgstr "стварэнне дырэкторыі %s"
@@ -3554,9 +3787,9 @@ msgstr "Выберыце групавыя размовы, з якіх Вы хо
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:801
-#: ../src/roster_window.py:1614 ../src/roster_window.py:1616
-#: ../src/roster_window.py:5251
+#: ../src/common/helpers.py:57 ../src/roster_window.py:815
+#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
+#: ../src/roster_window.py:5323
 msgid "Groupchats"
 msgstr "Групавыя размовы"
 
@@ -3618,7 +3851,8 @@ msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
 #: ../src/common/config.py:88
-msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgid ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
 #: ../src/common/config.py:93
@@ -3672,9 +3906,9 @@ msgid ""
 msgstr "Спіс падзеленых прагаламі згорнутых рахункаў і групаў."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:501
-#: ../src/common/optparser.py:290 ../src/common/optparser.py:486
-#: ../src/common/optparser.py:520 ../src/gui_interface.py:3370
+#: ../src/common/config.py:106 ../src/common/config.py:505
+#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
+#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
 #, fuzzy
 msgid "default"
 msgstr "Прадвызначана"
@@ -3893,7 +4127,8 @@ msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "У стандарце IEC вызначана, што КіБ = 1024 байтаў, КБ = 1000 байтаў."
 
 #: ../src/common/config.py:197
-msgid "Notify of events in the system trayicon."
+#, fuzzy
+msgid "Notify of events in the notification area."
 msgstr "Нагадваць аб падзеях праз значку прасторы паведамленняў."
 
 #: ../src/common/config.py:203
@@ -3928,9 +4163,10 @@ msgstr ""
 "размовах."
 
 #: ../src/common/config.py:221
+#, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
+"setting is taken into account only if notification icon is used."
 msgstr ""
 "Калі true, Gajim сканчвае работу па націску кнопкі X вакна. Гэтае "
 "настаўленне ўлічваецца толькі разам з значкай прасторы паведамленняў."
@@ -4201,7 +4437,7 @@ msgstr ""
 #: ../src/common/config.py:270
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
-"systray icon."
+"notification icon."
 msgstr ""
 
 #: ../src/common/config.py:271
@@ -4372,111 +4608,122 @@ msgstr ""
 msgid "Message that is sent to contacts you want to add"
 msgstr "Запоўніце палі звесткамі, каб дадаць чалавека ў спіс"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:374
+msgid "Last time we syncronized with logs from server."
+msgstr ""
+
+#: ../src/common/config.py:436
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Ці ўжыты OpenPGP ў размове з гэтым чалавекам?"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:437 ../src/common/config.py:440
+#: ../src/common/config.py:438 ../src/common/config.py:441
 msgid "Language for which we want to check misspelled words"
 msgstr "Мова праверкі правапісу"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:447
 msgid "all or space separated status"
 msgstr "усе ці падзеленыя прагаламі станы"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:448
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no' ці 'both'"
 
-#: ../src/common/config.py:448 ../src/common/config.py:450
-#: ../src/common/config.py:451 ../src/common/config.py:454
-#: ../src/common/config.py:455
+#: ../src/common/config.py:449 ../src/common/config.py:451
+#: ../src/common/config.py:452 ../src/common/config.py:455
+#: ../src/common/config.py:456
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' ці ''"
 
-#: ../src/common/config.py:461 ../src/common/pep.py:157
+#: ../src/common/config.py:460
+msgid ""
+"State whether plugins should be activated on exit (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
+msgstr ""
+
+#: ../src/common/config.py:465 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Сон"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back soon"
 msgstr "Хутка буду"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back in some minutes."
 msgstr "Хутка буду."
 
-#: ../src/common/config.py:463 ../src/common/pep.py:127
+#: ../src/common/config.py:467 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Ежа"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:467
 msgid "I'm eating, so leave me a message."
 msgstr "Ямо, пакіньце мне паведамленне."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "Movie"
 msgstr "Фільм"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "I'm watching a movie."
 msgstr "Гляджу фільм."
 
-#: ../src/common/config.py:465 ../src/common/pep.py:186
+#: ../src/common/config.py:469 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Працую"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:469
 msgid "I'm working."
 msgstr "Працую."
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "Phone"
 msgstr "Тэлефон"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "I'm on the phone."
 msgstr "Я на тэлефоне."
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "Out"
 msgstr "Сышоў"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "I'm out enjoying life."
 msgstr "Я цешуся з жыцця."
 
-#: ../src/common/config.py:478
+#: ../src/common/config.py:482
 msgid "I'm available."
 msgstr "Я даступны."
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:483
 msgid "I'm free for chat."
 msgstr "Я магу размаўляць."
 
-#: ../src/common/config.py:480 ../src/config.py:1600
+#: ../src/common/config.py:484 ../src/config.py:1600
 msgid "Be right back."
 msgstr "Хутка прыйду."
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:485
 msgid "I'm not available."
 msgstr "Мяне няма."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:486
 msgid "Do not disturb."
 msgstr "Не турбаваць."
 
-#: ../src/common/config.py:483 ../src/common/config.py:484
+#: ../src/common/config.py:487 ../src/common/config.py:488
 msgid "Bye!"
 msgstr "Бывай!"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:498
 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."
@@ -4485,90 +4732,86 @@ msgstr ""
 "вызначаных у параметры muc_highlight_words, ці калі гэтае паведамленне "
 "ўтрымлівае Вашую мянушку."
 
-#: ../src/common/config.py:495
+#: ../src/common/config.py:499
 msgid "Sound to play when any MUC message arrives."
 msgstr "Прайграць гук пры атрыманні паведамлення MUC."
 
-#: ../src/common/config.py:504 ../src/common/optparser.py:304
+#: ../src/common/config.py:508 ../src/common/optparser.py:308
 msgid "green"
 msgstr "зялёны"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:290
+#: ../src/common/config.py:512 ../src/common/optparser.py:294
 msgid "grocery"
 msgstr "садавіна"
 
-#: ../src/common/config.py:512
+#: ../src/common/config.py:516
 msgid "human"
 msgstr "чалавек"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:520
 msgid "marine"
 msgstr "мора"
 
-#: ../src/common/connection_handlers.py:84
+#: ../src/common/connection_handlers.py:94
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Немагчыма загрузіць модуль idle"
 
-#: ../src/common/connection_handlers.py:117
+#: ../src/common/connection_handlers.py:127
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Звесткі рэгістрацыі для транспарта %s не прыйшлі ў час"
 
-#: ../src/common/connection_handlers.py:124
+#: ../src/common/connection_handlers.py:134
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Зарэгістравацца на %s"
 
-#: ../src/common/connection_handlers.py:125
+#: ../src/common/connection_handlers.py:135
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 #, fuzzy
 msgid "Registration failed"
 msgstr "Памылка злучэння"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:445
-#: ../src/common/connection_handlers.py:1633
-#: ../src/common/connection_handlers.py:1756
-#: ../src/common/connection_handlers.py:1957
-#: ../src/common/connection_handlers.py:2108 ../src/common/connection.py:449
+#: ../src/common/connection_handlers.py:466
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
 #: ../src/gajim.py:341
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:678 ../src/common/connection.py:1472
+#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Пашырэнне не падтрымліваецца"
 
-#: ../src/common/connection_handlers.py:679 ../src/common/connection.py:1473
+#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1446 ../src/common/connection.py:253
-#: ../src/config.py:2091 ../src/config.py:2100 ../src/config.py:2168
-#: ../src/config.py:3560 ../src/dataforms_widget.py:597 ../src/dialogs.py:2931
+#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
+#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
+#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
 msgid "Invalid Jabber ID"
 msgstr "Няправільны Jabber ID"
 
-#: ../src/common/connection_handlers.py:1447
+#: ../src/common/connection_handlers.py:1405
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1636
-#: ../src/common/connection_handlers.py:1759
-#: ../src/common/connection_handlers.py:1961
-#: ../src/common/connection_handlers.py:2111 ../src/common/connection.py:453
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
 #: ../src/gajim.py:160 ../src/session.py:139
 #, python-format
 msgid ""
@@ -4576,91 +4819,6 @@ msgid ""
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1805
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Такая мянушка не дазволеная: %s"
-
-#: ../src/common/connection_handlers.py:1902
-#: ../src/common/connection_handlers.py:1911
-#: ../src/common/connection_handlers.py:1918
-#: ../src/common/connection_handlers.py:1922
-#: ../src/common/connection_handlers.py:1926
-#: ../src/common/connection_handlers.py:1931 ../src/gui_interface.py:139
-msgid "Unable to join group chat"
-msgstr "Немагчыма ўвайсці ў групавую размову"
-
-#: ../src/common/connection_handlers.py:1903
-#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:1912
-#, fuzzy, python-format
-msgid "You are banned from group chat %s."
-msgstr "Вам забаронена казанне ў гэтай групавой размове."
-
-#: ../src/common/connection_handlers.py:1919
-#, fuzzy, python-format
-msgid "Group chat %s does not exist."
-msgstr "Такой групавой размовы няма."
-
-#: ../src/common/connection_handlers.py:1923
-msgid "Group chat creation is restricted."
-msgstr "Стварэнне групавых размоў абмежаванае."
-
-#: ../src/common/connection_handlers.py:1927
-#, fuzzy, python-format
-msgid "Your registered nickname must be used in group chat %s."
-msgstr "Вы павінны карыстацца зарэгістраванай для Вас мянушкай."
-
-#: ../src/common/connection_handlers.py:1932
-#, 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:1976
-#, fuzzy
-msgid "Room has been destroyed"
-msgstr "Аўтарызацыя забраная"
-
-#: ../src/common/connection_handlers.py:1984
-#, python-format
-msgid "You can join this room instead: %s"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:2020
-msgid "I would like to add you to my roster."
-msgstr "Я хачу дадаць Вас у мой кантактны ліст."
-
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2041
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "цяпер падпісаны на %s"
-
-#: ../src/common/connection_handlers.py:2043
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "запыт адпіскі ад %s"
-
-#: ../src/common/connection_handlers.py:2045
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "цяпер адпісаны ад %s"
-
-#: ../src/common/connection_handlers.py:2240
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"JID %s не адпавядае стандарту RFC. Ён не будзе дададзены ў кантактны ліст. "
-"Выдаліце яго з дапамогай адмысловай праграмы, напр., http://jru.jabberstudio."
-"org/"
-
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr ""
@@ -4791,28 +4949,28 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:254 ../src/dialogs.py:2932
+#: ../src/common/connection.py:256 ../src/dialogs.py:2948
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Немагчыма адправіць пусты файл"
 
-#: ../src/common/connection.py:276
+#: ../src/common/connection.py:278
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:281
 #, 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:331
+#: ../src/common/connection.py:333
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Гэтае паведамленне *зашыфраванае* (Гл.:JEP:`27`]"
 
-#: ../src/common/connection.py:439
+#: ../src/common/connection.py:441
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4821,108 +4979,108 @@ msgstr ""
 "Тэма: %s\n"
 "%s"
 
-#: ../src/common/connection.py:807
+#: ../src/common/connection.py:809
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Злучэнне для рахунка \"%s\" згубленае"
 
-#: ../src/common/connection.py:808
+#: ../src/common/connection.py:810
 msgid "Reconnect manually."
 msgstr "Перадалучыцеся самастойна."
 
-#: ../src/common/connection.py:820
+#: ../src/common/connection.py:822
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Транспарт %s некарэктна адказаў, каб зарэгістраваць запыт: %s"
 
-#: ../src/common/connection.py:854
+#: ../src/common/connection.py:856
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:867
+#: ../src/common/connection.py:869
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr ""
 
 #. wrong answer
-#: ../src/common/connection.py:882
+#: ../src/common/connection.py:884
 msgid "Invalid answer"
 msgstr "Няправільны адказ"
 
-#: ../src/common/connection.py:883
+#: ../src/common/connection.py:885
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Транспарт %s некарэктна адказаў, каб зарэгістраваць запыт: %s"
 
-#: ../src/common/connection.py:1165 ../src/common/connection.py:1294
-#: ../src/common/connection.py:1784
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
+#: ../src/common/connection.py:1792
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Немагчыма злучыцца з \"%s\""
 
-#: ../src/common/connection.py:1166 ../src/gui_interface.py:755
+#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
 msgid "Check your connection or try again later."
 msgstr "Праверце злучэнне, альбо паспрабуйце пазней."
 
-#: ../src/common/connection.py:1171
+#: ../src/common/connection.py:1173
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Захаваць у: %s"
 
-#: ../src/common/connection.py:1184
+#: ../src/common/connection.py:1186
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Памылка злучэння"
 
-#: ../src/common/connection.py:1215 ../src/common/connection.py:1274
+#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Немагчыма злучыцца з \"%s\""
 
-#: ../src/common/connection.py:1216 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Злучэнне для рахунка \"%s\" згубленае"
 
-#: ../src/common/connection.py:1241
+#: ../src/common/connection.py:1243
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1244
+#: ../src/common/connection.py:1246
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1248
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr ""
 
-#: ../src/common/connection.py:1295
+#: ../src/common/connection.py:1297
 msgid "Check your connection or try again later"
 msgstr "Праверце злучэнне альбо паспрабуйце пазней"
 
-#: ../src/common/connection.py:1324
+#: ../src/common/connection.py:1329
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Памылка аўтарызацыі з \"%s\""
 
-#: ../src/common/connection.py:1326
+#: ../src/common/connection.py:1331
 msgid "Please check your login and password for correctness."
 msgstr "Праверце звесткі аўтарызацыі."
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1400
 msgid "Error while removing privacy list"
 msgstr "Памылка ў часе выдалення спіса прыватнасці"
 
-#: ../src/common/connection.py:1396
+#: ../src/common/connection.py:1401
 #, fuzzy, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4931,41 +5089,41 @@ msgstr ""
 "Спіс прыватнасці %s не выдалены. Магчыма, ён ужываецца ў адным з Вашых "
 "злучаных рэсурсаў. Дэактывізуйце іх і паўтарыце свае дзеянні."
 
-#: ../src/common/connection.py:1650
+#: ../src/common/connection.py:1658
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1653
+#: ../src/common/connection.py:1661
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Людзі"
 
-#: ../src/common/connection.py:1799 ../src/common/connection.py:1822
+#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
 msgid "Not fetched because of invisible status"
 msgstr "Не атрымана з-за нябачнага стану"
 
-#: ../src/common/connection.py:2254
+#: ../src/common/connection.py:2262
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Памылка злучэння"
 
-#: ../src/common/connection.py:2255
+#: ../src/common/connection.py:2263
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
 #: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:674
+#: ../src/gui_interface.py:551
 msgid "Observers"
 msgstr "Назіральнікі"
 
 #: ../src/common/contacts.py:139 ../src/common/contacts.py:366
 #: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1499 ../src/gui_interface.py:424
-#: ../src/roster_window.py:840 ../src/roster_window.py:1525
-#: ../src/roster_window.py:1606 ../src/roster_window.py:1608
-#: ../src/roster_window.py:1769
+#: ../src/disco.py:1517 ../src/roster_window.py:854
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
+#: ../src/roster_window.py:2466
 msgid "Transports"
 msgstr "Транспарты"
 
@@ -5192,203 +5350,219 @@ msgstr "Канец тыдня"
 msgid "Weekend!"
 msgstr "Выходныя!"
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:148
+msgid "Username must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:153
 msgid "Invalid character in username."
 msgstr "Няправільны знак у імені карыстальніка."
 
-#: ../src/common/helpers.py:156
-msgid "Server address required."
-msgstr "Патрэбны адрас сервера."
+#: ../src/common/helpers.py:159
+msgid "Server must be between 1 and 1023 chars"
+msgstr ""
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 msgid "Invalid character in hostname."
 msgstr "Няправільны знак у назве вузла."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:166
+msgid "Server address required."
+msgstr "Патрэбны адрас сервера."
+
+#: ../src/common/helpers.py:170
+msgid "Resource must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:175
 msgid "Invalid character in resource."
 msgstr "Няправільны знак у назве рэсурса."
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:215
 msgid "_Busy"
 msgstr "_Заняты"
 
-#: ../src/common/helpers.py:211 ../src/tooltips.py:195
+#: ../src/common/helpers.py:217 ../src/tooltips.py:195
 msgid "Busy"
 msgstr "Заняты"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:220
 msgid "_Not Available"
 msgstr "М_яне няма"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:225
 msgid "_Free for Chat"
 msgstr "_Магу размаўляць"
 
-#: ../src/common/helpers.py:221 ../src/tooltips.py:191
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Free for Chat"
 msgstr "Магу размаўляць"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:230
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?transfer status:Прыпыненая"
 
-#: ../src/common/helpers.py:226 ../src/tooltips.py:189
+#: ../src/common/helpers.py:232 ../src/tooltips.py:189
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?transfer status:Прыпыненая"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:234
 msgid "Connecting"
 msgstr "Злучэнне"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:237
 msgid "A_way"
 msgstr "Н_е тут"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:242
 msgid "_Offline"
 msgstr "_Адключаны"
 
-#: ../src/common/helpers.py:238 ../src/tooltips.py:199
+#: ../src/common/helpers.py:244 ../src/tooltips.py:199
 msgid "Offline"
 msgstr "Адключаны"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:247
 msgid "_Invisible"
 msgstr "_Нябачны"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:253
 msgid "?contact has status:Unknown"
 msgstr "?чалавек у стане:Невядомы"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:255
 msgid "?contact has status:Has errors"
 msgstr "?чалавек у стане:Ёсць памылкі"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:260
 msgid "?Subscription we already have:None"
 msgstr "?Ужо ёсць падпіскі:Няма"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:262
 msgid "To"
 msgstr "Да"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
+msgid "From"
+msgstr "Ад"
+
+#: ../src/common/helpers.py:266
 msgid "Both"
 msgstr "Абодва"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:274
 msgid "?Ask (for Subscription):None"
 msgstr "?Запыт (на падпіску):Няма"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:276
 msgid "Subscribe"
 msgstr "Падпісацца"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:285
 msgid "?Group Chat Contact Role:None"
 msgstr "?Роля чалавека:Няма"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:288
 msgid "Moderators"
 msgstr "Мадэратары"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:290
 msgid "Moderator"
 msgstr "Мадэратар"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:293
 msgid "Participants"
 msgstr "Удзельнікі"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:295
 msgid "Participant"
 msgstr "Удзельнік"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:298
 msgid "Visitors"
 msgstr "Наведвальнікі"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:300
 msgid "Visitor"
 msgstr "Наведвальнік"
 
-#: ../src/common/helpers.py:300 ../src/tooltips.py:210
+#: ../src/common/helpers.py:306 ../src/tooltips.py:210
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Адносіны ўдзельніка групавой размовы:Няма"
 
-#: ../src/common/helpers.py:302 ../src/tooltips.py:216
+#: ../src/common/helpers.py:308 ../src/tooltips.py:216
 msgid "Owner"
 msgstr "Уладальнік"
 
-#: ../src/common/helpers.py:304 ../src/tooltips.py:214
+#: ../src/common/helpers.py:310 ../src/tooltips.py:214
 msgid "Administrator"
 msgstr "Адміністратар"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:212
+#: ../src/common/helpers.py:312 ../src/tooltips.py:212
 msgid "Member"
 msgstr "Удзельнік"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:351
 msgid "is paying attention to the conversation"
 msgstr "сочыць за размовай"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:353
 msgid "is doing something else"
 msgstr "заняты чымсьці іншым"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:355
 msgid "is composing a message..."
 msgstr "піша паведамленне..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:352
+#: ../src/common/helpers.py:358
 msgid "paused composing a message"
 msgstr "перастаў пісаць"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:360
 msgid "has closed the chat window or tab"
 msgstr "закрыў вакно / картку размовы"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:619
+#: ../src/common/helpers.py:625
 #, python-format
 msgid "%s GiB"
 msgstr "%s ГіБ"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:622
+#: ../src/common/helpers.py:628
 #, python-format
 msgid "%s GB"
 msgstr "%s ГБ"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:626
+#: ../src/common/helpers.py:632
 #, python-format
 msgid "%s MiB"
 msgstr "%s МіБ"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:629
+#: ../src/common/helpers.py:635
 #, python-format
 msgid "%s MB"
 msgstr "%s МБ"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:633
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s KiB"
 msgstr "%s кiБ"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:636
+#: ../src/common/helpers.py:642
 #, python-format
 msgid "%s KB"
 msgstr "%s кБ"
 
 #. B means bytes
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:645
 #, python-format
 msgid "%s B"
 msgstr "%s Б"
@@ -5433,12 +5607,12 @@ msgstr "Gajim - %s"
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:111
+#: ../src/common/jingle_rtp.py:107
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Настаўленні пакоя"
 
-#: ../src/common/jingle_rtp.py:112
+#: ../src/common/jingle_rtp.py:108
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5450,30 +5624,30 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:209
+#: ../src/common/jingle_rtp.py:205
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:210
+#: ../src/common/jingle_rtp.py:206
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Памылка: %s"
 
-#: ../src/common/jingle_rtp.py:336
+#: ../src/common/jingle_rtp.py:335
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:339
+#: ../src/common/jingle_rtp.py:338
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:382
+#: ../src/common/jingle_rtp.py:381
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:390
+#: ../src/common/jingle_rtp.py:389
 msgid "video output"
 msgstr ""
 
@@ -5550,11 +5724,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "памылка: немагчыма прачытаць %s"
 
-#: ../src/common/optparser.py:299 ../src/common/optparser.py:300
+#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:379
+#: ../src/common/optparser.py:383
 msgid "migrating logs database to indices"
 msgstr "перанос базы журналаў у індэкс"
 
@@ -6294,17 +6468,17 @@ msgid ""
 msgstr "Магчыма, Gajim ужо працуе. Перадача файлаў скасаваная."
 
 #. we're not english
-#: ../src/common/stanza_session.py:303
+#: ../src/common/stanza_session.py:423
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:178
+#: ../src/common/zeroconf/connection_zeroconf.py:181
 msgid "Avahi error"
 msgstr "Памылка Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:179
+#: ../src/common/zeroconf/connection_zeroconf.py:182
 #, python-format
 msgid ""
 "%s\n"
@@ -6313,46 +6487,46 @@ msgstr ""
 "%s\n"
 "Мясцовыя паведамленні могуць не працаваць."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:190
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Праверце, ці ўсталяваны Avahi."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:199
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Could not start local service"
 msgstr "Немагчыма стартаваць мясцовы сервіс"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Немагчыма злучыцца праз порт %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-#: ../src/common/zeroconf/connection_zeroconf.py:283
-#: ../src/common/zeroconf/connection_zeroconf.py:294
-#: ../src/common/zeroconf/connection_zeroconf.py:308
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:286
+#: ../src/common/zeroconf/connection_zeroconf.py:297
+#: ../src/common/zeroconf/connection_zeroconf.py:311
 msgid "Please check if avahi-daemon is running."
 msgstr "Праверце, ці працуе avahi-daemon."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:282
-#: ../src/common/zeroconf/connection_zeroconf.py:293
-#: ../src/common/zeroconf/connection_zeroconf.py:307
+#: ../src/common/zeroconf/connection_zeroconf.py:285
+#: ../src/common/zeroconf/connection_zeroconf.py:296
+#: ../src/common/zeroconf/connection_zeroconf.py:310
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Немагчыма змяніць стан рахунка \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:325
+#: ../src/common/zeroconf/connection_zeroconf.py:328
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "Чалавека пакуль няма. Вы не можаце адправіць паведамленне."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:335
+#: ../src/common/zeroconf/connection_zeroconf.py:338
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Чалавека пакуль няма. Вы не можаце адправіць паведамленне."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:363
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "Немагчыма злучыцца з вузлом: скончыўся тэрмін чакання."
@@ -6373,16 +6547,16 @@ msgstr "Стандартныя паведамленні стану"
 msgid "Enabled"
 msgstr "Уключыць"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3078
+#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
 msgid "Default"
 msgstr "Прадвызначана"
 
-#: ../src/config.py:739 ../src/dialogs.py:1395
+#: ../src/config.py:733 ../src/dialogs.py:1409
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Слоўніка для мовы %s няма"
 
-#: ../src/config.py:740
+#: ../src/config.py:734
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6400,9 +6574,9 @@ msgid "status message text"
 msgstr "тэкст паведамлення аб змене стану"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2383 ../src/dialogs.py:2449
-#: ../src/dialogs.py:3215 ../src/disco.py:866 ../src/disco.py:1726
-#: ../src/disco.py:2030 ../src/history_window.py:90
+#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
+#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
+#: ../src/disco.py:2048 ../src/history_window.py:90
 msgid "Name"
 msgstr "Назва"
 
@@ -6436,7 +6610,7 @@ msgstr "Вы пачалі размову ў рахунку %s"
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Усе размоўныя вокны закрыюцца. Хочаце працягнуць?"
 
-#: ../src/config.py:1976 ../src/config.py:2509 ../src/config.py:2545
+#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
 msgid "You are currently connected to the server"
 msgstr "Вы злучаны з серверам"
 
@@ -6471,135 +6645,135 @@ msgstr "Назва рахунка не павінна быць пустой."
 msgid "Account name cannot contain spaces."
 msgstr "Назва рахунка не павінна ўтрымліваць прагалаў."
 
-#: ../src/config.py:2072
+#: ../src/config.py:2074
 #, fuzzy
 msgid "Rename Account"
 msgstr "Кіраванне рахункамі"
 
-#: ../src/config.py:2073
+#: ../src/config.py:2075
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Вызначце новую назву групы %s"
 
-#: ../src/config.py:2101
+#: ../src/config.py:2103
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID павінны мець форму \"user@servername\"."
 
-#: ../src/config.py:2318 ../src/config.py:3606
+#: ../src/config.py:2320 ../src/config.py:3623
 msgid "Invalid entry"
 msgstr "Няправільны элемент"
 
-#: ../src/config.py:2319 ../src/config.py:3607
+#: ../src/config.py:2321 ../src/config.py:3624
 msgid "Custom port must be a port number."
 msgstr "Адмысловы порт павінны быць нумарам порта."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2342
 msgid "Failed to get secret keys"
 msgstr "Немагчыма атрымаць сакрэтныя ключы"
 
-#: ../src/config.py:2341
+#: ../src/config.py:2343
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Памылка пошуку Вашых сакрэтных ключоў OpenPGP."
 
-#: ../src/config.py:2375
+#: ../src/config.py:2377
 msgid "OpenPGP Key Selection"
 msgstr "Выбар ключоў OpenPGP"
 
-#: ../src/config.py:2376
+#: ../src/config.py:2378
 msgid "Choose your OpenPGP key"
 msgstr "Выберыце Ваш ключ OpenPGP"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2385
 msgid "No such account available"
 msgstr "Такога рахунка няма"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2386
 msgid "You must create your account before editing your personal information."
 msgstr "Вы павінны стварыць рахунак да рэдагавання асабістых звестак."
 
-#: ../src/config.py:2391 ../src/dialogs.py:2136 ../src/dialogs.py:2371
-#: ../src/dialogs.py:2557 ../src/disco.py:511 ../src/profile_window.py:339
+#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
+#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
 msgid "You are not connected to the server"
 msgstr "Вы не злучаны з серверам"
 
-#: ../src/config.py:2392
+#: ../src/config.py:2394
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Немагчыма рэдагаваць асабістыя звесткі ў адлучаным рэжыме."
 
-#: ../src/config.py:2396
+#: ../src/config.py:2398
 msgid "Your server doesn't support Vcard"
 msgstr "Ваш сервер не падтрымлівае Vcard"
 
-#: ../src/config.py:2397
+#: ../src/config.py:2399
 msgid "Your server can't save your personal information."
 msgstr "Сервер не можа захаваць Вашыя асабістыя звесткі."
 
-#: ../src/config.py:2510 ../src/config.py:2546
+#: ../src/config.py:2512 ../src/config.py:2548
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Каб змяніць назву рахунка, трэба папярэдне адлучыцца."
 
-#: ../src/config.py:2515
+#: ../src/config.py:2517
 msgid "Account Local already exists."
 msgstr "Мясцовы рахунак Local ужо існуе."
 
-#: ../src/config.py:2516
+#: ../src/config.py:2518
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Змяніце назву альбо выдаліце яго, каб скарыстаць мясцовыя паведамленні."
 
-#: ../src/config.py:2673
+#: ../src/config.py:2675
 #, python-format
 msgid "Edit %s"
 msgstr "Змяніць %s"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2677
 #, python-format
 msgid "Register to %s"
 msgstr "Зарэгістравацца на %s"
 
 #. list at the beginning
-#: ../src/config.py:2711
+#: ../src/config.py:2713
 msgid "Ban List"
 msgstr "Чорны спіс"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2714
 msgid "Member List"
 msgstr "Спіс удзельнікаў"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2714
 msgid "Owner List"
 msgstr "Спіс уладальнікаў"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2715
 msgid "Administrator List"
 msgstr "Спіс адміністратараў"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2763 ../src/disco.py:873 ../src/history_manager.py:201
+#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2773
+#: ../src/config.py:2789
 msgid "Reason"
 msgstr "Прычына"
 
-#: ../src/config.py:2780
+#: ../src/config.py:2796
 msgid "Nick"
 msgstr "Мянушка"
 
-#: ../src/config.py:2786
+#: ../src/config.py:2802
 msgid "Role"
 msgstr "Роля"
 
-#: ../src/config.py:2813
+#: ../src/config.py:2829
 msgid "Banning..."
 msgstr "Забараніць казанне..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2815
+#: ../src/config.py:2831
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6607,11 +6781,11 @@ msgstr ""
 "<b>Каму Вы хочаце забараніць казанне?</b>\n"
 "\n"
 
-#: ../src/config.py:2817
+#: ../src/config.py:2833
 msgid "Adding Member..."
 msgstr "Дадаць ўдзельніка..."
 
-#: ../src/config.py:2818
+#: ../src/config.py:2834
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6619,11 +6793,11 @@ msgstr ""
 "<b>Каго Вы хочаце зрабіць удзельнікам?</b>\n"
 "\n"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2836
 msgid "Adding Owner..."
 msgstr "Дадаць уладальніка..."
 
-#: ../src/config.py:2821
+#: ../src/config.py:2837
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6631,11 +6805,11 @@ msgstr ""
 "<b>Каго Вы хочаце зрабіць уладальнікам?</b>\n"
 "\n"
 
-#: ../src/config.py:2823
+#: ../src/config.py:2839
 msgid "Adding Administrator..."
 msgstr "Дадаць адміністратара..."
 
-#: ../src/config.py:2824
+#: ../src/config.py:2840
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6643,7 +6817,7 @@ msgstr ""
 "<b>Каго Вы хочаце зрабіць адміністратарам?</b>\n"
 "\n"
 
-#: ../src/config.py:2825
+#: ../src/config.py:2841
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6660,113 +6834,113 @@ msgstr ""
 "4. domain (гэты домэн user@domain,\n"
 "domain/resource ці адрас паддамена)."
 
-#: ../src/config.py:2926
+#: ../src/config.py:2943
 #, python-format
 msgid "Removing %s account"
 msgstr "Выдаленне рахунка %s"
 
-#: ../src/config.py:2941
+#: ../src/config.py:2958
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Шыфраванне адключанае"
 
-#: ../src/config.py:2942
+#: ../src/config.py:2959
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2955 ../src/gui_interface.py:1132
-#: ../src/gui_interface.py:1243
+#: ../src/config.py:2972 ../src/gui_interface.py:311
+#: ../src/gui_interface.py:1048
 msgid "Password Required"
 msgstr "Патрабуецца пароль"
 
-#: ../src/config.py:2956 ../src/gui_interface.py:1223
+#: ../src/config.py:2973 ../src/gui_interface.py:1028
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Увядзіце пароль для рахунка %s"
 
-#: ../src/config.py:2957 ../src/gui_interface.py:1243
+#: ../src/config.py:2974 ../src/gui_interface.py:1048
 msgid "Save password"
 msgstr "Захаваць пароль"
 
-#: ../src/config.py:2967
+#: ../src/config.py:2984
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Рахунак \"%s\" злучаны з серверам"
 
-#: ../src/config.py:2968
+#: ../src/config.py:2985
 msgid "If you remove it, the connection will be lost."
 msgstr "Калі Вы выдаліце яго, згубіцца злучэнне."
 
-#: ../src/config.py:2982
+#: ../src/config.py:2999
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Памылка злучэння"
 
-#: ../src/config.py:2983
+#: ../src/config.py:3000
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Што Вы хочаце зрабіць?"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3001
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Выдаліць рахунак _толькі для Gajim"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3002
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3078
+#: ../src/config.py:3095
 msgid "?print_status:All"
 msgstr "?print_status:Усе"
 
-#: ../src/config.py:3079
+#: ../src/config.py:3096
 msgid "Enter and leave only"
 msgstr "Увайсці і выйсці"
 
-#: ../src/config.py:3080
+#: ../src/config.py:3097
 msgid "?print_status:None"
 msgstr "?print_status:Няма"
 
-#: ../src/config.py:3150
+#: ../src/config.py:3167
 msgid "New Group Chat"
 msgstr "Новая групавая размова"
 
-#: ../src/config.py:3183
+#: ../src/config.py:3200
 msgid "This bookmark has invalid data"
 msgstr "Гэтая закладка мае няправільныя звесткі"
 
-#: ../src/config.py:3184
+#: ../src/config.py:3201
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Запоўніце палі сервера і пакоя альбо выдаліце гэтую закладку."
 
 #. invalid char
-#: ../src/config.py:3302 ../src/dialogs.py:1934
+#: ../src/config.py:3319 ../src/dialogs.py:1950
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/config.py:3303 ../src/config.py:3317 ../src/config.py:3331
+#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Такая мянушка не дазволеная: %s"
 
-#: ../src/config.py:3316 ../src/config.py:3582
+#: ../src/config.py:3333 ../src/config.py:3599
 #, fuzzy
 msgid "Invalid server"
 msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/config.py:3330
+#: ../src/config.py:3347
 #, fuzzy
 msgid "Invalid room"
 msgstr "Няправільны элемент"
 
-#: ../src/config.py:3498
+#: ../src/config.py:3515
 msgid "Account has been added successfully"
 msgstr "Рахунак паспяхова дададзены"
 
-#: ../src/config.py:3499 ../src/config.py:3505
+#: ../src/config.py:3516 ../src/config.py:3522
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6777,36 +6951,36 @@ msgstr ""
 "\"Адмысловыя\", альбо пазней, выбраўшы элемент \"Рахункі\" ў меню \"Змяніць"
 "\" галоўнага вакна."
 
-#: ../src/config.py:3504
+#: ../src/config.py:3521
 msgid "Your new account has been created successfully"
 msgstr "Новы рахунак паспяхова створаны"
 
-#: ../src/config.py:3543
+#: ../src/config.py:3560
 msgid "Invalid username"
 msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/config.py:3545
+#: ../src/config.py:3562
 msgid "You must provide a username to configure this account."
 msgstr ""
 "Вы павінны пазначыць імя карыстальніка, каб змяніць настаўленні гэтага "
 "рахунка."
 
-#: ../src/config.py:3583
+#: ../src/config.py:3600
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Вызначце сваю новую мянушку:"
 
-#: ../src/config.py:3639 ../src/gui_interface.py:1904
+#: ../src/config.py:3656 ../src/gui_interface.py:1693
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Чалавек ужо ёсць у кантактным лісце"
 
-#: ../src/config.py:3640 ../src/gui_interface.py:1905
+#: ../src/config.py:3657 ../src/gui_interface.py:1694
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3717
+#: ../src/config.py:3734
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6816,7 +6990,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3723 ../src/gui_interface.py:1932
+#: ../src/config.py:3740 ../src/gui_interface.py:1721
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6824,117 +6998,126 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3755 ../src/config.py:3789
+#: ../src/config.py:3772 ../src/config.py:3806
 msgid "An error occurred during account creation"
 msgstr "Адбылася памылка ў часе стварэння рахунка"
 
-#: ../src/config.py:3854
+#: ../src/config.py:3871
 msgid "Account name is in use"
 msgstr "Назва рахунка ўжо скарыстаная"
 
-#: ../src/config.py:3855
+#: ../src/config.py:3872
 msgid "You already have an account using this name."
 msgstr "Вы ўжо маеце рахунак з такой назваю."
 
-#: ../src/config.py:4009
+#: ../src/config.py:3991
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/config.py:3992
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#: ../src/config.py:4036
 msgid "Active"
 msgstr "Актыўны"
 
-#: ../src/config.py:4017
+#: ../src/config.py:4044
 msgid "Event"
 msgstr "Падзея"
 
-#: ../src/config.py:4052
+#: ../src/config.py:4079
 msgid "First Message Received"
 msgstr "Атрыманае першае паведамленне"
 
-#: ../src/config.py:4053
+#: ../src/config.py:4080
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Атрыманае наступнае паведамленне"
 
-#: ../src/config.py:4055
+#: ../src/config.py:4082
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Атрыманае наступнае паведамленне"
 
-#: ../src/config.py:4056
+#: ../src/config.py:4083
 msgid "Contact Connected"
 msgstr "Чалавек далучыўся"
 
-#: ../src/config.py:4057
+#: ../src/config.py:4084
 msgid "Contact Disconnected"
 msgstr "Чалавек адлучыўся"
 
-#: ../src/config.py:4058
+#: ../src/config.py:4085
 msgid "Message Sent"
 msgstr "Паведамленне адпраўленае"
 
-#: ../src/config.py:4059
+#: ../src/config.py:4086
 msgid "Group Chat Message Highlight"
 msgstr "Фарбаванае паведамленне ў групавой размове"
 
-#: ../src/config.py:4060
+#: ../src/config.py:4087
 msgid "Group Chat Message Received"
 msgstr "Новае паведамленне ў групавой размове"
 
-#: ../src/config.py:4061
+#: ../src/config.py:4088
 msgid "GMail Email Received"
 msgstr "Новы ліст GMail"
 
-#: ../src/conversation_textview.py:600
+#: ../src/conversation_textview.py:601
 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:619
+#: ../src/conversation_textview.py:620
 #, 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:739
+#: ../src/conversation_textview.py:740
 #, fuzzy
 msgid "_Quote"
 msgstr "_Выйсці"
 
-#: ../src/conversation_textview.py:746
+#: ../src/conversation_textview.py:747
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Дзеянні для \"%s\""
 
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Read _Wikipedia Article"
 msgstr "Прачытаць артыкул у _Вікіпедыі"
 
-#: ../src/conversation_textview.py:763
+#: ../src/conversation_textview.py:765
 msgid "Look it up in _Dictionary"
 msgstr "Шукаць у _слоўніку"
 
-#: ../src/conversation_textview.py:780
+#: ../src/conversation_textview.py:782
 #, 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:793
+#: ../src/conversation_textview.py:795
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "У адрасе пошуку ў Сеціве не хапае \"%s\""
 
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 msgid "Web _Search for it"
 msgstr "_Шукаць у Сеціве"
 
-#: ../src/conversation_textview.py:802
+#: ../src/conversation_textview.py:804
 msgid "Open as _Link"
 msgstr "Адкрыць _спасылку"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1296
+#: ../src/conversation_textview.py:1298
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6943,193 +7126,198 @@ msgstr[1] "Учора"
 msgstr[2] "Учора"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1344 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тэма: %s\n"
 
-#: ../src/dataforms_widget.py:544
+#: ../src/dataforms_widget.py:545
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Немагчыма загрузіць модуль idle"
 
-#: ../src/dataforms_widget.py:546
+#: ../src/dataforms_widget.py:547
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Пашырэнне не падтрымліваецца"
 
-#: ../src/dataforms_widget.py:601
+#: ../src/dataforms_widget.py:562
+msgid "This field is required"
+msgstr ""
+
+#: ../src/dataforms_widget.py:607
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Jabber-праграма"
 
-#: ../src/dataforms_widget.py:602
+#: ../src/dataforms_widget.py:608
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:613
+#: ../src/dataforms_widget.py:619
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:616 ../src/dataforms_widget.py:618
+#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Імя чалавека: <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:195
 msgid "Group"
 msgstr "Група"
 
-#: ../src/dialogs.py:201
+#: ../src/dialogs.py:202
 msgid "In the group"
 msgstr "У групе"
 
-#: ../src/dialogs.py:292
+#: ../src/dialogs.py:293
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:297
+#: ../src/dialogs.py:298
 msgid "Contact name"
 msgstr "Імя чалавека"
 
-#: ../src/dialogs.py:469
+#: ../src/dialogs.py:470
 #, fuzzy
 msgid "Set Mood"
 msgstr "Вызначыць MOTD"
 
-#: ../src/dialogs.py:589
+#: ../src/dialogs.py:590
 #, python-format
 msgid "%s Status Message"
 msgstr "Паведамленне аб змене стану %s"
 
-#: ../src/dialogs.py:603
+#: ../src/dialogs.py:604
 msgid "Status Message"
 msgstr "Паведамленне аб змене стану"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:794
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Паведамленне аб змене стану"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:795
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Гэтая назва ўжо скарыстаная для іншага рахунка. Выберыце іншую назву."
 
-#: ../src/dialogs.py:802
+#: ../src/dialogs.py:803
 msgid "Save as Preset Status Message"
 msgstr "Захаваць гэтае паведамленне аб змене стану"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:804
 msgid "Please type a name for this status message"
 msgstr "Вызначце назву гэтага паведамлення аб змене стану"
 
-#: ../src/dialogs.py:831
+#: ../src/dialogs.py:832
 msgid "AIM Address:"
 msgstr "Адрас AIM:"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:833
 msgid "GG Number:"
 msgstr "Нумар GG:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:834
 msgid "ICQ Number:"
 msgstr "Нумар ICQ:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:835
 msgid "MSN Address:"
 msgstr "Адрас MSN:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:836
 msgid "Yahoo! Address:"
 msgstr "Адрас Yahoo!:"
 
-#: ../src/dialogs.py:872
+#: ../src/dialogs.py:873
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Запоўніце палі звесткамі пра чалавека, якога Вы хочаце дадаць у спіс рахунка "
 "%s"
 
-#: ../src/dialogs.py:875
+#: ../src/dialogs.py:876
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Запоўніце палі звесткамі, каб дадаць чалавека ў спіс"
 
-#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
+#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
+#: ../src/dialogs.py:3464
 msgid "Invalid User ID"
 msgstr "Няправільны ID карыстальніка"
 
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1052
 msgid "The user ID must not contain a resource."
 msgstr "ID карыстальніка не павінны вызначаць рэсурс."
 
-#: ../src/dialogs.py:1051
+#: ../src/dialogs.py:1057
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Я хачу дадаць Вас у мой кантактны ліст."
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1071
 msgid "Contact already in roster"
 msgstr "Чалавек ужо ёсць у кантактным лісце"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1072
 msgid "This contact is already listed in your roster."
 msgstr "Гэты чалавек ужо ёсць у у кантактным лісце."
 
-#: ../src/dialogs.py:1112
+#: ../src/dialogs.py:1118
 msgid "User ID:"
 msgstr "ID карыстальніка:"
 
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1189
 msgid "A GTK+ jabber client"
 msgstr "Jabber-праграма для GTK+"
 
-#: ../src/dialogs.py:1176
+#: ../src/dialogs.py:1190
 msgid "GTK+ Version:"
 msgstr "Версія GTK+:"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1191
 msgid "PyGTK Version:"
 msgstr "Версія PyGTK:"
 
-#: ../src/dialogs.py:1187
+#: ../src/dialogs.py:1201
 msgid "Current Developers:"
 msgstr "Актыўныя распрацоўнікі:"
 
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1203
 msgid "Past Developers:"
 msgstr "Былыя распрацоўнікі:"
 
-#: ../src/dialogs.py:1195
+#: ../src/dialogs.py:1209
 msgid "THANKS:"
 msgstr "Падзякі:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1215
 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:1213
+#: ../src/dialogs.py:1227
 msgid "translator-credits"
 msgstr "Ihar Hrachyshka <ihar.hrachyshka@gmail.com>"
 
-#: ../src/dialogs.py:1396
+#: ../src/dialogs.py:1410
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7140,109 +7328,109 @@ msgstr ""
 "Вы павінны ўсталяваць слоўнік %s, каб спраўджваць правапіс, альбо выбраць "
 "іншую мову праз опцыю speller_language."
 
-#: ../src/dialogs.py:1935 ../src/dialogs.py:2322
+#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr "Jabber ID групавой размовы ўтрымлівае няправільныя знакі."
 
-#: ../src/dialogs.py:2053
+#: ../src/dialogs.py:2069
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Запыт увагі на рахунак %s ад %s"
 
-#: ../src/dialogs.py:2056
+#: ../src/dialogs.py:2072
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Запыт увагі ад %s"
 
-#: ../src/dialogs.py:2131 ../src/gui_interface.py:2672
+#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Вы ўжо ўдзельнічаеце ў групавой размове %s"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2153
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Вы не можаце ўдзельнічаць у групавой размове, не злучыўшыся з серверам."
 
-#: ../src/dialogs.py:2178
+#: ../src/dialogs.py:2194
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Удзельнічаць у групавой размове праз рахунак %s"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2325
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Няправільная назва рахунка"
 
-#: ../src/dialogs.py:2310
+#: ../src/dialogs.py:2326
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Вы павінны стварыць рахунак, каб размаўляць з іншымі людзьмі."
 
-#: ../src/dialogs.py:2321
+#: ../src/dialogs.py:2337
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/dialogs.py:2326 ../src/dialogs.py:2332
-#: ../src/groupchat_control.py:1832
+#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
+#: ../src/groupchat_control.py:1847
 msgid "Invalid group chat Jabber ID"
 msgstr "Няправільны Jabber ID групавой размовы"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2343
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "Jabber ID групавой размовы ўтрымлівае няправільныя знакі."
 
-#: ../src/dialogs.py:2333 ../src/groupchat_control.py:1833
+#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Jabber ID групавой размовы ўтрымлівае няправільныя знакі."
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2356
 msgid "This is not a group chat"
 msgstr "Гэта не групавая размова"
 
-#: ../src/dialogs.py:2341
+#: ../src/dialogs.py:2357
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s не з'яўляецца сапраўднай назвай групавой размовы."
 
-#: ../src/dialogs.py:2372
+#: ../src/dialogs.py:2388
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Вы не можаце змяніць пароль, не злучыўшыся з серверам."
 
-#: ../src/dialogs.py:2386
+#: ../src/dialogs.py:2402
 msgid "Server"
 msgstr "Сервер"
 
-#: ../src/dialogs.py:2421
+#: ../src/dialogs.py:2437
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Рахунак \"%s\" злучаны з серверам"
 
-#: ../src/dialogs.py:2422
+#: ../src/dialogs.py:2438
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Вы не можаце ўдзельнічаць у групавой размове, не злучыўшыся з серверам."
 
-#: ../src/dialogs.py:2446
+#: ../src/dialogs.py:2462
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2523
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Пачаць размову з рахунка %s"
 
-#: ../src/dialogs.py:2509
+#: ../src/dialogs.py:2525
 msgid "Start Chat"
 msgstr "Пачаць размову"
 
-#: ../src/dialogs.py:2510
+#: ../src/dialogs.py:2526
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7251,168 +7439,168 @@ msgstr ""
 "хочаце адправіць паведамленне:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2536 ../src/dialogs.py:2917 ../src/dialogs.py:3129
+#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
 msgid "Connection not available"
 msgstr "Няма злучэння"
 
-#: ../src/dialogs.py:2537 ../src/dialogs.py:2918 ../src/dialogs.py:3130
+#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Праверце злучэнне з \"%s\"."
 
-#: ../src/dialogs.py:2546 ../src/dialogs.py:2549
+#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
 msgid "Invalid JID"
 msgstr "Няправільны JID"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2565
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Немагчыма разабраць \"%s\"."
 
-#: ../src/dialogs.py:2558
+#: ../src/dialogs.py:2574
 msgid "Without a connection, you can not change your password."
 msgstr "Вы не можаце змяніць пароль, не злучыўшыся з серверам."
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "Invalid password"
 msgstr "Няправільны пароль"
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "You must enter a password."
 msgstr "Вы павінны ўвесці пароль."
 
-#: ../src/dialogs.py:2581
+#: ../src/dialogs.py:2597
 msgid "Passwords do not match"
 msgstr "Паролі розняцца"
 
-#: ../src/dialogs.py:2582
+#: ../src/dialogs.py:2598
 msgid "The passwords typed in both fields must be identical."
 msgstr "Паролі ў абодвух палях павінны быць аднолькавымі."
 
 #. default value
-#: ../src/dialogs.py:2619 ../src/notify.py:247 ../src/notify.py:473
+#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
 msgid "Contact Signed In"
 msgstr "Чалавек прыйшоў"
 
-#: ../src/dialogs.py:2621 ../src/notify.py:255 ../src/notify.py:475
+#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
 msgid "Contact Signed Out"
 msgstr "Чалавек сышоў"
 
 #. chat message
-#: ../src/dialogs.py:2623 ../src/notify.py:277 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
 msgid "New Message"
 msgstr "Новае паведамленне"
 
 #. single message
-#: ../src/dialogs.py:2623 ../src/notify.py:259 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
 msgid "New Single Message"
 msgstr "Новае асобнае паведамленне"
 
 #. private message
-#: ../src/dialogs.py:2624 ../src/notify.py:265 ../src/notify.py:478
+#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
 msgid "New Private Message"
 msgstr "Новае прыватнае паведамленне"
 
-#: ../src/dialogs.py:2624 ../src/gui_interface.py:1358 ../src/notify.py:487
+#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
 msgid "New E-mail"
 msgstr "Новы ліст"
 
-#: ../src/dialogs.py:2626 ../src/gui_interface.py:1420 ../src/notify.py:480
+#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
 msgid "File Transfer Request"
 msgstr "Запыт на перадачу файла"
 
-#: ../src/dialogs.py:2628 ../src/gui_interface.py:1320
-#: ../src/gui_interface.py:1389 ../src/notify.py:482
+#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
+#: ../src/gui_interface.py:1186 ../src/notify.py:482
 msgid "File Transfer Error"
 msgstr "Памылка перадачы файла"
 
-#: ../src/dialogs.py:2630 ../src/gui_interface.py:1466
-#: ../src/gui_interface.py:1489 ../src/gui_interface.py:1506
+#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
+#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
 #: ../src/notify.py:484
 msgid "File Transfer Completed"
 msgstr "Перадача файла скончаная"
 
-#: ../src/dialogs.py:2631 ../src/gui_interface.py:1469 ../src/notify.py:485
+#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
 msgid "File Transfer Stopped"
 msgstr "Перадача файла спыненая"
 
-#: ../src/dialogs.py:2633 ../src/gui_interface.py:1152 ../src/notify.py:489
+#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
 msgid "Groupchat Invitation"
 msgstr "Запрашэнне ў групавую размову"
 
-#: ../src/dialogs.py:2635 ../src/notify.py:239 ../src/notify.py:491
+#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
 msgid "Contact Changed Status"
 msgstr "Чалавек змяніў стан"
 
-#: ../src/dialogs.py:2836
+#: ../src/dialogs.py:2852
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Асобнае паведамленне для рахунка %s"
 
-#: ../src/dialogs.py:2838
+#: ../src/dialogs.py:2854
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Асобнае паведамленне для рахунка %s"
 
-#: ../src/dialogs.py:2840
+#: ../src/dialogs.py:2856
 msgid "Single Message"
 msgstr "Асобнае паведамленне"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2843
+#: ../src/dialogs.py:2859
 #, python-format
 msgid "Send %s"
 msgstr "Адправіць %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:2882
 #, python-format
 msgid "Received %s"
 msgstr "Атрымана %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2889
+#: ../src/dialogs.py:2905
 #, 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:2968
+#: ../src/dialogs.py:2984
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:2985
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s сказаў:\n"
 
-#: ../src/dialogs.py:3028
+#: ../src/dialogs.py:3044
 #, python-format
 msgid "XML Console for %s"
 msgstr "Кансоль XML для %s"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3046
 msgid "XML Console"
 msgstr "Кансоль XML"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "add"
 msgstr "Марнаванне часу"
 
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "modify"
 msgstr "_Змяніць"
 
-#: ../src/dialogs.py:3160
+#: ../src/dialogs.py:3176
 #, fuzzy
 msgid "remove"
 msgstr "Вы_даліць"
 
-#: ../src/dialogs.py:3188
+#: ../src/dialogs.py:3204
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7420,160 +7608,193 @@ msgid ""
 msgstr "Я хачу дадаць Вас у свой кантактны ліст."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3204 ../src/dialogs.py:3250
+#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
 #, fuzzy
 msgid "Add"
 msgstr "Адрас"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3206 ../src/dialogs.py:3281
+#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
 #, fuzzy
 msgid "Modify"
 msgstr "_Змяніць"
 
-#: ../src/dialogs.py:3212
+#: ../src/dialogs.py:3228
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:3218
+#: ../src/dialogs.py:3234
 #, fuzzy
 msgid "Groups"
 msgstr "Група"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3342
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Я хачу дадаць Вас у мой кантактны ліст."
 
-#: ../src/dialogs.py:3340
+#: ../src/dialogs.py:3356
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "Дадаць _чалавека"
 
-#: ../src/dialogs.py:3377
+#: ../src/dialogs.py:3393
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Выдаліць чалавека з спіса"
 
-#: ../src/dialogs.py:3430
+#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#, python-format
+msgid "Archiving Preferences for %s"
+msgstr ""
+
+#: ../src/dialogs.py:3473
+#, fuzzy
+msgid "Invalid expire value"
+msgstr "Няправільнае імя карыстальніка"
+
+#: ../src/dialogs.py:3474
+msgid "Expire must be a valid positive integer."
+msgstr ""
+
+#: ../src/dialogs.py:3521
+msgid "There is an error with the form"
+msgstr ""
+
+#: ../src/dialogs.py:3732
+msgid "There is an error"
+msgstr ""
+
+#: ../src/dialogs.py:3796
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Спіс прыватнасці <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3434
+#: ../src/dialogs.py:3800
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Спіс прыватнасці для %s"
 
-#: ../src/dialogs.py:3490
+#: ../src/dialogs.py:3856
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Парадак: %s, дзеянне: %s, тып: %s, значэнне: %s"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3861
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Парадак: %s, дзеянне: %s"
 
-#: ../src/dialogs.py:3539
+#: ../src/dialogs.py:3905
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Змяніць правіла</b>"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:4016
 msgid "<b>Add a rule</b>"
 msgstr "<b>Дадаць правіла</b>"
 
-#: ../src/dialogs.py:3750
+#: ../src/dialogs.py:4116
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Спісы прыватнасці для %s"
 
-#: ../src/dialogs.py:3752
+#: ../src/dialogs.py:4118
 msgid "Privacy Lists"
 msgstr "Спісы прыватнасці"
 
-#: ../src/dialogs.py:3822
+#: ../src/dialogs.py:4188
 msgid "Invalid List Name"
 msgstr "Няправільная назва спіса"
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4189
 msgid "You must enter a name to create a privacy list."
 msgstr "Вы павінны вызначыць назву для новага спіса прыватнасці."
 
-#: ../src/dialogs.py:3855
+#: ../src/dialogs.py:4221
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Вы не ўвайшлі ў пакой групавой размовы."
 
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4224
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact запрасіў Вас у групавую размову %(room_jid)s"
 
-#: ../src/dialogs.py:3860
+#: ../src/dialogs.py:4226
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact запрасіў Вас у групавую размову %(room_jid)s"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4234
 #, python-format
 msgid "Comment: %s"
 msgstr "Каментарый: %s"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4236
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3932
+#: ../src/dialogs.py:4298
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:3942 ../src/dialogs.py:3985 ../src/dialogs.py:4041
+#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
+#: ../src/dialogs.py:4495
 msgid "All files"
 msgstr "Усе файлы"
 
-#: ../src/dialogs.py:3947
+#: ../src/dialogs.py:4313
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:3975
+#: ../src/dialogs.py:4341
 msgid "Choose Sound"
 msgstr "Выберыце гукавы файл"
 
-#: ../src/dialogs.py:3990
+#: ../src/dialogs.py:4356
 msgid "Wav Sounds"
 msgstr "Файлы Wav"
 
-#: ../src/dialogs.py:4028
+#: ../src/dialogs.py:4394
 msgid "Choose Image"
 msgstr "Выберыце малюнак"
 
-#: ../src/dialogs.py:4046
+#: ../src/dialogs.py:4412
 msgid "Images"
 msgstr "Малюнкі"
 
-#: ../src/dialogs.py:4113
+#: ../src/dialogs.py:4482
+#, fuzzy
+msgid "Choose Archive"
+msgstr "Выберыце малюнак"
+
+#: ../src/dialogs.py:4500
+#, fuzzy
+msgid "Zip files"
+msgstr "Усе файлы"
+
+#: ../src/dialogs.py:4525
 #, python-format
 msgid "When %s becomes:"
 msgstr "Калі %s становіцца:"
 
-#: ../src/dialogs.py:4115
+#: ../src/dialogs.py:4527
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Дадаць асабістае нагадванне для %s"
 
-#: ../src/dialogs.py:4190
+#: ../src/dialogs.py:4602
 msgid "Condition"
 msgstr "Умова"
 
-#: ../src/dialogs.py:4310
+#: ../src/dialogs.py:4722
 msgid "when I am "
 msgstr "калі я "
 
-#: ../src/dialogs.py:4786
+#: ../src/dialogs.py:5198
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7581,38 +7802,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4789
+#: ../src/dialogs.py:5201
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4795 ../src/dialogs.py:4879
+#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4801
+#: ../src/dialogs.py:5213
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4806
+#: ../src/dialogs.py:5218
 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:4809 ../src/dialogs.py:4860 ../src/dialogs.py:4873
+#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4814
+#: ../src/dialogs.py:5226
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4825
+#: ../src/dialogs.py:5237
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4826
+#: ../src/dialogs.py:5238
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7622,44 +7843,44 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4827
+#: ../src/dialogs.py:5239
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4861
+#: ../src/dialogs.py:5273
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4867
+#: ../src/dialogs.py:5279
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4874
+#: ../src/dialogs.py:5286
 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:4880
+#: ../src/dialogs.py:5292
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:4945
+#: ../src/dialogs.py:5357
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4947
+#: ../src/dialogs.py:5359
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4949
+#: ../src/dialogs.py:5361
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4953
+#: ../src/dialogs.py:5365
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7675,25 +7896,25 @@ msgstr "Іншыя"
 msgid "Conference"
 msgstr "Канферэнцыі"
 
-#: ../src/disco.py:512
+#: ../src/disco.py:513
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 "Вы не можаце праглядзець спіс даступных сервісаў, не злучыўшыся з серверам."
 
-#: ../src/disco.py:589
+#: ../src/disco.py:600
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Пошук сервісаў для рахунка %s"
 
-#: ../src/disco.py:591
+#: ../src/disco.py:602
 msgid "Service Discovery"
 msgstr "Пошук сервісаў"
 
-#: ../src/disco.py:741
+#: ../src/disco.py:758
 msgid "The service could not be found"
 msgstr "Немагчыма знайсці сервіс"
 
-#: ../src/disco.py:742
+#: ../src/disco.py:759
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7701,98 +7922,98 @@ msgstr ""
 "Па вызначаным адрасе няма сервісаў, альбо яны не адказваюць на запыты. "
 "Праверце адрас і паспрабуйце зноў."
 
-#: ../src/disco.py:746 ../src/disco.py:1082
+#: ../src/disco.py:763 ../src/disco.py:1100
 msgid "The service is not browsable"
 msgstr "Немагчыма праглядзець сервіс"
 
-#: ../src/disco.py:747
+#: ../src/disco.py:764
 msgid "This type of service does not contain any items to browse."
 msgstr "Гэты сервіс не ўтрымлівае ў сабе элементаў."
 
-#: ../src/disco.py:786 ../src/disco.py:796
+#: ../src/disco.py:804 ../src/disco.py:814
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/disco.py:850
+#: ../src/disco.py:868
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Прагляд %s для рахунка %s"
 
-#: ../src/disco.py:894
+#: ../src/disco.py:912
 msgid "_Browse"
 msgstr "_Праглядзець"
 
-#: ../src/disco.py:1083
+#: ../src/disco.py:1101
 msgid "This service does not contain any items to browse."
 msgstr "Гэты сервіс не ўтрымлівае ў сабе элементаў, якія можна праглядзець."
 
-#: ../src/disco.py:1323
+#: ../src/disco.py:1341
 #, fuzzy
 msgid "_Execute Command"
 msgstr "_Выканаць загад..."
 
-#: ../src/disco.py:1333 ../src/disco.py:1504
+#: ../src/disco.py:1351 ../src/disco.py:1522
 msgid "Re_gister"
 msgstr "Зарэ_гістравацца"
 
-#: ../src/disco.py:1545
+#: ../src/disco.py:1563
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Пошук у %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1736
+#: ../src/disco.py:1754
 msgid "Users"
 msgstr "Карыстальнікі"
 
 #. Description column
-#: ../src/disco.py:1744
+#: ../src/disco.py:1762
 msgid "Description"
 msgstr "Апісанне"
 
 #. Id column
-#: ../src/disco.py:1752
+#: ../src/disco.py:1770
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1817 ../src/gui_interface.py:3182
+#: ../src/disco.py:1835 ../src/gui_interface.py:2995
 msgid "Bookmark already set"
 msgstr "Закладка ўжо ўсталяваная"
 
-#: ../src/disco.py:1818 ../src/gui_interface.py:3183
+#: ../src/disco.py:1836 ../src/gui_interface.py:2996
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Групавая размова \"%s\" ужо знаходзіцца ў Вашых закладках."
 
-#: ../src/disco.py:1827 ../src/gui_interface.py:3197
+#: ../src/disco.py:1845 ../src/gui_interface.py:3010
 msgid "Bookmark has been added successfully"
 msgstr "Закладка паспяхова дададзеная"
 
-#: ../src/disco.py:1828 ../src/gui_interface.py:3198
+#: ../src/disco.py:1846 ../src/gui_interface.py:3011
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Вы можаце рэдагаваць спіс Вашых закладак праз меню \"Дзеянні\" галоўнага "
 "вакна."
 
-#: ../src/disco.py:2039
+#: ../src/disco.py:2057
 msgid "Subscribed"
 msgstr "Падпісаны"
 
-#: ../src/disco.py:2047
+#: ../src/disco.py:2065
 #, fuzzy
 msgid "Node"
 msgstr "Ніякі"
 
-#: ../src/disco.py:2111
+#: ../src/disco.py:2129
 msgid "New post"
 msgstr "Новы допіс"
 
-#: ../src/disco.py:2117
+#: ../src/disco.py:2135
 msgid "_Subscribe"
 msgstr "Падп_ісацца"
 
-#: ../src/disco.py:2123
+#: ../src/disco.py:2141
 msgid "_Unsubscribe"
 msgstr "_Адпісацца"
 
@@ -7968,14 +8189,14 @@ msgstr ""
 
 #: ../src/features_window.py:95
 msgid ""
-"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
-"in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 
 #: ../src/features_window.py:96
 msgid ""
-"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
+"You have to set 'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 
 #: ../src/features_window.py:97
@@ -8133,33 +8354,33 @@ msgstr "Апісанне: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s хоча адправіць Вам файл:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Немагчыма перапісаць наяўны файл \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "Файл з такой назвай ужо існуе, а Вы не маеце правоў на яго перазапіс."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 msgid "This file already exists"
 msgstr "Такі файл ужо ёсць"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 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:369 ../src/gtkgui_helpers.py:914
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Немагчыма запісваць файлы ў дырэкторыю \"%s\""
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
 msgid "You do not have permission to create files in this directory."
 msgstr "Вы не маеце права ствараць файлы ў гэтай дырэкторыі."
 
@@ -8260,28 +8481,28 @@ msgstr ""
 "Gajim ужо працуе\n"
 "Усё роўна запусціць наноў?"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "Паказвае даведку па вызначаным загадзе"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:80
+#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
 msgid "command"
 msgstr "загад"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "паказаць даведку па загадзе"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Паказаць / схаваць галоўнае вакно"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Паказаць выплыўнае вакно з наступнай нягледжанай падзеяй"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8289,6 +8510,13 @@ msgstr ""
 "Паказаць спіс усіх людзей у кантактным лісце. Звесткі пра кожнага чалавека "
 "друкуюцца на асобным радку"
 
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
+#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
+#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
+#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
 #: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
 #: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
 #: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
@@ -8300,41 +8528,33 @@ msgstr ""
 msgid "account"
 msgstr "рахунак"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "паказаць людзей з пэўнага рахунка"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Паказаць спіс зарэгістраваных рахункаў"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "Змяніць стан рахунка(ў)"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
 msgid "status"
 msgstr "стан"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106
 #, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"accoun't previous status"
+msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "адзін з: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
-msgid "message"
-msgstr "паведамленне"
-
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "паведамленне стану"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8342,48 +8562,21 @@ msgstr ""
 "змяніць стан рахунка \"account\". Калі не вызначана, змяняецца стан усіх "
 "рахункаў, якія \"сінхранізуюцца з глабальным станам\""
 
-#: ../src/gajim-remote.py:117
-#, fuzzy
-msgid "Changes the priority of account or accounts"
-msgstr "Змяніць стан рахунка(ў)"
-
-#: ../src/gajim-remote.py:119
-#, fuzzy
-msgid "priority"
-msgstr "Прыяры_тэт:"
-
-#: ../src/gajim-remote.py:119
-#, fuzzy
-msgid "priority you want to give to the account"
-msgstr "_Зарэгістраваць новы рахунак"
-
-#: ../src/gajim-remote.py:121
-#, fuzzy
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-msgstr ""
-"змяніць стан рахунка \"account\". Калі не вызначана, змяняецца стан усіх "
-"рахункаў, якія \"сінхранізуюцца з глабальным станам\""
-
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Паказвае вакно, з якога Вы можаце адправіць паведамленне пэўнаму чалавеку"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID чалавека, з якім Вы хочаце паразмаўляць"
 
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
 #: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "Калі вызначана, то імя чалавека выбіраецца з спіса гэтага рахунка"
 
-#: ../src/gajim-remote.py:134
-msgid "message content. The account must be specified or \"\""
-msgstr ""
-
-#: ../src/gajim-remote.py:139
+#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
 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 "
@@ -8393,29 +8586,34 @@ msgstr ""
 "рахунка не абавязковае. Калі Вы хочаце вызначыць толькі 'account', без "
 "'ключа OpenPGP', проста выставіце 'ключ OpenPGP' у ''."
 
+#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
 #: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID чалавека, які атрымае паведамленне"
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
+#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "змест паведамлення"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "ключ pgp"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "Калі вызначана, паведамленне будзе зашыфраванае адкрытым ключом"
 
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
+#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "Калі вызначана, паведамленне будзе адпраўленае праз гэты рахунак"
 
-#: ../src/gajim-remote.py:152
+#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
 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 "
@@ -8425,141 +8623,286 @@ msgstr ""
 "OpenPGP і рахунка не абавязковае. Калі Вы хочаце вызначыць толькі 'account', "
 "без 'ключа OpenPGP', проста выставіце 'ключ OpenPGP' у ''."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "тэма"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "тэма паведамлення"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID чалавека, які атрымае паведамленне"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Атрымаць падрабязныя звесткі пра чалавека"
 
+#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
+#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
 #: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
 #: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID чалавека"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Атрымаць падрабязныя звесткі аб рахунку"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Назва рахунка"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Адправіць файл чалавеку"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "file"
 msgstr "файл"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Месца файла"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "Калі вызначана, файл будзе адпраўлены праз гэты рахунак"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Паказаць спіс усіх настаўленняў і іх значэнні"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Выстаўляе значэнне 'ключа' ў 'значэнне'"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "ключ=значэнне"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'ключ' ёсць назваю настаўлення, 'значэнне' ёсць выстаўляемым значэннем"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Выдаляе ўласцівасць"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
 msgid "key"
 msgstr "ключ"
 
-#: ../src/gajim-remote.py:209
-msgid "name of the preference to be deleted"
-msgstr "назва выдаляемай уласцівасці"
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "name of the preference to be deleted"
+msgstr "назва выдаляемай уласцівасці"
+
+#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+msgid "Writes the current state of Gajim preferences to the .config file"
+msgstr "Запісвае бягучыя настаўленні Gajim у файл .config"
+
+#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
+msgid "Removes contact from roster"
+msgstr "Выдаліць чалавека з спіса"
+
+#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+msgid "Adds contact to roster"
+msgstr "Дадаць чалавека ў спіс"
+
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+msgid "Adds new contact to this account"
+msgstr "Дадаць новага чалавека для гэтага рахунка"
+
+#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+msgid "Returns current status (the global one unless account is specified)"
+msgstr "Вяртае бягучы стан (глабальны, калі не вызначаны рахунак)"
+
+#: ../src/gajim-remote-plugin.py:226
+#, fuzzy
+msgid ""
+"Returns current status message(the global one unless account is specified)"
+msgstr ""
+"Вяртае бягучае паведамленне аб стане (глабальнае, калі не вызначаны рахунак)"
+
+#: ../src/gajim-remote-plugin.py:233 ../src/gajim-remote.py:249
+msgid "Returns number of unread messages"
+msgstr "Вяртае колькасць нечытаных паведамленняў"
+
+#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+msgid "Opens 'Start Chat' dialog"
+msgstr "Адкрыць вакно 'Пачаць размову'"
+
+#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+msgid "Starts chat, using this account"
+msgstr "Пачаць размову для рахунка"
+
+#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+msgid "Sends custom XML"
+msgstr "Адправіць асаблівы XML"
+
+#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+msgid "XML to send"
+msgstr "Адправіць XML"
+
+#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+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-plugin.py:252 ../src/gajim-remote.py:277
+msgid "Handle a xmpp:/ uri"
+msgstr "Апрацоўваць спасылкі xmpp:/"
+
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
+msgid "uri"
+msgstr "спасылка"
+
+#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+msgid "Join a MUC room"
+msgstr "Увайсці ў размоўны пакой"
+
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+msgid "room"
+msgstr "пакой"
+
+#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+msgid "nick"
+msgstr "мянушка"
+
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+msgid "password"
+msgstr "пароль"
+
+#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#, fuzzy
+msgid "Check if Gajim is running"
+msgstr "Праверце, ці працуе avahi-daemon."
+
+#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
+#: ../src/gajim-remote.py:300
+#, fuzzy
+msgid "Shows or hides the ipython window"
+msgstr "Паказаць / схаваць галоўнае вакно"
+
+#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+msgid "Missing argument \"contact_jid\""
+msgstr "Не хапае аргумента \"contact_jid\""
+
+#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#, python-format
+msgid ""
+"'%s' is not in your roster.\n"
+"Please specify account for sending the message."
+msgstr ""
+"'%s' няма ў Вашым спісе.\n"
+"Калі ласка, вызначце рахунак для адпраўкі паведамлення."
+
+#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+msgid "You have no active account"
+msgstr "У Вас няма актыўнага рахунка"
 
-#: ../src/gajim-remote.py:213
-msgid "Writes the current state of Gajim preferences to the .config file"
-msgstr "Запісвае бягучыя настаўленні Gajim у файл .config"
+#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+msgid "It seems Gajim is not running. So you can't use gajim-remote."
+msgstr ""
 
-#: ../src/gajim-remote.py:218
-msgid "Removes contact from roster"
-msgstr "Выдаліць чалавека з спіса"
+#: ../src/gajim-remote-plugin.py:412
+#, python-format
+msgid ""
+"Usage: %s %s %s \n"
+"\t %s"
+msgstr ""
+"Карыстанне: %s %s %s \n"
+"\t %s"
 
-#: ../src/gajim-remote.py:227
-msgid "Adds contact to roster"
-msgstr "Дадаць чалавека ў спіс"
+#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+msgid "Arguments:"
+msgstr "Аргументы:"
 
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "jid"
+#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#, python-format
+msgid "%s not found"
+msgstr "%s не знойдзены"
 
-#: ../src/gajim-remote.py:230
-msgid "Adds new contact to this account"
-msgstr "Дадаць новага чалавека для гэтага рахунка"
+#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
+#, python-format
+msgid ""
+"Usage: %s command [arguments]\n"
+"Command is one of:\n"
+msgstr ""
+"Карыстанне: %s загад [аргументы]\n"
+"Загад ёсць адным з:\n"
 
-#: ../src/gajim-remote.py:235
-msgid "Returns current status (the global one unless account is specified)"
-msgstr "Вяртае бягучы стан (глабальны, калі не вызначаны рахунак)"
+#: ../src/gajim-remote-plugin.py:496
+#, fuzzy, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Надта шмат аргументаў. \n"
+"Увядзіце \"%s help %s\" для падрабязнейшых звестак"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote-plugin.py:500
+#, fuzzy, python-format
 msgid ""
-"Returns current status message (the global one unless account is specified)"
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
 msgstr ""
-"Вяртае бягучае паведамленне аб стане (глабальнае, калі не вызначаны рахунак)"
+"Аргумент \"%s\" не вызначаны. \n"
+"Увядзіце \"%s help %s\" для падрабязных звестак"
 
-#: ../src/gajim-remote.py:249
-msgid "Returns number of unread messages"
-msgstr "Вяртае колькасць нечытаных паведамленняў"
+#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
+msgid "Wrong uri"
+msgstr "Няправільная спасылка"
 
-#: ../src/gajim-remote.py:253
-msgid "Opens 'Start Chat' dialog"
-msgstr "Адкрыць вакно 'Пачаць размову'"
+#: ../src/gajim-remote.py:109
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
+msgstr "адзін з: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:255
-msgid "Starts chat, using this account"
-msgstr "Пачаць размову для рахунка"
+#: ../src/gajim-remote.py:117
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Змяніць стан рахунка(ў)"
 
-#: ../src/gajim-remote.py:259
-msgid "Sends custom XML"
-msgstr "Адправіць асаблівы XML"
+#: ../src/gajim-remote.py:119
+#, fuzzy
+msgid "priority"
+msgstr "Прыяры_тэт:"
 
-#: ../src/gajim-remote.py:261
-msgid "XML to send"
-msgstr "Адправіць XML"
+#: ../src/gajim-remote.py:119
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "_Зарэгістраваць новы рахунак"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:121
+#, fuzzy
 msgid ""
-"Account in which the xml will be sent; if not specified, xml will be sent to "
-"all accounts"
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
 msgstr ""
-"Рахунак, на які будзе адпраўлены xml; калі не вызначаны, xml будзе "
-"адпраўлены на ўсе рахункі"
+"змяніць стан рахунка \"account\". Калі не вызначана, змяняецца стан усіх "
+"рахункаў, якія \"сінхранізуюцца з глабальным станам\""
+
+#: ../src/gajim-remote.py:134
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:242
+msgid ""
+"Returns current status message (the global one unless account is specified)"
+msgstr ""
+"Вяртае бягучае паведамленне аб стане (глабальнае, калі не вызначаны рахунак)"
 
 #: ../src/gajim-remote.py:268
 #, fuzzy
@@ -8580,14 +8923,6 @@ msgstr ""
 "Рахунак, на які будзе адпраўлены xml; калі не вызначаны, xml будзе "
 "адпраўлены на ўсе рахункі"
 
-#: ../src/gajim-remote.py:277
-msgid "Handle a xmpp:/ uri"
-msgstr "Апрацоўваць спасылкі xmpp:/"
-
-#: ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "спасылка"
-
 #: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr ""
@@ -8601,32 +8936,16 @@ msgstr ""
 msgid "Message content"
 msgstr "змест паведамлення"
 
-#: ../src/gajim-remote.py:286
-msgid "Join a MUC room"
-msgstr "Увайсці ў размоўны пакой"
-
-#: ../src/gajim-remote.py:288
-msgid "room"
-msgstr "пакой"
-
 #: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "Room JID"
 msgstr "Пакой:"
 
-#: ../src/gajim-remote.py:289
-msgid "nick"
-msgstr "мянушка"
-
 #: ../src/gajim-remote.py:289
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Мянушка не знойдзеная: %s"
 
-#: ../src/gajim-remote.py:290
-msgid "password"
-msgstr "пароль"
-
 #: ../src/gajim-remote.py:290
 #, fuzzy
 msgid "Password to enter the room"
@@ -8636,37 +8955,6 @@ msgstr "Паролі розняцца"
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:296
-#, fuzzy
-msgid "Check if Gajim is running"
-msgstr "Праверце, ці працуе avahi-daemon."
-
-#: ../src/gajim-remote.py:300
-#, fuzzy
-msgid "Shows or hides the ipython window"
-msgstr "Паказаць / схаваць галоўнае вакно"
-
-#: ../src/gajim-remote.py:327
-msgid "Missing argument \"contact_jid\""
-msgstr "Не хапае аргумента \"contact_jid\""
-
-#: ../src/gajim-remote.py:348
-#, python-format
-msgid ""
-"'%s' is not in your roster.\n"
-"Please specify account for sending the message."
-msgstr ""
-"'%s' няма ў Вашым спісе.\n"
-"Калі ласка, вызначце рахунак для адпраўкі паведамлення."
-
-#: ../src/gajim-remote.py:351
-msgid "You have no active account"
-msgstr "У Вас няма актыўнага рахунка"
-
-#: ../src/gajim-remote.py:404
-msgid "It seems Gajim is not running. So you can't use gajim-remote."
-msgstr ""
-
 #: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
@@ -8674,24 +8962,6 @@ msgid ""
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:435
-msgid "Arguments:"
-msgstr "Аргументы:"
-
-#: ../src/gajim-remote.py:439
-#, python-format
-msgid "%s not found"
-msgstr "%s не знойдзены"
-
-#: ../src/gajim-remote.py:445
-#, python-format
-msgid ""
-"Usage: %s command [arguments]\n"
-"Command is one of:\n"
-msgstr ""
-"Карыстанне: %s загад [аргументы]\n"
-"Загад ёсць адным з:\n"
-
 #: ../src/gajim-remote.py:514
 #, fuzzy, python-format
 msgid ""
@@ -8714,10 +8984,6 @@ msgstr ""
 msgid "No uri given"
 msgstr ""
 
-#: ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Няправільная спасылка"
-
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Тэма"
@@ -8744,202 +9010,200 @@ msgstr "Вы не можаце выдаліць актыўную тэму"
 msgid "Please first choose another for your current theme."
 msgstr "Спачатку актывізуйце іншую тэму."
 
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:170
 msgid "Sending private message failed"
 msgstr "Памылка адпраўкі прыватнага паведамлення"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:171
+#: ../src/groupchat_control.py:172
 #, 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:450
+#: ../src/groupchat_control.py:455
 msgid "Insert Nickname"
 msgstr "Уставіць мянушку"
 
-#: ../src/groupchat_control.py:631
+#: ../src/groupchat_control.py:636
 #, fuzzy
 msgid "Conversation with "
 msgstr "Журнал размоў"
 
-#: ../src/groupchat_control.py:633
+#: ../src/groupchat_control.py:638
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Злучэнне"
 
-#. Can be a message (see handle_event_gc_config_change in
-#. gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1272 ../src/gui_interface.py:1080
+#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1286
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1288
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Новы рахунак паспяхова створаны"
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1291
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1287
+#: ../src/groupchat_control.py:1297
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s пакараны: %(reason)s"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1300
 #, 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:1300
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "Для %(nick)s забаронена казанне: %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1312
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(who)s забараніў казанне для %(nick)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1314 ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вашая мянушка змененая на %s"
 
-#: ../src/groupchat_control.py:1330 ../src/gui_interface.py:919
+#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s змяніў мянушку на %s"
 
-#: ../src/groupchat_control.py:1372 ../src/groupchat_control.py:1377
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1392
 #, 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:1374
+#: ../src/groupchat_control.py:1383
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Адносіны: "
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1388
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1394
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1470
+#: ../src/groupchat_control.py:1477
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1474
+#: ../src/groupchat_control.py:1481
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1489
+#: ../src/groupchat_control.py:1496
 #, 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:1493
+#: ../src/groupchat_control.py:1500
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s пакараны: %(reason)s"
 
-#: ../src/groupchat_control.py:1522
+#: ../src/groupchat_control.py:1530
 #, python-format
 msgid "%s has left"
 msgstr "%s сышоў"
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1535
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s далучыўся да групавой размовы"
 
-#: ../src/groupchat_control.py:1529 ../src/gui_interface.py:946
+#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
 #: ../src/history_window.py:447 ../src/notify.py:234
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s цяпер %(status)s"
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1774
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Вы сапраўды хочаце сысці з групавой размовы \"%s\"?"
 
-#: ../src/groupchat_control.py:1761
+#: ../src/groupchat_control.py:1776
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Калі Вы закрыеце гэтае вакно, Вы выйдзеце з гэтай групавой размовы."
 
-#: ../src/groupchat_control.py:1765 ../src/gui_interface.py:1216
-#: ../src/gui_interface.py:1992 ../src/gui_interface.py:2029
-#: ../src/gui_interface.py:2064 ../src/message_window.py:224
-#: ../src/roster_window.py:2739 ../src/roster_window.py:3399
-#: ../src/roster_window.py:4123
+#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
+#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
+#: ../src/gui_interface.py:1853 ../src/message_window.py:224
+#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
+#: ../src/roster_window.py:4195
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Больш не пытацца"
 
-#: ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:1814
 msgid "Changing Subject"
 msgstr "Змяненне тэмы"
 
-#: ../src/groupchat_control.py:1800
+#: ../src/groupchat_control.py:1815
 msgid "Please specify the new subject:"
 msgstr "Вызначце новую тэму:"
 
-#: ../src/groupchat_control.py:1807
+#: ../src/groupchat_control.py:1822
 msgid "Changing Nickname"
 msgstr "Змена мянушкі"
 
-#: ../src/groupchat_control.py:1808
+#: ../src/groupchat_control.py:1823
 msgid "Please specify the new nickname you want to use:"
 msgstr "Вызначце сваю новую мянушку:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1839
+#: ../src/groupchat_control.py:1854
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Апісанне: %s"
 
-#: ../src/groupchat_control.py:1840
+#: ../src/groupchat_control.py:1855
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1842
+#: ../src/groupchat_control.py:1857
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2028
+#: ../src/groupchat_control.py:2046
 #, python-format
 msgid "Kicking %s"
 msgstr "Пакаранне %s"
 
-#: ../src/groupchat_control.py:2029 ../src/groupchat_control.py:2356
+#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
 msgid "You may specify a reason below:"
 msgstr "Вы можаце вызначыць прычыну:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2355
+#: ../src/groupchat_control.py:2373
 #, python-format
 msgid "Banning %s"
 msgstr "Забарона казання для %s"
@@ -8965,56 +9229,65 @@ msgid "Details"
 msgstr "Падрабязнасці"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
+#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Памылка: немагчыма прачытаць %s"
 
-#: ../src/gtkgui_helpers.py:400
+#: ../src/gtkgui_helpers.py:404
 msgid "Error reading file:"
 msgstr "Памылка чытання файла:"
 
-#: ../src/gtkgui_helpers.py:403
+#: ../src/gtkgui_helpers.py:407
 msgid "Error parsing file:"
 msgstr "Памылка разбору файла:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:444
+#: ../src/gtkgui_helpers.py:448
 #, 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:818
+#: ../src/gtkgui_helpers.py:822
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim не з'яўляецца прадвызначанай Jabber-праграмай"
 
-#: ../src/gtkgui_helpers.py:819
+#: ../src/gtkgui_helpers.py:823
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Ці Вы хочаце зрабіць Gajim прадвызначанай Jabber-праграмай?"
 
-#: ../src/gtkgui_helpers.py:820
+#: ../src/gtkgui_helpers.py:824
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 "Заўсёды пры запуску спраўджваць, ці з'яўляецца Gajim прадвызначанай Jabber-"
 "праграмай"
 
-#: ../src/gtkgui_helpers.py:887
+#: ../src/gtkgui_helpers.py:891
 msgid "Extension not supported"
 msgstr "Пашырэнне не падтрымліваецца"
 
-#: ../src/gtkgui_helpers.py:888
+#: ../src/gtkgui_helpers.py:892
 #, 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:924
+#: ../src/gtkgui_helpers.py:928
 msgid "Save Image as..."
 msgstr "Захаваць малюнак як..."
 
-#: ../src/gui_interface.py:140
+#. we are banned
+#. group chat does not exist
+#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
+#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
+#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
+#: ../src/gui_interface.py:348
+msgid "Unable to join group chat"
+msgstr "Немагчыма ўвайсці ў групавую размову"
+
+#: ../src/gui_interface.py:138
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9024,147 +9297,176 @@ msgstr ""
 "Гэтая мянушка ўжо ўжытая альбо зарэгістраваная іншым чалавекам.\n"
 "Выберыце іншую мянушку:"
 
-#: ../src/gui_interface.py:143
+#: ../src/gui_interface.py:141
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:159
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Хочаце задаволіць гэты запыт?"
 
-#: ../src/gui_interface.py:161
+#: ../src/gui_interface.py:160
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Хочаце задаволіць гэты запыт?"
 
-#: ../src/gui_interface.py:164
+#: ../src/gui_interface.py:163
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) аўтарызацыя для %s (id: %s)"
 
-#: ../src/gui_interface.py:213 ../src/notify.py:493
+#: ../src/gui_interface.py:209 ../src/notify.py:493
 msgid "Connection Failed"
 msgstr "Памылка злучэння"
 
-#: ../src/gui_interface.py:606 ../src/gui_interface.py:610
+#: ../src/gui_interface.py:312
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Каб удзельнічаць у гэтай групавой размове, трэба ведаць пароль."
+
+#: ../src/gui_interface.py:324
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/gui_interface.py:333
+#, fuzzy, python-format
+msgid "You are banned from group chat %s."
+msgstr "Вам забаронена казанне ў гэтай групавой размове."
+
+#: ../src/gui_interface.py:338
+#, fuzzy, python-format
+msgid "Group chat %s does not exist."
+msgstr "Такой групавой размовы няма."
+
+#: ../src/gui_interface.py:341
+msgid "Group chat creation is restricted."
+msgstr "Стварэнне групавых размоў абмежаванае."
+
+#: ../src/gui_interface.py:344
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Вы павінны карыстацца зарэгістраванай для Вас мянушкай."
+
+#: ../src/gui_interface.py:349
+#, fuzzy, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Вас няма ў спісе ўдзельнікаў."
+
+#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:621 ../src/gui_interface.py:636
+#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "памылка адпраўкі %s ( %s )"
 
-#: ../src/gui_interface.py:663 ../src/notify.py:495
+#: ../src/gui_interface.py:540 ../src/notify.py:495
 #, fuzzy
 msgid "Subscription request"
 msgstr "Запыт падпіскі"
 
-#: ../src/gui_interface.py:688
+#: ../src/gui_interface.py:565
 msgid "Authorization accepted"
 msgstr "Паспяховая аўтарызацыя"
 
-#: ../src/gui_interface.py:689
+#: ../src/gui_interface.py:566
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Чалавек \"%s\" дазволіў Вам бачыць змены яго стану."
 
-#: ../src/gui_interface.py:702
+#: ../src/gui_interface.py:579
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Чалавек \"%s\" забраў у Вас аўтарызацыю"
 
-#: ../src/gui_interface.py:703
+#: ../src/gui_interface.py:580
 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/gui_interface.py:727 ../src/notify.py:497
+#: ../src/gui_interface.py:604 ../src/notify.py:497
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Адпісацца"
 
-#: ../src/gui_interface.py:754
+#: ../src/gui_interface.py:631
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Немагчыма злучыцца з \"%s\""
 
-#: ../src/gui_interface.py:1015
+#: ../src/gui_interface.py:859
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1083
+#: ../src/gui_interface.py:926
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gui_interface.py:1085
+#: ../src/gui_interface.py:928
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gui_interface.py:1087
+#: ../src/gui_interface.py:930
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:1091
+#: ../src/gui_interface.py:934
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1093
+#: ../src/gui_interface.py:936
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1095
+#: ../src/gui_interface.py:938
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1098
+#: ../src/gui_interface.py:941
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1101
+#: ../src/gui_interface.py:944
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1133
-#, fuzzy, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Каб удзельнічаць у гэтай групавой размове, трэба ведаць пароль."
-
-#: ../src/gui_interface.py:1180
+#: ../src/gui_interface.py:985
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gui_interface.py:1182 ../src/gui_interface.py:1189
+#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Вы злучаны без выкарыстання ключа OpenPGP."
 
-#: ../src/gui_interface.py:1184
+#: ../src/gui_interface.py:989
 msgid "Your passphrase is incorrect"
 msgstr "Пароль няправільны"
 
-#: ../src/gui_interface.py:1188
+#: ../src/gui_interface.py:993
 #, fuzzy
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Пароль няправільны"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid "GPG key not trusted"
 msgstr ""
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
 msgstr ""
 
-#: ../src/gui_interface.py:1226
+#: ../src/gui_interface.py:1031
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not                 correctly started "
@@ -9173,12 +9475,12 @@ msgstr ""
 "Кіраўнік пароляў Gnomekeyring усталяваны, але няправільна выконваецца "
 "(магчыма, зменная асяроддзя выстаўленая няправільна)"
 
-#: ../src/gui_interface.py:1330
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Новая пошта на %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1332
+#: ../src/gui_interface.py:1133
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -9186,7 +9488,7 @@ msgstr[0] "%d новы ліст"
 msgstr[1] "%d новыя лісты"
 msgstr[2] "%d новых лістоў"
 
-#: ../src/gui_interface.py:1345
+#: ../src/gui_interface.py:1146
 #, python-format
 msgid ""
 "\n"
@@ -9196,103 +9498,103 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1418
+#: ../src/gui_interface.py:1215
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s хоча адправіць Вам файл."
 
-#: ../src/gui_interface.py:1455 ../src/roster_window.py:1856
+#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Выдаліць чалавека з спіса"
 
-#: ../src/gui_interface.py:1458 ../src/roster_window.py:1858
+#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
 #, fuzzy
 msgid "Error opening file"
 msgstr "Памылка чытання файла:"
 
-#: ../src/gui_interface.py:1490
+#: ../src/gui_interface.py:1287
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Файл %(filename)s паспяхова атрыманы ад %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1494
+#: ../src/gui_interface.py:1291
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Перадача файла %(filename)s ад %(name)s спыненая."
 
-#: ../src/gui_interface.py:1507
+#: ../src/gui_interface.py:1304
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Вы паспяхова адправілі файл %(filename)s для %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1511
+#: ../src/gui_interface.py:1308
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Перадача файла %(filename)s для %(name)s спыненая."
 
-#: ../src/gui_interface.py:1623
+#: ../src/gui_interface.py:1426
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gui_interface.py:1630
+#: ../src/gui_interface.py:1433
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Для кожнага _паведамлення"
 
-#: ../src/gui_interface.py:1702
+#: ../src/gui_interface.py:1505
 msgid "Username Conflict"
 msgstr "Канфлікт імёнаў карыстальнікаў"
 
-#: ../src/gui_interface.py:1703
+#: ../src/gui_interface.py:1506
 msgid "Please type a new username for your local account"
 msgstr "Вызначце імя карыстальніка для мясцовага рахунка"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1519
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gui_interface.py:1729
+#: ../src/gui_interface.py:1532
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gui_interface.py:1740
+#: ../src/gui_interface.py:1543
 msgid "Error."
 msgstr ""
 
-#: ../src/gui_interface.py:1768
+#: ../src/gui_interface.py:1556
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Канфлікт імёнаў карыстальнікаў"
 
-#: ../src/gui_interface.py:1769
+#: ../src/gui_interface.py:1557
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1816
+#: ../src/gui_interface.py:1604
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s хоча адправіць Вам файл."
 
-#: ../src/gui_interface.py:1819
+#: ../src/gui_interface.py:1607
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Запыт на перадачу файла"
 
-#: ../src/gui_interface.py:1927
+#: ../src/gui_interface.py:1716
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1928
+#: ../src/gui_interface.py:1717
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9300,15 +9602,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1936
+#: ../src/gui_interface.py:1725
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1956
+#: ../src/gui_interface.py:1745
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gui_interface.py:1957
+#: ../src/gui_interface.py:1746
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9319,13 +9621,13 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gui_interface.py:1987 ../src/gui_interface.py:2024
-#: ../src/gui_interface.py:2060
+#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
+#: ../src/gui_interface.py:1849
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Злучэнне"
 
-#: ../src/gui_interface.py:1988
+#: ../src/gui_interface.py:1777
 #, fuzzy
 msgid ""
 "You are about to connect to the server with an insecure connection. This "
@@ -9333,18 +9635,18 @@ msgid ""
 "want to do that?"
 msgstr "Вы ствараеце мета-кантакт. Вы сапраўды хочаце працягнуць?"
 
-#: ../src/gui_interface.py:1991 ../src/gui_interface.py:2028
-#: ../src/gui_interface.py:2063
+#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
+#: ../src/gui_interface.py:1852
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gui_interface.py:2025
+#: ../src/gui_interface.py:1814
 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/gui_interface.py:2061
+#: ../src/gui_interface.py:1850
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9352,58 +9654,58 @@ msgid ""
 msgstr "Вы ствараеце мета-кантакт. Вы сапраўды хочаце працягнуць?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2624 ../src/gui_interface.py:2647
+#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Шыфраванне адключанае"
 
-#: ../src/gui_interface.py:2625
+#: ../src/gui_interface.py:2423
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2648
+#: ../src/gui_interface.py:2446
 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/gui_interface.py:2679 ../src/roster_window.py:3560
+#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
 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/gui_interface.py:3058
+#: ../src/gui_interface.py:2871
 msgid "Could not save your settings and preferences"
 msgstr "Немагчыма захаваць настаўленні"
 
-#: ../src/gui_interface.py:3592
+#: ../src/gui_interface.py:3411
 msgid "Passphrase Required"
 msgstr "Патрэбны пароль"
 
-#: ../src/gui_interface.py:3593
+#: ../src/gui_interface.py:3412
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Вызначце пароль GPG для рахунка %s."
 
-#: ../src/gui_interface.py:3607
+#: ../src/gui_interface.py:3426
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gui_interface.py:3608
+#: ../src/gui_interface.py:3427
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Вы злучыцеся з %s без падтрымкі OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3617
+#: ../src/gui_interface.py:3436
 msgid "Wrong Passphrase"
 msgstr "Няправільны пароль"
 
-#: ../src/gui_interface.py:3618
+#: ../src/gui_interface.py:3437
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Паўтарыце ўвод пароля GPG альбо пстрыкніце Скасаваць."
 
@@ -9442,6 +9744,11 @@ msgstr "Мянушка"
 msgid "Message"
 msgstr "Паведамленне"
 
+#. holds subject
+#: ../src/history_manager.py:188 ../src/history_manager.py:219
+msgid "Subject"
+msgstr "Тэма"
+
 #: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -9543,19 +9850,19 @@ msgstr "Вы не злучаны з серверам"
 msgid "Do you really want to close them all?"
 msgstr "Вы сапраўды хочаце выдаліць выбранае паведамленне?"
 
-#: ../src/message_window.py:484
+#: ../src/message_window.py:485
 msgid "Chats"
 msgstr "Размовы"
 
-#: ../src/message_window.py:486
+#: ../src/message_window.py:487
 msgid "Group Chats"
 msgstr "Групавыя размовы"
 
-#: ../src/message_window.py:488
+#: ../src/message_window.py:489
 msgid "Private Chats"
 msgstr "Прыватныя размовы"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:495
 msgid "Messages"
 msgstr "Паведамленні"
 
@@ -9612,59 +9919,59 @@ msgstr "Новае паведамленне ад %(nickname)s"
 msgid "Ignore"
 msgstr "дзевяць"
 
-#: ../src/profile_window.py:57
+#: ../src/profile_window.py:58
 msgid "Retrieving profile..."
 msgstr "Чытанне профіля..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2935
+#: ../src/profile_window.py:111 ../src/roster_window.py:3001
 #, fuzzy
 msgid "File is empty"
 msgstr "Месца файла"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2938
+#: ../src/profile_window.py:114 ../src/roster_window.py:3004
 #, fuzzy
 msgid "File does not exist"
 msgstr "Такой групавой размовы няма."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2940 ../src/roster_window.py:2951
+#: ../src/profile_window.py:128 ../src/profile_window.py:144
+#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
 msgid "Could not load image"
 msgstr "Немагчыма загрузіць малюнак"
 
-#: ../src/profile_window.py:214
+#: ../src/profile_window.py:215
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Асабістыя звесткі"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:216
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Фармат: ГГГГ-ММ-ДД"
 
-#: ../src/profile_window.py:269
+#: ../src/profile_window.py:270
 msgid "Information received"
 msgstr "Атрыманыя звесткі"
 
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:341
 msgid "Without a connection you can not publish your contact information."
 msgstr ""
 "Вы не можаце абнавіць Вашыя асабістыя звесткі, не злучыўшыся з серверам."
 
-#: ../src/profile_window.py:353
+#: ../src/profile_window.py:354
 msgid "Sending profile..."
 msgstr "Адпраўленне профіля..."
 
-#: ../src/profile_window.py:368
+#: ../src/profile_window.py:369
 msgid "Information NOT published"
 msgstr "Звесткі НЕ абноўленыя"
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:376
 msgid "vCard publication failed"
 msgstr "Памылка абнаўлення vCard"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:377
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9672,51 +9979,51 @@ msgstr ""
 "У часе абнаўлення Вашых асабістых звестак адбылася памылка, паспрабуйце "
 "абнавіць пазней."
 
-#: ../src/roster_window.py:256 ../src/roster_window.py:1012
+#: ../src/roster_window.py:262 ../src/roster_window.py:1026
 msgid "Merged accounts"
 msgstr "Аб'яднаныя рахункі"
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1942
 msgid "Authorization has been sent"
 msgstr "Адпраўленая аўтарызацыя"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1943
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Цяпер \"%s\" можа бачыць Ваш стан."
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1966
 msgid "Subscription request has been sent"
 msgstr "Адпраўлены запыт на падпіску"
 
-#: ../src/roster_window.py:1944
+#: ../src/roster_window.py:1967
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Калі \"%s\" задаволіць гэты запыт, Вы зможаце бачыць яго стан."
 
-#: ../src/roster_window.py:1958
+#: ../src/roster_window.py:1981
 msgid "Authorization has been removed"
 msgstr "Аўтарызацыя забраная"
 
-#: ../src/roster_window.py:1959
+#: ../src/roster_window.py:1982
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Цяпер \"%s\" будзе заўсёды бачыць Вас адлучаным."
 
-#: ../src/roster_window.py:1986
+#: ../src/roster_window.py:2009
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:1987
+#: ../src/roster_window.py:2010
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Вы злучыцеся з %s без падтрымкі OpenPGP."
 
-#: ../src/roster_window.py:2199 ../src/roster_window.py:3496
+#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
 msgid "You are participating in one or more group chats"
 msgstr "Вы ўдзельнічаеце ў некалькіх групавых размовах"
 
-#: ../src/roster_window.py:2200 ../src/roster_window.py:3497
+#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9724,39 +10031,39 @@ msgstr ""
 "Змяніўшы свой стан на нябачны, Вы такім чынам выйдзеце з гэтых групавых "
 "размоў. Вы сапраўды хочаце стаць нябачным?"
 
-#: ../src/roster_window.py:2226
+#: ../src/roster_window.py:2249
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2288
+#: ../src/roster_window.py:2311
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2289
+#: ../src/roster_window.py:2312
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Вы сапраўды хочаце сысці з групавой размовы \"%s\"?"
 
-#: ../src/roster_window.py:2290
+#: ../src/roster_window.py:2313
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2373
+#: ../src/roster_window.py:2396
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Скасаваць перадачу файла"
 
-#: ../src/roster_window.py:2374
+#: ../src/roster_window.py:2397
 msgid ""
-"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2405 ../src/roster_window.py:2653
+#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
 msgid "You have unread messages"
 msgstr "Ёсць нечытаныя паведамленні"
 
-#: ../src/roster_window.py:2406
+#: ../src/roster_window.py:2429
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9765,95 +10072,95 @@ msgstr ""
 "Вы зможаце прачытаць нечытаныя паведамленні толькі з уключаным вядзеннем "
 "журналаў размоў."
 
-#: ../src/roster_window.py:2654
+#: ../src/roster_window.py:2720
 msgid "You must read them before removing this transport."
 msgstr "Вы павінны прачытаць іх перад выдаленнем гэтага транспарта."
 
-#: ../src/roster_window.py:2657
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспарт \"%s\" будзе выдалены"
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2724
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr "Вы больш не зможаце мець зносіны з людзьмі праз гэты транспарт."
 
-#: ../src/roster_window.py:2661
+#: ../src/roster_window.py:2727
 msgid "Transports will be removed"
 msgstr "Транспарты будуць выдаленыя"
 
-#: ../src/roster_window.py:2666
+#: ../src/roster_window.py:2732
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "these transports: %s"
 msgstr "Вы больш не зможаце мець зносіны з людзьмі праз гэтыя транспарты: %s"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2800
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Вы ствараеце мета-кантакт. Вы сапраўды хочаце працягнуць?"
 
-#: ../src/roster_window.py:2736
+#: ../src/roster_window.py:2802
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2827
+#: ../src/roster_window.py:2893
 msgid "Rename Contact"
 msgstr "Змяніць імя чалавека"
 
-#: ../src/roster_window.py:2828
+#: ../src/roster_window.py:2894
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Вызначце новую мянушку для чалавека %s."
 
-#: ../src/roster_window.py:2835
+#: ../src/roster_window.py:2901
 msgid "Rename Group"
 msgstr "Змяніць назву групы"
 
-#: ../src/roster_window.py:2836
+#: ../src/roster_window.py:2902
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Вызначце новую назву групы %s"
 
-#: ../src/roster_window.py:2881
+#: ../src/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Выдаліць групу"
 
-#: ../src/roster_window.py:2882
+#: ../src/roster_window.py:2948
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Хочаце выдаліць групу %s з кантактнага ліста?"
 
-#: ../src/roster_window.py:2883
+#: ../src/roster_window.py:2949
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Таксама выдаліць усіх людзей з гэтай групы"
 
-#: ../src/roster_window.py:2922
+#: ../src/roster_window.py:2988
 msgid "Assign OpenPGP Key"
 msgstr "Прызначыць ключ OpenPGP"
 
-#: ../src/roster_window.py:2923
+#: ../src/roster_window.py:2989
 msgid "Select a key to apply to the contact"
 msgstr "Выберыце ключ для гэтага чалавека"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3372
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "\"%s\" будзе выдалены з Вашага кантактнага ліста"
 
-#: ../src/roster_window.py:3308
+#: ../src/roster_window.py:3374
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3313
+#: ../src/roster_window.py:3379
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9862,12 +10169,12 @@ msgstr ""
 "прыбярэце ў яго аўтарызацыю, і ён заўсёды будзе бачыць Вас адлучаным."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3319
+#: ../src/roster_window.py:3385
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Што Вы хочаце зрабіць?"
 
-#: ../src/roster_window.py:3323
+#: ../src/roster_window.py:3389
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9876,16 +10183,16 @@ msgstr ""
 "чынам таксама прыбярэце ў яго аўтарызацыю, і ён заўсёды будзе бачыць Вас "
 "адлучаным."
 
-#: ../src/roster_window.py:3326
+#: ../src/roster_window.py:3392
 msgid "I want this contact to know my status after removal"
 msgstr "Я хачу, каб гэты чалавек мог бачыць мой стан пасля выдалення"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3330
+#: ../src/roster_window.py:3396
 msgid "Contacts will be removed from your roster"
 msgstr "Людзі будуць выдаленыя з Вашага кантактнага ліста"
 
-#: ../src/roster_window.py:3335
+#: ../src/roster_window.py:3401
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9895,32 +10202,32 @@ msgstr ""
 "з Вашага кантактнага ліста, Вы такім чынам таксама прыбярэце ў іх "
 "аўтарызацыю, і яны заўсёды будуць бачыць Вас адлучаным."
 
-#: ../src/roster_window.py:3393
+#: ../src/roster_window.py:3459
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want  to continue?"
 msgstr "Вы ствараеце мета-кантакт. Вы сапраўды хочаце працягнуць?"
 
-#: ../src/roster_window.py:3395
+#: ../src/roster_window.py:3461
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he or she will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3414
+#: ../src/roster_window.py:3480
 msgid "No account available"
 msgstr "Рахункаў няма"
 
-#: ../src/roster_window.py:3415
+#: ../src/roster_window.py:3481
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Вы павінны стварыць рахунак, каб размаўляць з іншымі людзьмі."
 
-#: ../src/roster_window.py:4023
+#: ../src/roster_window.py:4095
 msgid "Metacontacts storage not supported by your server"
 msgstr "Сервер не падтрымлівае сховішча мета-кантактаў"
 
-#: ../src/roster_window.py:4025
+#: ../src/roster_window.py:4097
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9929,12 +10236,12 @@ msgstr ""
 "Сервер не падтрымлівае мета-кантакты. Гэтае настаўленне не захаваецца для "
 "наступных сеансаў."
 
-#: ../src/roster_window.py:4117
+#: ../src/roster_window.py:4189
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Вы ствараеце мета-кантакт. Вы сапраўды хочаце працягнуць?"
 
-#: ../src/roster_window.py:4119
+#: ../src/roster_window.py:4191
 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 "
@@ -9944,12 +10251,12 @@ msgstr ""
 "кантактнага ліста. Звычайна ўжываецца, калі ў чалавека некалькі рахункаў "
 "Jabber альбо некалькі транспартных рахункаў."
 
-#: ../src/roster_window.py:4234
+#: ../src/roster_window.py:4306
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Няправільны файл"
 
-#: ../src/roster_window.py:4246
+#: ../src/roster_window.py:4318
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9957,12 +10264,12 @@ msgstr[0] "%s хоча адправіць Вам файл:"
 msgstr[1] "%s хоча адправіць Вам файл:"
 msgstr[2] "%s хоча адправіць Вам файл:"
 
-#: ../src/roster_window.py:4361
+#: ../src/roster_window.py:4433
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Адправіць %s"
 
-#: ../src/roster_window.py:4367
+#: ../src/roster_window.py:4439
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Зрабіць %s і %s мета-кантактамі"
@@ -9972,151 +10279,151 @@ msgstr "Зрабіць %s і %s мета-кантактамі"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4816 ../src/roster_window.py:4889
-#: ../src/roster_window.py:4898 ../src/statusicon.py:246
-#: ../src/statusicon.py:293 ../src/statusicon.py:299
+#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
+#: ../src/roster_window.py:4970 ../src/statusicon.py:263
+#: ../src/statusicon.py:310 ../src/statusicon.py:316
 #, python-format
 msgid "using account %s"
 msgstr "выкарыстоўвае рахунак %s"
 
 #. add
-#: ../src/roster_window.py:4905
+#: ../src/roster_window.py:4977
 #, python-format
 msgid "to %s account"
 msgstr "рахунку %s"
 
 #. disco
-#: ../src/roster_window.py:4910
+#: ../src/roster_window.py:4982
 #, python-format
 msgid "using %s account"
 msgstr "выкарыстоўвае рахунак %s"
 
-#: ../src/roster_window.py:4948 ../src/statusicon.py:309
+#: ../src/roster_window.py:5020 ../src/statusicon.py:326
 msgid "_Manage Bookmarks..."
 msgstr "_Кіраванне закладкамі..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4968
+#: ../src/roster_window.py:5040
 #, python-format
 msgid "of account %s"
 msgstr "рахунка %s"
 
-#: ../src/roster_window.py:5009
+#: ../src/roster_window.py:5081
 #, python-format
 msgid "for account %s"
 msgstr "для рахунка %s"
 
-#: ../src/roster_window.py:5069 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
 msgid "_Change Status Message"
 msgstr "З_мяніць паведамленне аб стане"
 
-#: ../src/roster_window.py:5102
+#: ../src/roster_window.py:5174
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Абнавіць"
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5176
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Абнавіць"
 
-#: ../src/roster_window.py:5107
+#: ../src/roster_window.py:5179
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Праглядзець сервісы..."
 
-#: ../src/roster_window.py:5252
+#: ../src/roster_window.py:5324
 msgid "_Maximize All"
 msgstr ""
 
-#: ../src/roster_window.py:5262 ../src/roster_window.py:5436
+#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
 msgid "Send Group M_essage"
 msgstr "Ад_правіць групавое паведамленне"
 
-#: ../src/roster_window.py:5270
+#: ../src/roster_window.py:5342
 msgid "To all users"
 msgstr "Усім карыстальнікам"
 
-#: ../src/roster_window.py:5274
+#: ../src/roster_window.py:5346
 msgid "To all online users"
 msgstr "Усім актыўным карыстальнікам"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5456
+#: ../src/roster_window.py:5528
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Змяніць імя чалавека"
 
 #. Edit Groups
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5537
 msgid "Edit _Groups"
 msgstr "Змяніць _групы"
 
 #. Send single message
-#: ../src/roster_window.py:5520
+#: ../src/roster_window.py:5592
 #, fuzzy
 msgid "Send Single Message"
 msgstr "Ад_правіць асобнае паведамленне"
 
 #. Execute Command
-#: ../src/roster_window.py:5567
+#: ../src/roster_window.py:5639
 msgid "Execute Command..."
 msgstr "Выканаць загад..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5577
+#: ../src/roster_window.py:5649
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Транспарты"
 
 #. Modify Transport
-#: ../src/roster_window.py:5586
+#: ../src/roster_window.py:5658
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Паказаць _транспарты"
 
 #. Rename
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5668
 msgid "_Rename"
 msgstr "Змяніць _імя"
 
-#: ../src/roster_window.py:5656
+#: ../src/roster_window.py:5728
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5665
+#: ../src/roster_window.py:5737
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Чалавек адлучыўся"
 
-#: ../src/roster_window.py:5672
+#: ../src/roster_window.py:5744
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Чалавек адлучыўся"
 
 #. History manager
-#: ../src/roster_window.py:5754
+#: ../src/roster_window.py:5833
 msgid "History Manager"
 msgstr "Кіраўнік журналаў"
 
-#: ../src/roster_window.py:5765
+#: ../src/roster_window.py:5844
 msgid "_Join New Group Chat"
 msgstr "_Удзельнічаць у групавой размове"
 
-#: ../src/roster_window.py:5938
+#: ../src/roster_window.py:6019
 msgid "Change Status Message..."
 msgstr "Змяніць паведамленне стану..."
 
-#: ../src/search_window.py:94
+#: ../src/search_window.py:105
 msgid "Waiting for results"
 msgstr ""
 
-#: ../src/search_window.py:132 ../src/search_window.py:210
+#: ../src/search_window.py:143 ../src/search_window.py:220
 msgid "Error in received dataform"
 msgstr ""
 
 #. No result
-#: ../src/search_window.py:166 ../src/search_window.py:202
+#: ../src/search_window.py:177 ../src/search_window.py:212
 msgid "No result"
 msgstr ""
 
@@ -10129,21 +10436,22 @@ msgstr ""
 msgid "Subject: %s"
 msgstr "Тэма: %s"
 
-#: ../src/session.py:433 ../src/session.py:468
+#: ../src/session.py:447 ../src/session.py:491
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:435
+#: ../src/session.py:448
 #, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
+"The remote client wants '\n"
+"                            'to negotiate an session with these features:\n"
 "\n"
 "%s\n"
 "\n"
 "Are these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:469
+#: ../src/session.py:492
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10153,16 +10461,16 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/statusicon.py:210
+#: ../src/statusicon.py:227
 msgid "_Change Status Message..."
 msgstr "_Змяніць паведамленне стану..."
 
-#: ../src/statusicon.py:322
+#: ../src/statusicon.py:339
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Няма ў спісе"
 
-#: ../src/statusicon.py:333
+#: ../src/statusicon.py:350
 msgid "Hide this menu"
 msgstr "Схаваць гэтае меню"
 
@@ -10303,70 +10611,108 @@ msgstr ""
 "Гэты сервіс не дае падрабязных звестак.\n"
 "Хутчэй за ўсё, гэты сервіс састарэлы ці зламаны"
 
-#: ../src/vcard.py:251
+#: ../src/vcard.py:265
 msgid "?Client:Unknown"
 msgstr "?Праграма:Невядомая"
 
-#: ../src/vcard.py:253
+#: ../src/vcard.py:267
 msgid "?OS:Unknown"
 msgstr "?Сістэма:Невядомая"
 
-#: ../src/vcard.py:274
+#: ../src/vcard.py:288
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "?Праграма:Невядомая"
 
-#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
+#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
 #, python-format
 msgid "since %s"
 msgstr "ад %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:345
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:349
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Праграмы</b>"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:357
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr "Вы не цікавіцеся гэтым чалавекам, але ён цікавіцца Вамі"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:359
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 msgstr "Вы цікавіцеся чалавекам, але ён не цікавіцца Вамі"
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:361
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Вы і гэты чалавек абодва цікавіцеся адзін адным"
 
 #. None
-#: ../src/vcard.py:349
+#: ../src/vcard.py:363
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "Вы не цікавіцеся чалавекам, і ён не цікавіцца Вамі"
 
-#: ../src/vcard.py:356
+#: ../src/vcard.py:370
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Вы чакаеце адказу на Ваш запыт"
 
-#: ../src/vcard.py:358
+#: ../src/vcard.py:372
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
+#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
 msgid " resource with priority "
 msgstr " рэсурс з прыярытэтам "
 
-#~ msgid "_Available"
-#~ msgstr "_Тут"
+#~ msgid "_Disable showing event in systray"
+#~ msgstr "_Не паказваць падзею ў прасторы паведамленняў"
+
+#~ msgid "_Show event in systray"
+#~ msgstr "_Паказваць падзею ў прасторы паведамленняў"
+
+#, fuzzy
+#~ msgid "Autodetect on every Gajim startup"
+#~ msgstr "_Злучацца па старце Gajim"
+
+#, fuzzy
+#~ msgid "Show systray:"
+#~ msgstr "_Паказваць падзею ў прасторы паведамленняў"
+
+#~ msgid "Nickname not allowed: %s"
+#~ msgstr "Такая мянушка не дазволеная: %s"
+
+#, fuzzy
+#~ msgid "Room has been destroyed"
+#~ msgstr "Аўтарызацыя забраная"
+
+#~ msgid "I would like to add you to my roster."
+#~ msgstr "Я хачу дадаць Вас у мой кантактны ліст."
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "цяпер падпісаны на %s"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "запыт адпіскі ад %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "цяпер адпісаны ад %s"
+
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "JID %s не адпавядае стандарту RFC. Ён не будзе дададзены ў кантактны "
+#~ "ліст. Выдаліце яго з дапамогай адмысловай праграмы, напр., http://jru."
+#~ "jabberstudio.org/"
 
 #~ msgid "Account Modification"
 #~ msgstr "Змяненне рахунка"
@@ -10459,34 +10805,6 @@ msgstr " рэсурс з прыярытэтам "
 #~ msgid "gtk-delete"
 #~ msgstr "Выдаліць"
 
-#, fuzzy
-#~ msgid "Add this contact to roster (Ctrl+D)"
-#~ msgstr "Дадаць чалавека ў спіс"
-
-#, fuzzy
-#~ msgid "Bookmark this room (Ctrl+B)"
-#~ msgstr "_Змясціць у закладках"
-
-#, fuzzy
-#~ msgid "Change your nickname (Ctrl+N)"
-#~ msgstr "Змяніць м_янушку"
-
-#, fuzzy
-#~ msgid "Invite contacts to the conversation (Ctrl+G)"
-#~ msgstr "сочыць за размовай"
-
-#, fuzzy
-#~ msgid "Show a list of emoticons (Alt+M)"
-#~ msgstr "Пстрыкніце, каб уставіць сымболік (Alt+M)"
-
-#, fuzzy
-#~ msgid "Show a list of formattings"
-#~ msgstr "Пстрыкніце, каб уставіць сымболік (Alt+M)"
-
-#, fuzzy
-#~ msgid "Show a menu of advanced functions (Alt+D)"
-#~ msgstr "Пстрыкніце, каб уставіць сымболік (Alt+M)"
-
 #~ msgid ""
 #~ "All chat states\n"
 #~ "Composing only\n"
@@ -10524,9 +10842,6 @@ msgstr " рэсурс з прыярытэтам "
 #~ msgid "gtk-cancel"
 #~ msgstr "Выдаліць"
 
-#~ msgid "_Preferences"
-#~ msgstr "_Настаўленні"
-
 #~ msgid "_Quit"
 #~ msgstr "_Выйсці"
 
@@ -10950,9 +11265,6 @@ msgstr " рэсурс з прыярытэтам "
 #~ msgid "Treat all incoming messages as:"
 #~ msgstr "Лічыць усе ўваходныя паведамленні:"
 
-#~ msgid "Use t_rayicon (aka. notification area icon)"
-#~ msgstr "_Значка панэлі паведамленняў"
-
 #~ msgid ""
 #~ "When a new event (message, file transfer request etc..) is received, the "
 #~ "following methods may be used to inform you about it. Please note that "
@@ -11071,13 +11383,6 @@ msgstr " рэсурс з прыярытэтам "
 #~ msgid "Session Management support not available (missing gnome.ui module)"
 #~ msgstr "Падтрымка працоўных сеансаў адсутнічае (няма модуля gnome.ui)"
 
-#~ msgid ""
-#~ "Usage: %s %s %s \n"
-#~ "\t %s"
-#~ msgstr ""
-#~ "Карыстанне: %s %s %s \n"
-#~ "\t %s"
-
 #~ msgid "Private Chat"
 #~ msgstr "Прыватная размова"
 
diff --git a/po/be@latin.po b/po/be@latin.po
index d103291bebed8c6257fa481214471dd42ed3b94d..9e3a31dd8dc8a52d9d657973ce8916f4407daa38 100644
--- a/po/be@latin.po
+++ b/po/be@latin.po
@@ -4,11 +4,15 @@
 # Based on cyrillic version.
 #
 # Ihar Hrachyshka <ihar.hrachyshka@gmail.com>, 2006-2007, 2009.
+#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.11.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 11:28+0200\n"
+"POT-Creation-Date: 2010-10-01 20:39+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"
@@ -28,7 +32,7 @@ msgstr "Dałučysia da _pakoju"
 msgid "_Add Contact..."
 msgstr "_Dadaj kantakt..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:17
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
 msgid "_Discover Services"
 msgstr "_Å ukaj servisy"
 
@@ -50,7 +54,7 @@ msgstr "_Adčyni poštu Gmail"
 msgid "_Personal Events"
 msgstr "Asabistyja źviestki"
 
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:23
+#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
 #, fuzzy
 msgid "_Start Chat..."
 msgstr "_Pačni razmovu"
@@ -85,76 +89,72 @@ msgid "<b>Please select a server</b>"
 msgstr ""
 
 #: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid "@"
-msgstr ""
-
-#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
 msgstr ""
 
-#: ../data/gui/account_creation_wizard_window.ui.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:10
 #, fuzzy
 msgid "Anon_ymous authentication"
 msgstr "Užyvaj aŭtaryzacyju"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Connect when I press Finish"
 msgstr "Dałučysia pa nacisku knopki \"Skonč\""
 
-#: ../data/gui/account_creation_wizard_window.ui.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Stvareńnie kontu"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 #, fuzzy
 msgid "I already have an account I want to _use"
 msgstr "Ja ŭžo maju patrebny kont"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I want to _register for a new account"
 msgstr "Ja chaču za_rehistravać novy kont"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:16
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 #: ../data/gui/accounts_window.ui.h:28
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Kali ŭklučanaja hetaja opcyja, Gajim zapomnić parol dla hetaha kontu"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:17
+#: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Kiruj..."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:18
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
 #: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2263 ../src/config.py:2342
-#: ../src/config.py:2355 ../src/config.py:3596 ../src/config.py:3671
-#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513
-#: ../src/dialogs.py:526 ../src/roster_window.py:2890
-#: ../src/roster_window.py:2896 ../src/roster_window.py:2901
+#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
+#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
+#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
+#: ../src/dialogs.py:527 ../src/roster_window.py:2956
+#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
 msgid "None"
 msgstr "Nijaki"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:19
+#: ../data/gui/account_creation_wizard_window.ui.h:18
 #, fuzzy
 msgid "Prox_y:"
 msgstr "Proxy:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #: ../data/gui/accounts_window.ui.h:48
 msgid "Save pass_word"
 msgstr "Zachavaj _parol"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:21
+#: ../data/gui/account_creation_wizard_window.ui.h:20
 msgid "Set my profile when I connect"
 msgstr "Nastaŭ profil paśla złučeńnia"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:22
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Use custom hostname/port"
 msgstr "Skarystaj admysłovy host/port"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:23
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -162,35 +162,35 @@ msgstr ""
 "Ty musiš mieć kont, kab dałučycca da sietki\n"
 "Jabber."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-#: ../data/gui/roster_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:16
 msgid "_Advanced"
 msgstr "_Dadatkovyja"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:25
 msgid "_Finish"
 msgstr "_Skonč"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:27
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 #, fuzzy
 msgid "_Hostname:"
 msgstr "Nazva hosta: "
 
-#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #: ../data/gui/accounts_window.ui.h:62
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:28
 #: ../data/gui/accounts_window.ui.h:64
 msgid "_Password:"
 msgstr "_Parol:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:29
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:31
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Server:"
 msgstr "_Server:"
 
@@ -301,17 +301,17 @@ msgstr "Imia:"
 #. No configured account
 #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
 #: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592
-#: ../src/notify.py:608
+#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
+#: ../src/notify.py:616
 msgid "Gajim"
 msgstr "Gajim"
 
 #. FIXME: Ugly workaround.
 #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
 #. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:61
-#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121
-#: ../src/roster_window.py:2832 ../src/roster_window.py:5379
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
+#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
 msgid "General"
 msgstr "Ahulnaja"
 
@@ -369,7 +369,7 @@ msgstr "Źviestki pra ciabie, jakija zachoŭvajucca na servery"
 
 #: ../data/gui/accounts_window.ui.h:35
 #: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:830
+#: ../src/dialogs.py:831
 msgid "Jabber ID:"
 msgstr "JID:"
 
@@ -383,7 +383,7 @@ msgid "Mer_ge accounts"
 msgstr "_Źlej konty ŭ adno"
 
 #: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2356
+#: ../src/config.py:2358
 msgid "No key selected"
 msgstr "Kluč nie abrany"
 
@@ -410,7 +410,7 @@ msgid "Priority will change automatically according to your status."
 msgstr "Źmianiaj pryjarytet aŭtamatyčna zhodna z statusam."
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5329
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
 msgid "Re_name"
 msgstr "_Źmiani nazvu"
 
@@ -644,40 +644,45 @@ msgstr "Vydal paviedamleńnie dniu"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
 #, fuzzy
+msgid "Edit Archi_ving Preferences"
+msgstr "_Nałady"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#, fuzzy
 msgid "Edit _Privacy Lists..."
 msgstr "_Śpisy pryvatnaści"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sends a message to users currently connected to this server"
 msgstr "Dašli paviedamleńnie karystalnikam, dałučanym da servera"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 #, fuzzy
 msgid "Set MOTD..."
 msgstr "Vyznač MOTD"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Vyznač paviedamleńnie dniu"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Show _XML Console"
 msgstr "Pakažy _kansol XML"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "Aktualizuj MOTD"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "Aktualizuj paviedamleńnie dniu"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:11
 msgid "_Administrator"
 msgstr "_Administratar"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:11
+#: ../data/gui/advanced_menuitem_menu.ui.h:12
 #, fuzzy
 msgid "_Send Server Message..."
 msgstr "_Dašli paviedamleńnie servera"
@@ -712,7 +717,7 @@ msgid "All statuses"
 msgstr "Usie statusy"
 
 #: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:233
+#: ../src/common/commands.py:106 ../src/common/helpers.py:239
 #: ../src/tooltips.py:193
 msgid "Away"
 msgstr "Adyjšoŭ"
@@ -765,7 +770,7 @@ msgid "Have "
 msgstr "Nie razmaÅ­laju "
 
 #: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:249
 msgid "Invisible"
 msgstr "Niabačny"
 
@@ -774,7 +779,7 @@ msgid "Launch a command"
 msgstr "Vykanaj zahad"
 
 #: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:216 ../src/tooltips.py:197
+#: ../src/common/helpers.py:222 ../src/tooltips.py:197
 msgid "Not Available"
 msgstr "Niedastupny"
 
@@ -817,12 +822,13 @@ msgid "_Disable existing sound for this event"
 msgstr "_Nie ahučvaj hetaj padzieji"
 
 #: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in roster"
+#, fuzzy
+msgid "_Disable showing event in notification area"
 msgstr "_Nie pakazvać paviedamleńniaŭ u śpisie kantaktaŭ"
 
 #: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in systray"
-msgstr "_Nie pakazvać padziejaŭ u poli nahadvańnia"
+msgid "_Disable showing event in roster"
+msgstr "_Nie pakazvać paviedamleńniaŭ u śpisie kantaktaŭ"
 
 #: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
@@ -833,12 +839,13 @@ msgid "_Open chat window with user"
 msgstr "_Adčyni akno razmovy z karystalnikam"
 
 #: ../data/gui/advanced_notifications_window.ui.h:35
-msgid "_Show event in roster"
+#, fuzzy
+msgid "_Show event in notification area"
 msgstr "_Pakazvaj padzieju ŭ śpisie kantaktaŭ"
 
 #: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in systray"
-msgstr "_Pakazvaj padzieju ŭ poli nahadvańnia"
+msgid "_Show event in roster"
+msgstr "_Pakazvaj padzieju ŭ śpisie kantaktaŭ"
 
 #: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
@@ -866,6 +873,45 @@ msgstr "Hrupa"
 msgid "when I'm in"
 msgstr "kali maju "
 
+#: ../data/gui/archiving_preferences_window.ui.h:1
+msgid "<i>Method Auto</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "<i>Method Local</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:3
+msgid "<i>Method Manual</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:4
+#, fuzzy
+msgid "Auto"
+msgstr "Aŭtamatyčna dałučajsia"
+
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Concede"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "Forbid"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:7
+#, fuzzy
+msgid "No"
+msgstr "Nijaki"
+
+#: ../data/gui/archiving_preferences_window.ui.h:8
+#, fuzzy
+msgid "Prefer"
+msgstr "Nałady"
+
+#: ../data/gui/archiving_preferences_window.ui.h:9
+msgid "Yes"
+msgstr ""
+
 #: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Zapis:"
@@ -893,8 +939,8 @@ msgstr "Kantakty"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5348
-#: ../src/roster_window.py:5476 ../src/roster_window.py:5609
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
+#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
 msgid "_Unblock"
 msgstr ""
 
@@ -988,7 +1034,7 @@ msgid "_Start Chat"
 msgstr "_Pačni razmovu"
 
 #. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4184
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
 msgid "#"
 msgstr "â„–"
 
@@ -1036,13 +1082,55 @@ msgstr ""
 msgid "9"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:13
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Dadaje kantakt u śpis kantaktaŭ"
+
 #: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
+msgid "Browse the chat history (Ctrl+H)"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:15
+#, fuzzy
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "sočyć za razmovaj"
+
+#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+#, fuzzy
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Klikni, kab ustavić smajlik (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
+#, fuzzy
+msgid "Show a list of formattings"
+msgstr "Klikni, kab ustavić smajlik (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Klikni, kab ustavić smajlik (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:19
+#, fuzzy
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr "Dadaje kantakt u śpis kantaktaŭ"
+
+#: ../data/gui/chat_control.ui.h:20
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:21
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
 #: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Vyšli"
 
-#: ../data/gui/chat_control.ui.h:15 ../data/gui/groupchat_control.ui.h:3
+#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
 msgid "label"
 msgstr ""
 
@@ -1096,8 +1184,8 @@ msgstr "Źmiani _hrupy"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5284
-#: ../src/roster_window.py:5444
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
+#: ../src/roster_window.py:5516
 msgid "In_vite to"
 msgstr "_Zaprasi"
 
@@ -1111,8 +1199,8 @@ msgstr "Kantakty"
 msgid "Remo_ve"
 msgstr "_Vydal"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5294
-#: ../src/roster_window.py:5533
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
+#: ../src/roster_window.py:5605
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Dasyłaje svoj XML"
@@ -1148,8 +1236,8 @@ msgid "_Allow him/her to see my status"
 msgstr "Dazvol jamu/joj _bačyć moj status"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5482 ../src/roster_window.py:5612
+#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
+#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
 msgid "_Block"
 msgstr ""
 
@@ -1159,8 +1247,8 @@ msgstr "Za_barani jamu/joj bačyć moj status"
 
 #: ../data/gui/contact_context_menu.ui.h:20
 #: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:21
-#: ../src/roster_window.py:5683
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
+#: ../src/roster_window.py:5755
 msgid "_History"
 msgstr "_Žurnał razmoŭ"
 
@@ -1296,7 +1384,7 @@ msgstr "<b>Kolery kartak u aknie razmoÅ­</b>"
 msgid "Account row"
 msgstr "Kont"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:925
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
 msgid "Bold"
 msgstr "TÅ‚usty"
 
@@ -1334,7 +1422,7 @@ msgstr "Hrupa"
 msgid "Inactive"
 msgstr "PasiÅ­ny"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:926
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
 msgid "Italic"
 msgstr "Nachileny"
 
@@ -1385,7 +1473,7 @@ msgstr "Źmiani _temu"
 msgid "Configure _Room..."
 msgstr "Kanfihuruj _pakoj"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1782
+#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
 #, fuzzy
 msgid "_Bookmark"
 msgstr "_Stvary zakładku dla hetaja pakoju"
@@ -1449,19 +1537,33 @@ msgstr "_Dasłać pryvatnaje paviedamleńnie"
 msgid "_Voice"
 msgstr "_Daj hołas"
 
+#: ../data/gui/groupchat_control.ui.h:1
+#, fuzzy
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "_Stvary zakładku dla hetaja pakoju"
+
+#: ../data/gui/groupchat_control.ui.h:3
+msgid "Change the room's subject (Alt+T)"
+msgstr ""
+
+#: ../data/gui/groupchat_control.ui.h:4
+#, fuzzy
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Źmiani _mianušku"
+
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Stvary novy zapis"
 
-#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
-msgid "From"
-msgstr "Ad"
+#: ../data/gui/groups_post_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:2
+msgid "From:"
+msgstr "Ad:"
 
-#. holds subject
-#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
-#: ../src/history_manager.py:219
-msgid "Subject"
-msgstr "Tema"
+#: ../data/gui/groups_post_window.ui.h:3
+#: ../data/gui/single_message_window.ui.h:7
+msgid "Subject:"
+msgstr "Tema:"
 
 #: ../data/gui/history_manager.ui.h:1
 #, fuzzy
@@ -1485,8 +1587,8 @@ msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Kiraŭnik žurnałaŭ razmoŭ Gajim"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3208
-#: ../src/dialogs.py:3305
+#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
+#: ../src/dialogs.py:3321
 msgid "Delete"
 msgstr "Vydal"
 
@@ -1540,12 +1642,75 @@ msgstr "Å ukaj"
 msgid "_Log conversation history"
 msgstr "_Zachoŭvaj žurnał razmoŭ"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
+msgid "approve"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:2
+msgid "body"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:3
+msgid "concede"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:4
+msgid "expire"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:5
+msgid "false"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:6
+msgid "forbid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:7
+#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+msgid "jid"
+msgstr "jid"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:8
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
+#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
+msgid "message"
+msgstr "paviedamleńnie"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
+msgid "oppose"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
+#, fuzzy
+msgid "otr"
+msgstr "_Host:"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:11
+msgid "prefer"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:12
+msgid "require"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:13
+msgid "save"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:14
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
 msgid "Bro_wse Rooms"
 msgstr "_Prahladaj"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2180
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
 msgid "Join Group Chat"
 msgstr "Dałučysia da pakoju"
 
@@ -1583,8 +1748,8 @@ msgstr "Server:"
 msgid "_Bookmark this room"
 msgstr "_Stvary zakładku dla hetaja pakoju"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1341
-#: ../src/disco.py:1786
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../src/disco.py:1804
 msgid "_Join"
 msgstr "_Dałučysia"
 
@@ -1695,6 +1860,75 @@ msgstr "_Imia karystalnika:"
 msgid "Passphrase"
 msgstr "Parol"
 
+#: ../data/gui/plugins_window.ui.h:1
+msgid "&lt;empty&gt;"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:2
+msgid "<empty>"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:3
+#, fuzzy
+msgid "Authors:"
+msgstr "_AÅ­taryzuj"
+
+#: ../data/gui/plugins_window.ui.h:4
+#, fuzzy
+msgid "Available"
+msgstr "_Dastupny"
+
+#: ../data/gui/plugins_window.ui.h:5
+#, fuzzy
+msgid "Configure"
+msgstr "_Praciahni"
+
+#: ../data/gui/plugins_window.ui.h:6
+#, fuzzy
+msgid "Descrition:"
+msgstr "Apisańnie: %s"
+
+#: ../data/gui/plugins_window.ui.h:7
+#, fuzzy
+msgid "Homepage:"
+msgstr "Chatniaja staronka:"
+
+#: ../data/gui/plugins_window.ui.h:8
+msgid "Install"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:9
+#, fuzzy
+msgid "Installed"
+msgstr "Zatrymana"
+
+#: ../data/gui/plugins_window.ui.h:10
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:11
+msgid "Plugins"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:12
+msgid "Uninstall"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:13
+#, fuzzy
+msgid "Version:"
+msgstr "Versija GTK+:"
+
+#: ../data/gui/plugins_window.ui.h:14
+msgid "button"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:15
+msgid "homepage url"
+msgstr ""
+
 #: ../data/gui/popup_notification_window.ui.h:1
 #, fuzzy
 msgid "Event Type"
@@ -1832,128 +2066,111 @@ msgid "Always"
 msgstr "Adyjšoŭ"
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Always use GNOME default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:32
-msgid "Always use KDE default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:33
-msgid "Always use Xfce default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Spytaj paviedamleńnia statusu, kali ja:"
 
-#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
 msgid "Audio / Video"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:33
 msgid "Audio input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Audio output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:38
-#, fuzzy
-msgid "Autodetect on every Gajim startup"
-msgstr "_Zlučajsia pry starcie Gajim"
-
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:35
 #, fuzzy
 msgid "Chat message:"
 msgstr "Pa_viedamleńnie statusu:"
 
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:36
 #, 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/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:37
 #, fuzzy
 msgid "Composing only"
 msgstr "Uvod paviedamleńnia"
 
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:38
 msgid "Configure color and font of the interface"
 msgstr "Kanfihuruj koler i Å¡ryft interfejsu"
 
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Pa_viedamleńnie statusu:"
 
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Nazva kantaktu"
 
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:41
 #, fuzzy
 msgid "Custom"
 msgstr "<b>Asablivy</b>"
 
-#: ../data/gui/preferences_window.ui.h:46
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Detached roster with chat grouped by account"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Detached roster with detached chats"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:45
 msgid "Detached roster with single chat"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
-#: ../src/config.py:671
+#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
+#: ../src/config.py:665
 msgid "Disabled"
 msgstr "Adklučana"
 
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:47
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
 
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:48
 msgid "Display _extra email details"
 msgstr "Pakazvaj dadatkovyja _padrabiaznaści ab emaiłu"
 
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:49
 #, fuzzy
 msgid "Display _location of contacts in roster"
 msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
 
-#: ../data/gui/preferences_window.ui.h:54
+#: ../data/gui/preferences_window.ui.h:50
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display a_vatars of contacts in roster"
 msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
 
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:52
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
 
-#: ../data/gui/preferences_window.ui.h:57
+#: ../data/gui/preferences_window.ui.h:53
 msgid "Display status _messages of contacts in roster"
 msgstr "Pakazvaj paviedamleńni _statusu kantaktaŭ u śpisie kantaktaŭ"
 
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:54
 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 "
@@ -1963,7 +2180,7 @@ msgstr ""
 "kantaktam. Tut ty možaš vyznačyć, jakija paviedamleńni statusu treba "
 "pakazvać u voknach razmoŭ."
 
-#: ../data/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:55
 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 "
@@ -1973,7 +2190,7 @@ msgstr ""
 "kantaktam. Tut ty možaš vyznačyć, jakija paviedamleńni statusu treba dasyłać "
 "surazmoÅ­cam."
 
-#: ../data/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:56
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1981,12 +2198,12 @@ msgstr ""
 "Gajim budzie paviedamlać ab adłučeńni kantaktaŭ ad servera ŭ pravym nižnim "
 "kucie ekranu"
 
-#: ../data/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:58
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "Chavaje knopki Å­ aknie pakoju."
 
-#: ../data/gui/preferences_window.ui.h:63
+#: ../data/gui/preferences_window.ui.h:59
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
@@ -1995,7 +2212,7 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie dałučacca da hetaha pakoju pry "
 "starcie"
 
-#: ../data/gui/preferences_window.ui.h:64
+#: ../data/gui/preferences_window.ui.h:60
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -2003,18 +2220,18 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim taksama budzie paviedamlać dadatkovyja "
 "źviestki pra aŭtaraŭ novych listoŭ"
 
-#: ../data/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:61
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:66
+#: ../data/gui/preferences_window.ui.h:62
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -2022,7 +2239,7 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać avatary kantaktaŭ u "
 "śpisie kantaktaŭ i ŭ pakojach"
 
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -2030,7 +2247,7 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać paviedamleńni statusu "
 "kantaktaŭ u śpisie kantaktaŭ i ŭ pakojach"
 
-#: ../data/gui/preferences_window.ui.h:69
+#: ../data/gui/preferences_window.ui.h:65
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -2038,7 +2255,7 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać avatary kantaktaŭ u "
 "śpisie kantaktaŭ i ŭ pakojach"
 
-#: ../data/gui/preferences_window.ui.h:70
+#: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the location of contacts in the roster window"
@@ -2046,7 +2263,7 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać avatary kantaktaŭ u "
 "śpisie kantaktaŭ i ŭ pakojach"
 
-#: ../data/gui/preferences_window.ui.h:71
+#: ../data/gui/preferences_window.ui.h:67
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -2054,7 +2271,7 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać avatary kantaktaŭ u "
 "śpisie kantaktaŭ i ŭ pakojach"
 
-#: ../data/gui/preferences_window.ui.h:72
+#: ../data/gui/preferences_window.ui.h:68
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -2062,14 +2279,14 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać avatary kantaktaŭ u "
 "śpisie kantaktaŭ i ŭ pakojach"
 
-#: ../data/gui/preferences_window.ui.h:73
+#: ../data/gui/preferences_window.ui.h:69
 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/gui/preferences_window.ui.h:74
+#: ../data/gui/preferences_window.ui.h:70
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -2081,14 +2298,14 @@ msgstr ""
 "što ŭ takim razie nichto, akramia kantaktaŭ z tvajho śpisu, nia zmoža dasłać "
 "tabie paviedamleńnie"
 
-#: ../data/gui/preferences_window.ui.h:75
+#: ../data/gui/preferences_window.ui.h:71
 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/gui/preferences_window.ui.h:76
+#: ../data/gui/preferences_window.ui.h:72
 #, fuzzy
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
@@ -2097,7 +2314,7 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim taksama budzie paviedamlać dadatkovyja "
 "źviestki pra aŭtaraŭ novych listoŭ"
 
-#: ../data/gui/preferences_window.ui.h:77
+#: ../data/gui/preferences_window.ui.h:73
 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, "
@@ -2107,13 +2324,13 @@ msgstr ""
 "kožnaha pratakołu (naprykład, kantaktu z MSN buduć adpaviadać ikony statusu "
 "MSN)"
 
-#: ../data/gui/preferences_window.ui.h:78
+#: ../data/gui/preferences_window.ui.h:74
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:79
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2121,104 +2338,104 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie zamianiać ascii-smajliki "
 "(naprykład, ':)' ) na adpaviednyja hrafičnyja smajliki"
 
-#: ../data/gui/preferences_window.ui.h:80
+#: ../data/gui/preferences_window.ui.h:76
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:81
+#: ../data/gui/preferences_window.ui.h:77
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "_Hrupuj vokny:"
 
-#: ../data/gui/preferences_window.ui.h:82
+#: ../data/gui/preferences_window.ui.h:78
 msgid "Ma_nage..."
 msgstr "_Kiruj..."
 
-#: ../data/gui/preferences_window.ui.h:83
+#: ../data/gui/preferences_window.ui.h:79
 #, fuzzy
 msgid "Never"
 msgstr "_Nikoli"
 
-#: ../data/gui/preferences_window.ui.h:84
+#: ../data/gui/preferences_window.ui.h:80
 #, fuzzy
 msgid "Notifications"
 msgstr "Madyfikacyja kontu"
 
-#: ../data/gui/preferences_window.ui.h:85
+#: ../data/gui/preferences_window.ui.h:81
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Paviedamlaj mnie ab kantaktach, jakija źmianiajuć status na: "
 
-#: ../data/gui/preferences_window.ui.h:86
+#: ../data/gui/preferences_window.ui.h:82
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Paviedamlaj mnie ab kantaktach, jakija źmianiajuć status na: "
 
-#: ../data/gui/preferences_window.ui.h:87
+#: ../data/gui/preferences_window.ui.h:83
 #, fuzzy
 msgid "Notify me about it"
 msgstr "_Paviedam mnie pra heta"
 
-#: ../data/gui/preferences_window.ui.h:88
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notify on new _GMail email"
 msgstr "Paviedamlaj mnie ab novych listach u skryni _Gmail"
 
-#: ../data/gui/preferences_window.ui.h:89
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Only when pending events"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:90
+#: ../data/gui/preferences_window.ui.h:86
 #, fuzzy
 msgid "Personal Events"
 msgstr "Asabistyja źviestki"
 
-#: ../data/gui/preferences_window.ui.h:91
+#: ../data/gui/preferences_window.ui.h:87
 msgid "Play _sounds"
 msgstr "_Ahučvaj"
 
-#: ../data/gui/preferences_window.ui.h:92
+#: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
 msgid "Pop it up"
 msgstr "_Vynyrni"
 
-#: ../data/gui/preferences_window.ui.h:93
+#: ../data/gui/preferences_window.ui.h:89
 msgid "Preferences"
 msgstr "Nałady"
 
-#: ../data/gui/preferences_window.ui.h:94
+#: ../data/gui/preferences_window.ui.h:90
 msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:96
+#: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
 msgid "STUN server:"
 msgstr "Server:"
 
-#: ../data/gui/preferences_window.ui.h:97
+#: ../data/gui/preferences_window.ui.h:93
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Pakazvaj tolki ŭ śpisie _kantaktaŭ"
+msgid "Show notification area icon:"
+msgstr "Pakazvaj _ikonu ŭ poli nahadvańnia"
 
-#: ../data/gui/preferences_window.ui.h:98
+#: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
-msgid "Show systray:"
-msgstr "_Pakazvaj padzieju ŭ poli nahadvańnia"
+msgid "Show only in roster"
+msgstr "Pakazvaj tolki ŭ śpisie _kantaktaŭ"
 
-#: ../data/gui/preferences_window.ui.h:99
+#: ../data/gui/preferences_window.ui.h:95
 msgid "Sign _in"
 msgstr "_Dałučajusia"
 
-#: ../data/gui/preferences_window.ui.h:100
+#: ../data/gui/preferences_window.ui.h:96
 msgid "Sign _out"
 msgstr "_Adłučajusia"
 
-#: ../data/gui/preferences_window.ui.h:101
+#: ../data/gui/preferences_window.ui.h:97
 msgid "Single window for everything"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:102
+#: ../data/gui/preferences_window.ui.h:98
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2227,30 +2444,30 @@ msgstr ""
 "kolery i h.d.). Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać tekst "
 "biez afarmleńnia."
 
-#: ../data/gui/preferences_window.ui.h:103
+#: ../data/gui/preferences_window.ui.h:99
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "_Paradkuj kantakty pa statusie"
 
-#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
 msgid "Status"
 msgstr "Status"
 
-#: ../data/gui/preferences_window.ui.h:105
+#: ../data/gui/preferences_window.ui.h:101
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "Standartny zbor _ikon statusu:"
 
-#: ../data/gui/preferences_window.ui.h:106
+#: ../data/gui/preferences_window.ui.h:102
 #, fuzzy
 msgid "Style"
 msgstr "Zatrymana"
 
-#: ../data/gui/preferences_window.ui.h:107
+#: ../data/gui/preferences_window.ui.h:103
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/gui/preferences_window.ui.h:108
+#: ../data/gui/preferences_window.ui.h:104
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2258,7 +2475,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:111
+#: ../data/gui/preferences_window.ui.h:107
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2266,131 +2483,135 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:114
+#: ../data/gui/preferences_window.ui.h:110
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Užyvaj _ikony transpartaŭ"
 
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:111
+msgid "Use default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:112
 msgid "Use system _default"
 msgstr "Užyvaj _zmoŭčany dla systemy"
 
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:113
 msgid "Video framerate"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:117
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Video input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:118
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Video output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:119
+#: ../data/gui/preferences_window.ui.h:116
 msgid "Video size"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:120
+#: ../data/gui/preferences_window.ui.h:117
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Kali ŭčyniajecca novaja padzieja"
 
-#: ../data/gui/preferences_window.ui.h:121
+#: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
 msgid "Your message:"
 msgstr "Tekst pamyłki: %s"
 
-#: ../data/gui/preferences_window.ui.h:122
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your nickname:"
 msgstr "П_ерад мянушкай:"
 
-#: ../data/gui/preferences_window.ui.h:123
+#: ../data/gui/preferences_window.ui.h:120
 #, fuzzy
 msgid "_Away after:"
 msgstr "Aŭtamatyčna źmianiać stan na \"_Adyjšoŭ\" praz:"
 
-#: ../data/gui/preferences_window.ui.h:124
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Hartač:"
 
-#: ../data/gui/preferences_window.ui.h:125
+#: ../data/gui/preferences_window.ui.h:122
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "Pakazanyja nahadvańni statusu ŭ časie razmovy:"
 
-#: ../data/gui/preferences_window.ui.h:126
+#: ../data/gui/preferences_window.ui.h:123
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Smajliki:"
 
-#: ../data/gui/preferences_window.ui.h:127
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_File manager:"
 msgstr "_Kiraŭnik fajłaŭ:"
 
-#: ../data/gui/preferences_window.ui.h:128
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_Highlight misspelled words"
 msgstr "_Padśviatlaj słovy z pamyłkami"
 
-#: ../data/gui/preferences_window.ui.h:129
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ihnaruj padzieji ad kantaktaŭ, jakich niama ŭ śpisie kantaktaŭ"
 
-#: ../data/gui/preferences_window.ui.h:130
+#: ../data/gui/preferences_window.ui.h:127
 #, fuzzy
 msgid "_Ignore rich content in incoming messages"
 msgstr "Ihnaruj afarmleńnie ŭvachodnych paviedamleńniaŭ"
 
-#: ../data/gui/preferences_window.ui.h:131
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Log status changes of contacts"
 msgstr "_Zachoŭvać u žurnale źmieny statusu kantaktaŭ"
 
-#: ../data/gui/preferences_window.ui.h:132
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Mail client:"
 msgstr "_Paštovaja prahrama:"
 
-#: ../data/gui/preferences_window.ui.h:133
+#: ../data/gui/preferences_window.ui.h:130
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Aŭtamatyčna źmianiać stan na \"_Niedastupny\" praz:"
 
-#: ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Open..."
 msgstr "_Adčyni..."
 
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Reset to Default Colors"
 msgstr "_Viarni zvyčajnyja kolery"
 
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:133
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "Pakazanyja nahadvańni statusu ŭ časie razmovy:"
 
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Status message:"
 msgstr "Pa_viedamleńnie statusu:"
 
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:140
+#: ../data/gui/preferences_window.ui.h:137
 #, fuzzy
 msgid "in _group chats"
 msgstr "Dałučysia da _pakoju"
 
-#: ../data/gui/preferences_window.ui.h:141
+#: ../data/gui/preferences_window.ui.h:138
 #, fuzzy
 msgid "in _roster"
 msgstr "Niama ŭ śpisie kantaktaŭ"
 
-#: ../data/gui/preferences_window.ui.h:142
+#: ../data/gui/preferences_window.ui.h:139
 msgid "minutes"
 msgstr "chvilinaÅ­"
 
@@ -2443,7 +2664,7 @@ msgstr "JID"
 msgid "Order:"
 msgstr "Paradak:"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3436
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
 msgid "Privacy List"
 msgstr "Śpis pryvatnaści"
 
@@ -2678,8 +2899,8 @@ msgstr "Vydal kont i dla Gajim, i na _servery"
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5492 ../src/roster_window.py:5622
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
+#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
 msgid "_Remove"
 msgstr "_Vydal"
 
@@ -2725,59 +2946,63 @@ msgid "Help online"
 msgstr "Dapamoha online"
 
 #: ../data/gui/roster_window.ui.h:8
+msgid "P_lugins"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:9
 msgid "Profile, A_vatar"
 msgstr "Profil, a_vatar"
 
-#: ../data/gui/roster_window.ui.h:9
+#: ../data/gui/roster_window.ui.h:10
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "Pakažy _adłučanyja kantakty"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
 msgid "Show Trans_ports"
 msgstr "Pakažy _transparty"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
 msgid "Show _Offline Contacts"
 msgstr "Pakažy _adłučanyja kantakty"
 
-#: ../data/gui/roster_window.ui.h:12 ../src/statusicon.py:326
+#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
 msgid "Show _Roster"
 msgstr "Pakažy _śpis kantaktaŭ"
 
-#: ../data/gui/roster_window.ui.h:13
+#: ../data/gui/roster_window.ui.h:14
 #, 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/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
 #: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Dziejańni"
 
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
 msgid "_Contents"
 msgstr "_Źmiest"
 
-#: ../data/gui/roster_window.ui.h:18 ../src/disco.py:1502
+#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
 msgid "_Edit"
 msgstr "_Źmianić"
 
-#: ../data/gui/roster_window.ui.h:19
+#: ../data/gui/roster_window.ui.h:20
 msgid "_FAQ"
 msgstr "_Častyja pytańni"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Help"
 msgstr "_Dapamoha"
 
-#: ../data/gui/roster_window.ui.h:22
+#: ../data/gui/roster_window.ui.h:23
 #, fuzzy
 msgid "_Send Single Message..."
 msgstr "Dašli _asobnaje aviedamleńnie..."
 
-#: ../data/gui/roster_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:25
 msgid "_View"
 msgstr "_Vyhlad"
 
@@ -2796,12 +3021,12 @@ msgid "_Add contact"
 msgstr "_Dadaj kantakt"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5634
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
 #, fuzzy
 msgid "_Information"
 msgstr "Źviestki ab kantakcie"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1353
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
 msgid "_Search"
 msgstr "Å _ukaj"
 
@@ -2821,10 +3046,6 @@ msgstr "Zarehistrujsia na"
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: ../data/gui/single_message_window.ui.h:2
-msgid "From:"
-msgstr "Ad:"
-
 #: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Adkažy na hetaje paviedamleńnie"
@@ -2841,10 +3062,6 @@ msgstr "Dašli paviedamleńnie"
 msgid "Send message and close window"
 msgstr "Dašli paviedamleńnie i začyni akno"
 
-#: ../data/gui/single_message_window.ui.h:7
-msgid "Subject:"
-msgstr "Tema:"
-
 #: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Da:"
@@ -3066,26 +3283,36 @@ msgstr "Kamunikatar Gajim"
 msgid "Jabber IM Client"
 msgstr "Klijent kamunikacyi dla Jabber"
 
-#: ../src/adhoc_commands.py:314
+#: ../src/adhoc_commands.py:323
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Źviestki ab kantakcie"
 
-#: ../src/adhoc_commands.py:315
+#: ../src/adhoc_commands.py:324
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:351 ../src/adhoc_commands.py:374
+#: ../src/adhoc_commands.py:370
+#, fuzzy
+msgid "Invalid Form"
+msgstr "Niapravilny zapis"
+
+#: ../src/adhoc_commands.py:371
+#, fuzzy
+msgid "The form is not filled correctly."
+msgstr "JID pakoju Å­trymlivaje niedazvolenyja znaki."
+
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:360
+#: ../src/adhoc_commands.py:399
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:471
+#: ../src/adhoc_commands.py:513
 msgid "Service returned an error."
 msgstr ""
 
@@ -3110,7 +3337,7 @@ msgstr "Cely lik"
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:945
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
 msgid "Color"
 msgstr "Koler"
 
@@ -3148,235 +3375,235 @@ msgstr[2] "AtrymaÅ­ novy zapis:"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "English"
 msgstr "Anhielskaja"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Belarusian"
 msgstr "Biełaruskaja"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Bulgarian"
 msgstr "BaÅ­harskaja"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Breton"
 msgstr "Brytonskaja"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Czech"
 msgstr "ÄŒeskaja"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "German"
 msgstr "Niamieckaja"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Greek"
 msgstr "Hreckaja"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "British"
 msgstr "Brytanskaja"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Spanish"
 msgstr "Hišpanskaja"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Basque"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "French"
 msgstr "Francuzkaja"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Croatian"
 msgstr "Charvackaja"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Italian"
 msgstr "Italijskaja"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian (b)"
 msgstr "Narveskaja (b)"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Dutch"
 msgstr "Halandzkaja"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian"
 msgstr "Narveskaja"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Polish"
 msgstr "Polskaja"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Portuguese"
 msgstr "Partuhalskaja"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Brazilian Portuguese"
 msgstr "Brazilskaja partuhalskaja"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Russian"
 msgstr "Rasiejskaja"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Serbian"
 msgstr "Serbskaja"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Slovak"
 msgstr "SÅ‚avackaja"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Swedish"
 msgstr "Å vedzkaja"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Chinese (Ch)"
 msgstr "Kitajskaja (Ch)"
 
-#: ../src/chat_control.py:479
+#: ../src/chat_control.py:496
 msgid "Spelling language"
 msgstr "Mova spraŭdžvańnia pravapisu"
 
 #. we are not connected
-#: ../src/chat_control.py:511 ../src/chat_control.py:720
+#: ../src/chat_control.py:528 ../src/chat_control.py:737
 msgid "A connection is not available"
 msgstr "Złučeńnie niemahčymaje"
 
-#: ../src/chat_control.py:512 ../src/chat_control.py:721
+#: ../src/chat_control.py:529 ../src/chat_control.py:738
 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:927
+#: ../src/chat_control.py:944
 #, fuzzy
 msgid "Underline"
 msgstr "dziaviataja"
 
-#: ../src/chat_control.py:928
+#: ../src/chat_control.py:945
 #, fuzzy
 msgid "Strike"
 msgstr "Mianuška"
 
-#: ../src/chat_control.py:951
+#: ../src/chat_control.py:968
 #, fuzzy
 msgid "Font"
 msgstr "_Å ryft:"
 
-#: ../src/chat_control.py:960
+#: ../src/chat_control.py:977
 #, fuzzy
 msgid "Clear formating"
 msgstr "Źviestki ab kantakcie"
 
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1055
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:1039
+#: ../src/chat_control.py:1056
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1503 ../src/chat_control.py:1987
+#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Šyfravańnie ŭklučanaje"
 
 #. Add to roster
-#: ../src/chat_control.py:1528 ../src/common/contacts.py:158
+#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
 #: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:245 ../src/dialogs.py:1064 ../src/dialogs.py:2078
-#: ../src/dialogs.py:2107 ../src/gui_interface.py:674
+#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
+#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
 #: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1610 ../src/roster_window.py:1612
-#: ../src/roster_window.py:1942 ../src/roster_window.py:3289
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
+#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
+#: ../src/roster_window.py:3382
 msgid "Not in Roster"
 msgstr "Niama ŭ śpisie"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1575
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Śpis dziejnych, skončanych i spynienych pieradačaŭ fajłaŭ"
 
-#: ../src/chat_control.py:1561
+#: ../src/chat_control.py:1578
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1656
+#: ../src/chat_control.py:1677
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:1869
 #, 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:1967 ../src/dialogs.py:4866
+#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1968
+#: ../src/chat_control.py:1991
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1977
+#: ../src/chat_control.py:2000
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Šyfravańnie adklučanaje"
 
-#: ../src/chat_control.py:2003
+#: ../src/chat_control.py:2026
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:2028
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2051
 #, fuzzy
 msgid "and authenticated"
 msgstr "Užyvaj aŭtaryzacyju"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2032
+#: ../src/chat_control.py:2055
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Užyvaj aŭtaryzacyju"
@@ -3384,58 +3611,66 @@ 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:2039
+#: ../src/chat_control.py:2062
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2182
+#: ../src/chat_control.py:2205
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2191
+#: ../src/chat_control.py:2215
+msgid "This session WILL be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2217
+msgid "This session WILL NOT be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2226
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Hetaje paviedamleńnie zašyfravanaje]"
 
-#: ../src/chat_control.py:2194
+#: ../src/chat_control.py:2229
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2196
+#: ../src/chat_control.py:2231
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2201
+#: ../src/chat_control.py:2236
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2203
+#: ../src/chat_control.py:2238
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Šyfravańnie adklučanaje"
 
-#: ../src/chat_control.py:2241 ../src/chat_control.py:2254
+#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Hetaje paviedamleńnie zašyfravanaje]"
 
-#: ../src/chat_control.py:2247
+#: ../src/chat_control.py:2288
 #, 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:2519
+#: ../src/chat_control.py:2566
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Tolki što atrymanaje paviedamleńnie ad \"%s\""
 
-#: ../src/chat_control.py:2520
+#: ../src/chat_control.py:2567
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3443,22 +3678,20 @@ msgstr ""
 "Kali ty začyniš hetuju kartku i kali žurnały nie vieducca, to hetaje "
 "paviedamleńnie źniknie nazaŭždy."
 
-#: ../src/chat_control.py:2663 ../src/common/connection_handlers.py:1635
-#: ../src/common/connection_handlers.py:1758
-#: ../src/common/connection_handlers.py:1960
-#: ../src/common/connection_handlers.py:2110 ../src/common/connection.py:452
+#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
 #: ../src/gajim.py:159 ../src/session.py:138
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2664
+#: ../src/chat_control.py:2714
 #, 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:2906
+#: ../src/chat_control.py:2962
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s maje ciapier status %(status)s"
@@ -3472,28 +3705,28 @@ msgstr "stvarajecca baza žurnałaŭ"
 msgid "creating cache database"
 msgstr "stvarajecca baza žurnałaŭ"
 
-#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
-#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
-#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
-#: ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
 #, 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:275 ../src/common/check_paths.py:282
-#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
-#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
-#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:333
+#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
+#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
+#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
 msgid "Gajim will now exit"
 msgstr "Gajim zaviaršaje vykanańnie"
 
-#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
+#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
 #, 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:342
+#: ../src/common/check_paths.py:351
 #, python-format
 msgid "creating %s directory"
 msgstr "stvarajecca kataloh %s"
@@ -3557,9 +3790,9 @@ msgstr "Zaznač pakoji, jakija chočaš pakinuć"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:801
-#: ../src/roster_window.py:1614 ../src/roster_window.py:1616
-#: ../src/roster_window.py:5251
+#: ../src/common/helpers.py:57 ../src/roster_window.py:815
+#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
+#: ../src/roster_window.py:5323
 msgid "Groupchats"
 msgstr "Pakoji"
 
@@ -3622,7 +3855,8 @@ msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
 #: ../src/common/config.py:88
-msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgid ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
 #: ../src/common/config.py:93
@@ -3676,9 +3910,9 @@ msgid ""
 msgstr "Śpis (padzielenych prabiełami) zhornutych radkoŭ (kontaŭ i hrupaŭ)."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:501
-#: ../src/common/optparser.py:290 ../src/common/optparser.py:486
-#: ../src/common/optparser.py:520 ../src/gui_interface.py:3370
+#: ../src/common/config.py:106 ../src/common/config.py:505
+#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
+#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
 #, fuzzy
 msgid "default"
 msgstr "Zmoŭčany"
@@ -3902,7 +4136,8 @@ 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:197
-msgid "Notify of events in the system trayicon."
+#, fuzzy
+msgid "Notify of events in the notification area."
 msgstr "Nahadvaj ab padziejach ikonaj pola nahadvańnia."
 
 #: ../src/common/config.py:203
@@ -3937,9 +4172,10 @@ msgstr ""
 "pakojach."
 
 #: ../src/common/config.py:221
+#, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
+"setting is taken into account only if notification icon is used."
 msgstr ""
 "Kali opcyja maje vartaść True, Gajim zaviaršaje vykanańnie pa nacisku knopki "
 "X Kiraŭnika voknaŭ. Hetaja nałada dziejničaje tolki ź dziejnaj ikonaj pola "
@@ -4220,7 +4456,7 @@ msgstr ""
 #: ../src/common/config.py:270
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
-"systray icon."
+"notification icon."
 msgstr ""
 
 #: ../src/common/config.py:271
@@ -4392,111 +4628,122 @@ msgstr ""
 msgid "Message that is sent to contacts you want to add"
 msgstr "Kali łaska, zapoŭni źviestki ab kantakcie, jaki chočaš dadać"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:374
+msgid "Last time we syncronized with logs from server."
+msgstr ""
+
+#: ../src/common/config.py:436
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Ci vykarystoŭvajecca šyfravańnie OpenPGP dla hetaha kantaktu?"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:437 ../src/common/config.py:440
+#: ../src/common/config.py:438 ../src/common/config.py:441
 msgid "Language for which we want to check misspelled words"
 msgstr "Mova, dla jakoj treba praviarać pravapis"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:447
 msgid "all or space separated status"
 msgstr "\"all\" albo statusy, padzielenyja prabiełami"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:448
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no' albo 'both'"
 
-#: ../src/common/config.py:448 ../src/common/config.py:450
-#: ../src/common/config.py:451 ../src/common/config.py:454
-#: ../src/common/config.py:455
+#: ../src/common/config.py:449 ../src/common/config.py:451
+#: ../src/common/config.py:452 ../src/common/config.py:455
+#: ../src/common/config.py:456
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' albo ''"
 
-#: ../src/common/config.py:461 ../src/common/pep.py:157
+#: ../src/common/config.py:460
+msgid ""
+"State whether plugins should be activated on exit (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
+msgstr ""
+
+#: ../src/common/config.py:465 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Splu"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back soon"
 msgstr "Chutka viarnusia"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back in some minutes."
 msgstr "Viarnusia praz paru chvilinaÅ­."
 
-#: ../src/common/config.py:463 ../src/common/pep.py:127
+#: ../src/common/config.py:467 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Jem"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:467
 msgid "I'm eating, so leave me a message."
 msgstr "Ja jem, možaš pakinuć mnie paviedamleńnie."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "I'm watching a movie."
 msgstr "Hladžu film."
 
-#: ../src/common/config.py:465 ../src/common/pep.py:186
+#: ../src/common/config.py:469 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Pracuju"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:469
 msgid "I'm working."
 msgstr "Ja pracuju."
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "I'm on the phone."
 msgstr "Ja razmaÅ­laju pa telefonie."
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "Out"
 msgstr "Vyjšaŭ"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "I'm out enjoying life."
 msgstr "Vyjšaŭ ciešycca z žyćcia."
 
-#: ../src/common/config.py:478
+#: ../src/common/config.py:482
 msgid "I'm available."
 msgstr "Dastupny."
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:483
 msgid "I'm free for chat."
 msgstr "Achvotna parazmaÅ­laju."
 
-#: ../src/common/config.py:480 ../src/config.py:1600
+#: ../src/common/config.py:484 ../src/config.py:1600
 msgid "Be right back."
 msgstr "Chutka viarnusia."
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:485
 msgid "I'm not available."
 msgstr "Niedastupny."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:486
 msgid "Do not disturb."
 msgstr "Nie turbavać."
 
-#: ../src/common/config.py:483 ../src/common/config.py:484
+#: ../src/common/config.py:487 ../src/common/config.py:488
 msgid "Bye!"
 msgstr "Byvaj!"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:498
 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."
@@ -4504,181 +4751,92 @@ 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:495
+#: ../src/common/config.py:499
 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:504 ../src/common/optparser.py:304
+#: ../src/common/config.py:508 ../src/common/optparser.py:308
 msgid "green"
 msgstr "zialony"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:290
+#: ../src/common/config.py:512 ../src/common/optparser.py:294
 msgid "grocery"
 msgstr "bakaleja"
 
-#: ../src/common/config.py:512
+#: ../src/common/config.py:516
 msgid "human"
 msgstr "čałaviek"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:520
 msgid "marine"
 msgstr "marski"
 
-#: ../src/common/connection_handlers.py:84
+#: ../src/common/connection_handlers.py:94
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Niemahčyma adčytać modulu idle"
 
-#: ../src/common/connection_handlers.py:117
+#: ../src/common/connection_handlers.py:127
 #, 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:124
+#: ../src/common/connection_handlers.py:134
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Zarehistrujsia na %s"
 
-#: ../src/common/connection_handlers.py:125
-#, python-format
-msgid "Registration with agent %s succeeded"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:133
-#, fuzzy
-msgid "Registration failed"
-msgstr "Niemahvyma dałučycca"
-
-#: ../src/common/connection_handlers.py:133
-#, python-format
-msgid ""
-"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:445
-#: ../src/common/connection_handlers.py:1633
-#: ../src/common/connection_handlers.py:1756
-#: ../src/common/connection_handlers.py:1957
-#: ../src/common/connection_handlers.py:2108 ../src/common/connection.py:449
-#: ../src/gajim.py:341
-msgid "Disk Write Error"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:678 ../src/common/connection.py:1472
-#, fuzzy
-msgid "Invisibility not supported"
-msgstr "Pašyreńnie nie padtrymvajecca"
-
-#: ../src/common/connection_handlers.py:679 ../src/common/connection.py:1473
-#, python-format
-msgid "Account %s doesn't support invisibility."
-msgstr ""
-
-#: ../src/common/connection_handlers.py:1446 ../src/common/connection.py:253
-#: ../src/config.py:2091 ../src/config.py:2100 ../src/config.py:2168
-#: ../src/config.py:3560 ../src/dataforms_widget.py:597 ../src/dialogs.py:2931
-msgid "Invalid Jabber ID"
-msgstr "Niapravilny JID"
-
-#: ../src/common/connection_handlers.py:1447
-msgid "A message from a non-valid JID arrived, it has been ignored."
-msgstr ""
-
-#: ../src/common/connection_handlers.py:1636
-#: ../src/common/connection_handlers.py:1759
-#: ../src/common/connection_handlers.py:1961
-#: ../src/common/connection_handlers.py:2111 ../src/common/connection.py:453
-#: ../src/gajim.py:160 ../src/session.py:139
-#, 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:1805
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Mianuška nie dazvolenaja: %s"
-
-#: ../src/common/connection_handlers.py:1902
-#: ../src/common/connection_handlers.py:1911
-#: ../src/common/connection_handlers.py:1918
-#: ../src/common/connection_handlers.py:1922
-#: ../src/common/connection_handlers.py:1926
-#: ../src/common/connection_handlers.py:1931 ../src/gui_interface.py:139
-msgid "Unable to join group chat"
-msgstr "Niemahčyma dałučycca da pakoju"
-
-#: ../src/common/connection_handlers.py:1903
-#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:1912
-#, fuzzy, python-format
-msgid "You are banned from group chat %s."
-msgstr "Ty zablakavany Å­ hetym pakoji."
-
-#: ../src/common/connection_handlers.py:1919
-#, fuzzy, python-format
-msgid "Group chat %s does not exist."
-msgstr "Takoha pakoju niama."
-
-#: ../src/common/connection_handlers.py:1923
-msgid "Group chat creation is restricted."
-msgstr "Stvareńnie pakojaŭ abmiežavanaje."
-
-#: ../src/common/connection_handlers.py:1927
-#, 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:1932
-#, fuzzy, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Ciabie niama ŭ śpisie ŭdzielnikaŭ."
+#: ../src/common/connection_handlers.py:135
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr ""
 
-#. Room has been destroyed. see
-#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:1976
+#: ../src/common/connection_handlers.py:143
 #, fuzzy
-msgid "Room has been destroyed"
-msgstr "AÅ­taryzacyja anulavanaja"
+msgid "Registration failed"
+msgstr "Niemahvyma dałučycca"
 
-#: ../src/common/connection_handlers.py:1984
+#: ../src/common/connection_handlers.py:143
 #, python-format
-msgid "You can join this room instead: %s"
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2020
-msgid "I would like to add you to my roster."
-msgstr "Ja chaču dadać ciabie ŭ svoj śpis kantaktaŭ."
+#: ../src/common/connection_handlers.py:466
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
+#: ../src/gajim.py:341
+msgid "Disk Write Error"
+msgstr ""
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2041
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "padpisany na %s"
+#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
+#, fuzzy
+msgid "Invisibility not supported"
+msgstr "Pašyreńnie nie padtrymvajecca"
 
-#: ../src/common/connection_handlers.py:2043
+#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
 #, python-format
-msgid "unsubscribe request from %s"
-msgstr "zapyt adpiski ad %s"
+msgid "Account %s doesn't support invisibility."
+msgstr ""
 
-#: ../src/common/connection_handlers.py:2045
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "ciapier adpisany ad %s"
+#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
+#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
+#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
+msgid "Invalid Jabber ID"
+msgstr "Niapravilny JID"
+
+#: ../src/common/connection_handlers.py:1405
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr ""
 
-#: ../src/common/connection_handlers.py:2240
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
+#: ../src/gajim.py:160 ../src/session.py:139
 #, python-format
 msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
+"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 ""
-"JID %s nie adpaviadaje standartu RFC. Jon nia budzie dadany da tvajho śpisu "
-"kantaktaŭ. Vydal jaho z dapamohaj pryłady kiravańnia śpisam kantaktaŭ, "
-"naprykład, http://jru.jabberstudio.org/"
 
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
@@ -4810,28 +4968,28 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:254 ../src/dialogs.py:2932
+#: ../src/common/connection.py:256 ../src/dialogs.py:2948
 #, 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:276
+#: ../src/common/connection.py:278
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:281
 #, 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:331
+#: ../src/common/connection.py:333
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Hetaje paviedamleńnie *zašyfravanaje* (Hladzi :JEP:`27`]"
 
-#: ../src/common/connection.py:439
+#: ../src/common/connection.py:441
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4840,108 +4998,108 @@ msgstr ""
 "Tema: %s\n"
 "%s"
 
-#: ../src/common/connection.py:807
+#: ../src/common/connection.py:809
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Złučeńnie dla kontu \"%s\" zhubiłasia"
 
-#: ../src/common/connection.py:808
+#: ../src/common/connection.py:810
 msgid "Reconnect manually."
 msgstr "Pieradałučysia samastojna."
 
-#: ../src/common/connection.py:820
+#: ../src/common/connection.py:822
 #, 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:854
+#: ../src/common/connection.py:856
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:867
+#: ../src/common/connection.py:869
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr ""
 
 #. wrong answer
-#: ../src/common/connection.py:882
+#: ../src/common/connection.py:884
 msgid "Invalid answer"
 msgstr "Niapravilny adkaz"
 
-#: ../src/common/connection.py:883
+#: ../src/common/connection.py:885
 #, 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:1165 ../src/common/connection.py:1294
-#: ../src/common/connection.py:1784
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
+#: ../src/common/connection.py:1792
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Niemahčyma złučycca z \"%s\""
 
-#: ../src/common/connection.py:1166 ../src/gui_interface.py:755
+#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
 msgid "Check your connection or try again later."
 msgstr "Pravier złučeńnie albo pasprabuj paźniej."
 
-#: ../src/common/connection.py:1171
+#: ../src/common/connection.py:1173
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Zapisany Å­: %s"
 
-#: ../src/common/connection.py:1184
+#: ../src/common/connection.py:1186
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Niemahvyma dałučycca"
 
-#: ../src/common/connection.py:1215 ../src/common/connection.py:1274
+#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Niemahčyma złučycca z \"%s\""
 
-#: ../src/common/connection.py:1216 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
 #, 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:1241
+#: ../src/common/connection.py:1243
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1244
+#: ../src/common/connection.py:1246
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1248
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr ""
 
-#: ../src/common/connection.py:1295
+#: ../src/common/connection.py:1297
 msgid "Check your connection or try again later"
 msgstr "Pravier złučeńnie albo paŭtary paźniej"
 
-#: ../src/common/connection.py:1324
+#: ../src/common/connection.py:1329
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Pamyłka aŭtaryzacyi z \"%s\""
 
-#: ../src/common/connection.py:1326
+#: ../src/common/connection.py:1331
 msgid "Please check your login and password for correctness."
 msgstr "Kali łaska, pravier pravilnaść loginu i parolu."
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1400
 msgid "Error while removing privacy list"
 msgstr "Pamyłka vydaleńnia śpisu pryvatnaści"
 
-#: ../src/common/connection.py:1396
+#: ../src/common/connection.py:1401
 #, fuzzy, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4950,41 +5108,41 @@ 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:1650
+#: ../src/common/connection.py:1658
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1653
+#: ../src/common/connection.py:1661
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Kantakty"
 
-#: ../src/common/connection.py:1799 ../src/common/connection.py:1822
+#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
 msgid "Not fetched because of invisible status"
 msgstr "Nia ściahnuta z-za niabačnaha statusu"
 
-#: ../src/common/connection.py:2254
+#: ../src/common/connection.py:2262
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Niemahvyma dałučycca"
 
-#: ../src/common/connection.py:2255
+#: ../src/common/connection.py:2263
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
 #: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:674
+#: ../src/gui_interface.py:551
 msgid "Observers"
 msgstr "Naziralniki"
 
 #: ../src/common/contacts.py:139 ../src/common/contacts.py:366
 #: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1499 ../src/gui_interface.py:424
-#: ../src/roster_window.py:840 ../src/roster_window.py:1525
-#: ../src/roster_window.py:1606 ../src/roster_window.py:1608
-#: ../src/roster_window.py:1769
+#: ../src/disco.py:1517 ../src/roster_window.py:854
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
+#: ../src/roster_window.py:2466
 msgid "Transports"
 msgstr "Transparty"
 
@@ -5212,203 +5370,219 @@ msgstr "Kaniec tydnia"
 msgid "Weekend!"
 msgstr "Vychodny!"
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:148
+msgid "Username must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:153
 msgid "Invalid character in username."
 msgstr "Niapravilny znak u imiani karystalnika."
 
-#: ../src/common/helpers.py:156
-msgid "Server address required."
-msgstr "Patrabujecca adras servera."
+#: ../src/common/helpers.py:159
+msgid "Server must be between 1 and 1023 chars"
+msgstr ""
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 msgid "Invalid character in hostname."
 msgstr "Niapravilny znak u naźvie hostu."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:166
+msgid "Server address required."
+msgstr "Patrabujecca adras servera."
+
+#: ../src/common/helpers.py:170
+msgid "Resource must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:175
 msgid "Invalid character in resource."
 msgstr "Niapravilny znak u naźvie krynicy."
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:215
 msgid "_Busy"
 msgstr "_Zaniaty"
 
-#: ../src/common/helpers.py:211 ../src/tooltips.py:195
+#: ../src/common/helpers.py:217 ../src/tooltips.py:195
 msgid "Busy"
 msgstr "Zaniaty"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:220
 msgid "_Not Available"
 msgstr "_Niedastupny"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:225
 msgid "_Free for Chat"
 msgstr "_Achvotna parazmaÅ­laju"
 
-#: ../src/common/helpers.py:221 ../src/tooltips.py:191
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Free for Chat"
 msgstr "Achvotna parazmaÅ­laju"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:230
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?status pieradačy:Prypyniena"
 
-#: ../src/common/helpers.py:226 ../src/tooltips.py:189
+#: ../src/common/helpers.py:232 ../src/tooltips.py:189
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?status pieradačy:Prypyniena"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:234
 msgid "Connecting"
 msgstr "Dałučajusia"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:237
 msgid "A_way"
 msgstr "_Adyjšoŭ"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:242
 msgid "_Offline"
 msgstr "Adł_učany"
 
-#: ../src/common/helpers.py:238 ../src/tooltips.py:199
+#: ../src/common/helpers.py:244 ../src/tooltips.py:199
 msgid "Offline"
 msgstr "Adłučany"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:247
 msgid "_Invisible"
 msgstr "N_iabačny"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:253
 msgid "?contact has status:Unknown"
 msgstr "?kantakt maje status:Nieviadomy"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:255
 msgid "?contact has status:Has errors"
 msgstr "?kantakt maje status:Jość pamyłki"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:260
 msgid "?Subscription we already have:None"
 msgstr "?NajaÅ­naja aÅ­taryzacyja:Niama"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:262
 msgid "To"
 msgstr "Da"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
+msgid "From"
+msgstr "Ad"
+
+#: ../src/common/helpers.py:266
 msgid "Both"
 msgstr "Dvuchbakovaja"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:274
 msgid "?Ask (for Subscription):None"
 msgstr "?Zapyt (aÅ­taryzacyi):Niama"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:276
 msgid "Subscribe"
 msgstr "AÅ­taryzuj"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:285
 msgid "?Group Chat Contact Role:None"
 msgstr "?Funkcyja kantaktu Å­ pakoji:Niama"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:288
 msgid "Moderators"
 msgstr "Maderatary"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:290
 msgid "Moderator"
 msgstr "Maderatar"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:293
 msgid "Participants"
 msgstr "Udzielniki"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:295
 msgid "Participant"
 msgstr "Udzielnik"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:298
 msgid "Visitors"
 msgstr "Naviedniki"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:300
 msgid "Visitor"
 msgstr "Naviednik"
 
-#: ../src/common/helpers.py:300 ../src/tooltips.py:210
+#: ../src/common/helpers.py:306 ../src/tooltips.py:210
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Suviaź udzielnikaŭ pakoju:Niama"
 
-#: ../src/common/helpers.py:302 ../src/tooltips.py:216
+#: ../src/common/helpers.py:308 ../src/tooltips.py:216
 msgid "Owner"
 msgstr "Ułaśnik"
 
-#: ../src/common/helpers.py:304 ../src/tooltips.py:214
+#: ../src/common/helpers.py:310 ../src/tooltips.py:214
 msgid "Administrator"
 msgstr "Administratar"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:212
+#: ../src/common/helpers.py:312 ../src/tooltips.py:212
 msgid "Member"
 msgstr "Udzielnik"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:351
 msgid "is paying attention to the conversation"
 msgstr "sočyć za razmovaj"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:353
 msgid "is doing something else"
 msgstr "robić štości inšaje"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:355
 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:352
+#: ../src/common/helpers.py:358
 msgid "paused composing a message"
 msgstr "pierastaŭ pisać"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:360
 msgid "has closed the chat window or tab"
 msgstr "začyniŭ akno/kartku razmovy"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:619
+#: ../src/common/helpers.py:625
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:622
+#: ../src/common/helpers.py:628
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:626
+#: ../src/common/helpers.py:632
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:629
+#: ../src/common/helpers.py:635
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:633
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:636
+#: ../src/common/helpers.py:642
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:645
 #, python-format
 msgid "%s B"
 msgstr "%s B"
@@ -5453,12 +5627,12 @@ msgstr "Gajim - %s"
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:111
+#: ../src/common/jingle_rtp.py:107
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Kanfihuracyja pakoju"
 
-#: ../src/common/jingle_rtp.py:112
+#: ../src/common/jingle_rtp.py:108
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5470,30 +5644,30 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:209
+#: ../src/common/jingle_rtp.py:205
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:210
+#: ../src/common/jingle_rtp.py:206
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Tekst pamyłki: %s"
 
-#: ../src/common/jingle_rtp.py:336
+#: ../src/common/jingle_rtp.py:335
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:339
+#: ../src/common/jingle_rtp.py:338
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:382
+#: ../src/common/jingle_rtp.py:381
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:390
+#: ../src/common/jingle_rtp.py:389
 msgid "video output"
 msgstr ""
 
@@ -5570,11 +5744,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "pamyłka: niemahčyma adčynić %s, kab adčytać"
 
-#: ../src/common/optparser.py:299 ../src/common/optparser.py:300
+#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:379
+#: ../src/common/optparser.py:383
 msgid "migrating logs database to indices"
 msgstr "indeksavańnie bazy razmoŭ"
 
@@ -6315,17 +6489,17 @@ msgstr ""
 "Mahčyma, inšaja kopija Gajim užo vykonvajecca. Pieradača fajłaŭ anulavanaja."
 
 #. we're not english
-#: ../src/common/stanza_session.py:303
+#: ../src/common/stanza_session.py:423
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:178
+#: ../src/common/zeroconf/connection_zeroconf.py:181
 msgid "Avahi error"
 msgstr "Pamyłka Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:179
+#: ../src/common/zeroconf/connection_zeroconf.py:182
 #, python-format
 msgid ""
 "%s\n"
@@ -6334,46 +6508,46 @@ msgstr ""
 "%s\n"
 "Lakalnyja paviedamleńni mohuć pracavać pamyłkova."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:190
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Kali Å‚aska, pravier instalacyju Avahi."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:199
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Could not start local service"
 msgstr "Niemahčyma ŭruchomić lakalny servis"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Niemahčyma dałučycca da portu %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-#: ../src/common/zeroconf/connection_zeroconf.py:283
-#: ../src/common/zeroconf/connection_zeroconf.py:294
-#: ../src/common/zeroconf/connection_zeroconf.py:308
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:286
+#: ../src/common/zeroconf/connection_zeroconf.py:297
+#: ../src/common/zeroconf/connection_zeroconf.py:311
 msgid "Please check if avahi-daemon is running."
 msgstr "Kali Å‚aska, pravier, ci pracuje avahi-daemon."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:282
-#: ../src/common/zeroconf/connection_zeroconf.py:293
-#: ../src/common/zeroconf/connection_zeroconf.py:307
+#: ../src/common/zeroconf/connection_zeroconf.py:285
+#: ../src/common/zeroconf/connection_zeroconf.py:296
+#: ../src/common/zeroconf/connection_zeroconf.py:310
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Niemahčyma źmianić status kontu \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:325
+#: ../src/common/zeroconf/connection_zeroconf.py:328
 #, 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:335
+#: ../src/common/zeroconf/connection_zeroconf.py:338
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kantakt adłučany. Niemahčyma dasłać paviedamleńnie."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:363
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6396,16 +6570,16 @@ msgstr "Standartnyja šablony paviedamleńniaŭ statusu"
 msgid "Enabled"
 msgstr "Ukluč"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3078
+#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
 msgid "Default"
 msgstr "Zmoŭčany"
 
-#: ../src/config.py:739 ../src/dialogs.py:1395
+#: ../src/config.py:733 ../src/dialogs.py:1409
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "SÅ‚oÅ­nik dla movy %s niedastupny"
 
-#: ../src/config.py:740
+#: ../src/config.py:734
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6423,9 +6597,9 @@ msgid "status message text"
 msgstr "tekst paviedamleńnia statusu"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2383 ../src/dialogs.py:2449
-#: ../src/dialogs.py:3215 ../src/disco.py:866 ../src/disco.py:1726
-#: ../src/disco.py:2030 ../src/history_window.py:90
+#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
+#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
+#: ../src/disco.py:2048 ../src/history_window.py:90
 msgid "Name"
 msgstr "Nazva"
 
@@ -6459,7 +6633,7 @@ msgstr "Akno razmovy adčynienaje dla kontu %s"
 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:1976 ../src/config.py:2509 ../src/config.py:2545
+#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
 msgid "You are currently connected to the server"
 msgstr "Prahrama dałučanaja da servera"
 
@@ -6493,136 +6667,136 @@ msgstr "Nazva kontu nia moža być pustoj."
 msgid "Account name cannot contain spaces."
 msgstr "Nazva kontu nia moža ŭtrymlivać prabiełaŭ."
 
-#: ../src/config.py:2072
+#: ../src/config.py:2074
 #, fuzzy
 msgid "Rename Account"
 msgstr "Kiruj kontami"
 
-#: ../src/config.py:2073
+#: ../src/config.py:2075
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Vyznač novuju nazvu dla hrupy %s"
 
-#: ../src/config.py:2101
+#: ../src/config.py:2103
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "JID musić mieć formu \"user@servername\"."
 
-#: ../src/config.py:2318 ../src/config.py:3606
+#: ../src/config.py:2320 ../src/config.py:3623
 msgid "Invalid entry"
 msgstr "Niapravilny zapis"
 
-#: ../src/config.py:2319 ../src/config.py:3607
+#: ../src/config.py:2321 ../src/config.py:3624
 msgid "Custom port must be a port number."
 msgstr "Abrany port musić być numeram portu."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2342
 msgid "Failed to get secret keys"
 msgstr "Niemahčyma atrymać sakretnyja klučy"
 
-#: ../src/config.py:2341
+#: ../src/config.py:2343
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Adbyłasia pamyłka ŭ časie atrymańnia sakretnych klučoŭ OpenPGP."
 
-#: ../src/config.py:2375
+#: ../src/config.py:2377
 msgid "OpenPGP Key Selection"
 msgstr "Vybar kluča OpenPGP"
 
-#: ../src/config.py:2376
+#: ../src/config.py:2378
 msgid "Choose your OpenPGP key"
 msgstr "Abiary svoj kluč OpenPGP"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2385
 msgid "No such account available"
 msgstr "Takoha kontu niama"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2386
 msgid "You must create your account before editing your personal information."
 msgstr "Treba stvaryć kont, kab redahavać asabistyja źviestki."
 
-#: ../src/config.py:2391 ../src/dialogs.py:2136 ../src/dialogs.py:2371
-#: ../src/dialogs.py:2557 ../src/disco.py:511 ../src/profile_window.py:339
+#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
+#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
 msgid "You are not connected to the server"
 msgstr "Niama złučeńnia z serveram"
 
-#: ../src/config.py:2392
+#: ../src/config.py:2394
 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:2396
+#: ../src/config.py:2398
 msgid "Your server doesn't support Vcard"
 msgstr "Server nie padtrymvaje Vcard"
 
-#: ../src/config.py:2397
+#: ../src/config.py:2399
 msgid "Your server can't save your personal information."
 msgstr "Server nia moža zachoŭvać asabistyja źviestki."
 
-#: ../src/config.py:2510 ../src/config.py:2546
+#: ../src/config.py:2512 ../src/config.py:2548
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Kab źmianić nazvu kontu, treba pieradałučycca."
 
-#: ../src/config.py:2515
+#: ../src/config.py:2517
 msgid "Account Local already exists."
 msgstr "Kont Local užo isnuje."
 
-#: ../src/config.py:2516
+#: ../src/config.py:2518
 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:2673
+#: ../src/config.py:2675
 #, python-format
 msgid "Edit %s"
 msgstr "Źmiani %s"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2677
 #, python-format
 msgid "Register to %s"
 msgstr "Zarehistrujsia na %s"
 
 #. list at the beginning
-#: ../src/config.py:2711
+#: ../src/config.py:2713
 msgid "Ban List"
 msgstr "Åšpis zablakavanych kantaktaÅ­"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2714
 msgid "Member List"
 msgstr "Åšpis udzielnikaÅ­"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2714
 msgid "Owner List"
 msgstr "Śpis ułaśnikaŭ"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2715
 msgid "Administrator List"
 msgstr "Åšpis administrataraÅ­"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2763 ../src/disco.py:873 ../src/history_manager.py:201
+#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2773
+#: ../src/config.py:2789
 msgid "Reason"
 msgstr "Pryčyna"
 
-#: ../src/config.py:2780
+#: ../src/config.py:2796
 msgid "Nick"
 msgstr "Mianuška"
 
-#: ../src/config.py:2786
+#: ../src/config.py:2802
 msgid "Role"
 msgstr "Funkcyja"
 
-#: ../src/config.py:2813
+#: ../src/config.py:2829
 msgid "Banning..."
 msgstr "Blakavańnie..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2815
+#: ../src/config.py:2831
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6630,11 +6804,11 @@ msgstr ""
 "<b>Kaho chočaš zablakavać?</b>\n"
 "\n"
 
-#: ../src/config.py:2817
+#: ../src/config.py:2833
 msgid "Adding Member..."
 msgstr "Dadajecca Å­dzielnik..."
 
-#: ../src/config.py:2818
+#: ../src/config.py:2834
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6642,11 +6816,11 @@ msgstr ""
 "<b>Kaho chočaš zrabić udzielnikam?</b>\n"
 "\n"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2836
 msgid "Adding Owner..."
 msgstr "Dadajecca ŭłaśnik..."
 
-#: ../src/config.py:2821
+#: ../src/config.py:2837
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6654,11 +6828,11 @@ msgstr ""
 "<b>Kaho chočaš zrabić ułaśnikam?</b>\n"
 "\n"
 
-#: ../src/config.py:2823
+#: ../src/config.py:2839
 msgid "Adding Administrator..."
 msgstr "Dadajecca administratar..."
 
-#: ../src/config.py:2824
+#: ../src/config.py:2840
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6666,7 +6840,7 @@ msgstr ""
 "<b>Kaho chočaš zrabić administrataram?</b>\n"
 "\n"
 
-#: ../src/config.py:2825
+#: ../src/config.py:2841
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6683,83 +6857,83 @@ msgstr ""
 "4. damen (adpaviadaje damen, jak karystalnik@damen,\n"
 "damen/krynica ci paddamen)."
 
-#: ../src/config.py:2926
+#: ../src/config.py:2943
 #, python-format
 msgid "Removing %s account"
 msgstr "Vydalajecca kont %s"
 
-#: ../src/config.py:2941
+#: ../src/config.py:2958
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Šyfravańnie adklučanaje"
 
-#: ../src/config.py:2942
+#: ../src/config.py:2959
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2955 ../src/gui_interface.py:1132
-#: ../src/gui_interface.py:1243
+#: ../src/config.py:2972 ../src/gui_interface.py:311
+#: ../src/gui_interface.py:1048
 msgid "Password Required"
 msgstr "Vymahaje parolu"
 
-#: ../src/config.py:2956 ../src/gui_interface.py:1223
+#: ../src/config.py:2973 ../src/gui_interface.py:1028
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Uviadzi parol dla kontu %s"
 
-#: ../src/config.py:2957 ../src/gui_interface.py:1243
+#: ../src/config.py:2974 ../src/gui_interface.py:1048
 msgid "Save password"
 msgstr "Zachavaj parol"
 
-#: ../src/config.py:2967
+#: ../src/config.py:2984
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kont \"%s\" dałučany da servera"
 
-#: ../src/config.py:2968
+#: ../src/config.py:2985
 msgid "If you remove it, the connection will be lost."
 msgstr "Kali ty vydališ jaho, złučeńnie razarviecca."
 
-#: ../src/config.py:2982
+#: ../src/config.py:2999
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Niemahvyma dałučycca"
 
-#: ../src/config.py:2983
+#: ../src/config.py:3000
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Što chočaš zrabić?"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3001
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Vydal kont _tolki dla Gajim"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3002
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3078
+#: ../src/config.py:3095
 msgid "?print_status:All"
 msgstr "?print_status:Usie"
 
-#: ../src/config.py:3079
+#: ../src/config.py:3096
 msgid "Enter and leave only"
 msgstr "Tolki Å­vachod i vychad"
 
-#: ../src/config.py:3080
+#: ../src/config.py:3097
 msgid "?print_status:None"
 msgstr "?print_status:Niama"
 
-#: ../src/config.py:3150
+#: ../src/config.py:3167
 msgid "New Group Chat"
 msgstr "Novaja hrupavaja razmova"
 
-#: ../src/config.py:3183
+#: ../src/config.py:3200
 msgid "This bookmark has invalid data"
 msgstr "Hetaja zakładka źmiaščaje niapravilnyja źviestki"
 
-#: ../src/config.py:3184
+#: ../src/config.py:3201
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6767,31 +6941,31 @@ msgstr ""
 "zakładku."
 
 #. invalid char
-#: ../src/config.py:3302 ../src/dialogs.py:1934
+#: ../src/config.py:3319 ../src/dialogs.py:1950
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: ../src/config.py:3303 ../src/config.py:3317 ../src/config.py:3331
+#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Mianuška nie dazvolenaja: %s"
 
-#: ../src/config.py:3316 ../src/config.py:3582
+#: ../src/config.py:3333 ../src/config.py:3599
 #, fuzzy
 msgid "Invalid server"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: ../src/config.py:3330
+#: ../src/config.py:3347
 #, fuzzy
 msgid "Invalid room"
 msgstr "Niapravilny zapis"
 
-#: ../src/config.py:3498
+#: ../src/config.py:3515
 msgid "Account has been added successfully"
 msgstr "Kont paśpiachova dadany"
 
-#: ../src/config.py:3499 ../src/config.py:3505
+#: ../src/config.py:3516 ../src/config.py:3522
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6801,34 +6975,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:3504
+#: ../src/config.py:3521
 msgid "Your new account has been created successfully"
 msgstr "Novy kont paśpiachova stvorany"
 
-#: ../src/config.py:3543
+#: ../src/config.py:3560
 msgid "Invalid username"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: ../src/config.py:3545
+#: ../src/config.py:3562
 msgid "You must provide a username to configure this account."
 msgstr "Treba vyznačyć imia karystalnika, kab skanfihuravać hety kont."
 
-#: ../src/config.py:3583
+#: ../src/config.py:3600
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Kali łaska, vyznač dla siabie novuju mianušku:"
 
-#: ../src/config.py:3639 ../src/gui_interface.py:1904
+#: ../src/config.py:3656 ../src/gui_interface.py:1693
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Kantakt užo jość u śpisie kantaktaŭ"
 
-#: ../src/config.py:3640 ../src/gui_interface.py:1905
+#: ../src/config.py:3657 ../src/gui_interface.py:1694
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3717
+#: ../src/config.py:3734
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6838,7 +7012,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3723 ../src/gui_interface.py:1932
+#: ../src/config.py:3740 ../src/gui_interface.py:1721
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6846,72 +7020,81 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3755 ../src/config.py:3789
+#: ../src/config.py:3772 ../src/config.py:3806
 msgid "An error occurred during account creation"
 msgstr "Adbyłasia pamyłka padčas stvareńnia kontu"
 
-#: ../src/config.py:3854
+#: ../src/config.py:3871
 msgid "Account name is in use"
 msgstr "Nazva kontu ŭžo vykarystoŭvajecca"
 
-#: ../src/config.py:3855
+#: ../src/config.py:3872
 msgid "You already have an account using this name."
 msgstr "Kont z takoj nazvaj užo isnuje."
 
-#: ../src/config.py:4009
+#: ../src/config.py:3991
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/config.py:3992
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#: ../src/config.py:4036
 msgid "Active"
 msgstr "Dziejny"
 
-#: ../src/config.py:4017
+#: ../src/config.py:4044
 msgid "Event"
 msgstr "Padzieja"
 
-#: ../src/config.py:4052
+#: ../src/config.py:4079
 msgid "First Message Received"
 msgstr "Atrymanaje pieršaje paviedamleńnie"
 
-#: ../src/config.py:4053
+#: ../src/config.py:4080
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Atrymanaje novaje paviedamleńnie"
 
-#: ../src/config.py:4055
+#: ../src/config.py:4082
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Atrymanaje novaje paviedamleńnie"
 
-#: ../src/config.py:4056
+#: ../src/config.py:4083
 msgid "Contact Connected"
 msgstr "Kantakt dałučyŭsia"
 
-#: ../src/config.py:4057
+#: ../src/config.py:4084
 msgid "Contact Disconnected"
 msgstr "Kantakt adłučyŭsia"
 
-#: ../src/config.py:4058
+#: ../src/config.py:4085
 msgid "Message Sent"
 msgstr "Paviedamleńnie dasłanaje"
 
-#: ../src/config.py:4059
+#: ../src/config.py:4086
 msgid "Group Chat Message Highlight"
 msgstr "Padśviatleńnie paviedamleńnia ŭ pakoji"
 
-#: ../src/config.py:4060
+#: ../src/config.py:4087
 msgid "Group Chat Message Received"
 msgstr "Novaje paviedamleńnie ŭ pakoji"
 
-#: ../src/config.py:4061
+#: ../src/config.py:4088
 msgid "GMail Email Received"
 msgstr "Novy list na skryncy GMail"
 
-#: ../src/conversation_textview.py:600
+#: ../src/conversation_textview.py:601
 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:619
+#: ../src/conversation_textview.py:620
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6920,45 +7103,45 @@ msgstr ""
 "Tekst pad hetaj rysaj addzialaje toj tekst, jaki ty jašče nia bačyŭ/nia "
 "bačyła"
 
-#: ../src/conversation_textview.py:739
+#: ../src/conversation_textview.py:740
 #, fuzzy
 msgid "_Quote"
 msgstr "_Skonč pracu"
 
-#: ../src/conversation_textview.py:746
+#: ../src/conversation_textview.py:747
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Dziejańni dla \"%s\""
 
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Read _Wikipedia Article"
 msgstr "Pračytać artykuł u _Wikipedii"
 
-#: ../src/conversation_textview.py:763
+#: ../src/conversation_textview.py:765
 msgid "Look it up in _Dictionary"
 msgstr "Šukaj u _słoŭniku"
 
-#: ../src/conversation_textview.py:780
+#: ../src/conversation_textview.py:782
 #, 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:793
+#: ../src/conversation_textview.py:795
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "U adrasie dla web-pošuku nie staje \"%s\""
 
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 msgid "Web _Search for it"
 msgstr "_Å ukaj u Web"
 
-#: ../src/conversation_textview.py:802
+#: ../src/conversation_textview.py:804
 msgid "Open as _Link"
 msgstr "Adčyni jak _spasyłku"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1296
+#: ../src/conversation_textview.py:1298
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6967,190 +7150,195 @@ msgstr[1] "Učora"
 msgstr[2] "Učora"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1344 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
 
-#: ../src/dataforms_widget.py:544
+#: ../src/dataforms_widget.py:545
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Niemahčyma adčytać modulu idle"
 
-#: ../src/dataforms_widget.py:546
+#: ../src/dataforms_widget.py:547
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Pašyreńnie nie padtrymvajecca"
 
-#: ../src/dataforms_widget.py:601
+#: ../src/dataforms_widget.py:562
+msgid "This field is required"
+msgstr ""
+
+#: ../src/dataforms_widget.py:607
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Klijent kamunikacyi dla Jabber"
 
-#: ../src/dataforms_widget.py:602
+#: ../src/dataforms_widget.py:608
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:613
+#: ../src/dataforms_widget.py:619
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:616 ../src/dataforms_widget.py:618
+#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nazva kantaktu: <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:195
 msgid "Group"
 msgstr "Hrupa"
 
-#: ../src/dialogs.py:201
+#: ../src/dialogs.py:202
 msgid "In the group"
 msgstr "U hrupie"
 
-#: ../src/dialogs.py:292
+#: ../src/dialogs.py:293
 msgid "KeyID"
 msgstr "ID kluča"
 
-#: ../src/dialogs.py:297
+#: ../src/dialogs.py:298
 msgid "Contact name"
 msgstr "Nazva kantaktu"
 
-#: ../src/dialogs.py:469
+#: ../src/dialogs.py:470
 #, fuzzy
 msgid "Set Mood"
 msgstr "Vyznač MOTD"
 
-#: ../src/dialogs.py:589
+#: ../src/dialogs.py:590
 #, python-format
 msgid "%s Status Message"
 msgstr "Paviedamleńnie statusu %s"
 
-#: ../src/dialogs.py:603
+#: ../src/dialogs.py:604
 msgid "Status Message"
 msgstr "Paviedamleńnie statusu"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:794
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Paviedamleńnie statusu"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:795
 #, 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:802
+#: ../src/dialogs.py:803
 msgid "Save as Preset Status Message"
 msgstr "Zapišy jak šablon paviedamleńnia statusu"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:804
 msgid "Please type a name for this status message"
 msgstr "Kali łaska, uviadzi nazvu dla hetaha paviedamleńnia statusu"
 
-#: ../src/dialogs.py:831
+#: ../src/dialogs.py:832
 msgid "AIM Address:"
 msgstr "Adras AIM:"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:833
 msgid "GG Number:"
 msgstr "Numer GG:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:834
 msgid "ICQ Number:"
 msgstr "Numer ICQ:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:835
 msgid "MSN Address:"
 msgstr "Adras MSN:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:836
 msgid "Yahoo! Address:"
 msgstr "Adras Yahoo!:"
 
-#: ../src/dialogs.py:872
+#: ../src/dialogs.py:873
 #, 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:875
+#: ../src/dialogs.py:876
 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:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
+#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
+#: ../src/dialogs.py:3464
 msgid "Invalid User ID"
 msgstr "Niapravilny identyfikatar karystalnika"
 
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1052
 msgid "The user ID must not contain a resource."
 msgstr "Identyfikatar karystalnika nia moža ŭtrymlivać krynicy."
 
-#: ../src/dialogs.py:1051
+#: ../src/dialogs.py:1057
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Ja chaču dadać ciabie ŭ svoj śpis kantaktaŭ."
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1071
 msgid "Contact already in roster"
 msgstr "Kantakt užo jość u śpisie kantaktaŭ"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1072
 msgid "This contact is already listed in your roster."
 msgstr "Hety kantakt užo jość u tvajim śpisie kantaktaŭ."
 
-#: ../src/dialogs.py:1112
+#: ../src/dialogs.py:1118
 msgid "User ID:"
 msgstr "Identyfikatar karystalnika:"
 
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1189
 msgid "A GTK+ jabber client"
 msgstr "Jabber-klijent dla GTK+"
 
-#: ../src/dialogs.py:1176
+#: ../src/dialogs.py:1190
 msgid "GTK+ Version:"
 msgstr "Versija GTK+:"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1191
 msgid "PyGTK Version:"
 msgstr "Versija PyGTK:"
 
-#: ../src/dialogs.py:1187
+#: ../src/dialogs.py:1201
 msgid "Current Developers:"
 msgstr "Dziejnyja raspracoÅ­niki:"
 
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1203
 msgid "Past Developers:"
 msgstr "Byłyja raspracoŭniki:"
 
-#: ../src/dialogs.py:1195
+#: ../src/dialogs.py:1209
 msgid "THANKS:"
 msgstr "PADZIAKI:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1215
 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:1213
+#: ../src/dialogs.py:1227
 msgid "translator-credits"
 msgstr "Ihar Hrachyshka <ihar.hrachyshka@gmail.com>"
 
-#: ../src/dialogs.py:1396
+#: ../src/dialogs.py:1410
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7161,109 +7349,109 @@ msgstr ""
 "Treba zainstalavać słoŭnik %s, kab praviarać pravapis, albo abrać inšuju "
 "movu Å­ opcyi speller_language."
 
-#: ../src/dialogs.py:1935 ../src/dialogs.py:2322
+#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr "JID pakoju Å­trymlivaje niedazvolenyja znaki."
 
-#: ../src/dialogs.py:2053
+#: ../src/dialogs.py:2069
 #, 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:2056
+#: ../src/dialogs.py:2072
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Zapyt aÅ­taryzacyi ad %s"
 
-#: ../src/dialogs.py:2131 ../src/gui_interface.py:2672
+#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Užo ŭdzielničaješ u razmovie ŭ pakoji %s"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2153
 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:2178
+#: ../src/dialogs.py:2194
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Dałučysia da pakoju dla kontu %s"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2325
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Niapravilnaja nazva kontu"
 
-#: ../src/dialogs.py:2310
+#: ../src/dialogs.py:2326
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Treba stvaryć kont, kab razmaŭlać ź inšymi kantaktami."
 
-#: ../src/dialogs.py:2321
+#: ../src/dialogs.py:2337
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: ../src/dialogs.py:2326 ../src/dialogs.py:2332
-#: ../src/groupchat_control.py:1832
+#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
+#: ../src/groupchat_control.py:1847
 msgid "Invalid group chat Jabber ID"
 msgstr "Niapravilny JID pakoju"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2343
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "JID pakoju Å­trymlivaje niedazvolenyja znaki."
 
-#: ../src/dialogs.py:2333 ../src/groupchat_control.py:1833
+#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "JID pakoju Å­trymlivaje niedazvolenyja znaki."
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2356
 msgid "This is not a group chat"
 msgstr "Heta nie pakoj"
 
-#: ../src/dialogs.py:2341
+#: ../src/dialogs.py:2357
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "Naźvie %s nie adpaviadaje nivodny pakoj."
 
-#: ../src/dialogs.py:2372
+#: ../src/dialogs.py:2388
 #, 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:2386
+#: ../src/dialogs.py:2402
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2421
+#: ../src/dialogs.py:2437
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Kont \"%s\" dałučany da servera"
 
-#: ../src/dialogs.py:2422
+#: ../src/dialogs.py:2438
 #, 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:2446
+#: ../src/dialogs.py:2462
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2523
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Pačni razmovu dla kontu %s"
 
-#: ../src/dialogs.py:2509
+#: ../src/dialogs.py:2525
 msgid "Start Chat"
 msgstr "Pačni razmovu"
 
-#: ../src/dialogs.py:2510
+#: ../src/dialogs.py:2526
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7272,168 +7460,168 @@ msgstr ""
 "paviedamleńnie:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2536 ../src/dialogs.py:2917 ../src/dialogs.py:3129
+#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
 msgid "Connection not available"
 msgstr "Złučeńnia niama"
 
-#: ../src/dialogs.py:2537 ../src/dialogs.py:2918 ../src/dialogs.py:3130
+#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
 #, 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:2546 ../src/dialogs.py:2549
+#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
 msgid "Invalid JID"
 msgstr "Niapravilny JID"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2565
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Niemahčyma razabrać \"%s\"."
 
-#: ../src/dialogs.py:2558
+#: ../src/dialogs.py:2574
 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:2577
+#: ../src/dialogs.py:2593
 msgid "Invalid password"
 msgstr "Niapravilny parol"
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "You must enter a password."
 msgstr "Treba ŭvieści parol."
 
-#: ../src/dialogs.py:2581
+#: ../src/dialogs.py:2597
 msgid "Passwords do not match"
 msgstr "Paroli roźniacca"
 
-#: ../src/dialogs.py:2582
+#: ../src/dialogs.py:2598
 msgid "The passwords typed in both fields must be identical."
 msgstr "Parolu ŭ abodvuch palach nie pavinny roźnicca."
 
 #. default value
-#: ../src/dialogs.py:2619 ../src/notify.py:247 ../src/notify.py:473
+#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
 msgid "Contact Signed In"
 msgstr "Kantakt dałučyŭsia"
 
-#: ../src/dialogs.py:2621 ../src/notify.py:255 ../src/notify.py:475
+#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
 msgid "Contact Signed Out"
 msgstr "Kantakt adłučyŭsia"
 
 #. chat message
-#: ../src/dialogs.py:2623 ../src/notify.py:277 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
 msgid "New Message"
 msgstr "Novaje paviedamleńnie"
 
 #. single message
-#: ../src/dialogs.py:2623 ../src/notify.py:259 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
 msgid "New Single Message"
 msgstr "Novaje asobnaje paviedamleńnie"
 
 #. private message
-#: ../src/dialogs.py:2624 ../src/notify.py:265 ../src/notify.py:478
+#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
 msgid "New Private Message"
 msgstr "Novaje pryvatnaje paviedamleńnie"
 
-#: ../src/dialogs.py:2624 ../src/gui_interface.py:1358 ../src/notify.py:487
+#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
 msgid "New E-mail"
 msgstr "Novy list"
 
-#: ../src/dialogs.py:2626 ../src/gui_interface.py:1420 ../src/notify.py:480
+#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
 msgid "File Transfer Request"
 msgstr "Zapyt na pieradaču fajłu"
 
-#: ../src/dialogs.py:2628 ../src/gui_interface.py:1320
-#: ../src/gui_interface.py:1389 ../src/notify.py:482
+#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
+#: ../src/gui_interface.py:1186 ../src/notify.py:482
 msgid "File Transfer Error"
 msgstr "Pamyłka pieradačy fajłu"
 
-#: ../src/dialogs.py:2630 ../src/gui_interface.py:1466
-#: ../src/gui_interface.py:1489 ../src/gui_interface.py:1506
+#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
+#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
 #: ../src/notify.py:484
 msgid "File Transfer Completed"
 msgstr "Pieradača fajłu skončana"
 
-#: ../src/dialogs.py:2631 ../src/gui_interface.py:1469 ../src/notify.py:485
+#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
 msgid "File Transfer Stopped"
 msgstr "Pieradača fajłu spyniena"
 
-#: ../src/dialogs.py:2633 ../src/gui_interface.py:1152 ../src/notify.py:489
+#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
 msgid "Groupchat Invitation"
 msgstr "Zaprašeńnie ŭ pakoj"
 
-#: ../src/dialogs.py:2635 ../src/notify.py:239 ../src/notify.py:491
+#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
 msgid "Contact Changed Status"
 msgstr "Kantakt źmianiŭ status"
 
-#: ../src/dialogs.py:2836
+#: ../src/dialogs.py:2852
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Asobnaje paviedamleńnie z kontu %s"
 
-#: ../src/dialogs.py:2838
+#: ../src/dialogs.py:2854
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Asobnaje paviedamleńnie z kontu %s"
 
-#: ../src/dialogs.py:2840
+#: ../src/dialogs.py:2856
 msgid "Single Message"
 msgstr "Asobnaje paviedamleńnie"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2843
+#: ../src/dialogs.py:2859
 #, python-format
 msgid "Send %s"
 msgstr "Dašli %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:2882
 #, python-format
 msgid "Received %s"
 msgstr "Atrymana %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2889
+#: ../src/dialogs.py:2905
 #, 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:2968
+#: ../src/dialogs.py:2984
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:2985
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napisaÅ­:\n"
 
-#: ../src/dialogs.py:3028
+#: ../src/dialogs.py:3044
 #, python-format
 msgid "XML Console for %s"
 msgstr "Kansol XML dla %s"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3046
 msgid "XML Console"
 msgstr "Kansol XML"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "add"
 msgstr "Zatrymana"
 
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "modify"
 msgstr "_Madyfikuj"
 
-#: ../src/dialogs.py:3160
+#: ../src/dialogs.py:3176
 #, fuzzy
 msgid "remove"
 msgstr "_Vydal"
 
-#: ../src/dialogs.py:3188
+#: ../src/dialogs.py:3204
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7441,161 +7629,194 @@ msgid ""
 msgstr "Ja chaču dadać Vas u svoj śpis kantaktaŭ."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3204 ../src/dialogs.py:3250
+#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
 #, fuzzy
 msgid "Add"
 msgstr "Adras"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3206 ../src/dialogs.py:3281
+#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
 #, fuzzy
 msgid "Modify"
 msgstr "_Madyfikuj"
 
-#: ../src/dialogs.py:3212
+#: ../src/dialogs.py:3228
 #, fuzzy
 msgid "Jabber ID"
 msgstr "JID:"
 
-#: ../src/dialogs.py:3218
+#: ../src/dialogs.py:3234
 #, fuzzy
 msgid "Groups"
 msgstr "Hrupa"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3342
 #, 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:3340
+#: ../src/dialogs.py:3356
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "_Dadaj kantakt"
 
-#: ../src/dialogs.py:3377
+#: ../src/dialogs.py:3393
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Vydalaje kantakt sa śpisu"
 
-#: ../src/dialogs.py:3430
+#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#, python-format
+msgid "Archiving Preferences for %s"
+msgstr ""
+
+#: ../src/dialogs.py:3473
+#, fuzzy
+msgid "Invalid expire value"
+msgstr "Niapravilnaje imia karystalnika"
+
+#: ../src/dialogs.py:3474
+msgid "Expire must be a valid positive integer."
+msgstr ""
+
+#: ../src/dialogs.py:3521
+msgid "There is an error with the form"
+msgstr ""
+
+#: ../src/dialogs.py:3732
+msgid "There is an error"
+msgstr ""
+
+#: ../src/dialogs.py:3796
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Śpis pryvatnaści <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3434
+#: ../src/dialogs.py:3800
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Śpis pryvatnaści dla %s"
 
-#: ../src/dialogs.py:3490
+#: ../src/dialogs.py:3856
 #, 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:3495
+#: ../src/dialogs.py:3861
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Paradak: %s, dziejańnie: %s"
 
-#: ../src/dialogs.py:3539
+#: ../src/dialogs.py:3905
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Redahuj praviła</b>"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:4016
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dadaj praviła</b>"
 
-#: ../src/dialogs.py:3750
+#: ../src/dialogs.py:4116
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Śpisy pryvatnaści dla %s"
 
-#: ../src/dialogs.py:3752
+#: ../src/dialogs.py:4118
 msgid "Privacy Lists"
 msgstr "Śpisy pryvatnaści"
 
-#: ../src/dialogs.py:3822
+#: ../src/dialogs.py:4188
 msgid "Invalid List Name"
 msgstr "Niapravilnaja nazva śpisu"
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4189
 msgid "You must enter a name to create a privacy list."
 msgstr "Treba akreślić nazvu dla novaha śpisu pryvatnaści."
 
-#: ../src/dialogs.py:3855
+#: ../src/dialogs.py:4221
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Ty nie dałučyŭsia da pakoju."
 
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4224
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact zaprasiÅ­ ciabie Å­ pakoj %(room_jid)s"
 
-#: ../src/dialogs.py:3860
+#: ../src/dialogs.py:4226
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact zaprasiÅ­ ciabie Å­ pakoj %(room_jid)s"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4234
 #, python-format
 msgid "Comment: %s"
 msgstr "Kamentar: %s"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4236
 #, fuzzy
 msgid "Do you want to accept the invitation?"
 msgstr "%s choča dasłać tabie fajł:"
 
-#: ../src/dialogs.py:3932
+#: ../src/dialogs.py:4298
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:3942 ../src/dialogs.py:3985 ../src/dialogs.py:4041
+#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
+#: ../src/dialogs.py:4495
 msgid "All files"
 msgstr "Usie fajły"
 
-#: ../src/dialogs.py:3947
+#: ../src/dialogs.py:4313
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:3975
+#: ../src/dialogs.py:4341
 msgid "Choose Sound"
 msgstr "Abiary hukavy fajł"
 
-#: ../src/dialogs.py:3990
+#: ../src/dialogs.py:4356
 msgid "Wav Sounds"
 msgstr "Fajły ŭ Wav"
 
-#: ../src/dialogs.py:4028
+#: ../src/dialogs.py:4394
 msgid "Choose Image"
 msgstr "Abiary vyjavu"
 
-#: ../src/dialogs.py:4046
+#: ../src/dialogs.py:4412
 msgid "Images"
 msgstr "Vyjavy"
 
-#: ../src/dialogs.py:4113
+#: ../src/dialogs.py:4482
+#, fuzzy
+msgid "Choose Archive"
+msgstr "Abiary vyjavu"
+
+#: ../src/dialogs.py:4500
+#, fuzzy
+msgid "Zip files"
+msgstr "Usie fajły"
+
+#: ../src/dialogs.py:4525
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kali %s maje status:"
 
-#: ../src/dialogs.py:4115
+#: ../src/dialogs.py:4527
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dadajecca admysłovaje nahadvańnie dla %s"
 
-#: ../src/dialogs.py:4190
+#: ../src/dialogs.py:4602
 msgid "Condition"
 msgstr "Umova"
 
-#: ../src/dialogs.py:4310
+#: ../src/dialogs.py:4722
 msgid "when I am "
 msgstr "kali maju "
 
-#: ../src/dialogs.py:4786
+#: ../src/dialogs.py:5198
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7603,38 +7824,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4789
+#: ../src/dialogs.py:5201
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4795 ../src/dialogs.py:4879
+#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4801
+#: ../src/dialogs.py:5213
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4806
+#: ../src/dialogs.py:5218
 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:4809 ../src/dialogs.py:4860 ../src/dialogs.py:4873
+#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4814
+#: ../src/dialogs.py:5226
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4825
+#: ../src/dialogs.py:5237
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4826
+#: ../src/dialogs.py:5238
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7644,44 +7865,44 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4827
+#: ../src/dialogs.py:5239
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4861
+#: ../src/dialogs.py:5273
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4867
+#: ../src/dialogs.py:5279
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4874
+#: ../src/dialogs.py:5286
 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:4880
+#: ../src/dialogs.py:5292
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:4945
+#: ../src/dialogs.py:5357
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4947
+#: ../src/dialogs.py:5359
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4949
+#: ../src/dialogs.py:5361
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4953
+#: ../src/dialogs.py:5365
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7697,24 +7918,24 @@ msgstr "Inšyja"
 msgid "Conference"
 msgstr "Kanferencyja"
 
-#: ../src/disco.py:512
+#: ../src/disco.py:513
 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:589
+#: ../src/disco.py:600
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Prahlad servisaÅ­ dla kontu %s"
 
-#: ../src/disco.py:591
+#: ../src/disco.py:602
 msgid "Service Discovery"
 msgstr "Prahlad servisaÅ­"
 
-#: ../src/disco.py:741
+#: ../src/disco.py:758
 msgid "The service could not be found"
 msgstr "Niemahčyma znajści servis"
 
-#: ../src/disco.py:742
+#: ../src/disco.py:759
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7722,97 +7943,97 @@ msgstr ""
 "Niama servisu z akreślenym adrasam, albo jon nie adkazvaje. Pravier adras i "
 "pasprabuj znoÅ­."
 
-#: ../src/disco.py:746 ../src/disco.py:1082
+#: ../src/disco.py:763 ../src/disco.py:1100
 msgid "The service is not browsable"
 msgstr "Niemahčyma ahladać hety servis"
 
-#: ../src/disco.py:747
+#: ../src/disco.py:764
 msgid "This type of service does not contain any items to browse."
 msgstr "Taki servis nia ŭtrymlivaje elementaŭ dla ahladańnia."
 
-#: ../src/disco.py:786 ../src/disco.py:796
+#: ../src/disco.py:804 ../src/disco.py:814
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: ../src/disco.py:850
+#: ../src/disco.py:868
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Prahlad %s dla kontu %s"
 
-#: ../src/disco.py:894
+#: ../src/disco.py:912
 msgid "_Browse"
 msgstr "_Prahladaj"
 
-#: ../src/disco.py:1083
+#: ../src/disco.py:1101
 msgid "This service does not contain any items to browse."
 msgstr "Hety servis nia Å­trymlivaje elementaÅ­ dla prahladu."
 
-#: ../src/disco.py:1323
+#: ../src/disco.py:1341
 #, fuzzy
 msgid "_Execute Command"
 msgstr "_Vykanaj zahad..."
 
-#: ../src/disco.py:1333 ../src/disco.py:1504
+#: ../src/disco.py:1351 ../src/disco.py:1522
 msgid "Re_gister"
 msgstr "_Zarehistrujsia"
 
-#: ../src/disco.py:1545
+#: ../src/disco.py:1563
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanavańnie %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1736
+#: ../src/disco.py:1754
 msgid "Users"
 msgstr "Karystalniki"
 
 #. Description column
-#: ../src/disco.py:1744
+#: ../src/disco.py:1762
 msgid "Description"
 msgstr "Apisańnie"
 
 #. Id column
-#: ../src/disco.py:1752
+#: ../src/disco.py:1770
 msgid "Id"
 msgstr "Identyfikatar"
 
-#: ../src/disco.py:1817 ../src/gui_interface.py:3182
+#: ../src/disco.py:1835 ../src/gui_interface.py:2995
 msgid "Bookmark already set"
 msgstr "Zakładka ŭžo dadana"
 
-#: ../src/disco.py:1818 ../src/gui_interface.py:3183
+#: ../src/disco.py:1836 ../src/gui_interface.py:2996
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Pakoj \"%s\" užo jość u tvajich zakładkach."
 
-#: ../src/disco.py:1827 ../src/gui_interface.py:3197
+#: ../src/disco.py:1845 ../src/gui_interface.py:3010
 msgid "Bookmark has been added successfully"
 msgstr "Zakładka paśpiachova dadanaja"
 
-#: ../src/disco.py:1828 ../src/gui_interface.py:3198
+#: ../src/disco.py:1846 ../src/gui_interface.py:3011
 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:2039
+#: ../src/disco.py:2057
 msgid "Subscribed"
 msgstr "AÅ­taryzavany"
 
-#: ../src/disco.py:2047
+#: ../src/disco.py:2065
 #, fuzzy
 msgid "Node"
 msgstr "Nijaki"
 
-#: ../src/disco.py:2111
+#: ../src/disco.py:2129
 msgid "New post"
 msgstr "Novy zapis"
 
-#: ../src/disco.py:2117
+#: ../src/disco.py:2135
 msgid "_Subscribe"
 msgstr "_AÅ­taryzuj"
 
-#: ../src/disco.py:2123
+#: ../src/disco.py:2141
 msgid "_Unsubscribe"
 msgstr "_Anuluj aÅ­taryzacyju"
 
@@ -7988,14 +8209,14 @@ msgstr ""
 
 #: ../src/features_window.py:95
 msgid ""
-"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
-"in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 
 #: ../src/features_window.py:96
 msgid ""
-"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
+"You have to set 'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 
 #: ../src/features_window.py:97
@@ -8153,12 +8374,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:342 ../src/gtkgui_helpers.py:902
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Niemahčyma nadpisać fajł \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -8166,22 +8387,22 @@ msgstr ""
 "Fajł z takoj nazvaj užo isnuje, i nie staje pravoŭ dla nadpisańnia hetaha "
 "fajłu."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 msgid "This file already exists"
 msgstr "Hety fajł užo isnuje"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 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:369 ../src/gtkgui_helpers.py:914
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Niemahčyma zapisać u kataloh \"%s\""
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
 msgid "You do not have permission to create files in this directory."
 msgstr "Nie staje pravoŭ dla stvareńnia fajłaŭ u hetym katalohu."
 
@@ -8284,28 +8505,28 @@ msgstr ""
 "Gajim užo vykonvajecca\n"
 "Usio adno ŭruchomić?"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
 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:80
+#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
 msgid "command"
 msgstr "zahad"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "pakažy daviedku pa zahadzie"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Pakazvaje / chavaje śpis kantaktaŭ"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Adčyniaje akno z nastupnym niečytanym paviedamleńniem"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8313,6 +8534,13 @@ msgstr ""
 "Pakazvaje śpis usich kantaktaŭ sa śpisu kantaktaŭ. Źviestki ab kožnym "
 "kantakcie źjaŭlajucca na novym radku"
 
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
+#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
+#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
+#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
 #: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
 #: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
 #: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
@@ -8324,41 +8552,33 @@ msgstr ""
 msgid "account"
 msgstr "kont"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "pakažy kantakty akreślenaha kontu"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Pakazvaje śpis zarehistravanych kontaŭ"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
 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:109
+#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106
 #, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"accoun't previous status"
+msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "adno z: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
-msgid "message"
-msgstr "paviedamleńnie"
-
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "paviedamlennie statusu"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8367,48 +8587,20 @@ msgstr ""
 "dla Å­sich kontaÅ­, dla jakich vystaÅ­lenaja opcyja \"Synchranizuj z hlabalnym "
 "statusam\""
 
-#: ../src/gajim-remote.py:117
-#, fuzzy
-msgid "Changes the priority of account or accounts"
-msgstr "Źmianiaje status kontu albo kontaŭ"
-
-#: ../src/gajim-remote.py:119
-#, fuzzy
-msgid "priority"
-msgstr "Pryjary_tet:"
-
-#: ../src/gajim-remote.py:119
-#, fuzzy
-msgid "priority you want to give to the account"
-msgstr "Ja chaču za_rehistravać novy kont"
-
-#: ../src/gajim-remote.py:121
-#, fuzzy
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-msgstr ""
-"źmiani status kontu \"kont\". Kali nie akreślena, pasprabuj źmianić statusy "
-"dla Å­sich kontaÅ­, dla jakich vystaÅ­lenaja opcyja \"Synchranizuj z hlabalnym "
-"statusam\""
-
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
 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:129
+#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID kantaktu, ź jakim chočaš parazmaŭlać"
 
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
 #: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 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:134
-msgid "message content. The account must be specified or \"\""
-msgstr ""
-
-#: ../src/gajim-remote.py:139
+#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
 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 "
@@ -8418,30 +8610,35 @@ 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-plugin.py:127 ../src/gajim-remote-plugin.py:140
 #: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID kantaktu, jaki atrymaje paviedamleńnie"
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
+#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "źmiest paviedamleńnia"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "kluč pgp"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 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:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
+#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
 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:152
+#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
 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 "
@@ -8451,107 +8648,282 @@ 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:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "tema"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "tema paviedamleńnia"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID kantaktu, jaki atrymaje paviedamleńnie"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Atrymvaje padrabiaznyja źviestki ab kantakcie"
 
+#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
+#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
 #: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
 #: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID kantaktu"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Atrymvaje padrabiaznyja źviestki ab kantakcie"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Nazva kontu"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Dasyłaje kantaktu fajł"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "file"
 msgstr "fajł"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Ściežka da fajłu"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
 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:196
+#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Pakazvaje ŭsie nałady i ichnyja vartaści"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Akreślivaje dla 'kluča' 'vartaść'"
 
-#: ../src/gajim-remote.py:202
-msgid "key=value"
-msgstr "kluč=vartaść"
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+msgid "key=value"
+msgstr "kluč=vartaść"
+
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+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-plugin.py:191 ../src/gajim-remote.py:207
+msgid "Deletes a preference item"
+msgstr "Vydalaje naładu"
+
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "key"
+msgstr "kluč"
+
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "name of the preference to be deleted"
+msgstr "nazva vydalenaj nałady"
+
+#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+msgid "Writes the current state of Gajim preferences to the .config file"
+msgstr "Zapisvaje dziejnyja nałady Gajima ŭ fajł .config"
+
+#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
+msgid "Removes contact from roster"
+msgstr "Vydalaje kantakt sa śpisu"
+
+#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+msgid "Adds contact to roster"
+msgstr "Dadaje kantakt u śpis kantaktaŭ"
+
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+msgid "Adds new contact to this account"
+msgstr "Dadaje novy kantakt dla hetaha kontu"
+
+#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+msgid "Returns current status (the global one unless account is specified)"
+msgstr "Viartaje dziejny status (hlabalny, kali nie akreśleny kont)"
+
+#: ../src/gajim-remote-plugin.py:226
+#, fuzzy
+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-plugin.py:233 ../src/gajim-remote.py:249
+msgid "Returns number of unread messages"
+msgstr "Viartaje kolkaść niečytanych paviedamleńniaŭ"
+
+#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+msgid "Opens 'Start Chat' dialog"
+msgstr "Adčyniaje akno 'Pačni razmovu'"
+
+#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+msgid "Starts chat, using this account"
+msgstr "Pačynaje razmovu dla hetaha kontu"
+
+#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+msgid "Sends custom XML"
+msgstr "Dasyłaje svoj XML"
+
+#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+msgid "XML to send"
+msgstr "XML dla dasyłańnia"
+
+#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+"Kont, na jaki budzie dasłany XML; kali kont nie akreśleny, XML budzie "
+"dasłany na ŭsie konty"
+
+#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
+msgid "Handle a xmpp:/ uri"
+msgstr "Absłuhoŭvaj spasyłki xmpp:/"
+
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
+msgid "uri"
+msgstr "uri"
+
+#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+msgid "Join a MUC room"
+msgstr "Dałučysia da pakoju"
+
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+msgid "room"
+msgstr "pakoj"
+
+#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+msgid "nick"
+msgstr "mianuška"
+
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+msgid "password"
+msgstr "parol"
+
+#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#, fuzzy
+msgid "Check if Gajim is running"
+msgstr "Kali Å‚aska, pravier, ci pracuje avahi-daemon."
+
+#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
+#: ../src/gajim-remote.py:300
+#, fuzzy
+msgid "Shows or hides the ipython window"
+msgstr "Pakazvaje / chavaje śpis kantaktaŭ"
+
+#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+msgid "Missing argument \"contact_jid\""
+msgstr "Nie staje arhumenta \"contact_jid\""
+
+#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#, python-format
+msgid ""
+"'%s' is not in your roster.\n"
+"Please specify account for sending the message."
+msgstr ""
+"'%s' niama ŭ tvajim śpisie kantaktaŭ.\n"
+"Kali łaska, akreśli kont dla dasyłańnia paviedamleńnia."
+
+#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+msgid "You have no active account"
+msgstr "Nivodny kont nia dziejny"
+
+#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+msgid "It seems Gajim is not running. So you can't use gajim-remote."
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:412
+#, python-format
+msgid ""
+"Usage: %s %s %s \n"
+"\t %s"
+msgstr ""
+"Užyvańnie: %s %s %s \n"
+"\t %s"
+
+#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+msgid "Arguments:"
+msgstr "Arhumenty:"
+
+#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#, python-format
+msgid "%s not found"
+msgstr "%s nia znojdzieny"
 
-#: ../src/gajim-remote.py:202
-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-plugin.py:423 ../src/gajim-remote.py:445
+#, python-format
+msgid ""
+"Usage: %s command [arguments]\n"
+"Command is one of:\n"
+msgstr ""
+"Užyvańnie: %s zahad [arhumenty]\n"
+"Zahadam moža być adzin z nastupnych vyrazaŭ:\n"
 
-#: ../src/gajim-remote.py:207
-msgid "Deletes a preference item"
-msgstr "Vydalaje naładu"
+#: ../src/gajim-remote-plugin.py:496
+#, fuzzy, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Nadta Å¡mat arhumentaÅ­. \n"
+"Vykanaj \"%s help %s\" dla padrabiaźniejšych źviestak"
 
-#: ../src/gajim-remote.py:209
-msgid "key"
-msgstr "kluč"
+#: ../src/gajim-remote-plugin.py:500
+#, fuzzy, python-format
+msgid ""
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Arhument \"%s\" nie akreśleny. \n"
+"Vykanaj \"%s help %s\" dla padrabiaźniejšych źviestak"
 
-#: ../src/gajim-remote.py:209
-msgid "name of the preference to be deleted"
-msgstr "nazva vydalenaj nałady"
+#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
+msgid "Wrong uri"
+msgstr "Niapravilnaja spasyłka"
 
-#: ../src/gajim-remote.py:213
-msgid "Writes the current state of Gajim preferences to the .config file"
-msgstr "Zapisvaje dziejnyja nałady Gajima ŭ fajł .config"
+#: ../src/gajim-remote.py:109
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
+msgstr "adno z: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:218
-msgid "Removes contact from roster"
-msgstr "Vydalaje kantakt sa śpisu"
+#: ../src/gajim-remote.py:117
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Źmianiaje status kontu albo kontaŭ"
 
-#: ../src/gajim-remote.py:227
-msgid "Adds contact to roster"
-msgstr "Dadaje kantakt u śpis kantaktaŭ"
+#: ../src/gajim-remote.py:119
+#, fuzzy
+msgid "priority"
+msgstr "Pryjary_tet:"
 
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "jid"
+#: ../src/gajim-remote.py:119
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Ja chaču za_rehistravać novy kont"
 
-#: ../src/gajim-remote.py:230
-msgid "Adds new contact to this account"
-msgstr "Dadaje novy kantakt dla hetaha kontu"
+#: ../src/gajim-remote.py:121
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"źmiani status kontu \"kont\". Kali nie akreślena, pasprabuj źmianić statusy "
+"dla Å­sich kontaÅ­, dla jakich vystaÅ­lenaja opcyja \"Synchranizuj z hlabalnym "
+"statusam\""
 
-#: ../src/gajim-remote.py:235
-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:134
+msgid "message content. The account must be specified or \"\""
+msgstr ""
 
 #: ../src/gajim-remote.py:242
 msgid ""
@@ -8560,34 +8932,6 @@ msgstr ""
 "Viartaje dziejnaje paviedamleńnie statusu (hlabalnaha, kali nie akreśleny "
 "kont)"
 
-#: ../src/gajim-remote.py:249
-msgid "Returns number of unread messages"
-msgstr "Viartaje kolkaść niečytanych paviedamleńniaŭ"
-
-#: ../src/gajim-remote.py:253
-msgid "Opens 'Start Chat' dialog"
-msgstr "Adčyniaje akno 'Pačni razmovu'"
-
-#: ../src/gajim-remote.py:255
-msgid "Starts chat, using this account"
-msgstr "Pačynaje razmovu dla hetaha kontu"
-
-#: ../src/gajim-remote.py:259
-msgid "Sends custom XML"
-msgstr "Dasyłaje svoj XML"
-
-#: ../src/gajim-remote.py:261
-msgid "XML to send"
-msgstr "XML dla dasyłańnia"
-
-#: ../src/gajim-remote.py:262
-msgid ""
-"Account in which the xml will be sent; if not specified, xml will be sent to "
-"all accounts"
-msgstr ""
-"Kont, na jaki budzie dasłany XML; kali kont nie akreśleny, XML budzie "
-"dasłany na ŭsie konty"
-
 #: ../src/gajim-remote.py:268
 #, fuzzy
 msgid "Change the avatar"
@@ -8607,14 +8951,6 @@ msgstr ""
 "Kont, na jaki budzie dasłany XML; kali kont nie akreśleny, XML budzie "
 "dasłany na ŭsie konty"
 
-#: ../src/gajim-remote.py:277
-msgid "Handle a xmpp:/ uri"
-msgstr "Absłuhoŭvaj spasyłki xmpp:/"
-
-#: ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "uri"
-
 #: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr ""
@@ -8628,32 +8964,16 @@ msgstr ""
 msgid "Message content"
 msgstr "źmiest paviedamleńnia"
 
-#: ../src/gajim-remote.py:286
-msgid "Join a MUC room"
-msgstr "Dałučysia da pakoju"
-
-#: ../src/gajim-remote.py:288
-msgid "room"
-msgstr "pakoj"
-
 #: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "Room JID"
 msgstr "Pakoj:"
 
-#: ../src/gajim-remote.py:289
-msgid "nick"
-msgstr "mianuška"
-
 #: ../src/gajim-remote.py:289
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Mianuška nia znojdziena: %s"
 
-#: ../src/gajim-remote.py:290
-msgid "password"
-msgstr "parol"
-
 #: ../src/gajim-remote.py:290
 #, fuzzy
 msgid "Password to enter the room"
@@ -8663,37 +8983,6 @@ msgstr "Paroli roźniacca"
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:296
-#, fuzzy
-msgid "Check if Gajim is running"
-msgstr "Kali Å‚aska, pravier, ci pracuje avahi-daemon."
-
-#: ../src/gajim-remote.py:300
-#, fuzzy
-msgid "Shows or hides the ipython window"
-msgstr "Pakazvaje / chavaje śpis kantaktaŭ"
-
-#: ../src/gajim-remote.py:327
-msgid "Missing argument \"contact_jid\""
-msgstr "Nie staje arhumenta \"contact_jid\""
-
-#: ../src/gajim-remote.py:348
-#, python-format
-msgid ""
-"'%s' is not in your roster.\n"
-"Please specify account for sending the message."
-msgstr ""
-"'%s' niama ŭ tvajim śpisie kantaktaŭ.\n"
-"Kali łaska, akreśli kont dla dasyłańnia paviedamleńnia."
-
-#: ../src/gajim-remote.py:351
-msgid "You have no active account"
-msgstr "Nivodny kont nia dziejny"
-
-#: ../src/gajim-remote.py:404
-msgid "It seems Gajim is not running. So you can't use gajim-remote."
-msgstr ""
-
 #: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
@@ -8701,24 +8990,6 @@ msgid ""
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:435
-msgid "Arguments:"
-msgstr "Arhumenty:"
-
-#: ../src/gajim-remote.py:439
-#, python-format
-msgid "%s not found"
-msgstr "%s nia znojdzieny"
-
-#: ../src/gajim-remote.py:445
-#, python-format
-msgid ""
-"Usage: %s command [arguments]\n"
-"Command is one of:\n"
-msgstr ""
-"Užyvańnie: %s zahad [arhumenty]\n"
-"Zahadam moža być adzin z nastupnych vyrazaŭ:\n"
-
 #: ../src/gajim-remote.py:514
 #, fuzzy, python-format
 msgid ""
@@ -8741,10 +9012,6 @@ msgstr ""
 msgid "No uri given"
 msgstr ""
 
-#: ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Niapravilnaja spasyłka"
-
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Tema"
@@ -8771,202 +9038,200 @@ msgstr "Niemahčyma vydalić dziejnuju temu"
 msgid "Please first choose another for your current theme."
 msgstr "Kali łaska, zadziejničaj spačatku inšuju temu."
 
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:170
 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:171
+#: ../src/groupchat_control.py:172
 #, 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:450
+#: ../src/groupchat_control.py:455
 msgid "Insert Nickname"
 msgstr "Ustaŭ mianušku"
 
-#: ../src/groupchat_control.py:631
+#: ../src/groupchat_control.py:636
 #, fuzzy
 msgid "Conversation with "
 msgstr "Žurnał razmoŭ"
 
-#: ../src/groupchat_control.py:633
+#: ../src/groupchat_control.py:638
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Złučeńnie"
 
-#. Can be a message (see handle_event_gc_config_change in
-#. gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1272 ../src/gui_interface.py:1080
+#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1286
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1288
 #, fuzzy
 msgid "A new room has been created"
 msgstr "AÅ­taryzacyja anulavanaja"
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1291
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1287
+#: ../src/groupchat_control.py:1297
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s vypchnuty z pakoju: %(reason)s"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1300
 #, 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:1300
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s zablakavany: %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1312
 #, 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:1314 ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
 #, python-format
 msgid "You are now known as %s"
 msgstr "Ciabie ciapier viedajuć jak %s"
 
-#: ../src/groupchat_control.py:1330 ../src/gui_interface.py:919
+#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s ciapier viadomy jak %s"
 
-#: ../src/groupchat_control.py:1372 ../src/groupchat_control.py:1377
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1392
 #, 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:1374
+#: ../src/groupchat_control.py:1383
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Suviaź: "
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1388
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1394
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1470
+#: ../src/groupchat_control.py:1477
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1474
+#: ../src/groupchat_control.py:1481
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1489
+#: ../src/groupchat_control.py:1496
 #, 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:1493
+#: ../src/groupchat_control.py:1500
 #, 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:1522
+#: ../src/groupchat_control.py:1530
 #, python-format
 msgid "%s has left"
 msgstr "%s vyjšaŭ"
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1535
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s dałučyŭsia da pakoju"
 
-#: ../src/groupchat_control.py:1529 ../src/gui_interface.py:946
+#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
 #: ../src/history_window.py:447 ../src/notify.py:234
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s maje ciapier status %(status)s"
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1774
 #, 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:1761
+#: ../src/groupchat_control.py:1776
 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:1765 ../src/gui_interface.py:1216
-#: ../src/gui_interface.py:1992 ../src/gui_interface.py:2029
-#: ../src/gui_interface.py:2064 ../src/message_window.py:224
-#: ../src/roster_window.py:2739 ../src/roster_window.py:3399
-#: ../src/roster_window.py:4123
+#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
+#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
+#: ../src/gui_interface.py:1853 ../src/message_window.py:224
+#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
+#: ../src/roster_window.py:4195
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Bolš nie pytajsia"
 
-#: ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:1814
 msgid "Changing Subject"
 msgstr "Źmianiajecca tema"
 
-#: ../src/groupchat_control.py:1800
+#: ../src/groupchat_control.py:1815
 msgid "Please specify the new subject:"
 msgstr "Kali łaska, vyznač novuju temu:"
 
-#: ../src/groupchat_control.py:1807
+#: ../src/groupchat_control.py:1822
 msgid "Changing Nickname"
 msgstr "Źmianiajecca mianuška"
 
-#: ../src/groupchat_control.py:1808
+#: ../src/groupchat_control.py:1823
 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:1839
+#: ../src/groupchat_control.py:1854
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Apisańnie: %s"
 
-#: ../src/groupchat_control.py:1840
+#: ../src/groupchat_control.py:1855
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1842
+#: ../src/groupchat_control.py:1857
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2028
+#: ../src/groupchat_control.py:2046
 #, python-format
 msgid "Kicking %s"
 msgstr "Vypichvajecca %s"
 
-#: ../src/groupchat_control.py:2029 ../src/groupchat_control.py:2356
+#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
 msgid "You may specify a reason below:"
 msgstr "Možaš akreślić pryčynu nižej:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2355
+#: ../src/groupchat_control.py:2373
 #, python-format
 msgid "Banning %s"
 msgstr "Blakavańnie %s"
@@ -8992,54 +9257,63 @@ msgid "Details"
 msgstr "Padrabiaznaści"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
+#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Pamyłka: niemahčyma adčytać %s"
 
-#: ../src/gtkgui_helpers.py:400
+#: ../src/gtkgui_helpers.py:404
 msgid "Error reading file:"
 msgstr "Pamyłka adčytańnia fajłu:"
 
-#: ../src/gtkgui_helpers.py:403
+#: ../src/gtkgui_helpers.py:407
 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:444
+#: ../src/gtkgui_helpers.py:448
 #, 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:818
+#: ../src/gtkgui_helpers.py:822
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim nie akreśleny jak zmoŭčany klijent Jabber"
 
-#: ../src/gtkgui_helpers.py:819
+#: ../src/gtkgui_helpers.py:823
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Chočaš zrabić Gajim zmoŭčanym klijentam Jabber?"
 
-#: ../src/gtkgui_helpers.py:820
+#: ../src/gtkgui_helpers.py:824
 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:887
+#: ../src/gtkgui_helpers.py:891
 msgid "Extension not supported"
 msgstr "Pašyreńnie nie padtrymvajecca"
 
-#: ../src/gtkgui_helpers.py:888
+#: ../src/gtkgui_helpers.py:892
 #, 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:924
+#: ../src/gtkgui_helpers.py:928
 msgid "Save Image as..."
 msgstr "Zapišy vyjavu jak..."
 
-#: ../src/gui_interface.py:140
+#. we are banned
+#. group chat does not exist
+#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
+#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
+#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
+#: ../src/gui_interface.py:348
+msgid "Unable to join group chat"
+msgstr "Niemahčyma dałučycca da pakoju"
+
+#: ../src/gui_interface.py:138
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9049,148 +9323,177 @@ msgstr ""
 "Hetaja mianuška vykarystoŭvajecca ci zarehistravanaja na inšuju asobu.\n"
 "Kali łaska, vyznač inšuju mianušku nižej:"
 
-#: ../src/gui_interface.py:143
+#: ../src/gui_interface.py:141
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:159
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Prymaješ hety zapyt?"
 
-#: ../src/gui_interface.py:161
+#: ../src/gui_interface.py:160
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Prymaješ hety zapyt?"
 
-#: ../src/gui_interface.py:164
+#: ../src/gui_interface.py:163
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "AÅ­taryzacyja HTTP (%s) dla %s (id: %s)"
 
-#: ../src/gui_interface.py:213 ../src/notify.py:493
+#: ../src/gui_interface.py:209 ../src/notify.py:493
 msgid "Connection Failed"
 msgstr "Niemahvyma dałučycca"
 
-#: ../src/gui_interface.py:606 ../src/gui_interface.py:610
+#: ../src/gui_interface.py:312
+#, 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/gui_interface.py:324
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/gui_interface.py:333
+#, fuzzy, python-format
+msgid "You are banned from group chat %s."
+msgstr "Ty zablakavany Å­ hetym pakoji."
+
+#: ../src/gui_interface.py:338
+#, fuzzy, python-format
+msgid "Group chat %s does not exist."
+msgstr "Takoha pakoju niama."
+
+#: ../src/gui_interface.py:341
+msgid "Group chat creation is restricted."
+msgstr "Stvareńnie pakojaŭ abmiežavanaje."
+
+#: ../src/gui_interface.py:344
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Treba karystacca zarehistravanaj na siabie mianuškaj."
+
+#: ../src/gui_interface.py:349
+#, fuzzy, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Ciabie niama ŭ śpisie ŭdzielnikaŭ."
+
+#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:621 ../src/gui_interface.py:636
+#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "pamyłka dasyłańnia %s ( %s )"
 
-#: ../src/gui_interface.py:663 ../src/notify.py:495
+#: ../src/gui_interface.py:540 ../src/notify.py:495
 #, fuzzy
 msgid "Subscription request"
 msgstr "Zapyt aÅ­taryzacyi"
 
-#: ../src/gui_interface.py:688
+#: ../src/gui_interface.py:565
 msgid "Authorization accepted"
 msgstr "AÅ­taryzacyja pryniataja"
 
-#: ../src/gui_interface.py:689
+#: ../src/gui_interface.py:566
 #, 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/gui_interface.py:702
+#: ../src/gui_interface.py:579
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kantakt \"%s\" anulavaÅ­ tvaju aÅ­taryzacyju"
 
-#: ../src/gui_interface.py:703
+#: ../src/gui_interface.py:580
 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/gui_interface.py:727 ../src/notify.py:497
+#: ../src/gui_interface.py:604 ../src/notify.py:497
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Anuluj aÅ­taryzacyju"
 
-#: ../src/gui_interface.py:754
+#: ../src/gui_interface.py:631
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Niemahčyma złučycca z \"%s\""
 
-#: ../src/gui_interface.py:1015
+#: ../src/gui_interface.py:859
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1083
+#: ../src/gui_interface.py:926
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gui_interface.py:1085
+#: ../src/gui_interface.py:928
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gui_interface.py:1087
+#: ../src/gui_interface.py:930
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:1091
+#: ../src/gui_interface.py:934
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1093
+#: ../src/gui_interface.py:936
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1095
+#: ../src/gui_interface.py:938
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1098
+#: ../src/gui_interface.py:941
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1101
+#: ../src/gui_interface.py:944
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1133
-#, 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/gui_interface.py:1180
+#: ../src/gui_interface.py:985
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gui_interface.py:1182 ../src/gui_interface.py:1189
+#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Dałučany biez kluča OpenPGP."
 
-#: ../src/gui_interface.py:1184
+#: ../src/gui_interface.py:989
 msgid "Your passphrase is incorrect"
 msgstr "Parol niapravilny"
 
-#: ../src/gui_interface.py:1188
+#: ../src/gui_interface.py:993
 #, fuzzy
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Parol niapravilny"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid "GPG key not trusted"
 msgstr ""
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
 msgstr ""
 
-#: ../src/gui_interface.py:1226
+#: ../src/gui_interface.py:1031
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not                 correctly started "
@@ -9199,12 +9502,12 @@ msgstr ""
 "Kiraŭnik parolaŭ GNOME instalavany, ale niapravilna vykonvajecca (mahčyma, "
 "źmiennaja asiarodździa niapravilna akreślenaja)"
 
-#: ../src/gui_interface.py:1330
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Novaja pošta ŭ skryncy %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1332
+#: ../src/gui_interface.py:1133
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -9212,7 +9515,7 @@ msgstr[0] "%d novy list"
 msgstr[1] "%d novyja listy"
 msgstr[2] "%d novych listoÅ­"
 
-#: ../src/gui_interface.py:1345
+#: ../src/gui_interface.py:1146
 #, python-format
 msgid ""
 "\n"
@@ -9222,103 +9525,103 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1418
+#: ../src/gui_interface.py:1215
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s choča dasłać tabie fajł."
 
-#: ../src/gui_interface.py:1455 ../src/roster_window.py:1856
+#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Vydalaje kantakt sa śpisu"
 
-#: ../src/gui_interface.py:1458 ../src/roster_window.py:1858
+#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
 #, fuzzy
 msgid "Error opening file"
 msgstr "Pamyłka adčytańnia fajłu:"
 
-#: ../src/gui_interface.py:1490
+#: ../src/gui_interface.py:1287
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Atrymany fajł %(filename)s ad %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1494
+#: ../src/gui_interface.py:1291
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Pieradača fajłu %(filename)s ad %(name)s spyniena."
 
-#: ../src/gui_interface.py:1507
+#: ../src/gui_interface.py:1304
 #, 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/gui_interface.py:1511
+#: ../src/gui_interface.py:1308
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Pieradača fajłu %(filename)s da %(name)s spynienaja."
 
-#: ../src/gui_interface.py:1623
+#: ../src/gui_interface.py:1426
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gui_interface.py:1630
+#: ../src/gui_interface.py:1433
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Dla kožnaha _paviedamleńnia"
 
-#: ../src/gui_interface.py:1702
+#: ../src/gui_interface.py:1505
 msgid "Username Conflict"
 msgstr "Kanflikt imionaÅ­ karystalnikaÅ­"
 
-#: ../src/gui_interface.py:1703
+#: ../src/gui_interface.py:1506
 msgid "Please type a new username for your local account"
 msgstr "Kali łaska, akreśli novaje imia karystalnika dla lakalnaha kontu"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1519
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gui_interface.py:1729
+#: ../src/gui_interface.py:1532
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gui_interface.py:1740
+#: ../src/gui_interface.py:1543
 msgid "Error."
 msgstr ""
 
-#: ../src/gui_interface.py:1768
+#: ../src/gui_interface.py:1556
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Kanflikt imionaÅ­ karystalnikaÅ­"
 
-#: ../src/gui_interface.py:1769
+#: ../src/gui_interface.py:1557
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1816
+#: ../src/gui_interface.py:1604
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s choča dasłać tabie fajł."
 
-#: ../src/gui_interface.py:1819
+#: ../src/gui_interface.py:1607
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Zapyt na pieradaču fajłu"
 
-#: ../src/gui_interface.py:1927
+#: ../src/gui_interface.py:1716
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1928
+#: ../src/gui_interface.py:1717
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9326,15 +9629,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1936
+#: ../src/gui_interface.py:1725
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1956
+#: ../src/gui_interface.py:1745
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gui_interface.py:1957
+#: ../src/gui_interface.py:1746
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9345,13 +9648,13 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gui_interface.py:1987 ../src/gui_interface.py:2024
-#: ../src/gui_interface.py:2060
+#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
+#: ../src/gui_interface.py:1849
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Złučeńnie"
 
-#: ../src/gui_interface.py:1988
+#: ../src/gui_interface.py:1777
 #, fuzzy
 msgid ""
 "You are about to connect to the server with an insecure connection. This "
@@ -9359,18 +9662,18 @@ msgid ""
 "want to do that?"
 msgstr "Stvarajecca metakantakt. Ty sapraŭdy chočaš praciahnuć?"
 
-#: ../src/gui_interface.py:1991 ../src/gui_interface.py:2028
-#: ../src/gui_interface.py:2063
+#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
+#: ../src/gui_interface.py:1852
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gui_interface.py:2025
+#: ../src/gui_interface.py:1814
 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/gui_interface.py:2061
+#: ../src/gui_interface.py:1850
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9378,58 +9681,58 @@ msgid ""
 msgstr "Stvarajecca metakantakt. Ty sapraŭdy chočaš praciahnuć?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2624 ../src/gui_interface.py:2647
+#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Šyfravańnie adklučanaje"
 
-#: ../src/gui_interface.py:2625
+#: ../src/gui_interface.py:2423
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2648
+#: ../src/gui_interface.py:2446
 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/gui_interface.py:2679 ../src/roster_window.py:3560
+#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
 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/gui_interface.py:3058
+#: ../src/gui_interface.py:2871
 msgid "Could not save your settings and preferences"
 msgstr "Niemahčyma zapisać tvaje nałady i opcyi"
 
-#: ../src/gui_interface.py:3592
+#: ../src/gui_interface.py:3411
 msgid "Passphrase Required"
 msgstr "Musiš vyznačyć parol"
 
-#: ../src/gui_interface.py:3593
+#: ../src/gui_interface.py:3412
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Vyznač parol GPG dla kontu %s."
 
-#: ../src/gui_interface.py:3607
+#: ../src/gui_interface.py:3426
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gui_interface.py:3608
+#: ../src/gui_interface.py:3427
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Ty dałučyśsia da %s biaz OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3617
+#: ../src/gui_interface.py:3436
 msgid "Wrong Passphrase"
 msgstr "Niapravilny parol"
 
-#: ../src/gui_interface.py:3618
+#: ../src/gui_interface.py:3437
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Kali łaska, vyznač parol GPG znoŭ albo naciśni knopku \"Anuluj\"."
 
@@ -9468,6 +9771,11 @@ msgstr "Mianuška"
 msgid "Message"
 msgstr "Paviedamleńnie"
 
+#. holds subject
+#: ../src/history_manager.py:188 ../src/history_manager.py:219
+msgid "Subject"
+msgstr "Tema"
+
 #: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -9568,19 +9876,19 @@ msgstr "Niama złučeńnia z serveram"
 msgid "Do you really want to close them all?"
 msgstr "Sapraŭdy chočaš vydalić zaznačanaje paviedamleńnie?"
 
-#: ../src/message_window.py:484
+#: ../src/message_window.py:485
 msgid "Chats"
 msgstr "Razmovy"
 
-#: ../src/message_window.py:486
+#: ../src/message_window.py:487
 msgid "Group Chats"
 msgstr "Pakoji"
 
-#: ../src/message_window.py:488
+#: ../src/message_window.py:489
 msgid "Private Chats"
 msgstr "Pryvatnyja razmovy"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:495
 msgid "Messages"
 msgstr "Paviedamleńni"
 
@@ -9637,110 +9945,110 @@ msgstr "Novaje paviedamleńnie ad %(nickname)s"
 msgid "Ignore"
 msgstr "dziaviataja"
 
-#: ../src/profile_window.py:57
+#: ../src/profile_window.py:58
 msgid "Retrieving profile..."
 msgstr "Atrymańnie profilu..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2935
+#: ../src/profile_window.py:111 ../src/roster_window.py:3001
 #, fuzzy
 msgid "File is empty"
 msgstr "Ściežka da fajłu"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2938
+#: ../src/profile_window.py:114 ../src/roster_window.py:3004
 #, fuzzy
 msgid "File does not exist"
 msgstr "Takoha pakoju niama."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2940 ../src/roster_window.py:2951
+#: ../src/profile_window.py:128 ../src/profile_window.py:144
+#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
 msgid "Could not load image"
 msgstr "Niemahčyma adčytać vyjavu"
 
-#: ../src/profile_window.py:214
+#: ../src/profile_window.py:215
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Źviestki ab kantakcie"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:216
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Farmat: HHHH-MM-DD"
 
-#: ../src/profile_window.py:269
+#: ../src/profile_window.py:270
 msgid "Information received"
 msgstr "Źviestki atrymanyja"
 
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:341
 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:353
+#: ../src/profile_window.py:354
 msgid "Sending profile..."
 msgstr "Dasyłańnie profilu..."
 
-#: ../src/profile_window.py:368
+#: ../src/profile_window.py:369
 msgid "Information NOT published"
 msgstr "Źviestki NIE apublikavanyja"
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:376
 msgid "vCard publication failed"
 msgstr "Pamyłka publikacyi vCard"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:377
 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:256 ../src/roster_window.py:1012
+#: ../src/roster_window.py:262 ../src/roster_window.py:1026
 msgid "Merged accounts"
 msgstr "Abjadnanyja konty"
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1942
 msgid "Authorization has been sent"
 msgstr "Aŭtaryzacyja dasłanaja"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1943
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ciapier \"%s\" budzie viedać tvoj status."
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1966
 msgid "Subscription request has been sent"
 msgstr "Zapyt aŭtaryzacyi dasłany"
 
-#: ../src/roster_window.py:1944
+#: ../src/roster_window.py:1967
 #, 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:1958
+#: ../src/roster_window.py:1981
 msgid "Authorization has been removed"
 msgstr "AÅ­taryzacyja anulavanaja"
 
-#: ../src/roster_window.py:1959
+#: ../src/roster_window.py:1982
 #, 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:1986
+#: ../src/roster_window.py:2009
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:1987
+#: ../src/roster_window.py:2010
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Ty dałučyśsia da %s biaz OpenPGP."
 
-#: ../src/roster_window.py:2199 ../src/roster_window.py:3496
+#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
 msgid "You are participating in one or more group chats"
 msgstr "Ty znachodziśsia ŭ adnym ci niekalkich pakojach"
 
-#: ../src/roster_window.py:2200 ../src/roster_window.py:3497
+#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9748,39 +10056,39 @@ 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:2226
+#: ../src/roster_window.py:2249
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2288
+#: ../src/roster_window.py:2311
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2289
+#: ../src/roster_window.py:2312
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Ty sapraŭdy chočaš pakinuć pakoj \"%s\"?"
 
-#: ../src/roster_window.py:2290
+#: ../src/roster_window.py:2313
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2373
+#: ../src/roster_window.py:2396
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Anuluj pieradaču fajła"
 
-#: ../src/roster_window.py:2374
+#: ../src/roster_window.py:2397
 msgid ""
-"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2405 ../src/roster_window.py:2653
+#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
 msgid "You have unread messages"
 msgstr "Jość niečytanyja paviedamleńni"
 
-#: ../src/roster_window.py:2406
+#: ../src/roster_window.py:2429
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9789,16 +10097,16 @@ msgstr ""
 "Paviedamleńni možna budzie pračytać paźniej, kali ŭklučana viadzieńnie "
 "žurnałaŭ razmoŭ."
 
-#: ../src/roster_window.py:2654
+#: ../src/roster_window.py:2720
 msgid "You must read them before removing this transport."
 msgstr "Musiš pračytać ich pierad vydaleńniem hetaha transpartu."
 
-#: ../src/roster_window.py:2657
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transpart \"%s\" budzie vydaleny"
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2724
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9806,11 +10114,11 @@ msgstr ""
 "Ty bolš nia zmožaš kamunikavać z kantaktami, jakija karystajucca hetym "
 "transpartam."
 
-#: ../src/roster_window.py:2661
+#: ../src/roster_window.py:2727
 msgid "Transports will be removed"
 msgstr "Transparty buduć vydalenyja"
 
-#: ../src/roster_window.py:2666
+#: ../src/roster_window.py:2732
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9819,69 +10127,69 @@ msgstr ""
 "Ty bolš nia zmožaš kamunikavać z kantaktami, jakija karystajucca hetymi "
 "transpartami:%s"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2800
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Stvarajecca metakantakt. Ty sapraŭdy chočaš praciahnuć?"
 
-#: ../src/roster_window.py:2736
+#: ../src/roster_window.py:2802
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2827
+#: ../src/roster_window.py:2893
 msgid "Rename Contact"
 msgstr "Źmiani nazvu kantaktu"
 
-#: ../src/roster_window.py:2828
+#: ../src/roster_window.py:2894
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Vyznač novuju mianušku dla kantaktu %s."
 
-#: ../src/roster_window.py:2835
+#: ../src/roster_window.py:2901
 msgid "Rename Group"
 msgstr "Źmiani nazvu hrupy"
 
-#: ../src/roster_window.py:2836
+#: ../src/roster_window.py:2902
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Vyznač novuju nazvu dla hrupy %s"
 
-#: ../src/roster_window.py:2881
+#: ../src/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Vydal hrupu"
 
-#: ../src/roster_window.py:2882
+#: ../src/roster_window.py:2948
 #, 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:2883
+#: ../src/roster_window.py:2949
 #, 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:2922
+#: ../src/roster_window.py:2988
 msgid "Assign OpenPGP Key"
 msgstr "Pryznač kluč OpenPGP"
 
-#: ../src/roster_window.py:2923
+#: ../src/roster_window.py:2989
 msgid "Select a key to apply to the contact"
 msgstr "Abiary kluč dla hetaha kantaktu"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3372
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kantakt \"%s\" budzie vydaleny z tvajho śpisu kantaktaŭ"
 
-#: ../src/roster_window.py:3308
+#: ../src/roster_window.py:3374
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3313
+#: ../src/roster_window.py:3379
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9890,12 +10198,12 @@ msgstr ""
 "jon zaŭsiody budzie bačyć ciabie adłučanym."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3319
+#: ../src/roster_window.py:3385
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Što chočaš zrabić?"
 
-#: ../src/roster_window.py:3323
+#: ../src/roster_window.py:3389
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9903,16 +10211,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:3326
+#: ../src/roster_window.py:3392
 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:3330
+#: ../src/roster_window.py:3396
 msgid "Contacts will be removed from your roster"
 msgstr "Kantakty buduć vydalenyja z tvajho śpisu kantaktaŭ"
 
-#: ../src/roster_window.py:3335
+#: ../src/roster_window.py:3401
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9922,32 +10230,32 @@ msgstr ""
 "ty taksama anuluješ ichnyja aŭtaryzacyi. U vyniku jany zaŭsiody buduć bačyć "
 "ciabie adłučanym."
 
-#: ../src/roster_window.py:3393
+#: ../src/roster_window.py:3459
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want  to continue?"
 msgstr "Stvarajecca metakantakt. Ty sapraŭdy chočaš praciahnuć?"
 
-#: ../src/roster_window.py:3395
+#: ../src/roster_window.py:3461
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he or she will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3414
+#: ../src/roster_window.py:3480
 msgid "No account available"
 msgstr "Konty niedastupnyja"
 
-#: ../src/roster_window.py:3415
+#: ../src/roster_window.py:3481
 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:4023
+#: ../src/roster_window.py:4095
 msgid "Metacontacts storage not supported by your server"
 msgstr "Tvoj server nie padtrymvaje zachoŭvańnia metakantaktaŭ"
 
-#: ../src/roster_window.py:4025
+#: ../src/roster_window.py:4097
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9956,12 +10264,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:4117
+#: ../src/roster_window.py:4189
 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:4119
+#: ../src/roster_window.py:4191
 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 "
@@ -9971,12 +10279,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:4234
+#: ../src/roster_window.py:4306
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Niapravilny fajł"
 
-#: ../src/roster_window.py:4246
+#: ../src/roster_window.py:4318
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9984,12 +10292,12 @@ 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:4361
+#: ../src/roster_window.py:4433
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Dašli %s"
 
-#: ../src/roster_window.py:4367
+#: ../src/roster_window.py:4439
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Zrabi z %s i %s metakantakt"
@@ -9999,151 +10307,151 @@ msgstr "Zrabi z %s i %s metakantakt"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4816 ../src/roster_window.py:4889
-#: ../src/roster_window.py:4898 ../src/statusicon.py:246
-#: ../src/statusicon.py:293 ../src/statusicon.py:299
+#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
+#: ../src/roster_window.py:4970 ../src/statusicon.py:263
+#: ../src/statusicon.py:310 ../src/statusicon.py:316
 #, python-format
 msgid "using account %s"
 msgstr "praz kont %s"
 
 #. add
-#: ../src/roster_window.py:4905
+#: ../src/roster_window.py:4977
 #, python-format
 msgid "to %s account"
 msgstr "da kontu %s"
 
 #. disco
-#: ../src/roster_window.py:4910
+#: ../src/roster_window.py:4982
 #, python-format
 msgid "using %s account"
 msgstr "praz kont %s"
 
-#: ../src/roster_window.py:4948 ../src/statusicon.py:309
+#: ../src/roster_window.py:5020 ../src/statusicon.py:326
 msgid "_Manage Bookmarks..."
 msgstr "_Kiruj zakładkami..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4968
+#: ../src/roster_window.py:5040
 #, python-format
 msgid "of account %s"
 msgstr "kontu %s"
 
-#: ../src/roster_window.py:5009
+#: ../src/roster_window.py:5081
 #, python-format
 msgid "for account %s"
 msgstr "dla kontu %s"
 
-#: ../src/roster_window.py:5069 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
 msgid "_Change Status Message"
 msgstr "Ź_miani paviedamleńnie statusu"
 
-#: ../src/roster_window.py:5102
+#: ../src/roster_window.py:5174
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Абнавіць"
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5176
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Абнавіць"
 
-#: ../src/roster_window.py:5107
+#: ../src/roster_window.py:5179
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Å ukaj servisy..."
 
-#: ../src/roster_window.py:5252
+#: ../src/roster_window.py:5324
 msgid "_Maximize All"
 msgstr ""
 
-#: ../src/roster_window.py:5262 ../src/roster_window.py:5436
+#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
 msgid "Send Group M_essage"
 msgstr "_Dašli hrupavoje paviedamleńnie"
 
-#: ../src/roster_window.py:5270
+#: ../src/roster_window.py:5342
 msgid "To all users"
 msgstr "Usim karystalnikam"
 
-#: ../src/roster_window.py:5274
+#: ../src/roster_window.py:5346
 msgid "To all online users"
 msgstr "Usim dałučanym karystalnikam"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5456
+#: ../src/roster_window.py:5528
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Źmiani nazvu kantaktu"
 
 #. Edit Groups
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5537
 msgid "Edit _Groups"
 msgstr "Źmiani _hrupy"
 
 #. Send single message
-#: ../src/roster_window.py:5520
+#: ../src/roster_window.py:5592
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Dašli asobnaje paviedamleńnie"
 
 #. Execute Command
-#: ../src/roster_window.py:5567
+#: ../src/roster_window.py:5639
 msgid "Execute Command..."
 msgstr "Vykanaj zahad..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5577
+#: ../src/roster_window.py:5649
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transparty"
 
 #. Modify Transport
-#: ../src/roster_window.py:5586
+#: ../src/roster_window.py:5658
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Pakažy _transparty"
 
 #. Rename
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5668
 msgid "_Rename"
 msgstr "Źmiani _nazvu"
 
-#: ../src/roster_window.py:5656
+#: ../src/roster_window.py:5728
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5665
+#: ../src/roster_window.py:5737
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Kantakt adłučyŭsia"
 
-#: ../src/roster_window.py:5672
+#: ../src/roster_window.py:5744
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Kantakt adłučyŭsia"
 
 #. History manager
-#: ../src/roster_window.py:5754
+#: ../src/roster_window.py:5833
 msgid "History Manager"
 msgstr "Kiraŭnik žurnałaŭ"
 
-#: ../src/roster_window.py:5765
+#: ../src/roster_window.py:5844
 msgid "_Join New Group Chat"
 msgstr "_Dałučysia da pakoju"
 
-#: ../src/roster_window.py:5938
+#: ../src/roster_window.py:6019
 msgid "Change Status Message..."
 msgstr "Źmiani paviedamleńnie statusu..."
 
-#: ../src/search_window.py:94
+#: ../src/search_window.py:105
 msgid "Waiting for results"
 msgstr ""
 
-#: ../src/search_window.py:132 ../src/search_window.py:210
+#: ../src/search_window.py:143 ../src/search_window.py:220
 msgid "Error in received dataform"
 msgstr ""
 
 #. No result
-#: ../src/search_window.py:166 ../src/search_window.py:202
+#: ../src/search_window.py:177 ../src/search_window.py:212
 msgid "No result"
 msgstr ""
 
@@ -10156,21 +10464,22 @@ msgstr ""
 msgid "Subject: %s"
 msgstr "Tema: %s"
 
-#: ../src/session.py:433 ../src/session.py:468
+#: ../src/session.py:447 ../src/session.py:491
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:435
+#: ../src/session.py:448
 #, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
+"The remote client wants '\n"
+"                            'to negotiate an session with these features:\n"
 "\n"
 "%s\n"
 "\n"
 "Are these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:469
+#: ../src/session.py:492
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10180,16 +10489,16 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/statusicon.py:210
+#: ../src/statusicon.py:227
 msgid "_Change Status Message..."
 msgstr "Ź_miani paviedamleńnie statusu..."
 
-#: ../src/statusicon.py:322
+#: ../src/statusicon.py:339
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Niama ŭ śpisie kantaktaŭ"
 
-#: ../src/statusicon.py:333
+#: ../src/statusicon.py:350
 msgid "Hide this menu"
 msgstr "Schavaj hetaje menu"
 
@@ -10330,72 +10639,110 @@ msgstr ""
 "Hety servis nia zmoh adkazać na zapyt padrabiaznych źviestak.\n"
 "Servis sastareły albo złamany"
 
-#: ../src/vcard.py:251
+#: ../src/vcard.py:265
 msgid "?Client:Unknown"
 msgstr "?Klijent:Nieviadomy"
 
-#: ../src/vcard.py:253
+#: ../src/vcard.py:267
 msgid "?OS:Unknown"
 msgstr "?AS:Nieviadomaja"
 
-#: ../src/vcard.py:274
+#: ../src/vcard.py:288
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "?Klijent:Nieviadomy"
 
-#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
+#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
 #, python-format
 msgid "since %s"
 msgstr "ad %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:345
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:349
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Aplikacyi</b>"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:357
 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:345
+#: ../src/vcard.py:359
 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:347
+#: ../src/vcard.py:361
 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:349
+#: ../src/vcard.py:363
 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:356
+#: ../src/vcard.py:370
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Ty čakaješ adkazu kantaktu na zapyt aŭtaryzacyi"
 
-#: ../src/vcard.py:358
+#: ../src/vcard.py:372
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
+#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
 msgid " resource with priority "
 msgstr " krynica z pryjarytetam "
 
-#~ msgid "_Available"
-#~ msgstr "_Dastupny"
+#~ msgid "_Disable showing event in systray"
+#~ msgstr "_Nie pakazvać padziejaŭ u poli nahadvańnia"
+
+#~ msgid "_Show event in systray"
+#~ msgstr "_Pakazvaj padzieju ŭ poli nahadvańnia"
+
+#, fuzzy
+#~ msgid "Autodetect on every Gajim startup"
+#~ msgstr "_Zlučajsia pry starcie Gajim"
+
+#, fuzzy
+#~ msgid "Show systray:"
+#~ msgstr "_Pakazvaj padzieju ŭ poli nahadvańnia"
+
+#~ msgid "Nickname not allowed: %s"
+#~ msgstr "Mianuška nie dazvolenaja: %s"
+
+#, fuzzy
+#~ msgid "Room has been destroyed"
+#~ msgstr "AÅ­taryzacyja anulavanaja"
+
+#~ msgid "I would like to add you to my roster."
+#~ msgstr "Ja chaču dadać ciabie ŭ svoj śpis kantaktaŭ."
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "padpisany na %s"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "zapyt adpiski ad %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "ciapier adpisany ad %s"
+
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "JID %s nie adpaviadaje standartu RFC. Jon nia budzie dadany da tvajho "
+#~ "śpisu kantaktaŭ. Vydal jaho z dapamohaj pryłady kiravańnia śpisam "
+#~ "kantaktaŭ, naprykład, http://jru.jabberstudio.org/"
 
 #~ msgid "Account Modification"
 #~ msgstr "Madyfikacyja kontu"
@@ -10488,34 +10835,6 @@ msgstr " krynica z pryjarytetam "
 #~ msgid "gtk-delete"
 #~ msgstr "Vydal"
 
-#, fuzzy
-#~ msgid "Add this contact to roster (Ctrl+D)"
-#~ msgstr "Dadaje kantakt u śpis kantaktaŭ"
-
-#, fuzzy
-#~ msgid "Bookmark this room (Ctrl+B)"
-#~ msgstr "_Stvary zakładku dla hetaja pakoju"
-
-#, fuzzy
-#~ msgid "Change your nickname (Ctrl+N)"
-#~ msgstr "Źmiani _mianušku"
-
-#, fuzzy
-#~ msgid "Invite contacts to the conversation (Ctrl+G)"
-#~ msgstr "sočyć za razmovaj"
-
-#, fuzzy
-#~ msgid "Show a list of emoticons (Alt+M)"
-#~ msgstr "Klikni, kab ustavić smajlik (Alt+M)"
-
-#, fuzzy
-#~ msgid "Show a list of formattings"
-#~ msgstr "Klikni, kab ustavić smajlik (Alt+M)"
-
-#, fuzzy
-#~ msgid "Show a menu of advanced functions (Alt+D)"
-#~ msgstr "Klikni, kab ustavić smajlik (Alt+M)"
-
 #~ msgid ""
 #~ "All chat states\n"
 #~ "Composing only\n"
@@ -10553,9 +10872,6 @@ msgstr " krynica z pryjarytetam "
 #~ msgid "gtk-cancel"
 #~ msgstr "Vydal"
 
-#~ msgid "_Preferences"
-#~ msgstr "_Nałady"
-
 #~ msgid "_Quit"
 #~ msgstr "_Skonč pracu"
 
@@ -10974,9 +11290,6 @@ msgstr " krynica z pryjarytetam "
 #~ msgid "Treat all incoming messages as:"
 #~ msgstr "Traktuj usie ŭvachodnyja paviedamleńni jak:"
 
-#~ msgid "Use t_rayicon (aka. notification area icon)"
-#~ msgstr "Pakazvaj _ikonu ŭ poli nahadvańnia"
-
 #~ msgid ""
 #~ "When a new event (message, file transfer request etc..) is received, the "
 #~ "following methods may be used to inform you about it. Please note that "
@@ -11097,13 +11410,6 @@ msgstr " krynica z pryjarytetam "
 #~ msgid "Session Management support not available (missing gnome.ui module)"
 #~ msgstr "Nie staje padtrymki kiravańnia sesijami (nie staje modulu gnome.ui)"
 
-#~ msgid ""
-#~ "Usage: %s %s %s \n"
-#~ "\t %s"
-#~ msgstr ""
-#~ "Užyvańnie: %s %s %s \n"
-#~ "\t %s"
-
 #~ msgid "%s does not appear to be a valid JID"
 #~ msgstr "%s nia jość pravilnym JIDam"
 
diff --git a/po/bg.po b/po/bg.po
index 9582a18a83179ccfee68368f801cdee220ee0b96..4d7a1b5136765cc841c5fe75c7070b2e8005c9d9 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -4,11 +4,15 @@
 #
 #
 # Yavor Doganov <yavor@gnu.org>, 2005, 2006, 2007, 2008, 2009.
+#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 11:28+0200\n"
+"POT-Creation-Date: 2010-10-01 20:39+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"
@@ -26,7 +30,7 @@ msgstr "_Влизане в стая…"
 msgid "_Add Contact..."
 msgstr "_Добавяне на контакт…"
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:17
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
 msgid "_Discover Services"
 msgstr "_Откриване на услуги"
 
@@ -46,7 +50,7 @@ msgstr "_Отваряне на пощенската кутия на Gmail"
 msgid "_Personal Events"
 msgstr "_Лични събития"
 
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:23
+#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
 msgid "_Start Chat..."
 msgstr "_Започване на разговор…"
 
@@ -78,10 +82,6 @@ msgid "<b>Please select a server</b>"
 msgstr "<b>Изберете сървър</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid "@"
-msgstr ""
-
-#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
@@ -89,65 +89,65 @@ msgstr ""
 "Добавяне на този сертификат към списъка с доверени сертификати.\n"
 "Отпечатък тип SHA1 на сертификата:\n"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:10
 #, fuzzy
 msgid "Anon_ymous authentication"
 msgstr "Използване на удостоверяване"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Connect when I press Finish"
 msgstr "Свързване при натискане на бутона „Приключване“"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Помощник за създаване на акаунт"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "I already have an account I want to _use"
 msgstr "_Вече имам регистриран акаунт, който искам да използвам"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I want to _register for a new account"
 msgstr "_Искам да регистрирам нов акаунт"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:16
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 #: ../data/gui/accounts_window.ui.h:28
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Ако тази опция е избрана, ще се запомни паролата за този акаунт."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:17
+#: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Управление на…"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:18
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
 #: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2263 ../src/config.py:2342
-#: ../src/config.py:2355 ../src/config.py:3596 ../src/config.py:3671
-#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513
-#: ../src/dialogs.py:526 ../src/roster_window.py:2890
-#: ../src/roster_window.py:2896 ../src/roster_window.py:2901
+#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
+#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
+#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
+#: ../src/dialogs.py:527 ../src/roster_window.py:2956
+#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
 msgid "None"
 msgstr "Няма"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:19
+#: ../data/gui/account_creation_wizard_window.ui.h:18
 msgid "Prox_y:"
 msgstr "_Сървър-посредник:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #: ../data/gui/accounts_window.ui.h:48
 msgid "Save pass_word"
 msgstr "Запазване на паро_ла"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:21
+#: ../data/gui/account_creation_wizard_window.ui.h:20
 msgid "Set my profile when I connect"
 msgstr "Настройване на профила при свързване"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:22
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Use custom hostname/port"
 msgstr "Използване на нестандартен хост/порт"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:23
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -155,34 +155,34 @@ msgstr ""
 "Трябва да имате акаунт, за да се свържете с\n"
 "мрежата на Джабър."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-#: ../data/gui/roster_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:16
 msgid "_Advanced"
 msgstr "На_преднали"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:25
 msgid "_Finish"
 msgstr "_Приключване"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:27
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Hostname:"
 msgstr "_Хост:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #: ../data/gui/accounts_window.ui.h:62
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:28
 #: ../data/gui/accounts_window.ui.h:64
 msgid "_Password:"
 msgstr "_Парола:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:29
 msgid "_Port:"
 msgstr "По_рт:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:31
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Server:"
 msgstr "С_ървър:"
 
@@ -294,17 +294,17 @@ msgstr "Собствено име:"
 #. No configured account
 #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
 #: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592
-#: ../src/notify.py:608
+#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
+#: ../src/notify.py:616
 msgid "Gajim"
 msgstr "Gajim"
 
 #. FIXME: Ugly workaround.
 #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
 #. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:61
-#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121
-#: ../src/roster_window.py:2832 ../src/roster_window.py:5379
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
+#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
 msgid "General"
 msgstr "Общи"
 
@@ -362,7 +362,7 @@ msgstr "Вашите лични данни, както са запазени н
 
 #: ../data/gui/accounts_window.ui.h:35
 #: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:830
+#: ../src/dialogs.py:831
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -376,7 +376,7 @@ msgid "Mer_ge accounts"
 msgstr "_Смесване на акаунти"
 
 #: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2356
+#: ../src/config.py:2358
 msgid "No key selected"
 msgstr "Няма избран ключ"
 
@@ -403,7 +403,7 @@ msgid "Priority will change automatically according to your status."
 msgstr "Приоритетът ще се сменя автоматично в зависимост от състоянието ви."
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5329
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
 msgid "Re_name"
 msgstr "Пре_именуване"
 
@@ -640,39 +640,44 @@ msgid "Deletes Message of the Day"
 msgstr "Изтрива съобщението за деня"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
+#, fuzzy
+msgid "Edit Archi_ving Preferences"
+msgstr "_Настройки"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Edit _Privacy Lists..."
 msgstr "_Филтри за уединение…"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sends a message to users currently connected to this server"
 msgstr ""
 "Изпраща съобщение на всички потребители, свързани със сървъра в момента"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Set MOTD..."
 msgstr "Настройване на MOTD…"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Настройване на съобщение за деня"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Show _XML Console"
 msgstr "Показване на _XML конзола"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "Update MOTD..."
 msgstr "Актуализиране на MOTD…"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "Актуализиране на съобщението за деня"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:11
 msgid "_Administrator"
 msgstr "_Администратор"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:11
+#: ../data/gui/advanced_menuitem_menu.ui.h:12
 msgid "_Send Server Message..."
 msgstr "_Изпращане на съобщение от сървъра…"
 
@@ -706,7 +711,7 @@ msgid "All statuses"
 msgstr "Всички състояния"
 
 #: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:233
+#: ../src/common/commands.py:106 ../src/common/helpers.py:239
 #: ../src/tooltips.py:193
 msgid "Away"
 msgstr "Отсъствам"
@@ -759,7 +764,7 @@ msgid "Have "
 msgstr "имам "
 
 #: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:249
 msgid "Invisible"
 msgstr "Невидим"
 
@@ -768,7 +773,7 @@ msgid "Launch a command"
 msgstr "Изпълнение на команда"
 
 #: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:216 ../src/tooltips.py:197
+#: ../src/common/helpers.py:222 ../src/tooltips.py:197
 msgid "Not Available"
 msgstr "Не съм на разположение"
 
@@ -813,12 +818,13 @@ msgid "_Disable existing sound for this event"
 msgstr "_Изключване на съществуващ звук за това събитие"
 
 #: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in roster"
+#, fuzzy
+msgid "_Disable showing event in notification area"
 msgstr "_Изключване на показване на събитието в списъка"
 
 #: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in systray"
-msgstr "_Изключване на показване на събитието в областта за уведомяване"
+msgid "_Disable showing event in roster"
+msgstr "_Изключване на показване на събитието в списъка"
 
 #: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
@@ -829,12 +835,13 @@ msgid "_Open chat window with user"
 msgstr "_Отваряне на прозорец за разговор с потребителя"
 
 #: ../data/gui/advanced_notifications_window.ui.h:35
-msgid "_Show event in roster"
+#, fuzzy
+msgid "_Show event in notification area"
 msgstr "Показване на събитието в спис_ъка"
 
 #: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in systray"
-msgstr "Показване на събитието в областта за _уведомяване"
+msgid "_Show event in roster"
+msgstr "Показване на събитието в спис_ъка"
 
 #: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
@@ -862,6 +869,45 @@ msgstr "Група"
 msgid "when I'm in"
 msgstr "когато съм"
 
+#: ../data/gui/archiving_preferences_window.ui.h:1
+msgid "<i>Method Auto</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "<i>Method Local</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:3
+msgid "<i>Method Manual</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:4
+#, fuzzy
+msgid "Auto"
+msgstr "Автоматично влизане"
+
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Concede"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "Forbid"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:7
+#, fuzzy
+msgid "No"
+msgstr "Няма"
+
+#: ../data/gui/archiving_preferences_window.ui.h:8
+#, fuzzy
+msgid "Prefer"
+msgstr "Настройки"
+
+#: ../data/gui/archiving_preferences_window.ui.h:9
+msgid "Yes"
+msgstr ""
+
 #: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Запис:"
@@ -888,8 +934,8 @@ msgstr "Блокирани контакти"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5348
-#: ../src/roster_window.py:5476 ../src/roster_window.py:5609
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
+#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
 msgid "_Unblock"
 msgstr "_Деблокиране"
 
@@ -977,7 +1023,7 @@ msgid "_Start Chat"
 msgstr "_Започване на разговор"
 
 #. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4184
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
 msgid "#"
 msgstr "â„–"
 
@@ -1025,13 +1071,51 @@ msgstr ""
 msgid "9"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:13
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Добавяне на контакт към списъка (Ctrl+D)"
+
 #: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Разглеждане на историята на разговорите (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:15
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Покана на контакти в разговора (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Списък с емотикони (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
+#, fuzzy
+msgid "Show a list of formattings"
+msgstr "Списък с емотикони (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Меню с функции за напреднали (Ctrl+A)"
+
+#: ../data/gui/chat_control.ui.h:19
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr "Показване на профила на контакта (Ctrl+I)"
+
+#: ../data/gui/chat_control.ui.h:20
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:21
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
 #: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Изпращане"
 
-#: ../data/gui/chat_control.ui.h:15 ../data/gui/groupchat_control.ui.h:3
+#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
 msgid "label"
 msgstr ""
 
@@ -1082,8 +1166,8 @@ msgstr "Редактиране на _групи…"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5284
-#: ../src/roster_window.py:5444
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
+#: ../src/roster_window.py:5516
 msgid "In_vite to"
 msgstr "По_кана в"
 
@@ -1095,8 +1179,8 @@ msgstr "Покана на _контакти"
 msgid "Remo_ve"
 msgstr "П_ремахване"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5294
-#: ../src/roster_window.py:5533
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
+#: ../src/roster_window.py:5605
 msgid "Send Cus_tom Status"
 msgstr "Изпращане на _специфично състояние"
 
@@ -1129,8 +1213,8 @@ msgid "_Allow him/her to see my status"
 msgstr "_Позволение за виждане на състоянието ми"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5482 ../src/roster_window.py:5612
+#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
+#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
 msgid "_Block"
 msgstr "_Блокиране"
 
@@ -1140,8 +1224,8 @@ msgstr "За_брана за виждане на състоянието ми"
 
 #: ../data/gui/contact_context_menu.ui.h:20
 #: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:21
-#: ../src/roster_window.py:5683
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
+#: ../src/roster_window.py:5755
 msgid "_History"
 msgstr "Ист_ория"
 
@@ -1275,7 +1359,7 @@ msgstr "<b>Цветове на подпрозорците</b>"
 msgid "Account row"
 msgstr "Акаунт"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:925
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
 msgid "Bold"
 msgstr "Получер"
 
@@ -1313,7 +1397,7 @@ msgstr "Група"
 msgid "Inactive"
 msgstr "Бездеен"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:926
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
 msgid "Italic"
 msgstr "Курсив"
 
@@ -1361,7 +1445,7 @@ msgstr "Промяна на _темата…"
 msgid "Configure _Room..."
 msgstr "Настройки на _стаята…"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1782
+#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
 msgid "_Bookmark"
 msgstr "_Добавяне на стаята към отметките"
 
@@ -1421,19 +1505,31 @@ msgstr "_Изпращане на лично съобщение"
 msgid "_Voice"
 msgstr "_Глас"
 
+#: ../data/gui/groupchat_control.ui.h:1
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "_Добавяне на стаята към отметките (Ctrl+B)"
+
+#: ../data/gui/groupchat_control.ui.h:3
+msgid "Change the room's subject (Alt+T)"
+msgstr "Смяна на темата на стаята (Alt+T)"
+
+#: ../data/gui/groupchat_control.ui.h:4
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Смяна на псевдоним (Ctrl+N)"
+
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Създаване на ново съобщение"
 
-#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
-msgid "From"
-msgstr "От"
+#: ../data/gui/groups_post_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:2
+msgid "From:"
+msgstr "От:"
 
-#. holds subject
-#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
-#: ../src/history_manager.py:219
-msgid "Subject"
-msgstr "Тема"
+#: ../data/gui/groups_post_window.ui.h:3
+#: ../data/gui/single_message_window.ui.h:7
+msgid "Subject:"
+msgstr "Тема:"
 
 #: ../data/gui/history_manager.ui.h:1
 msgid ""
@@ -1451,8 +1547,8 @@ msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Добре дошли в мениджъра на историята на разговорите</b></big>"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3208
-#: ../src/dialogs.py:3305
+#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
+#: ../src/dialogs.py:3321
 msgid "Delete"
 msgstr "Изтриване"
 
@@ -1510,12 +1606,75 @@ msgstr "Търсене:"
 msgid "_Log conversation history"
 msgstr "_Запазване на разговорите"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
+msgid "approve"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:2
+msgid "body"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:3
+msgid "concede"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:4
+msgid "expire"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:5
+msgid "false"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:6
+msgid "forbid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:7
+#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+msgid "jid"
+msgstr "JID"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:8
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
+#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
+msgid "message"
+msgstr "съобщение"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
+msgid "oppose"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
+#, fuzzy
+msgid "otr"
+msgstr "Сгорещен"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:11
+msgid "prefer"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:12
+msgid "require"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:13
+msgid "save"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:14
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
 msgid "Bro_wse Rooms"
 msgstr "_Търсене"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2180
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
 msgid "Join Group Chat"
 msgstr "Влизане в стая"
 
@@ -1553,8 +1712,8 @@ msgstr "Сървър:"
 msgid "_Bookmark this room"
 msgstr "_Добавяне на стаята към отметките (Ctrl+B)"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1341
-#: ../src/disco.py:1786
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../src/disco.py:1804
 msgid "_Join"
 msgstr "_Влизане"
 
@@ -1661,6 +1820,75 @@ msgstr "И_ме на потребител:"
 msgid "Passphrase"
 msgstr "Парола"
 
+#: ../data/gui/plugins_window.ui.h:1
+msgid "&lt;empty&gt;"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:2
+msgid "<empty>"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:3
+#, fuzzy
+msgid "Authors:"
+msgstr "_Упълномощаване"
+
+#: ../data/gui/plugins_window.ui.h:4
+#, fuzzy
+msgid "Available"
+msgstr "На _линия"
+
+#: ../data/gui/plugins_window.ui.h:5
+#, fuzzy
+msgid "Configure"
+msgstr "_Настройване"
+
+#: ../data/gui/plugins_window.ui.h:6
+#, fuzzy
+msgid "Descrition:"
+msgstr "Описание: "
+
+#: ../data/gui/plugins_window.ui.h:7
+#, fuzzy
+msgid "Homepage:"
+msgstr "<b>Страница в Интернет:</b>"
+
+#: ../data/gui/plugins_window.ui.h:8
+msgid "Install"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:9
+#, fuzzy
+msgid "Installed"
+msgstr "Блокирал"
+
+#: ../data/gui/plugins_window.ui.h:10
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:11
+msgid "Plugins"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:12
+msgid "Uninstall"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:13
+#, fuzzy
+msgid "Version:"
+msgstr "Версия на GTK+:"
+
+#: ../data/gui/plugins_window.ui.h:14
+msgid "button"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:15
+msgid "homepage url"
+msgstr ""
+
 #: ../data/gui/popup_notification_window.ui.h:1
 #, fuzzy
 msgid "Event Type"
@@ -1789,120 +2017,103 @@ msgid "Always"
 msgstr "Отсъствам"
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Always use GNOME default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:32
-msgid "Always use KDE default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:33
-msgid "Always use Xfce default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Питане за съобщение за състояние при преминаване в режим:"
 
-#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
 msgid "Audio / Video"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:33
 msgid "Audio input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Audio output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:38
-#, fuzzy
-msgid "Autodetect on every Gajim startup"
-msgstr "С_вързване при стартиране"
-
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:35
 msgid "Chat message:"
 msgstr "Съобщение от разговор:"
 
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:36
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "_Да се проверява дали Gajim е стандартния Джабър клиент при стартиране"
 
-#: ../data/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:37
 #, fuzzy
 msgid "Composing only"
 msgstr "Пише"
 
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:38
 msgid "Configure color and font of the interface"
 msgstr "Настройване на цвят и шрифт на интерфейса"
 
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Съобщение от разговор:"
 
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Име на контакта"
 
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:41
 msgid "Custom"
 msgstr "Персонални"
 
-#: ../data/gui/preferences_window.ui.h:46
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Detached roster with chat grouped by account"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Detached roster with detached chats"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:45
 msgid "Detached roster with single chat"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
-#: ../src/config.py:671
+#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
+#: ../src/config.py:665
 msgid "Disabled"
 msgstr "Изключени"
 
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:47
 msgid "Display _activity of contacts in roster"
 msgstr "Показване на _дейност на контактите в списъка"
 
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:48
 msgid "Display _extra email details"
 msgstr "Показване на _допълнителни данни за е-поща"
 
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:49
 #, fuzzy
 msgid "Display _location of contacts in roster"
 msgstr "Показване на _настроенията на контактите в списъка"
 
-#: ../data/gui/preferences_window.ui.h:54
+#: ../data/gui/preferences_window.ui.h:50
 msgid "Display _tunes of contacts in roster"
 msgstr "Показване на _слушаната от контактите музика в списъка"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display a_vatars of contacts in roster"
 msgstr "Показване на _аватари на контактите в списъка"
 
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display m_ood of contacts in roster"
 msgstr "Показване на _настроенията на контактите в списъка"
 
-#: ../data/gui/preferences_window.ui.h:57
+#: ../data/gui/preferences_window.ui.h:53
 msgid "Display status _messages of contacts in roster"
 msgstr "Показване на _съобщенията за състояние на контактите в списъка"
 
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:54
 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 "
@@ -1912,7 +2123,7 @@ msgstr ""
 "даден контакт. Тук може да укажете кои състояния бихте искали да се показват "
 "в прозорците за разговор."
 
-#: ../data/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:55
 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 "
@@ -1921,7 +2132,7 @@ msgstr ""
 "Gajim може да изпраща и получава мета-информация, свързана с разговора с "
 "даден контакт. Тук може да укажете кои състояния бихте искали да изпращате."
 
-#: ../data/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:56
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1929,11 +2140,11 @@ msgstr ""
 "Ще се появява съобщение за уведомяване в долния десен ъгъл на екрана при "
 "изключване на контакти"
 
-#: ../data/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:58
 msgid "Hide all buttons in chat windows"
 msgstr "Скриване на всички бутони в прозорците за разговор."
 
-#: ../data/gui/preferences_window.ui.h:63
+#: ../data/gui/preferences_window.ui.h:59
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1941,7 +2152,7 @@ msgstr ""
 "Ако тази опция е избрана, контактите ще могат да откриват операционната "
 "система, която използвате."
 
-#: ../data/gui/preferences_window.ui.h:64
+#: ../data/gui/preferences_window.ui.h:60
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1949,14 +2160,14 @@ msgstr ""
 "Ако тази опция е избрана, Gajim ще включва информация за подателя на новите "
 "писма."
 
-#: ../data/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:61
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Ако тази опция е избрана, Gajim ще променя състоянието на „Отсъствам“ когато "
 "компютърът не се използва."
 
-#: ../data/gui/preferences_window.ui.h:66
+#: ../data/gui/preferences_window.ui.h:62
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1964,7 +2175,7 @@ msgstr ""
 "Ако тази опция е избрана, Gajim ще променя състоянието на „Не съм на "
 "разположение“ когато компютърът не се използва по-дълго време."
 
-#: ../data/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1972,7 +2183,7 @@ msgstr ""
 "Ако тази опция е избрана, Gajim ще изобразява аватари на контакти в списъка "
 "и стаите"
 
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1980,14 +2191,14 @@ msgstr ""
 "Ако тази опция е избрана, съобщенията за състояние на контактите ще се "
 "показват под имената им в списъка и в стаите"
 
-#: ../data/gui/preferences_window.ui.h:69
+#: ../data/gui/preferences_window.ui.h:65
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "Ако тази опция е избрана, Gajim ще изобразява дейността на контактите в "
 "списъка."
 
-#: ../data/gui/preferences_window.ui.h:70
+#: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the location of contacts in the roster window"
@@ -1995,21 +2206,21 @@ msgstr ""
 "Ако тази опция е избрана, Gajim ще изобразява настроението на контактите в "
 "списъка."
 
-#: ../data/gui/preferences_window.ui.h:71
+#: ../data/gui/preferences_window.ui.h:67
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
 "Ако тази опция е избрана, Gajim ще изобразява настроението на контактите в "
 "списъка."
 
-#: ../data/gui/preferences_window.ui.h:72
+#: ../data/gui/preferences_window.ui.h:68
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Ако тази опция е избрана, Gajim ще изобразява слушаната от контактите музика "
 "в списъка."
 
-#: ../data/gui/preferences_window.ui.h:73
+#: ../data/gui/preferences_window.ui.h:69
 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 "
@@ -2020,7 +2231,7 @@ msgstr ""
 "натискане с десния бутон на мишката в полето за въвеждане, ще се използва "
 "езикът по подразбиране."
 
-#: ../data/gui/preferences_window.ui.h:74
+#: ../data/gui/preferences_window.ui.h:70
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -2030,7 +2241,7 @@ msgstr ""
 "неупълномощени контакти. Използвайте я внимателно, тъй като блокира всички "
 "съобщения от всеки контакт, който не е в списъка."
 
-#: ../data/gui/preferences_window.ui.h:75
+#: ../data/gui/preferences_window.ui.h:71
 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 "
@@ -2040,7 +2251,7 @@ msgstr ""
 "съобщение. Забележете, че при шифриране тип „E2E“ другата страна трябва да "
 "се съгласи, иначе съобщенията няма да бъдат запазвани."
 
-#: ../data/gui/preferences_window.ui.h:76
+#: ../data/gui/preferences_window.ui.h:72
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -2048,7 +2259,7 @@ msgstr ""
 "Ако тази опция е избрана, Gajim ще показва уведомление при получаването на "
 "ново писмо чрез GMail."
 
-#: ../data/gui/preferences_window.ui.h:77
+#: ../data/gui/preferences_window.ui.h:73
 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, "
@@ -2058,7 +2269,7 @@ msgstr ""
 "състояние (т.е. контакт от MSN ще има еквивалентната за MSN икона за "
 "състоянията „На линия“, „Отсъствам“, „Зает“ и т.н.)."
 
-#: ../data/gui/preferences_window.ui.h:78
+#: ../data/gui/preferences_window.ui.h:74
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -2066,7 +2277,7 @@ msgstr ""
 "Ако тази опция е избрана, няма да се пита за съобщение за състояние — ще се "
 "използва стандартно зададеното."
 
-#: ../data/gui/preferences_window.ui.h:79
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2074,98 +2285,98 @@ msgstr ""
 "Ако тази опция е избрана, усмивките в ASCII като „:)“ ще се изобразяват със "
 "съответните анимирани или статични емотикони."
 
-#: ../data/gui/preferences_window.ui.h:80
+#: ../data/gui/preferences_window.ui.h:76
 msgid "Log _encrypted chat session"
 msgstr "Запазване на дневник на _шифрираната сесия"
 
-#: ../data/gui/preferences_window.ui.h:81
+#: ../data/gui/preferences_window.ui.h:77
 msgid "Ma_ke message windows compact"
 msgstr "_Компактни прозорци за разговор"
 
-#: ../data/gui/preferences_window.ui.h:82
+#: ../data/gui/preferences_window.ui.h:78
 msgid "Ma_nage..."
 msgstr "_Управление…"
 
-#: ../data/gui/preferences_window.ui.h:83
+#: ../data/gui/preferences_window.ui.h:79
 #, fuzzy
 msgid "Never"
 msgstr "Сървър"
 
-#: ../data/gui/preferences_window.ui.h:84
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Notifications"
 msgstr "Уведомления"
 
-#: ../data/gui/preferences_window.ui.h:85
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Notify me about contacts that sign _in"
 msgstr "Уведомяване за _включващи се контакти"
 
-#: ../data/gui/preferences_window.ui.h:86
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Notify me about contacts that sign _out"
 msgstr "Уведомяване за _изключващи се контакти"
 
-#: ../data/gui/preferences_window.ui.h:87
+#: ../data/gui/preferences_window.ui.h:83
 #, fuzzy
 msgid "Notify me about it"
 msgstr "Уведомяване за _изключващи се контакти"
 
-#: ../data/gui/preferences_window.ui.h:88
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notify on new _GMail email"
 msgstr "Уведомяване при нова поща от _GMail"
 
-#: ../data/gui/preferences_window.ui.h:89
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Only when pending events"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:90
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Personal Events"
 msgstr "Лични събития"
 
-#: ../data/gui/preferences_window.ui.h:91
+#: ../data/gui/preferences_window.ui.h:87
 msgid "Play _sounds"
 msgstr "Изпълнение на з_вуци"
 
-#: ../data/gui/preferences_window.ui.h:92
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Pop it up"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:93
+#: ../data/gui/preferences_window.ui.h:89
 msgid "Preferences"
 msgstr "Настройки"
 
-#: ../data/gui/preferences_window.ui.h:94
+#: ../data/gui/preferences_window.ui.h:90
 msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:96
+#: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
 msgid "STUN server:"
 msgstr "Сървър:"
 
-#: ../data/gui/preferences_window.ui.h:97
+#: ../data/gui/preferences_window.ui.h:93
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Показване на събитието в спис_ъка"
+msgid "Show notification area icon:"
+msgstr "Демон за уведомления"
 
-#: ../data/gui/preferences_window.ui.h:98
+#: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
-msgid "Show systray:"
-msgstr "Показване на събитието в областта за _уведомяване"
+msgid "Show only in roster"
+msgstr "Показване на събитието в спис_ъка"
 
-#: ../data/gui/preferences_window.ui.h:99
+#: ../data/gui/preferences_window.ui.h:95
 msgid "Sign _in"
 msgstr "_Включване"
 
-#: ../data/gui/preferences_window.ui.h:100
+#: ../data/gui/preferences_window.ui.h:96
 msgid "Sign _out"
 msgstr "Изкл_ючване"
 
-#: ../data/gui/preferences_window.ui.h:101
+#: ../data/gui/preferences_window.ui.h:97
 msgid "Single window for everything"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:102
+#: ../data/gui/preferences_window.ui.h:98
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2173,27 +2384,27 @@ msgstr ""
 "Някои съобщения могат да включват „rich content“ (форматиране, цветове и т."
 "н.). Ако тази опция е избрана, Gajim ще изобразява само обикновения текст."
 
-#: ../data/gui/preferences_window.ui.h:103
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sort contacts by status"
 msgstr "Подреждане на контактите по състояние"
 
-#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
 msgid "Status"
 msgstr "Състояние"
 
-#: ../data/gui/preferences_window.ui.h:105
+#: ../data/gui/preferences_window.ui.h:101
 msgid "Status _iconset:"
 msgstr "_Набор икони за състояние:"
 
-#: ../data/gui/preferences_window.ui.h:106
+#: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Стил"
 
-#: ../data/gui/preferences_window.ui.h:107
+#: ../data/gui/preferences_window.ui.h:103
 msgid "T_heme:"
 msgstr "_Тема:"
 
-#: ../data/gui/preferences_window.ui.h:108
+#: ../data/gui/preferences_window.ui.h:104
 #, fuzzy
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
@@ -2204,7 +2415,7 @@ msgstr ""
 "Съобщение за автоматично състояние „Отсъствам“. Ако е празно, няма да се "
 "сменя текущото съобщение."
 
-#: ../data/gui/preferences_window.ui.h:111
+#: ../data/gui/preferences_window.ui.h:107
 #, fuzzy
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
@@ -2215,121 +2426,125 @@ msgstr ""
 "Съобщение за автоматично състояние „Не съм на разположение“. Ако е празно, "
 "няма да се сменя текущото съобщение."
 
-#: ../data/gui/preferences_window.ui.h:114
+#: ../data/gui/preferences_window.ui.h:110
 msgid "Use _transports icons"
 msgstr "Използване на и_кони за транспортите"
 
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:111
+msgid "Use default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:112
 msgid "Use system _default"
 msgstr "Използване на стан_дартните за системата"
 
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:113
 msgid "Video framerate"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:117
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Video input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:118
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Video output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:119
+#: ../data/gui/preferences_window.ui.h:116
 msgid "Video size"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:120
+#: ../data/gui/preferences_window.ui.h:117
 msgid "When new event is received:"
 msgstr "При получаване на ново събитие:"
 
-#: ../data/gui/preferences_window.ui.h:121
+#: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
 msgid "Your message:"
 msgstr "Грешка: %s"
 
-#: ../data/gui/preferences_window.ui.h:122
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your nickname:"
 msgstr "Псевдоним:"
 
-#: ../data/gui/preferences_window.ui.h:123
+#: ../data/gui/preferences_window.ui.h:120
 msgid "_Away after:"
 msgstr "„_Отсъствам“ след:"
 
-#: ../data/gui/preferences_window.ui.h:124
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "Интернет _браузър:"
 
-#: ../data/gui/preferences_window.ui.h:125
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Display chat state notifications:"
 msgstr "Показване на уведомления при _разговор:"
 
-#: ../data/gui/preferences_window.ui.h:126
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Emoticons:"
 msgstr "_Емотикони:"
 
-#: ../data/gui/preferences_window.ui.h:127
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_File manager:"
 msgstr "_Файлов мениджър:"
 
-#: ../data/gui/preferences_window.ui.h:128
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_Highlight misspelled words"
 msgstr "_Осветяване на неправилно изписаните думи"
 
-#: ../data/gui/preferences_window.ui.h:129
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Ignore events from contacts not in the roster"
 msgstr "Прене_брегване на събития от контакти, които не са в списъка"
 
-#: ../data/gui/preferences_window.ui.h:130
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Пренебрегване на излишно форматиране на входящите съобщения"
 
-#: ../data/gui/preferences_window.ui.h:131
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Log status changes of contacts"
 msgstr "Запазване на промените на _състоянията на контактите"
 
-#: ../data/gui/preferences_window.ui.h:132
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Mail client:"
 msgstr "_Програма за е-поща:"
 
-#: ../data/gui/preferences_window.ui.h:133
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Not available after:"
 msgstr "„Не съм на _разположение“ след:"
 
-#: ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Open..."
 msgstr "_Отваряне…"
 
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Reset to Default Colors"
 msgstr "Възстановяване на стандартните _цветове"
 
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Send chat state notifications:"
 msgstr "Изпращане на уведомления при _разговор:"
 
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Status message:"
 msgstr "С_ъобщение за състояние:"
 
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_URL highlight:"
 msgstr "_Адреси:"
 
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_Window behavior:"
 msgstr "_Поведение на прозорците:"
 
-#: ../data/gui/preferences_window.ui.h:140
+#: ../data/gui/preferences_window.ui.h:137
 msgid "in _group chats"
 msgstr "в _стаи"
 
-#: ../data/gui/preferences_window.ui.h:141
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _roster"
 msgstr "в с_писъка"
 
-#: ../data/gui/preferences_window.ui.h:142
+#: ../data/gui/preferences_window.ui.h:139
 msgid "minutes"
 msgstr "минути"
 
@@ -2382,7 +2597,7 @@ msgstr "Jabber ID"
 msgid "Order:"
 msgstr "Ред:"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3436
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
 msgid "Privacy List"
 msgstr "Филтър за уединение"
 
@@ -2593,8 +2808,8 @@ msgstr "Премахване на акаунт от Gajim и от с_ървър
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5492 ../src/roster_window.py:5622
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
+#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
 msgid "_Remove"
 msgstr "_Премахване"
 
@@ -2638,57 +2853,61 @@ msgid "Help online"
 msgstr "Помощ в Интернет"
 
 #: ../data/gui/roster_window.ui.h:8
+msgid "P_lugins"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:9
 msgid "Profile, A_vatar"
 msgstr "_Профил, аватар"
 
-#: ../data/gui/roster_window.ui.h:9
+#: ../data/gui/roster_window.ui.h:10
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "Показване на изкл_ючените контакти"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
 msgid "Show Trans_ports"
 msgstr "Показване на т_ранспорти"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
 msgid "Show _Offline Contacts"
 msgstr "Показване на изкл_ючените контакти"
 
-#: ../data/gui/roster_window.ui.h:12 ../src/statusicon.py:326
+#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
 msgid "Show _Roster"
 msgstr "П_оказване на списъка"
 
-#: ../data/gui/roster_window.ui.h:13
+#: ../data/gui/roster_window.ui.h:14
 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/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
 #: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Действия"
 
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
 msgid "_Contents"
 msgstr "_Ръководства"
 
-#: ../data/gui/roster_window.ui.h:18 ../src/disco.py:1502
+#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
 msgid "_Edit"
 msgstr "_Редактиране"
 
-#: ../data/gui/roster_window.ui.h:19
+#: ../data/gui/roster_window.ui.h:20
 msgid "_FAQ"
 msgstr "_ЧЗВ"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Help"
 msgstr "Помо_щ"
 
-#: ../data/gui/roster_window.ui.h:22
+#: ../data/gui/roster_window.ui.h:23
 msgid "_Send Single Message..."
 msgstr "Изпращане на _еднократно съобщение…"
 
-#: ../data/gui/roster_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:25
 msgid "_View"
 msgstr "_Изглед"
 
@@ -2705,11 +2924,11 @@ msgid "_Add contact"
 msgstr "Добавяне на _контакт"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5634
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
 msgid "_Information"
 msgstr "_Информация"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1353
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
 msgid "_Search"
 msgstr "_Търсене"
 
@@ -2729,10 +2948,6 @@ msgstr "Регистриране към"
 msgid "_Cancel"
 msgstr "_Отказ"
 
-#: ../data/gui/single_message_window.ui.h:2
-msgid "From:"
-msgstr "От:"
-
 #: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Отговор на това съобщение"
@@ -2749,10 +2964,6 @@ msgstr "Изпращане на съобщение"
 msgid "Send message and close window"
 msgstr "Изпращане на съобщението и затваряне на прозореца"
 
-#: ../data/gui/single_message_window.ui.h:7
-msgid "Subject:"
-msgstr "Тема:"
-
 #: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "До:"
@@ -2962,25 +3173,35 @@ msgstr "Моментни съобщения (Gajim)"
 msgid "Jabber IM Client"
 msgstr "Джабър клиент за бързи съобщения"
 
-#: ../src/adhoc_commands.py:314
+#: ../src/adhoc_commands.py:323
 msgid "Cancel confirmation"
 msgstr "Отмяна на потвърждението"
 
-#: ../src/adhoc_commands.py:315
+#: ../src/adhoc_commands.py:324
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr "На път сте да изпълните команда. Наистина ли искате да я отмените?"
 
-#: ../src/adhoc_commands.py:351 ../src/adhoc_commands.py:374
+#: ../src/adhoc_commands.py:370
+#, fuzzy
+msgid "Invalid Form"
+msgstr "Невалиден формат"
+
+#: ../src/adhoc_commands.py:371
+#, fuzzy
+msgid "The form is not filled correctly."
+msgstr "Псевдонимът съдържа непозволени знаци."
+
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
 msgid "Service sent malformed data"
 msgstr "Услугата изпрати лошо форматирани данни"
 
-#: ../src/adhoc_commands.py:360
+#: ../src/adhoc_commands.py:399
 msgid "Service changed the session identifier."
 msgstr "Услугата промени идентификатора на сесията."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:471
+#: ../src/adhoc_commands.py:513
 msgid "Service returned an error."
 msgstr "Услугата върна грешка."
 
@@ -3005,7 +3226,7 @@ msgstr "Число"
 msgid "Text"
 msgstr "Текст"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:945
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
 msgid "Color"
 msgstr "Цвят"
 
@@ -3042,188 +3263,188 @@ msgstr[1] "Получихте нов запис:"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "English"
 msgstr "английски"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Belarusian"
 msgstr "белоруски"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Bulgarian"
 msgstr "български"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Breton"
 msgstr "бретонски"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Czech"
 msgstr "чешки"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "German"
 msgstr "немски"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Greek"
 msgstr "гръцки"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "British"
 msgstr "британски английски"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Esperanto"
 msgstr "есперанто"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Spanish"
 msgstr "испански"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Basque"
 msgstr "баски"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "French"
 msgstr "френски"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Croatian"
 msgstr "хърватски"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Italian"
 msgstr "италиански"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian (b)"
 msgstr "норвежки (Bokmål)"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Dutch"
 msgstr "холандски"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian"
 msgstr "норвежки (Nynorsk)"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Polish"
 msgstr "полски"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Portuguese"
 msgstr "португалски"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Brazilian Portuguese"
 msgstr "бразилски португалски"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Russian"
 msgstr "руски"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Serbian"
 msgstr "сръбски"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Slovak"
 msgstr "словашки"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Swedish"
 msgstr "шведски"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Chinese (Ch)"
 msgstr "китайски"
 
-#: ../src/chat_control.py:479
+#: ../src/chat_control.py:496
 msgid "Spelling language"
 msgstr "Език за проверка на правописа"
 
 #. we are not connected
-#: ../src/chat_control.py:511 ../src/chat_control.py:720
+#: ../src/chat_control.py:528 ../src/chat_control.py:737
 msgid "A connection is not available"
 msgstr "В момента няма връзка"
 
-#: ../src/chat_control.py:512 ../src/chat_control.py:721
+#: ../src/chat_control.py:529 ../src/chat_control.py:738
 msgid "Your message can not be sent until you are connected."
 msgstr "Съобщението не може да бъде изпратено, докато не се свържете."
 
-#: ../src/chat_control.py:927
+#: ../src/chat_control.py:944
 #, fuzzy
 msgid "Underline"
 msgstr "Неопределен"
 
-#: ../src/chat_control.py:928
+#: ../src/chat_control.py:945
 #, fuzzy
 msgid "Strike"
 msgstr "Болен"
 
-#: ../src/chat_control.py:951
+#: ../src/chat_control.py:968
 msgid "Font"
 msgstr ""
 
-#: ../src/chat_control.py:960
+#: ../src/chat_control.py:977
 #, fuzzy
 msgid "Clear formating"
 msgstr "Информация за контакта"
 
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1055
 msgid "Really send file?"
 msgstr "Наистина ли да се изпрати файла?"
 
-#: ../src/chat_control.py:1039
+#: ../src/chat_control.py:1056
 #, 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:1503 ../src/chat_control.py:1987
+#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
 msgid "GPG encryption enabled"
 msgstr "Шифрирането чрез GPG е включено"
 
 #. Add to roster
-#: ../src/chat_control.py:1528 ../src/common/contacts.py:158
+#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
 #: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:245 ../src/dialogs.py:1064 ../src/dialogs.py:2078
-#: ../src/dialogs.py:2107 ../src/gui_interface.py:674
+#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
+#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
 #: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1610 ../src/roster_window.py:1612
-#: ../src/roster_window.py:1942 ../src/roster_window.py:3289
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
+#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
+#: ../src/roster_window.py:3382
 msgid "Not in Roster"
 msgstr "Не е в списъка"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1575
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Списък с активни, завършили и прекъснати файлови трансфери"
 
-#: ../src/chat_control.py:1561
+#: ../src/chat_control.py:1578
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1656
+#: ../src/chat_control.py:1677
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:1869
 #, 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:1967 ../src/dialogs.py:4866
+#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
 msgid "No GPG key assigned"
 msgstr "Няма зададен ключ на GPG"
 
-#: ../src/chat_control.py:1968
+#: ../src/chat_control.py:1991
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3231,50 +3452,50 @@ msgstr ""
 "Няма зададен ключ на GPG за този контакт, така че не може да шифрирате "
 "съобщенията с GPG."
 
-#: ../src/chat_control.py:1977
+#: ../src/chat_control.py:2000
 msgid "GPG encryption disabled"
 msgstr "Шифрирането чрез GPG е изключено"
 
-#: ../src/chat_control.py:2003
+#: ../src/chat_control.py:2026
 msgid "Session WILL be logged"
 msgstr "ЩЕ СЕ запазва дневник за сесията"
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:2028
 msgid "Session WILL NOT be logged"
 msgstr "НЯМА да се запазва дневник за сесията"
 
 #. encryption %s active
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is"
 msgstr "е"
 
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is NOT"
 msgstr "НЕ е"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will"
 msgstr "Ще"
 
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will NOT"
 msgstr "НЯМА да"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2051
 msgid "and authenticated"
 msgstr "и удостоверяването е успешно"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2032
+#: ../src/chat_control.py:2055
 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:2039
+#: ../src/chat_control.py:2062
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3283,23 +3504,32 @@ msgstr ""
 "Шифрирането чрез %(type)s %(status)s включено %(authenticated)s.\n"
 "%(logged)s се запазва дневник за сесията."
 
-#: ../src/chat_control.py:2182
+#: ../src/chat_control.py:2205
 msgid "Session negotiation cancelled"
 msgstr "Договорката за сесията отменена"
 
-#: ../src/chat_control.py:2191
+#: ../src/chat_control.py:2215
+msgid "This session WILL be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2217
+#, fuzzy
+msgid "This session WILL NOT be archived on server"
+msgstr "НЯМА да се запазва дневник за сесията"
+
+#: ../src/chat_control.py:2226
 msgid "This session is encrypted"
 msgstr "Тази сесия е шифрирана"
 
-#: ../src/chat_control.py:2194
+#: ../src/chat_control.py:2229
 msgid " and WILL be logged"
 msgstr " и ЩЕ СЕ запазва дневник"
 
-#: ../src/chat_control.py:2196
+#: ../src/chat_control.py:2231
 msgid " and WILL NOT be logged"
 msgstr " и НЯМА да се запазва дневник"
 
-#: ../src/chat_control.py:2201
+#: ../src/chat_control.py:2236
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3307,25 +3537,25 @@ msgstr ""
 "Идентичността на отсрещния контакт не е потвърдена. Натиснете бутона със "
 "щита за повече информация."
 
-#: ../src/chat_control.py:2203
+#: ../src/chat_control.py:2238
 msgid "E2E encryption disabled"
 msgstr "Шифрирането чрез E2E е изключено"
 
-#: ../src/chat_control.py:2241 ../src/chat_control.py:2254
+#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
 msgid "The following message was NOT encrypted"
 msgstr "Следното съобщение НЕ БЕШЕ шифрирано"
 
-#: ../src/chat_control.py:2247
+#: ../src/chat_control.py:2288
 msgid "The following message was encrypted"
 msgstr "Следното съобщение беше шифрирано"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2519
+#: ../src/chat_control.py:2566
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Току-що получихте ново съобщение от „%s“"
 
-#: ../src/chat_control.py:2520
+#: ../src/chat_control.py:2567
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3333,15 +3563,13 @@ msgstr ""
 "Ако затворите този прозорец и нямате включена опция за запазване на "
 "историята, съобщението ще бъде загубено."
 
-#: ../src/chat_control.py:2663 ../src/common/connection_handlers.py:1635
-#: ../src/common/connection_handlers.py:1758
-#: ../src/common/connection_handlers.py:1960
-#: ../src/common/connection_handlers.py:2110 ../src/common/connection.py:452
+#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
 #: ../src/gajim.py:159 ../src/session.py:138
 msgid "Database Error"
 msgstr "Грешка в базата от данни"
 
-#: ../src/chat_control.py:2664
+#: ../src/chat_control.py:2714
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3350,7 +3578,7 @@ msgstr ""
 "Файлът „%s“ от базата от данни не може да бъде прочетен. Опитайте се да го "
 "поправите или изтриете (цялата история ще бъде загубена)."
 
-#: ../src/chat_control.py:2906
+#: ../src/chat_control.py:2962
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s вече е %(status)s"
@@ -3364,28 +3592,28 @@ msgstr "създаване на база от данни за разговори
 msgid "creating cache database"
 msgstr "създаване на база от данни за разговорите"
 
-#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
-#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
-#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
-#: ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s e файл, а би трябвало да е папка"
 
-#: ../src/common/check_paths.py:275 ../src/common/check_paths.py:282
-#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
-#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
-#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:333
+#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
+#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
+#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
 msgid "Gajim will now exit"
 msgstr "Спиране на програмата"
 
-#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
+#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s e папка, а би трябвало да е файл"
 
-#: ../src/common/check_paths.py:342
+#: ../src/common/check_paths.py:351
 #, python-format
 msgid "creating %s directory"
 msgstr "създаване на папка %s"
@@ -3449,9 +3677,9 @@ msgstr "Изберете стаите, които искате да напусн
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:801
-#: ../src/roster_window.py:1614 ../src/roster_window.py:1616
-#: ../src/roster_window.py:5251
+#: ../src/common/helpers.py:57 ../src/roster_window.py:815
+#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
+#: ../src/roster_window.py:5323
 msgid "Groupchats"
 msgstr "Стаи"
 
@@ -3515,7 +3743,8 @@ msgstr ""
 "отсъствие."
 
 #: ../src/common/config.py:88
-msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgid ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
 #: ../src/common/config.py:93
@@ -3571,9 +3800,9 @@ msgstr ""
 "свиват автоматично."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:501
-#: ../src/common/optparser.py:290 ../src/common/optparser.py:486
-#: ../src/common/optparser.py:520 ../src/gui_interface.py:3370
+#: ../src/common/config.py:106 ../src/common/config.py:505
+#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
+#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
 msgid "default"
 msgstr "по подразбиране"
 
@@ -3795,7 +4024,8 @@ msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Според стандарта на IEC KiB = 1024 байта, KB = 1000 байта."
 
 #: ../src/common/config.py:197
-msgid "Notify of events in the system trayicon."
+#, fuzzy
+msgid "Notify of events in the notification area."
 msgstr "Уведомяване за събития в областта за уведомяване."
 
 #: ../src/common/config.py:203
@@ -3834,9 +4064,10 @@ msgstr ""
 "разговор в стая."
 
 #: ../src/common/config.py:221
+#, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
+"setting is taken into account only if notification icon is used."
 msgstr ""
 "Ако е активирана, се спира програмата при натискане на бутона „X“ на "
 "администратора на прозорци. Тази настройка е валидна само ако се използва "
@@ -4120,9 +4351,10 @@ msgstr ""
 "редове се изчистват."
 
 #: ../src/common/config.py:270
+#, fuzzy
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
-"systray icon."
+"notification icon."
 msgstr ""
 "Ако активирана, прозорците за уведомления от „notification-daemon“ ще бъдат "
 "прикрепени към иконата в областта за уведомяване."
@@ -4320,111 +4552,122 @@ msgstr ""
 msgid "Message that is sent to contacts you want to add"
 msgstr "Попълнете данните за контакта, който искате да добавите"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:374
+msgid "Last time we syncronized with logs from server."
+msgstr ""
+
+#: ../src/common/config.py:436
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Активиран ли е OpenPGP за този контакт?"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr "Да се започва ли шифрирана сесия с този контакт, когато е възможно?"
 
-#: ../src/common/config.py:437 ../src/common/config.py:440
+#: ../src/common/config.py:438 ../src/common/config.py:441
 msgid "Language for which we want to check misspelled words"
 msgstr "Език, за който желаете да се проверяват сгрешените думи."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:447
 msgid "all or space separated status"
 msgstr "„all“ или състояния, разделени с интервал"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:448
 msgid "'yes', 'no', or 'both'"
 msgstr "„yes“, „no“ или „both“"
 
-#: ../src/common/config.py:448 ../src/common/config.py:450
-#: ../src/common/config.py:451 ../src/common/config.py:454
-#: ../src/common/config.py:455
+#: ../src/common/config.py:449 ../src/common/config.py:451
+#: ../src/common/config.py:452 ../src/common/config.py:455
+#: ../src/common/config.py:456
 msgid "'yes', 'no' or ''"
 msgstr "„yes“, „no“ или „“"
 
-#: ../src/common/config.py:461 ../src/common/pep.py:157
+#: ../src/common/config.py:460
+msgid ""
+"State whether plugins should be activated on exit (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
+msgstr ""
+
+#: ../src/common/config.py:465 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Спя"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back soon"
 msgstr "Връщам се скоро"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back in some minutes."
 msgstr "Ще се върна след малко."
 
-#: ../src/common/config.py:463 ../src/common/pep.py:127
+#: ../src/common/config.py:467 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Хапвам"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:467
 msgid "I'm eating, so leave me a message."
 msgstr "Хапвам, така че ми оставете съобщение."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "Movie"
 msgstr "Филм"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "I'm watching a movie."
 msgstr "Гледам филм."
 
-#: ../src/common/config.py:465 ../src/common/pep.py:186
+#: ../src/common/config.py:469 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Работя"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:469
 msgid "I'm working."
 msgstr "Работя."
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "I'm on the phone."
 msgstr "Говоря по телефона."
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "Out"
 msgstr "Навън"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "I'm out enjoying life."
 msgstr "Наслаждавам се на живота навън."
 
-#: ../src/common/config.py:478
+#: ../src/common/config.py:482
 msgid "I'm available."
 msgstr "На линия съм."
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:483
 msgid "I'm free for chat."
 msgstr "Свободен за разговор."
 
-#: ../src/common/config.py:480 ../src/config.py:1600
+#: ../src/common/config.py:484 ../src/config.py:1600
 msgid "Be right back."
 msgstr "Сега се връщам."
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:485
 msgid "I'm not available."
 msgstr "Не съм на разположение."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:486
 msgid "Do not disturb."
 msgstr "Не ме притеснявайте."
 
-#: ../src/common/config.py:483 ../src/common/config.py:484
+#: ../src/common/config.py:487 ../src/common/config.py:488
 msgid "Bye!"
 msgstr "Довиждане!"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:498
 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."
@@ -4432,184 +4675,94 @@ msgstr ""
 "Звукът, който да се възпроизвежда, когато в стаята се изпише дума от "
 "„muc_higlighted_words“ или когато съобщение съдържа псевдонима ви."
 
-#: ../src/common/config.py:495
+#: ../src/common/config.py:499
 msgid "Sound to play when any MUC message arrives."
 msgstr "Звук за изпълнение при получаване на каквото и да е съобщение в стая."
 
-#: ../src/common/config.py:504 ../src/common/optparser.py:304
+#: ../src/common/config.py:508 ../src/common/optparser.py:308
 msgid "green"
 msgstr "зелена"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:290
+#: ../src/common/config.py:512 ../src/common/optparser.py:294
 msgid "grocery"
 msgstr "колониална"
 
-#: ../src/common/config.py:512
+#: ../src/common/config.py:516
 msgid "human"
 msgstr "хуманна"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:520
 msgid "marine"
 msgstr "морска"
 
-#: ../src/common/connection_handlers.py:84
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
-msgid "Unable to load idle module"
-msgstr "Неуспех при зареждането на модула „idle“"
-
-#: ../src/common/connection_handlers.py:117
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "Информацията за регистрация за транспорт %s не пристигна навреме"
-
-#: ../src/common/connection_handlers.py:124
-#, fuzzy
-msgid "Registration succeeded"
-msgstr "Регистриране в %s"
-
-#: ../src/common/connection_handlers.py:125
-#, python-format
-msgid "Registration with agent %s succeeded"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:133
-#, fuzzy
-msgid "Registration failed"
-msgstr "Неуспех при свързването"
-
-#: ../src/common/connection_handlers.py:133
-#, python-format
-msgid ""
-"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:445
-#: ../src/common/connection_handlers.py:1633
-#: ../src/common/connection_handlers.py:1756
-#: ../src/common/connection_handlers.py:1957
-#: ../src/common/connection_handlers.py:2108 ../src/common/connection.py:449
-#: ../src/gajim.py:341
-msgid "Disk Write Error"
-msgstr "Грешка при запис"
-
-#: ../src/common/connection_handlers.py:678 ../src/common/connection.py:1472
-msgid "Invisibility not supported"
-msgstr "Състоянието „Невидим“ не се поддържа."
-
-#: ../src/common/connection_handlers.py:679 ../src/common/connection.py:1473
-#, python-format
-msgid "Account %s doesn't support invisibility."
-msgstr "Акаунтът „%s“ не поддържа невидимост."
-
-#: ../src/common/connection_handlers.py:1446 ../src/common/connection.py:253
-#: ../src/config.py:2091 ../src/config.py:2100 ../src/config.py:2168
-#: ../src/config.py:3560 ../src/dataforms_widget.py:597 ../src/dialogs.py:2931
-msgid "Invalid Jabber ID"
-msgstr "Невалиден Jabber ID"
-
-#: ../src/common/connection_handlers.py:1447
-msgid "A message from a non-valid JID arrived, it has been ignored."
-msgstr ""
-
-#: ../src/common/connection_handlers.py:1636
-#: ../src/common/connection_handlers.py:1759
-#: ../src/common/connection_handlers.py:1961
-#: ../src/common/connection_handlers.py:2111 ../src/common/connection.py:453
-#: ../src/gajim.py:160 ../src/session.py:139
-#, 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 ""
-"Файлът „%s“ от базата от данни не може да бъде прочетен. Опитайте се да го "
-"поправите (вижте http://trac.gajim.org/wiki/DatabaseBackup) или изтриете "
-"(цялата история ще бъде загубена)."
-
-#: ../src/common/connection_handlers.py:1805
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Псевдонимът не е позволен: %s"
-
-#: ../src/common/connection_handlers.py:1902
-#: ../src/common/connection_handlers.py:1911
-#: ../src/common/connection_handlers.py:1918
-#: ../src/common/connection_handlers.py:1922
-#: ../src/common/connection_handlers.py:1926
-#: ../src/common/connection_handlers.py:1931 ../src/gui_interface.py:139
-msgid "Unable to join group chat"
-msgstr "Неуспех при влизането в стаята"
-
-#: ../src/common/connection_handlers.py:1903
-#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:1912
-#, python-format
-msgid "You are banned from group chat %s."
-msgstr "Вие сте отлъчени от стаята %s."
-
-#: ../src/common/connection_handlers.py:1919
-#, python-format
-msgid "Group chat %s does not exist."
-msgstr "Стаята %s не съществува."
-
-#: ../src/common/connection_handlers.py:1923
-msgid "Group chat creation is restricted."
-msgstr "Създаването на стаи е ограничено."
-
-#: ../src/common/connection_handlers.py:1927
-#, python-format
-msgid "Your registered nickname must be used in group chat %s."
-msgstr "Трябва да се използва регистрирания ви псевдоним в стаята %s."
+#: ../src/common/connection_handlers.py:94
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
+msgid "Unable to load idle module"
+msgstr "Неуспех при зареждането на модула „idle“"
 
-#: ../src/common/connection_handlers.py:1932
+#: ../src/common/connection_handlers.py:127
 #, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Не сте в списъка с членове на стаята %s."
+msgid "Registration information for transport %s has not arrived in time"
+msgstr "Информацията за регистрация за транспорт %s не пристигна навреме"
 
-#. Room has been destroyed. see
-#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:1976
-msgid "Room has been destroyed"
-msgstr "Стаята е била унищожена"
+#: ../src/common/connection_handlers.py:134
+#, fuzzy
+msgid "Registration succeeded"
+msgstr "Регистриране в %s"
 
-#: ../src/common/connection_handlers.py:1984
+#: ../src/common/connection_handlers.py:135
 #, python-format
-msgid "You can join this room instead: %s"
-msgstr "Вместо това може да влезете в тази стая: %s"
-
-#: ../src/common/connection_handlers.py:2020
-msgid "I would like to add you to my roster."
+msgid "Registration with agent %s succeeded"
 msgstr ""
-"Бих искал(а) да ви добавя към списъка си. I would like to add you to my "
-"roster."
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2041
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "вече сме записани за %s"
+#: ../src/common/connection_handlers.py:143
+#, fuzzy
+msgid "Registration failed"
+msgstr "Неуспех при свързването"
 
-#: ../src/common/connection_handlers.py:2043
+#: ../src/common/connection_handlers.py:143
 #, python-format
-msgid "unsubscribe request from %s"
-msgstr "искане за отписване от %s"
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:2045
+#: ../src/common/connection_handlers.py:466
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
+#: ../src/gajim.py:341
+msgid "Disk Write Error"
+msgstr "Грешка при запис"
+
+#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
+msgid "Invisibility not supported"
+msgstr "Състоянието „Невидим“ не се поддържа."
+
+#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
 #, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "вече сме отписани от %s"
+msgid "Account %s doesn't support invisibility."
+msgstr "Акаунтът „%s“ не поддържа невидимост."
+
+#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
+#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
+#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
+msgid "Invalid Jabber ID"
+msgstr "Невалиден Jabber ID"
 
-#: ../src/common/connection_handlers.py:2240
+#: ../src/common/connection_handlers.py:1405
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
+#: ../src/gajim.py:160 ../src/session.py:139
 #, python-format
 msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
+"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 ""
-"JID %s не е съгласно стандарта по RFC. Няма да бъде добавен към списъка. "
-"Използвайте инструменти за управление на списък като http://jru.jabberstudio."
-"org/, за да го премахнете."
+"Файлът „%s“ от базата от данни не може да бъде прочетен. Опитайте се да го "
+"поправите (вижте http://trac.gajim.org/wiki/DatabaseBackup) или изтриете "
+"(цялата история ще бъде загубена)."
 
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
@@ -4743,27 +4896,27 @@ msgstr "Основната употреба не включва подписва
 msgid "Application verification failure"
 msgstr "Грешка на приложението за проверка"
 
-#: ../src/common/connection.py:254 ../src/dialogs.py:2932
+#: ../src/common/connection.py:256 ../src/dialogs.py:2948
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Не е възможно да бъдат изпращани празни файлове"
 
-#: ../src/common/connection.py:276
+#: ../src/common/connection.py:278
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr "Нито отдалеченото присъствие е подписано, нито има зададен ключ."
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:281
 #, 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:331
+#: ../src/common/connection.py:333
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Това съобщение е *шифрирано* (вижте XEP:„27“)]"
 
-#: ../src/common/connection.py:439
+#: ../src/common/connection.py:441
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4772,80 +4925,80 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:807
+#: ../src/common/connection.py:809
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Връзката на акаунт „%s“ се разпадна"
 
-#: ../src/common/connection.py:808
+#: ../src/common/connection.py:810
 msgid "Reconnect manually."
 msgstr "Свържете се наново."
 
-#: ../src/common/connection.py:820
+#: ../src/common/connection.py:822
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Сървърът „%(name)s“ отговори погрешно на запитването за регистрация: "
 "%(error)s"
 
-#: ../src/common/connection.py:854
+#: ../src/common/connection.py:856
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Сървърът „%s“ предостави различна форма за регистрация"
 
-#: ../src/common/connection.py:867
+#: ../src/common/connection.py:869
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Неизвестна грешка на SSL: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:882
+#: ../src/common/connection.py:884
 msgid "Invalid answer"
 msgstr "Невалиден отговор"
 
-#: ../src/common/connection.py:883
+#: ../src/common/connection.py:885
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Транспортът „%(name)s“ отговори погрешно на запитването за регистрация: "
 "%(error)s"
 
-#: ../src/common/connection.py:1165 ../src/common/connection.py:1294
-#: ../src/common/connection.py:1784
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
+#: ../src/common/connection.py:1792
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Неуспех при свързване с „%s“"
 
-#: ../src/common/connection.py:1166 ../src/gui_interface.py:755
+#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
 msgid "Check your connection or try again later."
 msgstr "Проверете връзката или опитайте отново по-късно."
 
-#: ../src/common/connection.py:1171
+#: ../src/common/connection.py:1173
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Запазен в: %s"
 
-#: ../src/common/connection.py:1184
+#: ../src/common/connection.py:1186
 msgid "Connection to proxy failed"
 msgstr "Неуспех при свързването със сървъра-посредник"
 
-#: ../src/common/connection.py:1215 ../src/common/connection.py:1274
+#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Неуспех при свързване с акаунт „%s“"
 
-#: ../src/common/connection.py:1216 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Връзката на акаунт „%s“ се разпадна. Опит за повторно свързване."
 
-#: ../src/common/connection.py:1241
+#: ../src/common/connection.py:1243
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Автентичността на сертификата на %s може да е под въпрос."
 
-#: ../src/common/connection.py:1244
+#: ../src/common/connection.py:1246
 #, python-format
 msgid ""
 "\n"
@@ -4854,7 +5007,7 @@ msgstr ""
 "\n"
 "Грешка на SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1248
 #, python-format
 msgid ""
 "\n"
@@ -4863,24 +5016,24 @@ msgstr ""
 "\n"
 "Неизвестна грешка на SSL: %d"
 
-#: ../src/common/connection.py:1295
+#: ../src/common/connection.py:1297
 msgid "Check your connection or try again later"
 msgstr "Проверете връзката или опитайте отново по-късно"
 
-#: ../src/common/connection.py:1324
+#: ../src/common/connection.py:1329
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Неуспех при удостоверяването с „%s“"
 
-#: ../src/common/connection.py:1326
+#: ../src/common/connection.py:1331
 msgid "Please check your login and password for correctness."
 msgstr "Проверете дали името и паролата са правилни."
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1400
 msgid "Error while removing privacy list"
 msgstr "Грешка при премахването на списъка за уединение"
 
-#: ../src/common/connection.py:1396
+#: ../src/common/connection.py:1401
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4889,41 +5042,41 @@ msgstr ""
 "Списъкът за уединение „%s“ не беше премахнат. Навярно е активен в някой от "
 "свързаните ви ресурси. Изключете го и опитайте отново."
 
-#: ../src/common/connection.py:1650
+#: ../src/common/connection.py:1658
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1653
+#: ../src/common/connection.py:1661
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Покана на _контакти"
 
-#: ../src/common/connection.py:1799 ../src/common/connection.py:1822
+#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
 msgid "Not fetched because of invisible status"
 msgstr "Не е изтеглен, понеже е в състояние „Невидим“"
 
-#: ../src/common/connection.py:2254
+#: ../src/common/connection.py:2262
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Неуспех при свързването"
 
-#: ../src/common/connection.py:2255
+#: ../src/common/connection.py:2263
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
 #: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:674
+#: ../src/gui_interface.py:551
 msgid "Observers"
 msgstr "Наблюдатели"
 
 #: ../src/common/contacts.py:139 ../src/common/contacts.py:366
 #: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1499 ../src/gui_interface.py:424
-#: ../src/roster_window.py:840 ../src/roster_window.py:1525
-#: ../src/roster_window.py:1606 ../src/roster_window.py:1608
-#: ../src/roster_window.py:1769
+#: ../src/disco.py:1517 ../src/roster_window.py:854
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
+#: ../src/roster_window.py:2466
 msgid "Transports"
 msgstr "Транспорти"
 
@@ -5150,203 +5303,219 @@ msgstr "Края на седмицата"
 msgid "Weekend!"
 msgstr "Събота и неделя!"
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:148
+msgid "Username must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:153
 msgid "Invalid character in username."
 msgstr "Невалиден символ в потребителското име."
 
-#: ../src/common/helpers.py:156
-msgid "Server address required."
-msgstr "Необходим е адрес на сървъра."
+#: ../src/common/helpers.py:159
+msgid "Server must be between 1 and 1023 chars"
+msgstr ""
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 msgid "Invalid character in hostname."
 msgstr "Невалиден символ в името на хоста."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:166
+msgid "Server address required."
+msgstr "Необходим е адрес на сървъра."
+
+#: ../src/common/helpers.py:170
+msgid "Resource must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:175
 msgid "Invalid character in resource."
 msgstr "Невалиден символ в ресурса."
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:215
 msgid "_Busy"
 msgstr "_Зает"
 
-#: ../src/common/helpers.py:211 ../src/tooltips.py:195
+#: ../src/common/helpers.py:217 ../src/tooltips.py:195
 msgid "Busy"
 msgstr "Зает"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:220
 msgid "_Not Available"
 msgstr "_Не съм на разположение"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:225
 msgid "_Free for Chat"
 msgstr "_Свободен за разговор"
 
-#: ../src/common/helpers.py:221 ../src/tooltips.py:191
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Free for Chat"
 msgstr "Свободен за разговор"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:230
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "Временно прекъснат"
 
-#: ../src/common/helpers.py:226 ../src/tooltips.py:189
+#: ../src/common/helpers.py:232 ../src/tooltips.py:189
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Временно прекъснат"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:234
 msgid "Connecting"
 msgstr "Свързване"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:237
 msgid "A_way"
 msgstr "_Отсъствам"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:242
 msgid "_Offline"
 msgstr "_Изключен"
 
-#: ../src/common/helpers.py:238 ../src/tooltips.py:199
+#: ../src/common/helpers.py:244 ../src/tooltips.py:199
 msgid "Offline"
 msgstr "Изключен"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:247
 msgid "_Invisible"
 msgstr "Не_видим"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:253
 msgid "?contact has status:Unknown"
 msgstr "Неизвестно"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:255
 msgid "?contact has status:Has errors"
 msgstr "Има грешки"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:260
 msgid "?Subscription we already have:None"
 msgstr "Няма"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:262
 msgid "To"
 msgstr "За"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
+msgid "From"
+msgstr "От"
+
+#: ../src/common/helpers.py:266
 msgid "Both"
 msgstr "Двустранно"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:274
 msgid "?Ask (for Subscription):None"
 msgstr "Няма"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:276
 msgid "Subscribe"
 msgstr "Записване"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:285
 msgid "?Group Chat Contact Role:None"
 msgstr "Не е установен"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:288
 msgid "Moderators"
 msgstr "Председатели"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:290
 msgid "Moderator"
 msgstr "Председател"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:293
 msgid "Participants"
 msgstr "Участници"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:295
 msgid "Participant"
 msgstr "Участник"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:298
 msgid "Visitors"
 msgstr "Посетители"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:300
 msgid "Visitor"
 msgstr "Посетител"
 
-#: ../src/common/helpers.py:300 ../src/tooltips.py:210
+#: ../src/common/helpers.py:306 ../src/tooltips.py:210
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Няма"
 
-#: ../src/common/helpers.py:302 ../src/tooltips.py:216
+#: ../src/common/helpers.py:308 ../src/tooltips.py:216
 msgid "Owner"
 msgstr "Собственик"
 
-#: ../src/common/helpers.py:304 ../src/tooltips.py:214
+#: ../src/common/helpers.py:310 ../src/tooltips.py:214
 msgid "Administrator"
 msgstr "Администратор"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:212
+#: ../src/common/helpers.py:312 ../src/tooltips.py:212
 msgid "Member"
 msgstr "Член"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:351
 msgid "is paying attention to the conversation"
 msgstr "обръща внимание на разговора"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:353
 msgid "is doing something else"
 msgstr "прави нещо друго"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:355
 msgid "is composing a message..."
 msgstr "пише съобщение…"
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:352
+#: ../src/common/helpers.py:358
 msgid "paused composing a message"
 msgstr "спря да пише съобщение"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:360
 msgid "has closed the chat window or tab"
 msgstr "затвори прозореца или подпрозореца"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:619
+#: ../src/common/helpers.py:625
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:622
+#: ../src/common/helpers.py:628
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:626
+#: ../src/common/helpers.py:632
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:629
+#: ../src/common/helpers.py:635
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:633
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s KiB"
 msgstr "%s KB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:636
+#: ../src/common/helpers.py:642
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:645
 #, python-format
 msgid "%s B"
 msgstr "%s B"
@@ -5389,12 +5558,12 @@ msgstr "Gajim - %s"
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:111
+#: ../src/common/jingle_rtp.py:107
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Настройки на стаята"
 
-#: ../src/common/jingle_rtp.py:112
+#: ../src/common/jingle_rtp.py:108
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5406,30 +5575,30 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:209
+#: ../src/common/jingle_rtp.py:205
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:210
+#: ../src/common/jingle_rtp.py:206
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Грешка: %s"
 
-#: ../src/common/jingle_rtp.py:336
+#: ../src/common/jingle_rtp.py:335
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:339
+#: ../src/common/jingle_rtp.py:338
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:382
+#: ../src/common/jingle_rtp.py:381
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:390
+#: ../src/common/jingle_rtp.py:389
 msgid "video output"
 msgstr ""
 
@@ -5506,11 +5675,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "грешка: %s не може да бъде отворен за четене"
 
-#: ../src/common/optparser.py:299 ../src/common/optparser.py:300
+#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
 msgid "cyan"
 msgstr "синьозелена"
 
-#: ../src/common/optparser.py:379
+#: ../src/common/optparser.py:383
 msgid "migrating logs database to indices"
 msgstr "мигриране на базата от данни с дневници към индекси"
 
@@ -6183,7 +6352,7 @@ msgstr ""
 "бъде отменен."
 
 #. we're not english
-#: ../src/common/stanza_session.py:303
+#: ../src/common/stanza_session.py:423
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6191,11 +6360,11 @@ msgstr ""
 "[Това е част от шифрирана сесия. Ако виждате това съобщение, нещо не е както "
 "трябва.]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:178
+#: ../src/common/zeroconf/connection_zeroconf.py:181
 msgid "Avahi error"
 msgstr "Грешка на Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:179
+#: ../src/common/zeroconf/connection_zeroconf.py:182
 #, python-format
 msgid ""
 "%s\n"
@@ -6205,44 +6374,44 @@ msgstr ""
 "Изпращането и получаването на съобщения тип „link-local“ може и да не "
 "функционира правилно."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:190
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Проверете дали Avahi или Bonjour е инсталиран."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:199
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Could not start local service"
 msgstr "Неуспех при стартирането на локална услуга"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Неуспех при свързването с порт %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-#: ../src/common/zeroconf/connection_zeroconf.py:283
-#: ../src/common/zeroconf/connection_zeroconf.py:294
-#: ../src/common/zeroconf/connection_zeroconf.py:308
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:286
+#: ../src/common/zeroconf/connection_zeroconf.py:297
+#: ../src/common/zeroconf/connection_zeroconf.py:311
 msgid "Please check if avahi-daemon is running."
 msgstr "Проверете дали е стартиран avahi-daemon."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:282
-#: ../src/common/zeroconf/connection_zeroconf.py:293
-#: ../src/common/zeroconf/connection_zeroconf.py:307
+#: ../src/common/zeroconf/connection_zeroconf.py:285
+#: ../src/common/zeroconf/connection_zeroconf.py:296
+#: ../src/common/zeroconf/connection_zeroconf.py:310
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Неуспех при промяната на състоянието на акаунт „%s“"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:325
+#: ../src/common/zeroconf/connection_zeroconf.py:328
 msgid "Your message could not be sent."
 msgstr "Съобщението ви не можа да бъде изпратено."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:335
+#: ../src/common/zeroconf/connection_zeroconf.py:338
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Контактът е изключен. Съобщението ви не можа да бъде изпратено."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:363
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6263,16 +6432,16 @@ msgstr "Стандартно съобщение"
 msgid "Enabled"
 msgstr "Включено"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3078
+#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
 msgid "Default"
 msgstr "По подразбиране"
 
-#: ../src/config.py:739 ../src/dialogs.py:1395
+#: ../src/config.py:733 ../src/dialogs.py:1409
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Няма наличен речник за %s език"
 
-#: ../src/config.py:740
+#: ../src/config.py:734
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6290,9 +6459,9 @@ msgid "status message text"
 msgstr "текст на съобщението за състояние"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2383 ../src/dialogs.py:2449
-#: ../src/dialogs.py:3215 ../src/disco.py:866 ../src/disco.py:1726
-#: ../src/disco.py:2030 ../src/history_window.py:90
+#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
+#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
+#: ../src/disco.py:2048 ../src/history_window.py:90
 msgid "Name"
 msgstr "Име"
 
@@ -6330,7 +6499,7 @@ msgstr ""
 "Всички прозорци за разговори и стаи ще бъдат затворени. Искате ли да "
 "продължите?"
 
-#: ../src/config.py:1976 ../src/config.py:2509 ../src/config.py:2545
+#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
 msgid "You are currently connected to the server"
 msgstr "В момента сте свързани със сървъра"
 
@@ -6365,136 +6534,136 @@ msgstr "Трябва да посочите някакво име на акаун
 msgid "Account name cannot contain spaces."
 msgstr "Името на акаунта не може да съдържа интервали."
 
-#: ../src/config.py:2072
+#: ../src/config.py:2074
 msgid "Rename Account"
 msgstr "Преименуване на акаунт"
 
-#: ../src/config.py:2073
+#: ../src/config.py:2075
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Въведете ново име за акаунт „%s“"
 
-#: ../src/config.py:2101
+#: ../src/config.py:2103
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID трябва да бъде във формат „user@server“."
 
-#: ../src/config.py:2318 ../src/config.py:3606
+#: ../src/config.py:2320 ../src/config.py:3623
 msgid "Invalid entry"
 msgstr "Невалиден формат"
 
-#: ../src/config.py:2319 ../src/config.py:3607
+#: ../src/config.py:2321 ../src/config.py:3624
 msgid "Custom port must be a port number."
 msgstr "Портът по избор трябва все пак да е номер на порт."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2342
 msgid "Failed to get secret keys"
 msgstr "Неуспех при извличането на частните ключове"
 
-#: ../src/config.py:2341
+#: ../src/config.py:2343
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Възникна проблем при извличането на частните ви OpenPGP ключове."
 
-#: ../src/config.py:2375
+#: ../src/config.py:2377
 msgid "OpenPGP Key Selection"
 msgstr "Избор на ключ на OpenPGP"
 
-#: ../src/config.py:2376
+#: ../src/config.py:2378
 msgid "Choose your OpenPGP key"
 msgstr "Изберете вашия ключ на OpenPGP"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2385
 msgid "No such account available"
 msgstr "Няма такъв наличен акаунт"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2386
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Трябва първо да създадете акаунт и след това да редактирате личните данни."
 
-#: ../src/config.py:2391 ../src/dialogs.py:2136 ../src/dialogs.py:2371
-#: ../src/dialogs.py:2557 ../src/disco.py:511 ../src/profile_window.py:339
+#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
+#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
 msgid "You are not connected to the server"
 msgstr "Не сте свързани към сървъра."
 
-#: ../src/config.py:2392
+#: ../src/config.py:2394
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Трябва да сте свързани, за да редактирате личните данни."
 
-#: ../src/config.py:2396
+#: ../src/config.py:2398
 msgid "Your server doesn't support Vcard"
 msgstr "Сървърът ви не поддържа визитки"
 
-#: ../src/config.py:2397
+#: ../src/config.py:2399
 msgid "Your server can't save your personal information."
 msgstr "Сървърът ви не може да запази личната ви информация."
 
-#: ../src/config.py:2510 ../src/config.py:2546
+#: ../src/config.py:2512 ../src/config.py:2548
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Трябва да сте изключени, за да смените името на акаунта."
 
-#: ../src/config.py:2515
+#: ../src/config.py:2517
 msgid "Account Local already exists."
 msgstr "Името на акаунта вече се използва."
 
-#: ../src/config.py:2516
+#: ../src/config.py:2518
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Преименувайте го или го премахнете преди да активирате съобщения от/за "
 "локални контакти."
 
-#: ../src/config.py:2673
+#: ../src/config.py:2675
 #, python-format
 msgid "Edit %s"
 msgstr "Редактиране на %s"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2677
 #, python-format
 msgid "Register to %s"
 msgstr "Регистриране в %s"
 
 #. list at the beginning
-#: ../src/config.py:2711
+#: ../src/config.py:2713
 msgid "Ban List"
 msgstr "Списък с отлъчени"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2714
 msgid "Member List"
 msgstr "Списък с членове"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2714
 msgid "Owner List"
 msgstr "Списък със собственици"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2715
 msgid "Administrator List"
 msgstr "Списък с администратори"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2763 ../src/disco.py:873 ../src/history_manager.py:201
+#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2773
+#: ../src/config.py:2789
 msgid "Reason"
 msgstr "Причина"
 
-#: ../src/config.py:2780
+#: ../src/config.py:2796
 msgid "Nick"
 msgstr "Псевдоним"
 
-#: ../src/config.py:2786
+#: ../src/config.py:2802
 msgid "Role"
 msgstr "Роля"
 
-#: ../src/config.py:2813
+#: ../src/config.py:2829
 msgid "Banning..."
 msgstr "Отлъчване…"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2815
+#: ../src/config.py:2831
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6502,11 +6671,11 @@ msgstr ""
 "<b>Кого искате да отлъчите?</b>\n"
 "\n"
 
-#: ../src/config.py:2817
+#: ../src/config.py:2833
 msgid "Adding Member..."
 msgstr "Добавяне на член…"
 
-#: ../src/config.py:2818
+#: ../src/config.py:2834
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6514,11 +6683,11 @@ msgstr ""
 "<b>Кого искате да направите член?</b>\n"
 "\n"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2836
 msgid "Adding Owner..."
 msgstr "Добавяне на собственик…"
 
-#: ../src/config.py:2821
+#: ../src/config.py:2837
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6526,11 +6695,11 @@ msgstr ""
 "<b>Кого искате да направите собственик?</b>\n"
 "\n"
 
-#: ../src/config.py:2823
+#: ../src/config.py:2839
 msgid "Adding Administrator..."
 msgstr "Добавяне на администратор…"
 
-#: ../src/config.py:2824
+#: ../src/config.py:2840
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6538,7 +6707,7 @@ msgstr ""
 "<b>Кого искате да направите администратор?</b>\n"
 "\n"
 
-#: ../src/config.py:2825
+#: ../src/config.py:2841
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6555,111 +6724,111 @@ msgstr ""
 "4. домейн (домейна съвпада, както и всеки потребител@домейн,\n"
 "домейн/ресурс или адрес, съдържащ под-домейн."
 
-#: ../src/config.py:2926
+#: ../src/config.py:2943
 #, python-format
 msgid "Removing %s account"
 msgstr "Премахване на акаунт „%s“"
 
-#: ../src/config.py:2941
+#: ../src/config.py:2958
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Емотиконите са изключени"
 
-#: ../src/config.py:2942
+#: ../src/config.py:2959
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2955 ../src/gui_interface.py:1132
-#: ../src/gui_interface.py:1243
+#: ../src/config.py:2972 ../src/gui_interface.py:311
+#: ../src/gui_interface.py:1048
 msgid "Password Required"
 msgstr "Необходима е парола"
 
-#: ../src/config.py:2956 ../src/gui_interface.py:1223
+#: ../src/config.py:2973 ../src/gui_interface.py:1028
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Въведете парола за акаунт „%s“"
 
-#: ../src/config.py:2957 ../src/gui_interface.py:1243
+#: ../src/config.py:2974 ../src/gui_interface.py:1048
 msgid "Save password"
 msgstr "Запазване на паролата"
 
-#: ../src/config.py:2967
+#: ../src/config.py:2984
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Акаунт „%s“ е свързан към сървъра"
 
-#: ../src/config.py:2968
+#: ../src/config.py:2985
 msgid "If you remove it, the connection will be lost."
 msgstr "Ако го премахнете, връзката ще се разпадне."
 
-#: ../src/config.py:2982
+#: ../src/config.py:2999
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Неуспех при свързването със сървъра-посредник"
 
-#: ../src/config.py:2983
+#: ../src/config.py:3000
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Какво искате да направите?"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3001
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Премахване на акаунт _само от Gajim"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3002
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3078
+#: ../src/config.py:3095
 msgid "?print_status:All"
 msgstr "Всички"
 
-#: ../src/config.py:3079
+#: ../src/config.py:3096
 msgid "Enter and leave only"
 msgstr "Само влизащи и излизащи"
 
-#: ../src/config.py:3080
+#: ../src/config.py:3097
 msgid "?print_status:None"
 msgstr "Без"
 
-#: ../src/config.py:3150
+#: ../src/config.py:3167
 msgid "New Group Chat"
 msgstr "Нова стая"
 
-#: ../src/config.py:3183
+#: ../src/config.py:3200
 msgid "This bookmark has invalid data"
 msgstr "Тази отметка съдържа невалидни данни"
 
-#: ../src/config.py:3184
+#: ../src/config.py:3201
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Попълнете полетата за сървър и стая или изтрийте тази отметка."
 
 #. invalid char
-#: ../src/config.py:3302 ../src/dialogs.py:1934
+#: ../src/config.py:3319 ../src/dialogs.py:1950
 msgid "Invalid nickname"
 msgstr "Невалиден псевдоним"
 
-#: ../src/config.py:3303 ../src/config.py:3317 ../src/config.py:3331
+#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Псевдонимът не е позволен: %s"
 
-#: ../src/config.py:3316 ../src/config.py:3582
+#: ../src/config.py:3333 ../src/config.py:3599
 msgid "Invalid server"
 msgstr "Невалиден сървър"
 
-#: ../src/config.py:3330
+#: ../src/config.py:3347
 #, fuzzy
 msgid "Invalid room"
 msgstr "Невалиден формат"
 
-#: ../src/config.py:3498
+#: ../src/config.py:3515
 msgid "Account has been added successfully"
 msgstr "Акаунтът беше добавен успешно"
 
-#: ../src/config.py:3499 ../src/config.py:3505
+#: ../src/config.py:3516 ../src/config.py:3522
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6669,33 +6838,33 @@ msgstr ""
 "Може да настроите допълнителните опции, като натиснете бутона „Напреднали“ "
 "или по-късно от менюто „Редактиране“->„Акаунти“ в основния прозорец."
 
-#: ../src/config.py:3504
+#: ../src/config.py:3521
 msgid "Your new account has been created successfully"
 msgstr "Новият акаунт беше създаден успешно"
 
-#: ../src/config.py:3543
+#: ../src/config.py:3560
 msgid "Invalid username"
 msgstr "Невалидно потребителско име"
 
-#: ../src/config.py:3545
+#: ../src/config.py:3562
 msgid "You must provide a username to configure this account."
 msgstr "Трябва да въведете име на потребител за новия акаунт."
 
-#: ../src/config.py:3583
+#: ../src/config.py:3600
 msgid "Please provide a server on which you want to register."
 msgstr "Задайте сървър, където искате да се регистрирате."
 
-#: ../src/config.py:3639 ../src/gui_interface.py:1904
+#: ../src/config.py:3656 ../src/gui_interface.py:1693
 msgid "Certificate Already in File"
 msgstr "Сертификатът вече е във файла"
 
-#: ../src/config.py:3640 ../src/gui_interface.py:1905
+#: ../src/config.py:3657 ../src/gui_interface.py:1694
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 "Този сертификат вече е във файла „%s“, така че няма да бъде добавен наново."
 
-#: ../src/config.py:3717
+#: ../src/config.py:3734
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6710,7 +6879,7 @@ msgstr ""
 "Грешка на SSL: %(error)s\n"
 "Все още ли искате да се свържете с този сървър?"
 
-#: ../src/config.py:3723 ../src/gui_interface.py:1932
+#: ../src/config.py:3740 ../src/gui_interface.py:1721
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6721,63 +6890,72 @@ msgstr ""
 "Отпечатък тип SHA1 на сертификата:\n"
 "%s"
 
-#: ../src/config.py:3755 ../src/config.py:3789
+#: ../src/config.py:3772 ../src/config.py:3806
 msgid "An error occurred during account creation"
 msgstr "Възникна грешка при създаването на акаунта"
 
-#: ../src/config.py:3854
+#: ../src/config.py:3871
 msgid "Account name is in use"
 msgstr "Името на акаунта се използва"
 
-#: ../src/config.py:3855
+#: ../src/config.py:3872
 msgid "You already have an account using this name."
 msgstr "Вече има регистриран акаунт с това име."
 
-#: ../src/config.py:4009
+#: ../src/config.py:3991
+msgid "PEP node was not removed"
+msgstr "Възелът на PEP не беше премахнат"
+
+#: ../src/config.py:3992
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr "Възелът на PEP %(node)s не беше премахнат: %(message)s"
+
+#: ../src/config.py:4036
 msgid "Active"
 msgstr "Активен"
 
-#: ../src/config.py:4017
+#: ../src/config.py:4044
 msgid "Event"
 msgstr "Събитие"
 
-#: ../src/config.py:4052
+#: ../src/config.py:4079
 msgid "First Message Received"
 msgstr "Първо получено съобщение"
 
-#: ../src/config.py:4053
+#: ../src/config.py:4080
 msgid "Next Message Received Focused"
 msgstr "Следващо получено съобщение в прозорец на фокус"
 
-#: ../src/config.py:4055
+#: ../src/config.py:4082
 msgid "Next Message Received Unfocused"
 msgstr "Следващо получено съобщение в прозорец без фокус"
 
-#: ../src/config.py:4056
+#: ../src/config.py:4083
 msgid "Contact Connected"
 msgstr "Включване на контакт"
 
-#: ../src/config.py:4057
+#: ../src/config.py:4084
 msgid "Contact Disconnected"
 msgstr "Изключване на контакт"
 
-#: ../src/config.py:4058
+#: ../src/config.py:4085
 msgid "Message Sent"
 msgstr "Изпратено съобщение"
 
-#: ../src/config.py:4059
+#: ../src/config.py:4086
 msgid "Group Chat Message Highlight"
 msgstr "Осветено съобщение в стая"
 
-#: ../src/config.py:4060
+#: ../src/config.py:4087
 msgid "Group Chat Message Received"
 msgstr "Получено съобщение в стая"
 
-#: ../src/config.py:4061
+#: ../src/config.py:4088
 msgid "GMail Email Received"
 msgstr "Получена поща от Gmail"
 
-#: ../src/conversation_textview.py:600
+#: ../src/conversation_textview.py:601
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6787,7 +6965,7 @@ msgstr ""
 "получено от отсрещния контакт. Ако иконата остане\n"
 "дълго време, най-вероятно съобщението е било изгубено."
 
-#: ../src/conversation_textview.py:619
+#: ../src/conversation_textview.py:620
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6795,45 +6973,45 @@ msgstr ""
 "Текстът под този ред е последното, което е казано откакто\n"
 "за последен път сте обърнали внимание на тази стая"
 
-#: ../src/conversation_textview.py:739
+#: ../src/conversation_textview.py:740
 #, fuzzy
 msgid "_Quote"
 msgstr "_Изход"
 
-#: ../src/conversation_textview.py:746
+#: ../src/conversation_textview.py:747
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Действия за „%s“"
 
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Read _Wikipedia Article"
 msgstr "Четене на статия от _Уикипедия"
 
-#: ../src/conversation_textview.py:763
+#: ../src/conversation_textview.py:765
 msgid "Look it up in _Dictionary"
 msgstr "Проверка в _речника"
 
-#: ../src/conversation_textview.py:780
+#: ../src/conversation_textview.py:782
 #, 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:793
+#: ../src/conversation_textview.py:795
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Липсва „%s“ в адреса за търсене"
 
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 msgid "Web _Search for it"
 msgstr "_Търсене в уеб"
 
-#: ../src/conversation_textview.py:802
+#: ../src/conversation_textview.py:804
 msgid "Open as _Link"
 msgstr "Отваряне като _връзка"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1296
+#: ../src/conversation_textview.py:1298
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6841,185 +7019,190 @@ msgstr[0] "Вчера"
 msgstr[1] "Вчера"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1344 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
 
-#: ../src/dataforms_widget.py:544
+#: ../src/dataforms_widget.py:545
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Неуспех при зареждането на модула „idle“"
 
-#: ../src/dataforms_widget.py:546
+#: ../src/dataforms_widget.py:547
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Състоянието „Невидим“ не се поддържа."
 
-#: ../src/dataforms_widget.py:601
+#: ../src/dataforms_widget.py:562
+msgid "This field is required"
+msgstr ""
+
+#: ../src/dataforms_widget.py:607
 msgid "Jabber ID already in list"
 msgstr "В списъка вече има такъв Jabber ID"
 
-#: ../src/dataforms_widget.py:602
+#: ../src/dataforms_widget.py:608
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Въведеният Jabber ID вече съществува в списъка. Изберете друг."
 
 #. Default jid
-#: ../src/dataforms_widget.py:613
+#: ../src/dataforms_widget.py:619
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:616 ../src/dataforms_widget.py:618
+#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Име на контакта: <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:195
 msgid "Group"
 msgstr "Група"
 
-#: ../src/dialogs.py:201
+#: ../src/dialogs.py:202
 msgid "In the group"
 msgstr "В групата"
 
-#: ../src/dialogs.py:292
+#: ../src/dialogs.py:293
 msgid "KeyID"
 msgstr "Идентификатор на ключ"
 
-#: ../src/dialogs.py:297
+#: ../src/dialogs.py:298
 msgid "Contact name"
 msgstr "Име на контакта"
 
-#: ../src/dialogs.py:469
+#: ../src/dialogs.py:470
 msgid "Set Mood"
 msgstr "Задаване на настроение"
 
-#: ../src/dialogs.py:589
+#: ../src/dialogs.py:590
 #, python-format
 msgid "%s Status Message"
 msgstr "Съобщение за състояние „%s“"
 
-#: ../src/dialogs.py:603
+#: ../src/dialogs.py:604
 msgid "Status Message"
 msgstr "Съобщение за състояние"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:794
 msgid "Overwrite Status Message?"
 msgstr "Презаписване на съобщението за състояние?"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:795
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "Това име вече се използва. Искате ли да презапишете това съобщение за "
 "състояние?"
 
-#: ../src/dialogs.py:802
+#: ../src/dialogs.py:803
 msgid "Save as Preset Status Message"
 msgstr "Запазване като настроено съобщение за състояние"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:804
 msgid "Please type a name for this status message"
 msgstr "Напишете име за това съобщение за състояние"
 
-#: ../src/dialogs.py:831
+#: ../src/dialogs.py:832
 msgid "AIM Address:"
 msgstr "Адрес на AIM:"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:833
 msgid "GG Number:"
 msgstr "Номер на GG:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:834
 msgid "ICQ Number:"
 msgstr "Номер на ICQ:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:835
 msgid "MSN Address:"
 msgstr "Адрес на MSN:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:836
 msgid "Yahoo! Address:"
 msgstr "Адрес на Yahoo!:"
 
-#: ../src/dialogs.py:872
+#: ../src/dialogs.py:873
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Попълнете данните за контакта, който искате да добавите към акаунт „%s“"
 
-#: ../src/dialogs.py:875
+#: ../src/dialogs.py:876
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Попълнете данните за контакта, който искате да добавите"
 
-#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
+#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
+#: ../src/dialogs.py:3464
 msgid "Invalid User ID"
 msgstr "Невалиден идентификатор"
 
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1052
 msgid "The user ID must not contain a resource."
 msgstr "Потребителският идентификатор не трябва да съдържа ресурс."
 
-#: ../src/dialogs.py:1051
+#: ../src/dialogs.py:1057
 msgid "You cannot add yourself to your roster."
 msgstr "Не може да добавите себе си към списъка."
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1071
 msgid "Contact already in roster"
 msgstr "Контактът вече е в списъка"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1072
 msgid "This contact is already listed in your roster."
 msgstr "Контактът вече съществува в списъка."
 
-#: ../src/dialogs.py:1112
+#: ../src/dialogs.py:1118
 msgid "User ID:"
 msgstr "Идентификатор на потребител:"
 
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1189
 msgid "A GTK+ jabber client"
 msgstr "Джабър клиент за GTK+"
 
-#: ../src/dialogs.py:1176
+#: ../src/dialogs.py:1190
 msgid "GTK+ Version:"
 msgstr "Версия на GTK+:"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1191
 msgid "PyGTK Version:"
 msgstr "Версия на PyGTK:"
 
-#: ../src/dialogs.py:1187
+#: ../src/dialogs.py:1201
 msgid "Current Developers:"
 msgstr "Текущи разработчици:"
 
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1203
 msgid "Past Developers:"
 msgstr "Бивши разработчици:"
 
-#: ../src/dialogs.py:1195
+#: ../src/dialogs.py:1209
 msgid "THANKS:"
 msgstr "БЛАГОДАРНОСТИ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1215
 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:1213
+#: ../src/dialogs.py:1227
 msgid "translator-credits"
 msgstr ""
 "Явор Доганов <yavor@gnu.org>\n"
@@ -7028,7 +7211,7 @@ msgstr ""
 "Научете повече за нас на http://gnome.cult.bg\n"
 "Докладвайте за грешки на http://gnome.cult.bg/bugs"
 
-#: ../src/dialogs.py:1396
+#: ../src/dialogs.py:1410
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7041,102 +7224,102 @@ msgstr ""
 "\n"
 "Функционалността за осветяване на сгрешени думи ще е изключена"
 
-#: ../src/dialogs.py:1935 ../src/dialogs.py:2322
+#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
 msgid "The nickname has not allowed characters."
 msgstr "Псевдонимът съдържа непозволени знаци."
 
-#: ../src/dialogs.py:2053
+#: ../src/dialogs.py:2069
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Искане за записване за акаунт „%(account)s“ от %(jid)s"
 
-#: ../src/dialogs.py:2056
+#: ../src/dialogs.py:2072
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Искане за записване от %s"
 
-#: ../src/dialogs.py:2131 ../src/gui_interface.py:2672
+#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Вече сте в стая „%s“"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2153
 msgid "You can not join a group chat unless you are connected."
 msgstr "Трябва да сте свързани, за да влезете в стая."
 
-#: ../src/dialogs.py:2178
+#: ../src/dialogs.py:2194
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Влизане в стая с акаунт „%s“"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2325
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Невалидно име на акаунт"
 
-#: ../src/dialogs.py:2310
+#: ../src/dialogs.py:2326
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Акаунт, от който искате да влезете в стаята"
 
-#: ../src/dialogs.py:2321
+#: ../src/dialogs.py:2337
 msgid "Invalid Nickname"
 msgstr "Невалиден псевдоним"
 
-#: ../src/dialogs.py:2326 ../src/dialogs.py:2332
-#: ../src/groupchat_control.py:1832
+#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
+#: ../src/groupchat_control.py:1847
 msgid "Invalid group chat Jabber ID"
 msgstr "Невалиден Jabber ID на стая"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2343
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "Jabber ID на стаята съдържа непозволени знаци."
 
-#: ../src/dialogs.py:2333 ../src/groupchat_control.py:1833
+#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Jabber ID на стаята съдържа непозволени знаци."
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2356
 msgid "This is not a group chat"
 msgstr "Това не е стая"
 
-#: ../src/dialogs.py:2341
+#: ../src/dialogs.py:2357
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s не е име на стая."
 
-#: ../src/dialogs.py:2372
+#: ../src/dialogs.py:2388
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Трябва да сте свързани, за да синхронизирате контактите си."
 
-#: ../src/dialogs.py:2386
+#: ../src/dialogs.py:2402
 msgid "Server"
 msgstr "Сървър"
 
-#: ../src/dialogs.py:2421
+#: ../src/dialogs.py:2437
 msgid "This account is not connected to the server"
 msgstr "Този акаунт не е свързан към сървъра"
 
-#: ../src/dialogs.py:2422
+#: ../src/dialogs.py:2438
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Не може да се синхронизирате с акаунт, ако не е свързан."
 
-#: ../src/dialogs.py:2446
+#: ../src/dialogs.py:2462
 msgid "Synchronise"
 msgstr "Синхронизиране"
 
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2523
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Започване на разговор с акаунт „%s“"
 
-#: ../src/dialogs.py:2509
+#: ../src/dialogs.py:2525
 msgid "Start Chat"
 msgstr "Започване на разговор"
 
-#: ../src/dialogs.py:2510
+#: ../src/dialogs.py:2526
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7145,168 +7328,168 @@ msgstr ""
 "искате да изпратите съобщение:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2536 ../src/dialogs.py:2917 ../src/dialogs.py:3129
+#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
 msgid "Connection not available"
 msgstr "В момента няма връзка"
 
-#: ../src/dialogs.py:2537 ../src/dialogs.py:2918 ../src/dialogs.py:3130
+#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Уверете се, че сте свързани към „%s“."
 
-#: ../src/dialogs.py:2546 ../src/dialogs.py:2549
+#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
 msgid "Invalid JID"
 msgstr "Невалиден JID"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2565
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Неуспех при анализирането на „%s“."
 
-#: ../src/dialogs.py:2558
+#: ../src/dialogs.py:2574
 msgid "Without a connection, you can not change your password."
 msgstr "Трябва да сте свързани, за да променяте паролата."
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "Invalid password"
 msgstr "Невалидна парола"
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "You must enter a password."
 msgstr "Трябва да въведете парола."
 
-#: ../src/dialogs.py:2581
+#: ../src/dialogs.py:2597
 msgid "Passwords do not match"
 msgstr "Паролите не съвпадат"
 
-#: ../src/dialogs.py:2582
+#: ../src/dialogs.py:2598
 msgid "The passwords typed in both fields must be identical."
 msgstr "Паролите, написани в двете полета, трябва да са едни и същи."
 
 #. default value
-#: ../src/dialogs.py:2619 ../src/notify.py:247 ../src/notify.py:473
+#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
 msgid "Contact Signed In"
 msgstr "Включи се контакт"
 
-#: ../src/dialogs.py:2621 ../src/notify.py:255 ../src/notify.py:475
+#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
 msgid "Contact Signed Out"
 msgstr "Изключи се контакт"
 
 #. chat message
-#: ../src/dialogs.py:2623 ../src/notify.py:277 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
 msgid "New Message"
 msgstr "Ново съобщение"
 
 #. single message
-#: ../src/dialogs.py:2623 ../src/notify.py:259 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
 msgid "New Single Message"
 msgstr "Ново еднократно съобщение"
 
 #. private message
-#: ../src/dialogs.py:2624 ../src/notify.py:265 ../src/notify.py:478
+#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
 msgid "New Private Message"
 msgstr "Ново лично съобщение"
 
-#: ../src/dialogs.py:2624 ../src/gui_interface.py:1358 ../src/notify.py:487
+#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
 msgid "New E-mail"
 msgstr "Нова е-поща"
 
-#: ../src/dialogs.py:2626 ../src/gui_interface.py:1420 ../src/notify.py:480
+#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
 msgid "File Transfer Request"
 msgstr "Запитване за файлов трансфер"
 
-#: ../src/dialogs.py:2628 ../src/gui_interface.py:1320
-#: ../src/gui_interface.py:1389 ../src/notify.py:482
+#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
+#: ../src/gui_interface.py:1186 ../src/notify.py:482
 msgid "File Transfer Error"
 msgstr "Грешка при файловия трансфер"
 
-#: ../src/dialogs.py:2630 ../src/gui_interface.py:1466
-#: ../src/gui_interface.py:1489 ../src/gui_interface.py:1506
+#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
+#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
 #: ../src/notify.py:484
 msgid "File Transfer Completed"
 msgstr "Файловият трансфер е приключен"
 
-#: ../src/dialogs.py:2631 ../src/gui_interface.py:1469 ../src/notify.py:485
+#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
 msgid "File Transfer Stopped"
 msgstr "Файловият трансфер е преустановен"
 
-#: ../src/dialogs.py:2633 ../src/gui_interface.py:1152 ../src/notify.py:489
+#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
 msgid "Groupchat Invitation"
 msgstr "Покана за разговор в стая"
 
-#: ../src/dialogs.py:2635 ../src/notify.py:239 ../src/notify.py:491
+#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
 msgid "Contact Changed Status"
 msgstr "Контактът промени състоянието си"
 
-#: ../src/dialogs.py:2836
+#: ../src/dialogs.py:2852
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Еднократно съобщение с акаунт „%s“"
 
-#: ../src/dialogs.py:2838
+#: ../src/dialogs.py:2854
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Еднократно съобщение за акаунт „%s“"
 
-#: ../src/dialogs.py:2840
+#: ../src/dialogs.py:2856
 msgid "Single Message"
 msgstr "Еднократно съобщение"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2843
+#: ../src/dialogs.py:2859
 #, python-format
 msgid "Send %s"
 msgstr "Изпращане на %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:2882
 #, python-format
 msgid "Received %s"
 msgstr "Получено %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2889
+#: ../src/dialogs.py:2905
 #, 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:2968
+#: ../src/dialogs.py:2984
 #, python-format
 msgid "RE: %s"
 msgstr "Относно: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:2985
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s написа:\n"
 
-#: ../src/dialogs.py:3028
+#: ../src/dialogs.py:3044
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML конзола за %s"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3046
 msgid "XML Console"
 msgstr "XML конзола"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "add"
 msgstr "Тъжен"
 
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "modify"
 msgstr "Унил"
 
-#: ../src/dialogs.py:3160
+#: ../src/dialogs.py:3176
 #, fuzzy
 msgid "remove"
 msgstr "П_ремахване"
 
-#: ../src/dialogs.py:3188
+#: ../src/dialogs.py:3204
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7314,160 +7497,194 @@ msgid ""
 msgstr "Бих искал(а) да ви добавя към списъка си."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3204 ../src/dialogs.py:3250
+#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
 msgid "Add"
 msgstr ""
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3206 ../src/dialogs.py:3281
+#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
 #, fuzzy
 msgid "Modify"
 msgstr "Унил"
 
-#: ../src/dialogs.py:3212
+#: ../src/dialogs.py:3228
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:3218
+#: ../src/dialogs.py:3234
 #, fuzzy
 msgid "Groups"
 msgstr "Група"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3342
 #, 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:3340
+#: ../src/dialogs.py:3356
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "Добавяне на _контакт"
 
-#: ../src/dialogs.py:3377
+#: ../src/dialogs.py:3393
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Премахване на контакт от списъка"
 
-#: ../src/dialogs.py:3430
+#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#, python-format
+msgid "Archiving Preferences for %s"
+msgstr ""
+
+#: ../src/dialogs.py:3473
+#, fuzzy
+msgid "Invalid expire value"
+msgstr "Невалидно име на сървър"
+
+#: ../src/dialogs.py:3474
+msgid "Expire must be a valid positive integer."
+msgstr ""
+
+#: ../src/dialogs.py:3521
+msgid "There is an error with the form"
+msgstr ""
+
+#: ../src/dialogs.py:3732
+#, fuzzy
+msgid "There is an error"
+msgstr "Услугата върна грешка."
+
+#: ../src/dialogs.py:3796
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Филтър за уединение <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3434
+#: ../src/dialogs.py:3800
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Филтър за уединение за %s"
 
-#: ../src/dialogs.py:3490
+#: ../src/dialogs.py:3856
 #, 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:3495
+#: ../src/dialogs.py:3861
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ред: %(order)s, действие: %(action)s"
 
-#: ../src/dialogs.py:3539
+#: ../src/dialogs.py:3905
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Редактиране на правило</b>"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:4016
 msgid "<b>Add a rule</b>"
 msgstr "<b>Добавяне на правило</b>"
 
-#: ../src/dialogs.py:3750
+#: ../src/dialogs.py:4116
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Филтри за уединение за %s"
 
-#: ../src/dialogs.py:3752
+#: ../src/dialogs.py:4118
 msgid "Privacy Lists"
 msgstr "Филтри за уединение"
 
-#: ../src/dialogs.py:3822
+#: ../src/dialogs.py:4188
 msgid "Invalid List Name"
 msgstr "Невалидно име на филтър"
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4189
 msgid "You must enter a name to create a privacy list."
 msgstr "Трябва да въведете име, за да се създаде филтър за уединение."
 
-#: ../src/dialogs.py:3855
+#: ../src/dialogs.py:4221
 msgid "You are invited to a groupchat"
 msgstr "Поканени сте в стая."
 
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4224
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact ви покани да се присъедините към дискусия"
 
-#: ../src/dialogs.py:3860
+#: ../src/dialogs.py:4226
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact ви покани в стая %(room_jid)s."
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4234
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4236
 msgid "Do you want to accept the invitation?"
 msgstr "Искате ли да приемете поканата?"
 
-#: ../src/dialogs.py:3932
+#: ../src/dialogs.py:4298
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:3942 ../src/dialogs.py:3985 ../src/dialogs.py:4041
+#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
+#: ../src/dialogs.py:4495
 msgid "All files"
 msgstr "Всички файлове"
 
-#: ../src/dialogs.py:3947
+#: ../src/dialogs.py:4313
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:3975
+#: ../src/dialogs.py:4341
 msgid "Choose Sound"
 msgstr "Избор на звук"
 
-#: ../src/dialogs.py:3990
+#: ../src/dialogs.py:4356
 msgid "Wav Sounds"
 msgstr "Формат WAV"
 
-#: ../src/dialogs.py:4028
+#: ../src/dialogs.py:4394
 msgid "Choose Image"
 msgstr "Избор на изображение"
 
-#: ../src/dialogs.py:4046
+#: ../src/dialogs.py:4412
 msgid "Images"
 msgstr "Изображения"
 
-#: ../src/dialogs.py:4113
+#: ../src/dialogs.py:4482
+#, fuzzy
+msgid "Choose Archive"
+msgstr "Избор на изображение"
+
+#: ../src/dialogs.py:4500
+#, fuzzy
+msgid "Zip files"
+msgstr "Всички файлове"
+
+#: ../src/dialogs.py:4525
 #, python-format
 msgid "When %s becomes:"
 msgstr "Когато %s стане:"
 
-#: ../src/dialogs.py:4115
+#: ../src/dialogs.py:4527
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Добавяне на специално уведомление за %s"
 
-#: ../src/dialogs.py:4190
+#: ../src/dialogs.py:4602
 msgid "Condition"
 msgstr "Условие"
 
-#: ../src/dialogs.py:4310
+#: ../src/dialogs.py:4722
 msgid "when I am "
 msgstr "когато съм "
 
-#: ../src/dialogs.py:4786
+#: ../src/dialogs.py:5198
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7478,19 +7695,19 @@ msgstr ""
 "\n"
 "Краткият удостоверителен низ (SAS) на сесията е <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4789
+#: ../src/dialogs.py:5201
 msgid "You have already verified this contact's identity."
 msgstr "Вече се проверили идентичността на този контакт."
 
-#: ../src/dialogs.py:4795 ../src/dialogs.py:4879
+#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
 msgid "Contact's identity verified"
 msgstr "Идентичността на контакта проверена"
 
-#: ../src/dialogs.py:4801
+#: ../src/dialogs.py:5213
 msgid "Verify again..."
 msgstr "Проверка наново…"
 
-#: ../src/dialogs.py:4806
+#: ../src/dialogs.py:5218
 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 "
@@ -7500,19 +7717,19 @@ msgstr ""
 "съобщения или да ви изпраща такива, е необходимо да проверите идентичността "
 "му като натиснете бутона по-долу."
 
-#: ../src/dialogs.py:4809 ../src/dialogs.py:4860 ../src/dialogs.py:4873
+#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
 msgid "Contact's identity NOT verified"
 msgstr "Идентичността на контакта НЕ Е проверена"
 
-#: ../src/dialogs.py:4814
+#: ../src/dialogs.py:5226
 msgid "Verify..."
 msgstr "Проверка…"
 
-#: ../src/dialogs.py:4825
+#: ../src/dialogs.py:5237
 msgid "Have you verified the contact's identity?"
 msgstr "Проверихте ли идентичността на контакта?"
 
-#: ../src/dialogs.py:4826
+#: ../src/dialogs.py:5238
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7527,22 +7744,22 @@ msgstr ""
 "\n"
 "Краткият удостоверителен низ на тази сесия е <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4827
+#: ../src/dialogs.py:5239
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Говорихте ли с отдалечение контакт за проверка на SAS?"
 
-#: ../src/dialogs.py:4861
+#: ../src/dialogs.py:5273
 #, 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:4867
+#: ../src/dialogs.py:5279
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Няма зададен ключ на GPG за този контакт, така че не може да шифрирате "
 "съобщения."
 
-#: ../src/dialogs.py:4874
+#: ../src/dialogs.py:5286
 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."
@@ -7551,7 +7768,7 @@ msgstr ""
 "така че съобщенията <b>не могат</b> да се шифрират. За да се доверите на "
 "този ключ, използвайте клиент на GPG."
 
-#: ../src/dialogs.py:4880
+#: ../src/dialogs.py:5292
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7559,19 +7776,19 @@ msgstr ""
 "Има зададен ключ на GPG за този контакт и вие му се доверявате, така че "
 "съобщенията ще бъдат шифрирани."
 
-#: ../src/dialogs.py:4945
+#: ../src/dialogs.py:5357
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4947
+#: ../src/dialogs.py:5359
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4949
+#: ../src/dialogs.py:5361
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4953
+#: ../src/dialogs.py:5365
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7587,24 +7804,24 @@ msgstr "Други"
 msgid "Conference"
 msgstr "Стаи за разговор"
 
-#: ../src/disco.py:512
+#: ../src/disco.py:513
 msgid "Without a connection, you can not browse available services"
 msgstr "Трябва да сте свързани, за да разглеждате наличните услуги"
 
-#: ../src/disco.py:589
+#: ../src/disco.py:600
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Откриване на налични услуги за акаунт „%s“"
 
-#: ../src/disco.py:591
+#: ../src/disco.py:602
 msgid "Service Discovery"
 msgstr "Откриване на услуги"
 
-#: ../src/disco.py:741
+#: ../src/disco.py:758
 msgid "The service could not be found"
 msgstr "Услугата не може да бъде намерена"
 
-#: ../src/disco.py:742
+#: ../src/disco.py:759
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7612,93 +7829,93 @@ msgstr ""
 "Няма услуга на въведения адрес или не отговаря. Проверете адреса и опитайте "
 "отново."
 
-#: ../src/disco.py:746 ../src/disco.py:1082
+#: ../src/disco.py:763 ../src/disco.py:1100
 msgid "The service is not browsable"
 msgstr "Услугата не е достъпна"
 
-#: ../src/disco.py:747
+#: ../src/disco.py:764
 msgid "This type of service does not contain any items to browse."
 msgstr "Този вид услуга не съдържа обекти за показване."
 
-#: ../src/disco.py:786 ../src/disco.py:796
+#: ../src/disco.py:804 ../src/disco.py:814
 msgid "Invalid Server Name"
 msgstr "Невалидно име на сървър"
 
-#: ../src/disco.py:850
+#: ../src/disco.py:868
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Търсене в %(address)s от акаунт „%(account)s“"
 
-#: ../src/disco.py:894
+#: ../src/disco.py:912
 msgid "_Browse"
 msgstr "_Търсене"
 
-#: ../src/disco.py:1083
+#: ../src/disco.py:1101
 msgid "This service does not contain any items to browse."
 msgstr "Тази услуга не съдържа обекти за показване."
 
-#: ../src/disco.py:1323
+#: ../src/disco.py:1341
 msgid "_Execute Command"
 msgstr "_Изпълнение на команда"
 
-#: ../src/disco.py:1333 ../src/disco.py:1504
+#: ../src/disco.py:1351 ../src/disco.py:1522
 msgid "Re_gister"
 msgstr "_Регистриране"
 
-#: ../src/disco.py:1545
+#: ../src/disco.py:1563
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Сканиране на %(current)d / %(total)d…"
 
 #. Users column
-#: ../src/disco.py:1736
+#: ../src/disco.py:1754
 msgid "Users"
 msgstr "Потребители"
 
 #. Description column
-#: ../src/disco.py:1744
+#: ../src/disco.py:1762
 msgid "Description"
 msgstr "Описание"
 
 #. Id column
-#: ../src/disco.py:1752
+#: ../src/disco.py:1770
 msgid "Id"
 msgstr "Идентификатор"
 
-#: ../src/disco.py:1817 ../src/gui_interface.py:3182
+#: ../src/disco.py:1835 ../src/gui_interface.py:2995
 msgid "Bookmark already set"
 msgstr "Отметката вече е установена"
 
-#: ../src/disco.py:1818 ../src/gui_interface.py:3183
+#: ../src/disco.py:1836 ../src/gui_interface.py:2996
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Стаята „%s“ вече присъства в отметките."
 
-#: ../src/disco.py:1827 ../src/gui_interface.py:3197
+#: ../src/disco.py:1845 ../src/gui_interface.py:3010
 msgid "Bookmark has been added successfully"
 msgstr "Отметката беше добавена успешно"
 
-#: ../src/disco.py:1828 ../src/gui_interface.py:3198
+#: ../src/disco.py:1846 ../src/gui_interface.py:3011
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Може да организирате отметките чрез менюто „Действия“."
 
-#: ../src/disco.py:2039
+#: ../src/disco.py:2057
 msgid "Subscribed"
 msgstr "Записан"
 
-#: ../src/disco.py:2047
+#: ../src/disco.py:2065
 msgid "Node"
 msgstr "Възел"
 
-#: ../src/disco.py:2111
+#: ../src/disco.py:2129
 msgid "New post"
 msgstr "Ново съобщение"
 
-#: ../src/disco.py:2117
+#: ../src/disco.py:2135
 msgid "_Subscribe"
 msgstr "_Записване"
 
-#: ../src/disco.py:2123
+#: ../src/disco.py:2141
 msgid "_Unsubscribe"
 msgstr "_Отписване"
 
@@ -7882,18 +8099,22 @@ msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Трансформира изрази на LaTex, разграничени с $$ $$."
 
 #: ../src/features_window.py:95
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
-"in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 "Изисква texlive-latex-base и dvipng. Трябва да активирате опцията "
 "„use_latex“ в редактора на настройки за напреднали."
 
 #: ../src/features_window.py:96
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
+"You have to set 'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
+"Изисква texlive-latex-base и dvipng. Трябва да активирате опцията "
+"„use_latex“ в редактора на настройки за напреднали."
 
 #: ../src/features_window.py:97
 #, fuzzy
@@ -8050,33 +8271,33 @@ msgstr "Описание: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s иска да ви изпрати файл:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Неуспех при презаписването на съществуващия файл „%s“"
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "Вече съществува файл с това име и нямате права да го презапишете."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 msgid "This file already exists"
 msgstr "Този файл вече съществува"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 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:369 ../src/gtkgui_helpers.py:914
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Папката „%s“ не е разрешена за запис"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
 msgid "You do not have permission to create files in this directory."
 msgstr "Нямата права да създавате файлове в тази папка."
 
@@ -8178,28 +8399,28 @@ msgstr ""
 "Изглежда вече е стартирана друга инстанция на Gajim\n"
 "Продължаване въпреки това?"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "Показва помощ за специфична команда"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:80
+#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
 msgid "command"
 msgstr "команда"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "показване на помощ за команда"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Показва или скрива списъка"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Показва следващото чакащо събитие в изскачащ прозорец"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8207,6 +8428,13 @@ msgstr ""
 "Показване на списък с всички контакти. Всеки контакт се появява на отделен "
 "ред"
 
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
+#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
+#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
+#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
 #: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
 #: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
 #: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
@@ -8218,44 +8446,36 @@ msgstr ""
 msgid "account"
 msgstr "акаунт"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "показва само контактите на дадения акаунт"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Показване на списък с регистрираните акаунти"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "Промяна на състоянието на акаунта или акаунтите"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
 msgid "status"
 msgstr "състояние"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106
 #, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"accoun't previous status"
+msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "едно от: offline (изключен), online (на линия), chat (свободен за разговор), "
 "away (отсъствам), xa (не съм на разположение), dnd (зает), invisible "
 "(невидим)"
 
-#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
-msgid "message"
-msgstr "съобщение"
-
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "съобщение за състояние"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8264,50 +8484,22 @@ msgstr ""
 "състоянието на всички акаунти, които имат настроена опция „синхронизиране с "
 "общото състояние“"
 
-#: ../src/gajim-remote.py:117
-#, fuzzy
-msgid "Changes the priority of account or accounts"
-msgstr "Промяна на състоянието на акаунта или акаунтите"
-
-#: ../src/gajim-remote.py:119
-#, fuzzy
-msgid "priority"
-msgstr "Приори_тет:"
-
-#: ../src/gajim-remote.py:119
-#, fuzzy
-msgid "priority you want to give to the account"
-msgstr "_Искам да регистрирам нов акаунт"
-
-#: ../src/gajim-remote.py:121
-#, fuzzy
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-msgstr ""
-"променя състоянието на акаунта. Ако не е указано се прави опит за смяна на "
-"състоянието на всички акаунти, които имат настроена опция „синхронизиране с "
-"общото състояние“"
-
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Показване на диалогов прозорец за разговор, за да може да се изпрати "
 "съобщение до контакта"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID на контакта, с който искате да разговаряте"
 
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
 #: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "ако е указано, контактът се взима от списъка с контакти на този акаунт"
 
-#: ../src/gajim-remote.py:134
-msgid "message content. The account must be specified or \"\""
-msgstr ""
-
-#: ../src/gajim-remote.py:139
+#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
 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 "
@@ -8317,30 +8509,35 @@ msgstr ""
 "„OpenPGP key“ са по избор. Ако искате да настроите само „account“ без "
 "“OpenPGP key“, настройте „OpenPGP key“ на „“."
 
+#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
 #: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID на контакта, който ще получи съобщението"
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
+#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "текст на съобщението"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "ключ на OpenPGP"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "ако е указано, съобщението ще се шифрира, използвайки този публичен ключ"
 
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
+#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "ако е указано, съобщението ще бъде изпратено от този акаунт"
 
-#: ../src/gajim-remote.py:152
+#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
 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 "
@@ -8350,142 +8547,289 @@ msgstr ""
 "„OpenPGP key“ са по избор. Ако искате да настроите само „account“ без "
 "“OpenPGP key“, настройте „OpenPGP key“ на „“."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "тема"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "тема на съобщението"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Изпраща ново съобщение до стаята, в която сте влезли."
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "JID на стаята, която ще получи съобщението"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Получаване на подробна информация за контакта"
 
+#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
+#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
 #: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
 #: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID на контакта"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Получаване на подробна информация за акаунта"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Име на акаунта"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Изпращане на файл до контакт"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "file"
 msgstr "файл"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Път до файл"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "ако е указано, файлът бъде изпратен от този акаунт"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Показва всички настройки и техните стойности"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Настройва стойността на „ключ“ на „стойност“."
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "ключ=стойност"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "„ключ“ е името на настройката, „стойност“ е стойността, която се задава"
 
-#: ../src/gajim-remote.py:207
-msgid "Deletes a preference item"
-msgstr "Изтрива обект от настройките"
+#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
+msgid "Deletes a preference item"
+msgstr "Изтрива обект от настройките"
+
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "key"
+msgstr "ключ"
+
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "name of the preference to be deleted"
+msgstr "име на настройката за изтриване"
+
+#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+msgid "Writes the current state of Gajim preferences to the .config file"
+msgstr "Запазва текущото състояние на настройките във файла .config"
+
+#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
+msgid "Removes contact from roster"
+msgstr "Премахване на контакт от списъка"
+
+#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+msgid "Adds contact to roster"
+msgstr "Добавяне на контакт към списъка"
+
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+msgid "Adds new contact to this account"
+msgstr "Добавяне на нов контакт към този акаунт"
+
+#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+msgid "Returns current status (the global one unless account is specified)"
+msgstr "Връща текущото състояние (общото, в случай, че не е указан акаунт)"
+
+#: ../src/gajim-remote-plugin.py:226
+#, fuzzy
+msgid ""
+"Returns current status message(the global one unless account is specified)"
+msgstr ""
+"Връща текущото съобщение за състояние (общото, в случай, че не е указан "
+"акаунт)"
+
+#: ../src/gajim-remote-plugin.py:233 ../src/gajim-remote.py:249
+msgid "Returns number of unread messages"
+msgstr "Връща броя непрочетени съобщения"
+
+#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+msgid "Opens 'Start Chat' dialog"
+msgstr "Отваря прозореца „Започване на разговор“"
+
+#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+msgid "Starts chat, using this account"
+msgstr "Започване на разговор, като се използва този акаунт"
+
+#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+msgid "Sends custom XML"
+msgstr "Изпраща указан XML"
+
+#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+msgid "XML to send"
+msgstr "XML за изпращане"
+
+#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+"Акаунт, до който да се изпраща XML; ако не е указан, ще се изпрати до всички "
+"акаунти"
+
+#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
+msgid "Handle a xmpp:/ uri"
+msgstr "Обработка на адрес тип xmpp://"
+
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
+msgid "uri"
+msgstr "адрес"
+
+#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+msgid "Join a MUC room"
+msgstr "Влизане в стая"
+
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+msgid "room"
+msgstr "стая"
+
+#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+msgid "nick"
+msgstr "псевдоним"
+
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+msgid "password"
+msgstr "парола"
+
+#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+msgid "Check if Gajim is running"
+msgstr "Проверка дали Gajim е стартиран"
+
+#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
+#: ../src/gajim-remote.py:300
+msgid "Shows or hides the ipython window"
+msgstr "Показва или скрива прозореца на IPython"
+
+#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+msgid "Missing argument \"contact_jid\""
+msgstr "Липсващ аргумент „contact_jid“"
+
+#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#, python-format
+msgid ""
+"'%s' is not in your roster.\n"
+"Please specify account for sending the message."
+msgstr ""
+"„%s“ не е в списъка ви.\n"
+"Укажете акаунт за изпращането на това съобщение."
+
+#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+msgid "You have no active account"
+msgstr "Нямате активен акаунт"
 
-#: ../src/gajim-remote.py:209
-msgid "key"
-msgstr "ключ"
+#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+msgid "It seems Gajim is not running. So you can't use gajim-remote."
+msgstr ""
+"Изглежда Gajim не е стартиран, така че не може да ползвате gajim-remote."
 
-#: ../src/gajim-remote.py:209
-msgid "name of the preference to be deleted"
-msgstr "име на настройката за изтриване"
+#: ../src/gajim-remote-plugin.py:412
+#, python-format
+msgid ""
+"Usage: %s %s %s \n"
+"\t %s"
+msgstr ""
 
-#: ../src/gajim-remote.py:213
-msgid "Writes the current state of Gajim preferences to the .config file"
-msgstr "Запазва текущото състояние на настройките във файла .config"
+#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+msgid "Arguments:"
+msgstr "Аргументи:"
 
-#: ../src/gajim-remote.py:218
-msgid "Removes contact from roster"
-msgstr "Премахване на контакт от списъка"
+#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#, python-format
+msgid "%s not found"
+msgstr "%s не е намерен"
 
-#: ../src/gajim-remote.py:227
-msgid "Adds contact to roster"
-msgstr "Добавяне на контакт към списъка"
+#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
+#, python-format
+msgid ""
+"Usage: %s command [arguments]\n"
+"Command is one of:\n"
+msgstr ""
+"Употреба: %s команда [аргументи]\n"
+"Командата е една от:\n"
 
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "JID"
+#: ../src/gajim-remote-plugin.py:496
+#, fuzzy, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Твърде много аргументи. \n"
+"Напишете „%(basename)s help %(command)s“ за повече информация"
 
-#: ../src/gajim-remote.py:230
-msgid "Adds new contact to this account"
-msgstr "Добавяне на нов контакт към този акаунт"
+#: ../src/gajim-remote-plugin.py:500
+#, fuzzy, python-format
+msgid ""
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Не е указан аргумент „%(arg)s“.\n"
+"Напишете „%(basename)s help %(command)s“ за повече информация"
 
-#: ../src/gajim-remote.py:235
-msgid "Returns current status (the global one unless account is specified)"
-msgstr "Връща текущото състояние (общото, в случай, че не е указан акаунт)"
+#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
+msgid "Wrong uri"
+msgstr "Грешен адрес"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:109
+#, fuzzy
 msgid ""
-"Returns current status message (the global one unless account is specified)"
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
 msgstr ""
-"Връща текущото съобщение за състояние (общото, в случай, че не е указан "
-"акаунт)"
+"едно от: offline (изключен), online (на линия), chat (свободен за разговор), "
+"away (отсъствам), xa (не съм на разположение), dnd (зает), invisible "
+"(невидим)"
 
-#: ../src/gajim-remote.py:249
-msgid "Returns number of unread messages"
-msgstr "Връща броя непрочетени съобщения"
+#: ../src/gajim-remote.py:117
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Промяна на състоянието на акаунта или акаунтите"
 
-#: ../src/gajim-remote.py:253
-msgid "Opens 'Start Chat' dialog"
-msgstr "Отваря прозореца „Започване на разговор“"
+#: ../src/gajim-remote.py:119
+#, fuzzy
+msgid "priority"
+msgstr "Приори_тет:"
 
-#: ../src/gajim-remote.py:255
-msgid "Starts chat, using this account"
-msgstr "Започване на разговор, като се използва този акаунт"
+#: ../src/gajim-remote.py:119
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "_Искам да регистрирам нов акаунт"
 
-#: ../src/gajim-remote.py:259
-msgid "Sends custom XML"
-msgstr "Изпраща указан XML"
+#: ../src/gajim-remote.py:121
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"променя състоянието на акаунта. Ако не е указано се прави опит за смяна на "
+"състоянието на всички акаунти, които имат настроена опция „синхронизиране с "
+"общото състояние“"
 
-#: ../src/gajim-remote.py:261
-msgid "XML to send"
-msgstr "XML за изпращане"
+#: ../src/gajim-remote.py:134
+msgid "message content. The account must be specified or \"\""
+msgstr ""
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:242
 msgid ""
-"Account in which the xml will be sent; if not specified, xml will be sent to "
-"all accounts"
+"Returns current status message (the global one unless account is specified)"
 msgstr ""
-"Акаунт, до който да се изпраща XML; ако не е указан, ще се изпрати до всички "
-"акаунти"
+"Връща текущото съобщение за състояние (общото, в случай, че не е указан "
+"акаунт)"
 
 #: ../src/gajim-remote.py:268
 #, fuzzy
@@ -8506,14 +8850,6 @@ msgstr ""
 "Акаунт, до който да се изпраща XML; ако не е указан, ще се изпрати до всички "
 "акаунти"
 
-#: ../src/gajim-remote.py:277
-msgid "Handle a xmpp:/ uri"
-msgstr "Обработка на адрес тип xmpp://"
-
-#: ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "адрес"
-
 #: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr "Адрес за обработка"
@@ -8527,30 +8863,14 @@ msgstr "Акаунт, за който искате да го обработит
 msgid "Message content"
 msgstr "текст на съобщението"
 
-#: ../src/gajim-remote.py:286
-msgid "Join a MUC room"
-msgstr "Влизане в стая"
-
-#: ../src/gajim-remote.py:288
-msgid "room"
-msgstr "стая"
-
 #: ../src/gajim-remote.py:288
 msgid "Room JID"
 msgstr "JID на стая"
 
-#: ../src/gajim-remote.py:289
-msgid "nick"
-msgstr "псевдоним"
-
 #: ../src/gajim-remote.py:289
 msgid "Nickname to use"
 msgstr "Псевдоним"
 
-#: ../src/gajim-remote.py:290
-msgid "password"
-msgstr "парола"
-
 #: ../src/gajim-remote.py:290
 msgid "Password to enter the room"
 msgstr "Парола за влизане в стаята"
@@ -8559,36 +8879,6 @@ msgstr "Парола за влизане в стаята"
 msgid "Account from which you want to enter the room"
 msgstr "Акаунт, от който искате да влезете в стаята"
 
-#: ../src/gajim-remote.py:296
-msgid "Check if Gajim is running"
-msgstr "Проверка дали Gajim е стартиран"
-
-#: ../src/gajim-remote.py:300
-msgid "Shows or hides the ipython window"
-msgstr "Показва или скрива прозореца на IPython"
-
-#: ../src/gajim-remote.py:327
-msgid "Missing argument \"contact_jid\""
-msgstr "Липсващ аргумент „contact_jid“"
-
-#: ../src/gajim-remote.py:348
-#, python-format
-msgid ""
-"'%s' is not in your roster.\n"
-"Please specify account for sending the message."
-msgstr ""
-"„%s“ не е в списъка ви.\n"
-"Укажете акаунт за изпращането на това съобщение."
-
-#: ../src/gajim-remote.py:351
-msgid "You have no active account"
-msgstr "Нямате активен акаунт"
-
-#: ../src/gajim-remote.py:404
-msgid "It seems Gajim is not running. So you can't use gajim-remote."
-msgstr ""
-"Изглежда Gajim не е стартиран, така че не може да ползвате gajim-remote."
-
 #: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
@@ -8598,24 +8888,6 @@ msgstr ""
 "Употреба: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:435
-msgid "Arguments:"
-msgstr "Аргументи:"
-
-#: ../src/gajim-remote.py:439
-#, python-format
-msgid "%s not found"
-msgstr "%s не е намерен"
-
-#: ../src/gajim-remote.py:445
-#, python-format
-msgid ""
-"Usage: %s command [arguments]\n"
-"Command is one of:\n"
-msgstr ""
-"Употреба: %s команда [аргументи]\n"
-"Командата е една от:\n"
-
 #: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
@@ -8638,10 +8910,6 @@ msgstr ""
 msgid "No uri given"
 msgstr ""
 
-#: ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Грешен адрес"
-
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Тема"
@@ -8667,177 +8935,175 @@ msgstr "Не може да изтриете текущата тема"
 msgid "Please first choose another for your current theme."
 msgstr "Първо изберете друга като текуща тема."
 
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:170
 msgid "Sending private message failed"
 msgstr "Неуспех при изпращането на лично съобщение"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:171
+#: ../src/groupchat_control.py:172
 #, 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:455
 msgid "Insert Nickname"
 msgstr "Въведете псевдоним"
 
-#: ../src/groupchat_control.py:631
+#: ../src/groupchat_control.py:636
 msgid "Conversation with "
 msgstr "Разговор с "
 
-#: ../src/groupchat_control.py:633
+#: ../src/groupchat_control.py:638
 msgid "Continued conversation"
 msgstr "Продължен разговор"
 
-#. Can be a message (see handle_event_gc_config_change in
-#. gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1272 ../src/gui_interface.py:1080
+#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
 msgid "Any occupant is allowed to see your full JID"
 msgstr "На всеки участник е позволено да вижда вашия JID"
 
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1286
 msgid "Room logging is enabled"
 msgstr "Воденето на дневник на стаята е включено"
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1288
 msgid "A new room has been created"
 msgstr "Беше създадена нова стая"
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1291
 msgid "The server has assigned or modified your roomnick"
 msgstr "Сървърът назначи или промени псевдонима ви в стаята"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1287
+#: ../src/groupchat_control.py:1297
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s беше изритан: %(reason)s"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1300
 #, 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:1300
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s беше отлъчен: %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1312
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s беше отлъчен от %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1314 ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вече сте познати като %s"
 
-#: ../src/groupchat_control.py:1330 ../src/gui_interface.py:919
+#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s вече е познат като %(new_nick)s"
 
-#: ../src/groupchat_control.py:1372 ../src/groupchat_control.py:1377
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1392
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s беше изритан от стаята (%(reason)s)"
 
-#: ../src/groupchat_control.py:1374
+#: ../src/groupchat_control.py:1383
 msgid "affiliation changed"
 msgstr "рангът е променен"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1388
 msgid "room configuration changed to members-only"
 msgstr "Конфигурацията на стаята бе променена на „само за членове“"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1394
 msgid "system shutdown"
 msgstr "Изключване на системата"
 
-#: ../src/groupchat_control.py:1470
+#: ../src/groupchat_control.py:1477
 #, 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:1474
+#: ../src/groupchat_control.py:1481
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Рангът на %(nick)s бе зададен на %(affiliation)s"
 
-#: ../src/groupchat_control.py:1489
+#: ../src/groupchat_control.py:1496
 #, 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:1493
+#: ../src/groupchat_control.py:1500
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Ролята на %(nick)s бе зададена на %(role)s"
 
-#: ../src/groupchat_control.py:1522
+#: ../src/groupchat_control.py:1530
 #, python-format
 msgid "%s has left"
 msgstr "%s напусна"
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1535
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s влезе в стаята"
 
-#: ../src/groupchat_control.py:1529 ../src/gui_interface.py:946
+#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
 #: ../src/history_window.py:447 ../src/notify.py:234
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s вече е %(status)s"
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1774
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Сигурни ли сте, че искате да напуснете стаята „%s“?"
 
-#: ../src/groupchat_control.py:1761
+#: ../src/groupchat_control.py:1776
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Ако затворите този прозорец, връзката със стаята ще бъде прекъсната."
 
-#: ../src/groupchat_control.py:1765 ../src/gui_interface.py:1216
-#: ../src/gui_interface.py:1992 ../src/gui_interface.py:2029
-#: ../src/gui_interface.py:2064 ../src/message_window.py:224
-#: ../src/roster_window.py:2739 ../src/roster_window.py:3399
-#: ../src/roster_window.py:4123
+#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
+#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
+#: ../src/gui_interface.py:1853 ../src/message_window.py:224
+#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
+#: ../src/roster_window.py:4195
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "Да _не се задава този въпрос отново"
 
-#: ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:1814
 msgid "Changing Subject"
 msgstr "Промяна на темата"
 
-#: ../src/groupchat_control.py:1800
+#: ../src/groupchat_control.py:1815
 msgid "Please specify the new subject:"
 msgstr "Въведете новата тема:"
 
-#: ../src/groupchat_control.py:1807
+#: ../src/groupchat_control.py:1822
 msgid "Changing Nickname"
 msgstr "Промяна на псевдонима"
 
-#: ../src/groupchat_control.py:1808
+#: ../src/groupchat_control.py:1823
 msgid "Please specify the new nickname you want to use:"
 msgstr "Въведете новия псевдоним, който искате да използвате:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1839
+#: ../src/groupchat_control.py:1854
 #, python-format
 msgid "Destroying %s"
 msgstr "Унищожаване на %s"
 
-#: ../src/groupchat_control.py:1840
+#: ../src/groupchat_control.py:1855
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8845,22 +9111,22 @@ msgstr ""
 "Определено сте на път да унищожите тази стая.\n"
 "Може да укажете причина по-долу:"
 
-#: ../src/groupchat_control.py:1842
+#: ../src/groupchat_control.py:1857
 msgid "You may also enter an alternate venue:"
 msgstr "Може да въведете и друго място за срещи:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2028
+#: ../src/groupchat_control.py:2046
 #, python-format
 msgid "Kicking %s"
 msgstr "Изритване на %s"
 
-#: ../src/groupchat_control.py:2029 ../src/groupchat_control.py:2356
+#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
 msgid "You may specify a reason below:"
 msgstr "Може да уточните причина по-долу:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2355
+#: ../src/groupchat_control.py:2373
 #, python-format
 msgid "Banning %s"
 msgstr "Отлъчване на %s"
@@ -8885,58 +9151,67 @@ msgid "Details"
 msgstr "Подробности"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
+#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Грешка: %s не може да бъде отворен за четене"
 
-#: ../src/gtkgui_helpers.py:400
+#: ../src/gtkgui_helpers.py:404
 msgid "Error reading file:"
 msgstr "Грешка при четене на файл:"
 
-#: ../src/gtkgui_helpers.py:403
+#: ../src/gtkgui_helpers.py:407
 msgid "Error parsing file:"
 msgstr "Грешка при анализиране на файл:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:444
+#: ../src/gtkgui_helpers.py:448
 #, 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:818
+#: ../src/gtkgui_helpers.py:822
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim не е стандартния Джабър клиент"
 
-#: ../src/gtkgui_helpers.py:819
+#: ../src/gtkgui_helpers.py:823
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Искате ли Gajim да бъде стандартния Джабър клиент?"
 
-#: ../src/gtkgui_helpers.py:820
+#: ../src/gtkgui_helpers.py:824
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 "Винаги да се проверява дали Gajim е стандартния Джабър клиент при всяко "
 "стартиране"
 
-#: ../src/gtkgui_helpers.py:887
+#: ../src/gtkgui_helpers.py:891
 msgid "Extension not supported"
 msgstr "Разширението не се поддържа"
 
-#: ../src/gtkgui_helpers.py:888
+#: ../src/gtkgui_helpers.py:892
 #, 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:924
+#: ../src/gtkgui_helpers.py:928
 msgid "Save Image as..."
 msgstr "Запазване на изображението като…"
 
-#: ../src/gui_interface.py:140
+#. we are banned
+#. group chat does not exist
+#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
+#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
+#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
+#: ../src/gui_interface.py:348
+msgid "Unable to join group chat"
+msgstr "Неуспех при влизането в стаята"
+
+#: ../src/gui_interface.py:138
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8947,59 +9222,93 @@ msgstr ""
 "участник.\n"
 "Укажете друг псевдоним по-долу:"
 
-#: ../src/gui_interface.py:143
+#: ../src/gui_interface.py:141
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:159
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Приемате ли това запитване?"
 
-#: ../src/gui_interface.py:161
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Приемате ли това запитване за акаунт %s?"
 
-#: ../src/gui_interface.py:164
+#: ../src/gui_interface.py:163
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Упълномощаване по HTTP (%(method)s) за „%(url)s“ (id: %(id)s)"
 
-#: ../src/gui_interface.py:213 ../src/notify.py:493
+#: ../src/gui_interface.py:209 ../src/notify.py:493
 msgid "Connection Failed"
 msgstr "Неуспех при свързването"
 
-#: ../src/gui_interface.py:606 ../src/gui_interface.py:610
+#: ../src/gui_interface.py:312
+#, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Необходима е парола за влизане в стаята „%s“. Въведете я."
+
+#: ../src/gui_interface.py:324
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/gui_interface.py:333
+#, python-format
+msgid "You are banned from group chat %s."
+msgstr "Вие сте отлъчени от стаята %s."
+
+#: ../src/gui_interface.py:338
+#, python-format
+msgid "Group chat %s does not exist."
+msgstr "Стаята %s не съществува."
+
+#: ../src/gui_interface.py:341
+msgid "Group chat creation is restricted."
+msgstr "Създаването на стаи е ограничено."
+
+#: ../src/gui_interface.py:344
+#, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Трябва да се използва регистрирания ви псевдоним в стаята %s."
+
+#: ../src/gui_interface.py:349
+#, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Не сте в списъка с членове на стаята %s."
+
+#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Грешка %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:621 ../src/gui_interface.py:636
+#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "грешка при изпращане на %(message)s ( %(error)s )"
 
-#: ../src/gui_interface.py:663 ../src/notify.py:495
+#: ../src/gui_interface.py:540 ../src/notify.py:495
 #, fuzzy
 msgid "Subscription request"
 msgstr "Искане за записване"
 
-#: ../src/gui_interface.py:688
+#: ../src/gui_interface.py:565
 msgid "Authorization accepted"
 msgstr "Упълномощаването е прието"
 
-#: ../src/gui_interface.py:689
+#: ../src/gui_interface.py:566
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Контактът „%s“ ви упълномощи да виждате състоянието му."
 
-#: ../src/gui_interface.py:702
+#: ../src/gui_interface.py:579
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контактът „%s“ премахна записването за вас"
 
-#: ../src/gui_interface.py:703
+#: ../src/gui_interface.py:580
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -9007,62 +9316,57 @@ msgstr ""
 "Винаги ще го виждате като изключен.\n"
 "Искате ли да го премахнете от списъка с контакти?"
 
-#: ../src/gui_interface.py:727 ../src/notify.py:497
+#: ../src/gui_interface.py:604 ../src/notify.py:497
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Отписване"
 
-#: ../src/gui_interface.py:754
+#: ../src/gui_interface.py:631
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Неуспех при установяването на контакт с „%s“"
 
-#: ../src/gui_interface.py:1015
+#: ../src/gui_interface.py:859
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s зададе темата на %(subject)s"
 
-#: ../src/gui_interface.py:1083
+#: ../src/gui_interface.py:926
 msgid "Room now shows unavailable member"
 msgstr "Стаята показва отсъстващ член"
 
-#: ../src/gui_interface.py:1085
+#: ../src/gui_interface.py:928
 msgid "room now does not show unavailable members"
 msgstr "Стаята не показва отсъстващи членове"
 
-#: ../src/gui_interface.py:1087
+#: ../src/gui_interface.py:930
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 "Възникна промяна в конфигурацията на стаята (не е свързана с настройки за "
 "уединение)"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:1091
+#: ../src/gui_interface.py:934
 msgid "Room logging is now enabled"
 msgstr "Воденето на дневник на стаята е включено"
 
-#: ../src/gui_interface.py:1093
+#: ../src/gui_interface.py:936
 msgid "Room logging is now disabled"
 msgstr "Воденето на дневник на стаята е изключено"
 
-#: ../src/gui_interface.py:1095
+#: ../src/gui_interface.py:938
 msgid "Room is now non-anonymous"
 msgstr "Стаята не е анонимна"
 
-#: ../src/gui_interface.py:1098
+#: ../src/gui_interface.py:941
 msgid "Room is now semi-anonymous"
 msgstr "Стаята е полу-анонимна"
 
-#: ../src/gui_interface.py:1101
+#: ../src/gui_interface.py:944
 msgid "Room is now fully-anonymous"
 msgstr "Стаята е напълно анонимна"
 
-#: ../src/gui_interface.py:1133
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Необходима е парола за влизане в стаята „%s“. Въведете я."
-
-#: ../src/gui_interface.py:1180
+#: ../src/gui_interface.py:985
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -9070,25 +9374,25 @@ msgstr ""
 "Конфигурирали сте Gajim да използва агент на GPG, но такъв не е стартиран "
 "или е предоставил грешна парола.\n"
 
-#: ../src/gui_interface.py:1182 ../src/gui_interface.py:1189
+#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
 msgid "You are currently connected without your OpenPGP key."
 msgstr "В момента сте свързани без OpenPGP ключ."
 
-#: ../src/gui_interface.py:1184
+#: ../src/gui_interface.py:989
 msgid "Your passphrase is incorrect"
 msgstr "Паролата е грешна"
 
-#: ../src/gui_interface.py:1188
+#: ../src/gui_interface.py:993
 #, fuzzy
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Паролата е грешна"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 #, fuzzy
 msgid "GPG key not trusted"
 msgstr "GPG не е използваем"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 #, fuzzy
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
@@ -9097,7 +9401,7 @@ msgstr ""
 "Няма зададен ключ на GPG за този контакт, така че не може да шифрирате "
 "съобщения."
 
-#: ../src/gui_interface.py:1226
+#: ../src/gui_interface.py:1031
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not                 correctly started "
@@ -9106,19 +9410,19 @@ msgstr ""
 "Наборът с ключове на GNOME е инсталиран, но не е стартиран правилно (навярно "
 "променливата на обкръжението не е настроена)"
 
-#: ../src/gui_interface.py:1330
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Ново писмо за %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1332
+#: ../src/gui_interface.py:1133
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Имате %d ново писмо"
 msgstr[1] "Имате %d нови писма"
 
-#: ../src/gui_interface.py:1345
+#: ../src/gui_interface.py:1146
 #, python-format
 msgid ""
 "\n"
@@ -9133,44 +9437,44 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1418
+#: ../src/gui_interface.py:1215
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s иска да ви изпрати файл."
 
-#: ../src/gui_interface.py:1455 ../src/roster_window.py:1856
+#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Премахване на контакт от списъка"
 
-#: ../src/gui_interface.py:1458 ../src/roster_window.py:1858
+#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
 #, fuzzy
 msgid "Error opening file"
 msgstr "Грешка при четене на файл:"
 
-#: ../src/gui_interface.py:1490
+#: ../src/gui_interface.py:1287
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Успешно получихте %(filename)s от %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1494
+#: ../src/gui_interface.py:1291
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Файловият трансфер на %(filename)s от %(name)s прекъсна."
 
-#: ../src/gui_interface.py:1507
+#: ../src/gui_interface.py:1304
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Успешно изпратихте %(filename)s на %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1511
+#: ../src/gui_interface.py:1308
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Файловият трансфер на %(filename)s до %(name)s прекъсна."
 
-#: ../src/gui_interface.py:1623
+#: ../src/gui_interface.py:1426
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -9179,57 +9483,57 @@ msgstr ""
 "Неуспех при дешифрирането на съобщение от %s\n"
 "Възможно е да е било фалшифицирано."
 
-#: ../src/gui_interface.py:1630
+#: ../src/gui_interface.py:1433
 msgid "Unable to decrypt message"
 msgstr "Неуспех при дешифриране на съобщението"
 
-#: ../src/gui_interface.py:1702
+#: ../src/gui_interface.py:1505
 msgid "Username Conflict"
 msgstr "Конфликт с имената на потребители"
 
-#: ../src/gui_interface.py:1703
+#: ../src/gui_interface.py:1506
 msgid "Please type a new username for your local account"
 msgstr "Укажете ново потребителско име за локалния ви акаунт"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1519
 msgid "Ping?"
 msgstr "Пинг?"
 
-#: ../src/gui_interface.py:1729
+#: ../src/gui_interface.py:1532
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Понг! (%s сек)"
 
-#: ../src/gui_interface.py:1740
+#: ../src/gui_interface.py:1543
 msgid "Error."
 msgstr "Грешка."
 
-#: ../src/gui_interface.py:1768
+#: ../src/gui_interface.py:1556
 msgid "Resource Conflict"
 msgstr "Конфликт на ресурсите"
 
-#: ../src/gui_interface.py:1769
+#: ../src/gui_interface.py:1557
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr "Вече сте свързани към този акаунт със същия ресурс. Въведете нов."
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1816
+#: ../src/gui_interface.py:1604
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s иска да ви изпрати файл."
 
-#: ../src/gui_interface.py:1819
+#: ../src/gui_interface.py:1607
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Запитване за файлов трансфер"
 
-#: ../src/gui_interface.py:1927
+#: ../src/gui_interface.py:1716
 msgid "Error verifying SSL certificate"
 msgstr "Грешка при проверка на сертификата на SSL"
 
-#: ../src/gui_interface.py:1928
+#: ../src/gui_interface.py:1717
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9240,15 +9544,15 @@ msgstr ""
 "%(error)s\n"
 "Все още ли искате да се свържете със сървъра?"
 
-#: ../src/gui_interface.py:1936
+#: ../src/gui_interface.py:1725
 msgid "Ignore this error for this certificate."
 msgstr "Пренебрегване на грешката за този сертификат."
 
-#: ../src/gui_interface.py:1956
+#: ../src/gui_interface.py:1745
 msgid "SSL certificate error"
 msgstr "Грешка в сертификата на SSL"
 
-#: ../src/gui_interface.py:1957
+#: ../src/gui_interface.py:1746
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9264,12 +9568,12 @@ msgstr ""
 "\n"
 "Все още ли искате да се свържете и да обновите отпечатъка на сертификата?"
 
-#: ../src/gui_interface.py:1987 ../src/gui_interface.py:2024
-#: ../src/gui_interface.py:2060
+#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
+#: ../src/gui_interface.py:1849
 msgid "Insecure connection"
 msgstr "Несигурна връзка"
 
-#: ../src/gui_interface.py:1988
+#: ../src/gui_interface.py:1777
 #, fuzzy
 msgid ""
 "You are about to connect to the server with an insecure connection. This "
@@ -9280,12 +9584,12 @@ msgstr ""
 "инсталирате PyOpenSSL, за да предотвратите това. Сигурни ли сте, че искате "
 "да го направите?"
 
-#: ../src/gui_interface.py:1991 ../src/gui_interface.py:2028
-#: ../src/gui_interface.py:2063
+#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
+#: ../src/gui_interface.py:1852
 msgid "Yes, I really want to connect insecurely"
 msgstr "Да, наистина искам да се свържа по несигурен начин"
 
-#: ../src/gui_interface.py:2025
+#: ../src/gui_interface.py:1814
 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?"
@@ -9294,7 +9598,7 @@ msgstr ""
 "инсталирате PyOpenSSL, за да предотвратите това. Сигурни ли сте, че искате "
 "да го направите?"
 
-#: ../src/gui_interface.py:2061
+#: ../src/gui_interface.py:1850
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9304,17 +9608,17 @@ msgstr ""
 "че искате да го направите?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2624 ../src/gui_interface.py:2647
+#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
 msgid "Emoticons disabled"
 msgstr "Емотиконите са изключени"
 
-#: ../src/gui_interface.py:2625
+#: ../src/gui_interface.py:2423
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "Темата с емотикони не беше намерена, така че са изключени."
 
-#: ../src/gui_interface.py:2648
+#: ../src/gui_interface.py:2446
 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 "
@@ -9324,41 +9628,41 @@ msgstr ""
 "формата на файла emoticons.py. Вижте http://trac.gajim.org/wiki/Emoticons за "
 "повече подробности."
 
-#: ../src/gui_interface.py:2679 ../src/roster_window.py:3560
+#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
 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/gui_interface.py:3058
+#: ../src/gui_interface.py:2871
 msgid "Could not save your settings and preferences"
 msgstr "Неуспех при запазването на настройките"
 
-#: ../src/gui_interface.py:3592
+#: ../src/gui_interface.py:3411
 msgid "Passphrase Required"
 msgstr "Необходима е парола"
 
-#: ../src/gui_interface.py:3593
+#: ../src/gui_interface.py:3412
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Въведете парола за ключ на GPG %(keyid)s (акаунт „%(account)s“)."
 
-#: ../src/gui_interface.py:3607
+#: ../src/gui_interface.py:3426
 #, fuzzy
 msgid "GPG key expired"
 msgstr "Няма зададен ключ на GPG"
 
-#: ../src/gui_interface.py:3608
+#: ../src/gui_interface.py:3427
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Ще бъдете свързани към „%s“ без OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3617
+#: ../src/gui_interface.py:3436
 msgid "Wrong Passphrase"
 msgstr "Грешна парола"
 
-#: ../src/gui_interface.py:3618
+#: ../src/gui_interface.py:3437
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Въведете паролата за GPG ключа наново или натиснете „Отказване“."
 
@@ -9398,6 +9702,11 @@ msgstr "Псевдоним"
 msgid "Message"
 msgstr "Съобщение"
 
+#. holds subject
+#: ../src/history_manager.py:188 ../src/history_manager.py:219
+msgid "Subject"
+msgstr "Тема"
+
 #: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -9497,19 +9806,19 @@ msgstr "Не сте свързани към сървъра."
 msgid "Do you really want to close them all?"
 msgstr "Наистина ли искате да изтриете избраното съобщение?"
 
-#: ../src/message_window.py:484
+#: ../src/message_window.py:485
 msgid "Chats"
 msgstr "Разговори"
 
-#: ../src/message_window.py:486
+#: ../src/message_window.py:487
 msgid "Group Chats"
 msgstr "Стаи"
 
-#: ../src/message_window.py:488
+#: ../src/message_window.py:489
 msgid "Private Chats"
 msgstr "Лични разговори"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:495
 msgid "Messages"
 msgstr "Съобщения"
 
@@ -9566,107 +9875,107 @@ msgstr "Ново съобщение от %(nickname)s"
 msgid "Ignore"
 msgstr "_Игнориране"
 
-#: ../src/profile_window.py:57
+#: ../src/profile_window.py:58
 msgid "Retrieving profile..."
 msgstr "Извличане на профила…"
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2935
+#: ../src/profile_window.py:111 ../src/roster_window.py:3001
 msgid "File is empty"
 msgstr "Файлът не съдържа нищо"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2938
+#: ../src/profile_window.py:114 ../src/roster_window.py:3004
 msgid "File does not exist"
 msgstr "Файлът не съществува"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2940 ../src/roster_window.py:2951
+#: ../src/profile_window.py:128 ../src/profile_window.py:144
+#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
 msgid "Could not load image"
 msgstr "Неуспех при зареждането на изображението"
 
-#: ../src/profile_window.py:214
+#: ../src/profile_window.py:215
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Информация за контакта"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:216
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Формат: гггг-мм-дд"
 
-#: ../src/profile_window.py:269
+#: ../src/profile_window.py:270
 msgid "Information received"
 msgstr "Получена информация"
 
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:341
 msgid "Without a connection you can not publish your contact information."
 msgstr "Трябва да сте свързани, за да публикувате визитката."
 
-#: ../src/profile_window.py:353
+#: ../src/profile_window.py:354
 msgid "Sending profile..."
 msgstr "Изпращане на профила…"
 
-#: ../src/profile_window.py:368
+#: ../src/profile_window.py:369
 msgid "Information NOT published"
 msgstr "Информацията НЕ Е публикувана"
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:376
 msgid "vCard publication failed"
 msgstr "Неуспех при публикуването на визитката"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:377
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
 msgstr ""
 "Възникна грешка при публикуване на личните данни, опитайте отново по-късно."
 
-#: ../src/roster_window.py:256 ../src/roster_window.py:1012
+#: ../src/roster_window.py:262 ../src/roster_window.py:1026
 msgid "Merged accounts"
 msgstr "Смесени акаунти"
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1942
 msgid "Authorization has been sent"
 msgstr "Упълномощаването беше изпратено"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1943
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "„%s“ вече ще знае състоянието ви."
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1966
 msgid "Subscription request has been sent"
 msgstr "Искането за записване беше изпратено"
 
-#: ../src/roster_window.py:1944
+#: ../src/roster_window.py:1967
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ако „%s“ приеме това запитване, ще знаете за състоянието му."
 
-#: ../src/roster_window.py:1958
+#: ../src/roster_window.py:1981
 msgid "Authorization has been removed"
 msgstr "Упълномощаването беше прекратено"
 
-#: ../src/roster_window.py:1959
+#: ../src/roster_window.py:1982
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "„%s“ винаги ще ви вижда като изключен."
 
-#: ../src/roster_window.py:1986
+#: ../src/roster_window.py:2009
 msgid "GPG is not usable"
 msgstr "GPG не е използваем"
 
-#: ../src/roster_window.py:1987
+#: ../src/roster_window.py:2010
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Ще бъдете свързани към „%s“ без OpenPGP."
 
-#: ../src/roster_window.py:2199 ../src/roster_window.py:3496
+#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
 msgid "You are participating in one or more group chats"
 msgstr "Участвате в една или повече стаи"
 
-#: ../src/roster_window.py:2200 ../src/roster_window.py:3497
+#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9674,39 +9983,39 @@ msgstr ""
 "Промяната на състоянието до „Невидим“ ще ви изключи от тези стаи. Сигурни ли "
 "сте, че искате да станете „Невидим“?"
 
-#: ../src/roster_window.py:2226
+#: ../src/roster_window.py:2249
 msgid "desync'ed"
 msgstr "без синхронизация"
 
-#: ../src/roster_window.py:2288
+#: ../src/roster_window.py:2311
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2289
+#: ../src/roster_window.py:2312
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Сигурни ли сте, че искате да напуснете стаята „%s“?"
 
-#: ../src/roster_window.py:2290
+#: ../src/roster_window.py:2313
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2373
+#: ../src/roster_window.py:2396
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Отменя файловия трансфер"
 
-#: ../src/roster_window.py:2374
+#: ../src/roster_window.py:2397
 msgid ""
-"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2405 ../src/roster_window.py:2653
+#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
 msgid "You have unread messages"
 msgstr "Имате непрочетени съобщения"
 
-#: ../src/roster_window.py:2406
+#: ../src/roster_window.py:2429
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9714,16 +10023,16 @@ msgstr ""
 "Може да преглеждате съобщенията по-късно само ако е активирана опцията за "
 "историята и контактът е в списъка."
 
-#: ../src/roster_window.py:2654
+#: ../src/roster_window.py:2720
 msgid "You must read them before removing this transport."
 msgstr "Трябва да ги прочетете преди да премахнете този транспорт."
 
-#: ../src/roster_window.py:2657
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспортът „%s“ ще бъде премахнат"
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2724
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9731,11 +10040,11 @@ msgstr ""
 "Вече няма да можете да получавате и изпращате съобщения до контакти чрез "
 "този транспорт."
 
-#: ../src/roster_window.py:2661
+#: ../src/roster_window.py:2727
 msgid "Transports will be removed"
 msgstr "Ще бъдат премахнати транспорти"
 
-#: ../src/roster_window.py:2666
+#: ../src/roster_window.py:2732
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9744,70 +10053,70 @@ msgstr ""
 "Вече няма да можете да получавате и изпращате съобщения до контакти чрез "
 "тези транспорти: %s"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2800
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "На път сте да създадете мета-контакт. Сигурни ли сте, че искате да "
 "продължите?"
 
-#: ../src/roster_window.py:2736
+#: ../src/roster_window.py:2802
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2827
+#: ../src/roster_window.py:2893
 msgid "Rename Contact"
 msgstr "Преименуване на контакт"
 
-#: ../src/roster_window.py:2828
+#: ../src/roster_window.py:2894
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Въведете нов псевдоним за контакт „%s“"
 
-#: ../src/roster_window.py:2835
+#: ../src/roster_window.py:2901
 msgid "Rename Group"
 msgstr "Преименуване на група"
 
-#: ../src/roster_window.py:2836
+#: ../src/roster_window.py:2902
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Въведете ново име за група „%s“"
 
-#: ../src/roster_window.py:2881
+#: ../src/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Премахване на група"
 
-#: ../src/roster_window.py:2882
+#: ../src/roster_window.py:2948
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Искате ли да премахнете групата „%s“ от списъка?"
 
-#: ../src/roster_window.py:2883
+#: ../src/roster_window.py:2949
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Премахване от списъка и на всички контакти в тази група"
 
-#: ../src/roster_window.py:2922
+#: ../src/roster_window.py:2988
 msgid "Assign OpenPGP Key"
 msgstr "Задаване на OpenPGP ключ"
 
-#: ../src/roster_window.py:2923
+#: ../src/roster_window.py:2989
 msgid "Select a key to apply to the contact"
 msgstr "Изберете ключ за този контакт"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3372
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контактът „%s“ ще бъде премахнат от списъка ви"
 
-#: ../src/roster_window.py:3308
+#: ../src/roster_window.py:3374
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3313
+#: ../src/roster_window.py:3379
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9816,11 +10125,11 @@ msgstr ""
 "ще ви вижда изключен."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3319
+#: ../src/roster_window.py:3385
 msgid "Do you want to continue?"
 msgstr "Искате ли да продължите?"
 
-#: ../src/roster_window.py:3323
+#: ../src/roster_window.py:3389
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9828,16 +10137,16 @@ msgstr ""
 "Премахвайки този контакт, прекратявате и упълномощаването. Контактът винаги "
 "ще ви вижда изключен."
 
-#: ../src/roster_window.py:3326
+#: ../src/roster_window.py:3392
 msgid "I want this contact to know my status after removal"
 msgstr "Искам този контакт да вижда състоянието ми след премахването"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3330
+#: ../src/roster_window.py:3396
 msgid "Contacts will be removed from your roster"
 msgstr "Ще бъдат премахнати контакти от списъка"
 
-#: ../src/roster_window.py:3335
+#: ../src/roster_window.py:3401
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9846,7 +10155,7 @@ msgstr ""
 "Премахвайки тези контакти: %s\n"
 "прекратявате и упълномощаването, така че винаги ще ви виждат изключен(а)."
 
-#: ../src/roster_window.py:3393
+#: ../src/roster_window.py:3459
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want  to continue?"
@@ -9854,27 +10163,27 @@ msgstr ""
 "На път сте да създадете мета-контакт. Сигурни ли сте, че искате да "
 "продължите?"
 
-#: ../src/roster_window.py:3395
+#: ../src/roster_window.py:3461
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he or she will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3414
+#: ../src/roster_window.py:3480
 msgid "No account available"
 msgstr "Няма наличен акаунт"
 
-#: ../src/roster_window.py:3415
+#: ../src/roster_window.py:3481
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "За да разговаряте с други контакти, първо трябва да създадете Джабър акаунт."
 
-#: ../src/roster_window.py:4023
+#: ../src/roster_window.py:4095
 msgid "Metacontacts storage not supported by your server"
 msgstr "Сървърът ви няма поддръжка за мета-контакти"
 
-#: ../src/roster_window.py:4025
+#: ../src/roster_window.py:4097
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9882,14 +10191,14 @@ msgstr ""
 "Вашият сървър не поддържа съхраняването на информация за мета-контакти, така "
 "че тази информация няма да се запази при следващото свързване."
 
-#: ../src/roster_window.py:4117
+#: ../src/roster_window.py:4189
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "На път сте да създадете мета-контакт. Сигурни ли сте, че искате да "
 "продължите?"
 
-#: ../src/roster_window.py:4119
+#: ../src/roster_window.py:4191
 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 "
@@ -9899,23 +10208,23 @@ msgstr ""
 "Основно се използва, когато един и същ потребител има няколко акаунта за "
 "Джабър или акаунти за транспорти."
 
-#: ../src/roster_window.py:4234
+#: ../src/roster_window.py:4306
 msgid "Invalid file URI:"
 msgstr "Невалиден адрес на файл:"
 
-#: ../src/roster_window.py:4246
+#: ../src/roster_window.py:4318
 #, 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:4361
+#: ../src/roster_window.py:4433
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Изпращане на %s"
 
-#: ../src/roster_window.py:4367
+#: ../src/roster_window.py:4439
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Изпращане на файл до контакт"
@@ -9925,144 +10234,144 @@ msgstr "Изпращане на файл до контакт"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4816 ../src/roster_window.py:4889
-#: ../src/roster_window.py:4898 ../src/statusicon.py:246
-#: ../src/statusicon.py:293 ../src/statusicon.py:299
+#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
+#: ../src/roster_window.py:4970 ../src/statusicon.py:263
+#: ../src/statusicon.py:310 ../src/statusicon.py:316
 #, python-format
 msgid "using account %s"
 msgstr "от акаунт „%s“"
 
 #. add
-#: ../src/roster_window.py:4905
+#: ../src/roster_window.py:4977
 #, python-format
 msgid "to %s account"
 msgstr "към акаунт „%s“"
 
 #. disco
-#: ../src/roster_window.py:4910
+#: ../src/roster_window.py:4982
 #, python-format
 msgid "using %s account"
 msgstr "за акаунт „%s“"
 
-#: ../src/roster_window.py:4948 ../src/statusicon.py:309
+#: ../src/roster_window.py:5020 ../src/statusicon.py:326
 msgid "_Manage Bookmarks..."
 msgstr "_Управление на отметките…"
 
 #. profile, avatar
-#: ../src/roster_window.py:4968
+#: ../src/roster_window.py:5040
 #, python-format
 msgid "of account %s"
 msgstr "за акаунт „%s“"
 
-#: ../src/roster_window.py:5009
+#: ../src/roster_window.py:5081
 #, python-format
 msgid "for account %s"
 msgstr "за акаунт „%s“"
 
-#: ../src/roster_window.py:5069 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
 msgid "_Change Status Message"
 msgstr "Пром_яна на съобщението за състояние"
 
-#: ../src/roster_window.py:5102
+#: ../src/roster_window.py:5174
 msgid "Publish Tune"
 msgstr "Публикуване на мелодия"
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5176
 #, fuzzy
 msgid "Publish Location"
 msgstr "Публикуване на мелодия"
 
-#: ../src/roster_window.py:5107
+#: ../src/roster_window.py:5179
 msgid "Configure Services..."
 msgstr "Настройване на услуги…"
 
-#: ../src/roster_window.py:5252
+#: ../src/roster_window.py:5324
 msgid "_Maximize All"
 msgstr "_Максимизиране на всички"
 
-#: ../src/roster_window.py:5262 ../src/roster_window.py:5436
+#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
 msgid "Send Group M_essage"
 msgstr "_Изпращане на групово съобщение"
 
-#: ../src/roster_window.py:5270
+#: ../src/roster_window.py:5342
 msgid "To all users"
 msgstr "До всички потребители"
 
-#: ../src/roster_window.py:5274
+#: ../src/roster_window.py:5346
 msgid "To all online users"
 msgstr "До всички включени потребители"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5456
+#: ../src/roster_window.py:5528
 msgid "_Manage Contacts"
 msgstr "_Управление на контакти"
 
 #. Edit Groups
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5537
 msgid "Edit _Groups"
 msgstr "Редактиране на _групи"
 
 #. Send single message
-#: ../src/roster_window.py:5520
+#: ../src/roster_window.py:5592
 msgid "Send Single Message"
 msgstr "Изпращане на еднократно съобщение"
 
 #. Execute Command
-#: ../src/roster_window.py:5567
+#: ../src/roster_window.py:5639
 msgid "Execute Command..."
 msgstr "Изпълнение на команда…"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5577
+#: ../src/roster_window.py:5649
 msgid "_Manage Transport"
 msgstr "Управление на _транспорт"
 
 #. Modify Transport
-#: ../src/roster_window.py:5586
+#: ../src/roster_window.py:5658
 msgid "_Modify Transport"
 msgstr "Промяна на т_ранспорт"
 
 #. Rename
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5668
 msgid "_Rename"
 msgstr "_Преименуване"
 
-#: ../src/roster_window.py:5656
+#: ../src/roster_window.py:5728
 msgid "_Maximize"
 msgstr "_Максимизиране"
 
-#: ../src/roster_window.py:5665
+#: ../src/roster_window.py:5737
 #, fuzzy
 msgid "_Reconnect"
 msgstr "_Изключване"
 
-#: ../src/roster_window.py:5672
+#: ../src/roster_window.py:5744
 msgid "_Disconnect"
 msgstr "_Изключване"
 
 #. History manager
-#: ../src/roster_window.py:5754
+#: ../src/roster_window.py:5833
 msgid "History Manager"
 msgstr "Мениджър на историята"
 
-#: ../src/roster_window.py:5765
+#: ../src/roster_window.py:5844
 msgid "_Join New Group Chat"
 msgstr "_Влизане в нова стая"
 
-#: ../src/roster_window.py:5938
+#: ../src/roster_window.py:6019
 msgid "Change Status Message..."
 msgstr "Промяна на съобщението за състояние…"
 
-#: ../src/search_window.py:94
+#: ../src/search_window.py:105
 msgid "Waiting for results"
 msgstr "Изчакване на резултатите"
 
-#: ../src/search_window.py:132 ../src/search_window.py:210
+#: ../src/search_window.py:143 ../src/search_window.py:220
 msgid "Error in received dataform"
 msgstr "Грешка в получените данни"
 
 #. No result
-#: ../src/search_window.py:166 ../src/search_window.py:202
+#: ../src/search_window.py:177 ../src/search_window.py:212
 msgid "No result"
 msgstr "Няма резултати"
 
@@ -10075,14 +10384,15 @@ msgstr "Грешка при запис на диска"
 msgid "Subject: %s"
 msgstr "Тема: %s"
 
-#: ../src/session.py:433 ../src/session.py:468
+#: ../src/session.py:447 ../src/session.py:491
 msgid "Confirm these session options"
 msgstr "Потвърждение на тези настройки на сесията"
 
-#: ../src/session.py:435
+#: ../src/session.py:448
 #, fuzzy, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
+"The remote client wants '\n"
+"                            'to negotiate an session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -10094,7 +10404,7 @@ msgstr ""
 "\n"
 "\tДопустими ли са тези настройки?"
 
-#: ../src/session.py:469
+#: ../src/session.py:492
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10109,16 +10419,16 @@ msgstr ""
 "\n"
 "Продължаване с тази сесия?"
 
-#: ../src/statusicon.py:210
+#: ../src/statusicon.py:227
 msgid "_Change Status Message..."
 msgstr "_Промяна на съобщението за състояние…"
 
-#: ../src/statusicon.py:322
+#: ../src/statusicon.py:339
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "в с_писъка"
 
-#: ../src/statusicon.py:333
+#: ../src/statusicon.py:350
 msgid "Hide this menu"
 msgstr "Скриване на това меню"
 
@@ -10257,33 +10567,33 @@ msgstr ""
 "Тази услуга не можа да отговори с подробна информация.\n"
 "Най-вероятно е извън употреба или повредена"
 
-#: ../src/vcard.py:251
+#: ../src/vcard.py:265
 msgid "?Client:Unknown"
 msgstr "Неизвестен"
 
-#: ../src/vcard.py:253
+#: ../src/vcard.py:267
 msgid "?OS:Unknown"
 msgstr "Неизвестна"
 
-#: ../src/vcard.py:274
+#: ../src/vcard.py:288
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "Неизвестен"
 
-#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
+#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
 #, python-format
 msgid "since %s"
 msgstr "от %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:345
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:349
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Ранг:</b>"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:357
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10291,7 +10601,7 @@ msgstr ""
 "Този контакт се интересува от информацията за вашето състояние, но вие не се "
 "интересувате от неговото"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:359
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10299,13 +10609,13 @@ msgstr ""
 "Вие с интересувате от информацията за състоянието на този контакт, но той не "
 "се интересува от вашето"
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:361
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Вие и контакта се интересувате взаимно от информацията за състоянията си"
 
 #. None
-#: ../src/vcard.py:349
+#: ../src/vcard.py:363
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10313,26 +10623,62 @@ msgstr ""
 "Вие не се интересувате от информацията за състоянието на контакта, както и "
 "той от вашата"
 
-#: ../src/vcard.py:356
+#: ../src/vcard.py:370
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Чакате отговора на контакта относно запитването ви за записване"
 
-#: ../src/vcard.py:358
+#: ../src/vcard.py:372
 msgid "There is no pending subscription request."
 msgstr "Няма чакащо запитване за записване."
 
-#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
+#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
 msgid " resource with priority "
 msgstr " ресурс с приоритет "
 
-#~ msgid "_Available"
-#~ msgstr "На _линия"
+#~ msgid "_Disable showing event in systray"
+#~ msgstr "_Изключване на показване на събитието в областта за уведомяване"
+
+#~ msgid "_Show event in systray"
+#~ msgstr "Показване на събитието в областта за _уведомяване"
+
+#, fuzzy
+#~ msgid "Autodetect on every Gajim startup"
+#~ msgstr "С_вързване при стартиране"
+
+#, fuzzy
+#~ msgid "Show systray:"
+#~ msgstr "Показване на събитието в областта за _уведомяване"
+
+#~ msgid "Nickname not allowed: %s"
+#~ msgstr "Псевдонимът не е позволен: %s"
+
+#~ msgid "Room has been destroyed"
+#~ msgstr "Стаята е била унищожена"
+
+#~ msgid "You can join this room instead: %s"
+#~ msgstr "Вместо това може да влезете в тази стая: %s"
+
+#~ msgid "I would like to add you to my roster."
+#~ msgstr ""
+#~ "Бих искал(а) да ви добавя към списъка си. I would like to add you to my "
+#~ "roster."
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "вече сме записани за %s"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "искане за отписване от %s"
 
-#~ msgid "PEP node was not removed"
-#~ msgstr "Възелът на PEP не беше премахнат"
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "вече сме отписани от %s"
 
-#~ msgid "PEP node %(node)s was not removed: %(message)s"
-#~ msgstr "Възелът на PEP %(node)s не беше премахнат: %(message)s"
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "JID %s не е съгласно стандарта по RFC. Няма да бъде добавен към списъка. "
+#~ "Използвайте инструменти за управление на списък като http://jru."
+#~ "jabberstudio.org/, за да го премахнете."
 
 #~ msgid "Account Modification"
 #~ msgstr "Промяна на акаунт"
@@ -10442,41 +10788,9 @@ msgstr " ресурс с приоритет "
 #~ msgid "gtk-delete"
 #~ msgstr "gtk-delete"
 
-#~ msgid "Add this contact to roster (Ctrl+D)"
-#~ msgstr "Добавяне на контакт към списъка (Ctrl+D)"
-
-#~ msgid "Bookmark this room (Ctrl+B)"
-#~ msgstr "_Добавяне на стаята към отметките (Ctrl+B)"
-
-#~ msgid "Browse the chat history (Ctrl+H)"
-#~ msgstr "Разглеждане на историята на разговорите (Ctrl+H)"
-
-#~ msgid "Change the room's subject (Alt+T)"
-#~ msgstr "Смяна на темата на стаята (Alt+T)"
-
-#~ msgid "Change your nickname (Ctrl+N)"
-#~ msgstr "Смяна на псевдоним (Ctrl+N)"
-
-#~ msgid "Invite contacts to the conversation (Ctrl+G)"
-#~ msgstr "Покана на контакти в разговора (Ctrl+G)"
-
 #~ msgid "Send a file (Ctrl+F)"
 #~ msgstr "Изпращане на файл (Ctrl+F)"
 
-#~ msgid "Show a list of emoticons (Alt+M)"
-#~ msgstr "Списък с емотикони (Alt+M)"
-
-#, fuzzy
-#~ msgid "Show a list of formattings"
-#~ msgstr "Списък с емотикони (Alt+M)"
-
-#, fuzzy
-#~ msgid "Show a menu of advanced functions (Alt+D)"
-#~ msgstr "Меню с функции за напреднали (Ctrl+A)"
-
-#~ msgid "Show the contact's profile (Ctrl+I)"
-#~ msgstr "Показване на профила на контакта (Ctrl+I)"
-
 #~ msgid ""
 #~ "All chat states\n"
 #~ "Composing only\n"
@@ -10536,9 +10850,6 @@ msgstr " ресурс с приоритет "
 #~ msgid "gtk-cancel"
 #~ msgstr "gtk-close"
 
-#~ msgid "_Preferences"
-#~ msgstr "_Настройки"
-
 #~ msgid "_Quit"
 #~ msgstr "_Изход"
 
@@ -10826,9 +11137,6 @@ msgstr " ресурс с приоритет "
 #~ "Изисква python-gnome2-extras и компилация на модула „gtkspell“ от "
 #~ "изходния код на Gajim."
 
-#~ msgid "Notification-daemon"
-#~ msgstr "Демон за уведомления"
-
 #~ msgid "Idle"
 #~ msgstr "Време на бездействие"
 
diff --git a/po/br.po b/po/br.po
index 74bee1cbee84aaf01252f75bf408a35e59025984..e957c0c08d4436d86d9c496b663ff0e0f9ea27e4 100644
--- a/po/br.po
+++ b/po/br.po
@@ -7,11 +7,15 @@
 # , 2005.
 #
 #
+#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 11:28+0200\n"
+"POT-Creation-Date: 2010-10-01 20:39+0200\n"
 "PO-Revision-Date: 2006-06-05 19:14+0100\n"
 "Last-Translator: Giulia Fraboulet <djoulia_at_gmail.com>\n"
 "Language-Team: \n"
@@ -32,7 +36,7 @@ msgstr "Ebarzhiñ ur _webgaoz"
 msgid "_Add Contact..."
 msgstr "_Ouzhpennañ un darempred..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:17
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
 msgid "_Discover Services"
 msgstr "_Dizoleiñ ar servijoù"
 
@@ -56,7 +60,7 @@ msgstr "_Digeriñ ar bostelerez"
 msgid "_Personal Events"
 msgstr "Titouroù hiniennel"
 
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:23
+#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
 #, fuzzy
 msgid "_Start Chat..."
 msgstr "_Kregiñ da flapiñ"
@@ -91,77 +95,73 @@ msgid "<b>Please select a server</b>"
 msgstr ""
 
 #: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid "@"
-msgstr ""
-
-#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
 msgstr ""
 
-#: ../data/gui/account_creation_wizard_window.ui.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:10
 #, fuzzy
 msgid "Anon_ymous authentication"
 msgstr "Implij an diskleriañ"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Connect when I press Finish"
 msgstr "Kevreañ pa bouezan war Echuiñ"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim : Assistant de création de compte"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 #, fuzzy
 msgid "I already have an account I want to _use"
 msgstr "Bez em eus ur gont a fell din implij"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I want to _register for a new account"
 msgstr "Fellout a ra din emezelañ evit krouiñ ur gont"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:16
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 #: ../data/gui/accounts_window.ui.h:28
 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/gui/account_creation_wizard_window.ui.h:17
+#: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Kemmañ..."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:18
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
 #: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2263 ../src/config.py:2342
-#: ../src/config.py:2355 ../src/config.py:3596 ../src/config.py:3671
-#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513
-#: ../src/dialogs.py:526 ../src/roster_window.py:2890
-#: ../src/roster_window.py:2896 ../src/roster_window.py:2901
+#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
+#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
+#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
+#: ../src/dialogs.py:527 ../src/roster_window.py:2956
+#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
 msgid "None"
 msgstr "Hini ebet"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:19
+#: ../data/gui/account_creation_wizard_window.ui.h:18
 #, fuzzy
 msgid "Prox_y:"
 msgstr "Proksi:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #: ../data/gui/accounts_window.ui.h:48
 msgid "Save pass_word"
 msgstr "Enrollañ ar _ger-kuzh"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:21
+#: ../data/gui/account_creation_wizard_window.ui.h:20
 msgid "Set my profile when I connect"
 msgstr "Aozañ ma aelad pa lugan"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:22
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Use custom hostname/port"
 msgstr "Implij un anv ostiz/porzh personelaet"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:23
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -169,35 +169,35 @@ msgstr ""
 "Rankout a rit kaout ur gont evit en em lugañ\n"
 "d'ar rouedad Jabber."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-#: ../data/gui/roster_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:16
 msgid "_Advanced"
 msgstr "_Mont pelloc'h"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:25
 msgid "_Finish"
 msgstr "_Echuiñ"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:27
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 #, fuzzy
 msgid "_Hostname:"
 msgstr "Servijer:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #: ../data/gui/accounts_window.ui.h:62
 msgid "_Jabber ID:"
 msgstr "ID _Jabber:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:28
 #: ../data/gui/accounts_window.ui.h:64
 msgid "_Password:"
 msgstr "_Ger-kuzh:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:29
 msgid "_Port:"
 msgstr "_Porzh:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:31
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Server:"
 msgstr "_Servijer:"
 
@@ -310,17 +310,17 @@ msgstr "Anv:"
 #. No configured account
 #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
 #: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592
-#: ../src/notify.py:608
+#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
+#: ../src/notify.py:616
 msgid "Gajim"
 msgstr "Gajim"
 
 #. FIXME: Ugly workaround.
 #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
 #. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:61
-#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121
-#: ../src/roster_window.py:2832 ../src/roster_window.py:5379
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
+#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
 msgid "General"
 msgstr "Hollek"
 
@@ -378,7 +378,7 @@ msgstr "Titouroù diwar ho penn, miret war ar servijer"
 
 #: ../data/gui/accounts_window.ui.h:35
 #: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:830
+#: ../src/dialogs.py:831
 msgid "Jabber ID:"
 msgstr "ID Jabber:"
 
@@ -394,7 +394,7 @@ msgid "Mer_ge accounts"
 msgstr "_Strollañ ar c'hontoù"
 
 #: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2356
+#: ../src/config.py:2358
 msgid "No key selected"
 msgstr "Alc'hwez ebet diuzet"
 
@@ -418,7 +418,7 @@ msgid "Priority will change automatically according to your status."
 msgstr ""
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5329
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
 msgid "Re_name"
 msgstr "_Adenvel"
 
@@ -654,42 +654,47 @@ msgstr "A zilam kemennadenn an devezh"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
 #, fuzzy
+msgid "Edit Archi_ving Preferences"
+msgstr "_Penndibaboù"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#, fuzzy
 msgid "Edit _Privacy Lists..."
 msgstr "Flapoù prevez"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 #, fuzzy
 msgid "Sends a message to users currently connected to this server"
 msgstr "A gas ur gemennadenn d'an arveridi luget war ar servijer-mañ"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 #, fuzzy
 msgid "Set MOTD..."
 msgstr "Lakaat MOTD"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "A laka kemennadenn an devezh"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 #, fuzzy
 msgid "Show _XML Console"
 msgstr "Diskouez ar gonsol _XML"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "Hizivaat MOTD"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "A hiziva kemennadenn an devez"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:11
 msgid "_Administrator"
 msgstr "_Merour-ez"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:11
+#: ../data/gui/advanced_menuitem_menu.ui.h:12
 #, fuzzy
 msgid "_Send Server Message..."
 msgstr "_Kas ur gemennadenn d'ar servijer"
@@ -729,7 +734,7 @@ msgid "All statuses"
 msgstr "Stad:"
 
 #: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:233
+#: ../src/common/commands.py:106 ../src/common/helpers.py:239
 #: ../src/tooltips.py:193
 msgid "Away"
 msgstr "Ezvezant"
@@ -782,7 +787,7 @@ msgid "Have "
 msgstr ""
 
 #: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:249
 msgid "Invisible"
 msgstr "Diwelus"
 
@@ -792,7 +797,7 @@ msgid "Launch a command"
 msgstr "urzhiad"
 
 #: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:216 ../src/tooltips.py:197
+#: ../src/common/helpers.py:222 ../src/tooltips.py:197
 msgid "Not Available"
 msgstr "Dihegerz"
 
@@ -838,11 +843,11 @@ msgid "_Disable existing sound for this event"
 msgstr ""
 
 #: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in roster"
+msgid "_Disable showing event in notification area"
 msgstr ""
 
 #: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in systray"
+msgid "_Disable showing event in roster"
 msgstr ""
 
 #: ../data/gui/advanced_notifications_window.ui.h:33
@@ -856,12 +861,12 @@ msgstr "Utiliser une seule fenê_tre de discussion avec des onglets"
 
 #: ../data/gui/advanced_notifications_window.ui.h:35
 #, fuzzy
-msgid "_Show event in roster"
+msgid "_Show event in notification area"
 msgstr "Diskouez er _roll hepken"
 
 #: ../data/gui/advanced_notifications_window.ui.h:36
 #, fuzzy
-msgid "_Show event in systray"
+msgid "_Show event in roster"
 msgstr "Diskouez er _roll hepken"
 
 #: ../data/gui/advanced_notifications_window.ui.h:37
@@ -891,6 +896,44 @@ msgstr "Strollad"
 msgid "when I'm in"
 msgstr ""
 
+#: ../data/gui/archiving_preferences_window.ui.h:1
+msgid "<i>Method Auto</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "<i>Method Local</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:3
+msgid "<i>Method Manual</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:4
+msgid "Auto"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Concede"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "Forbid"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:7
+#, fuzzy
+msgid "No"
+msgstr "Hini ebet"
+
+#: ../data/gui/archiving_preferences_window.ui.h:8
+#, fuzzy
+msgid "Prefer"
+msgstr "Penndibaboù"
+
+#: ../data/gui/archiving_preferences_window.ui.h:9
+msgid "Yes"
+msgstr ""
+
 #: ../data/gui/atom_entry_window.ui.h:1
 #, fuzzy
 msgid "Entry:"
@@ -922,8 +965,8 @@ msgstr "Darempredoù"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5348
-#: ../src/roster_window.py:5476 ../src/roster_window.py:5609
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
+#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
 msgid "_Unblock"
 msgstr ""
 
@@ -1018,7 +1061,7 @@ msgid "_Start Chat"
 msgstr "_Kregiñ da flapiñ"
 
 #. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4184
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
 msgid "#"
 msgstr ""
 
@@ -1066,13 +1109,55 @@ msgstr ""
 msgid "9"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:13
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Ouzhennañ an darempred d'ar roll"
+
 #: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
+msgid "Browse the chat history (Ctrl+H)"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:15
+#, fuzzy
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "a zo aketus d'ar gaozeadenn"
+
+#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+#, fuzzy
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Klikit evit enlakaat ur boulomell (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
+#, fuzzy
+msgid "Show a list of formattings"
+msgstr "Klikit evit enlakaat ur boulomell (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Klikit evit enlakaat ur boulomell (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:19
+#, fuzzy
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr "Ouzhennañ an darempred d'ar roll"
+
+#: ../data/gui/chat_control.ui.h:20
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:21
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
 #: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Kas"
 
-#: ../data/gui/chat_control.ui.h:15 ../data/gui/groupchat_control.ui.h:3
+#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
 msgid "label"
 msgstr ""
 
@@ -1127,8 +1212,8 @@ msgstr "Kemmañ ar _strolladoù"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5284
-#: ../src/roster_window.py:5444
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
+#: ../src/roster_window.py:5516
 msgid "In_vite to"
 msgstr ""
 
@@ -1142,8 +1227,8 @@ msgstr "Darempredoù"
 msgid "Remo_ve"
 msgstr "_Dilemel"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5294
-#: ../src/roster_window.py:5533
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
+#: ../src/roster_window.py:5605
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Goulenn evit gwelet e/he stad"
@@ -1179,8 +1264,8 @@ msgid "_Allow him/her to see my status"
 msgstr "He/E aotren da welet ma stad"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5482 ../src/roster_window.py:5612
+#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
+#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
 msgid "_Block"
 msgstr ""
 
@@ -1191,8 +1276,8 @@ msgstr "Difenn dezhañ/dezhi gwelet ma stad"
 
 #: ../data/gui/contact_context_menu.ui.h:20
 #: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:21
-#: ../src/roster_window.py:5683
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
+#: ../src/roster_window.py:5755
 msgid "_History"
 msgstr "_Istoradur"
 
@@ -1333,7 +1418,7 @@ msgstr "<b>Liv-stad an ivinelloù</b>"
 msgid "Account row"
 msgstr "Kont"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:925
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
 msgid "Bold"
 msgstr "Tev"
 
@@ -1371,7 +1456,7 @@ msgstr "Strollad"
 msgid "Inactive"
 msgstr "Dizoberiant"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:926
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
 msgid "Italic"
 msgstr "Stouet"
 
@@ -1423,7 +1508,7 @@ msgstr "Kemmañ ar _sujed"
 msgid "Configure _Room..."
 msgstr "Ke_fluniañ ar flap"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1782
+#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
 #, fuzzy
 msgid "_Bookmark"
 msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
@@ -1487,19 +1572,33 @@ msgstr "_Kas ur gemennadenn brevez"
 msgid "_Voice"
 msgstr ""
 
+#: ../data/gui/groupchat_control.ui.h:1
+#, fuzzy
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
+
+#: ../data/gui/groupchat_control.ui.h:3
+msgid "Change the room's subject (Alt+T)"
+msgstr ""
+
+#: ../data/gui/groupchat_control.ui.h:4
+#, fuzzy
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Cheñch _lesanv"
+
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr ""
 
-#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
-msgid "From"
-msgstr "Digant"
+#: ../data/gui/groups_post_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:2
+msgid "From:"
+msgstr "Digant:"
 
-#. holds subject
-#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
-#: ../src/history_manager.py:219
-msgid "Subject"
-msgstr "Titl"
+#: ../data/gui/groups_post_window.ui.h:3
+#: ../data/gui/single_message_window.ui.h:7
+msgid "Subject:"
+msgstr "Titl:"
 
 #: ../data/gui/history_manager.ui.h:1
 msgid ""
@@ -1514,8 +1613,8 @@ msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Merour istoradur Gajim"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3208
-#: ../src/dialogs.py:3305
+#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
+#: ../src/dialogs.py:3321
 msgid "Delete"
 msgstr "Dilemel"
 
@@ -1569,12 +1668,75 @@ msgstr "Klask"
 msgid "_Log conversation history"
 msgstr "_Istoradur flapiñ"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
+msgid "approve"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:2
+msgid "body"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:3
+msgid "concede"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:4
+msgid "expire"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:5
+msgid "false"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:6
+msgid "forbid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:7
+#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+msgid "jid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:8
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
+#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
+msgid "message"
+msgstr "kemennadenn"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
+msgid "oppose"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
+#, fuzzy
+msgid "otr"
+msgstr "_Ostiz:"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:11
+msgid "prefer"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:12
+msgid "require"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:13
+msgid "save"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:14
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
 msgid "Bro_wse Rooms"
 msgstr "_Furchal"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2180
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
 msgid "Join Group Chat"
 msgstr "Ebarzhiñ ur sal-flapiñ"
 
@@ -1612,8 +1774,8 @@ msgstr "Servijer:"
 msgid "_Bookmark this room"
 msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1341
-#: ../src/disco.py:1786
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../src/disco.py:1804
 msgid "_Join"
 msgstr "E_barzhiñ"
 
@@ -1724,6 +1886,73 @@ msgstr "_Anv:"
 msgid "Passphrase"
 msgstr "Ger-kuzh"
 
+#: ../data/gui/plugins_window.ui.h:1
+msgid "&lt;empty&gt;"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:2
+msgid "<empty>"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:3
+#, fuzzy
+msgid "Authors:"
+msgstr "_Aotren"
+
+#: ../data/gui/plugins_window.ui.h:4
+#, fuzzy
+msgid "Available"
+msgstr "Dihegerz"
+
+#: ../data/gui/plugins_window.ui.h:5
+#, fuzzy
+msgid "Configure"
+msgstr "_Kenderc'hel"
+
+#: ../data/gui/plugins_window.ui.h:6
+#, fuzzy
+msgid "Descrition:"
+msgstr "Taolennadur: %s"
+
+#: ../data/gui/plugins_window.ui.h:7
+#, fuzzy
+msgid "Homepage:"
+msgstr "Lec'hienn hiniennel:"
+
+#: ../data/gui/plugins_window.ui.h:8
+msgid "Install"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:9
+msgid "Installed"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:10
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:11
+msgid "Plugins"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:12
+msgid "Uninstall"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:13
+msgid "Version:"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:14
+msgid "button"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:15
+msgid "homepage url"
+msgstr ""
+
 #: ../data/gui/popup_notification_window.ui.h:1
 #, fuzzy
 msgid "Event Type"
@@ -1860,125 +2089,108 @@ msgid "Always"
 msgstr "Ezvezant"
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Always use GNOME default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:32
-msgid "Always use KDE default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:33
-msgid "Always use Xfce default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Goulenn an titour-stad pa:"
 
-#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
 msgid "Audio / Video"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:33
 msgid "Audio input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Audio output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:38
-#, fuzzy
-msgid "Autodetect on every Gajim startup"
-msgstr "K_evreañ en ur loc'hañ Gajim"
-
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:35
 #, fuzzy
 msgid "Chat message:"
 msgstr "_Titour-stad:"
 
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:36
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:37
 #, fuzzy
 msgid "Composing only"
 msgstr "O skrivañ"
 
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:38
 msgid "Configure color and font of the interface"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
 msgid "Contact's message:"
 msgstr "_Titour-stad:"
 
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Anv an darempred"
 
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:41
 #, fuzzy
 msgid "Custom"
 msgstr "<b>Personelaet</b>"
 
-#: ../data/gui/preferences_window.ui.h:46
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Detached roster with chat grouped by account"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Detached roster with detached chats"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:45
 msgid "Detached roster with single chat"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
-#: ../src/config.py:671
+#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
+#: ../src/config.py:665
 msgid "Disabled"
 msgstr "Dizoberiant"
 
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:47
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Diskouez _skeudennigoù an darempredoù er roll"
 
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:48
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:49
 #, fuzzy
 msgid "Display _location of contacts in roster"
 msgstr "Diskouez _skeudennigoù an darempredoù er roll"
 
-#: ../data/gui/preferences_window.ui.h:54
+#: ../data/gui/preferences_window.ui.h:50
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Diskouez _skeudennigoù an darempredoù er roll"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display a_vatars of contacts in roster"
 msgstr "Diskouez _skeudennigoù an darempredoù er roll"
 
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:52
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Diskouez _skeudennigoù an darempredoù er roll"
 
-#: ../data/gui/preferences_window.ui.h:57
+#: ../data/gui/preferences_window.ui.h:53
 msgid "Display status _messages of contacts in roster"
 msgstr "Diskouez titouroù-stad an darempredoù e-barzh ar roll"
 
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:54
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -1989,7 +2201,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/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:55
 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 "
@@ -1999,7 +2211,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/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:56
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2007,25 +2219,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/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:58
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "A guzha an nozelennoù er prenestroù webgaoz"
 
-#: ../data/gui/preferences_window.ui.h:63
+#: ../data/gui/preferences_window.ui.h:59
 #, 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/gui/preferences_window.ui.h:64
+#: ../data/gui/preferences_window.ui.h:60
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:61
 #, fuzzy
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
@@ -2033,13 +2245,13 @@ msgstr ""
 "Si cette case est cochée, Gajim placera une icône dans la zone de "
 "notification"
 
-#: ../data/gui/preferences_window.ui.h:66
+#: ../data/gui/preferences_window.ui.h:62
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -2047,7 +2259,7 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
 "fenêtre principale et les salons"
 
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -2055,7 +2267,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/gui/preferences_window.ui.h:69
+#: ../data/gui/preferences_window.ui.h:65
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -2063,7 +2275,7 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
 "fenêtre principale et les salons"
 
-#: ../data/gui/preferences_window.ui.h:70
+#: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the location of contacts in the roster window"
@@ -2071,7 +2283,7 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
 "fenêtre principale et les salons"
 
-#: ../data/gui/preferences_window.ui.h:71
+#: ../data/gui/preferences_window.ui.h:67
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -2079,7 +2291,7 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
 "fenêtre principale et les salons"
 
-#: ../data/gui/preferences_window.ui.h:72
+#: ../data/gui/preferences_window.ui.h:68
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -2087,14 +2299,14 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
 "fenêtre principale et les salons"
 
-#: ../data/gui/preferences_window.ui.h:73
+#: ../data/gui/preferences_window.ui.h:69
 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/gui/preferences_window.ui.h:74
+#: ../data/gui/preferences_window.ui.h:70
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -2105,20 +2317,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/gui/preferences_window.ui.h:75
+#: ../data/gui/preferences_window.ui.h:71
 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/gui/preferences_window.ui.h:76
+#: ../data/gui/preferences_window.ui.h:72
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:77
+#: ../data/gui/preferences_window.ui.h:73
 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, "
@@ -2128,13 +2340,13 @@ msgstr ""
 "protocoles. (Par ex. un contact MSN aura les icônes de MSN pour les états "
 "disponible, absent, occupé, etc)"
 
-#: ../data/gui/preferences_window.ui.h:78
+#: ../data/gui/preferences_window.ui.h:74
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:79
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2142,133 +2354,133 @@ msgstr ""
 "M'eo lazhet, ne vo ket erlec'hiet ar voulomelloù ascii doare ':)' gant "
 "boulomelloù grafikel fiñv pe difiñv"
 
-#: ../data/gui/preferences_window.ui.h:80
+#: ../data/gui/preferences_window.ui.h:76
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:81
+#: ../data/gui/preferences_window.ui.h:77
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "Ur prenestr-flapiñ:"
 
-#: ../data/gui/preferences_window.ui.h:82
+#: ../data/gui/preferences_window.ui.h:78
 msgid "Ma_nage..."
 msgstr "Me_rañ..."
 
-#: ../data/gui/preferences_window.ui.h:83
+#: ../data/gui/preferences_window.ui.h:79
 #, fuzzy
 msgid "Never"
 msgstr "_Morse"
 
-#: ../data/gui/preferences_window.ui.h:84
+#: ../data/gui/preferences_window.ui.h:80
 #, fuzzy
 msgid "Notifications"
 msgstr "Kemmañ ar gont"
 
-#: ../data/gui/preferences_window.ui.h:85
+#: ../data/gui/preferences_window.ui.h:81
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Ma c'helaouiñ pa c'hoarvez gant un darempred:"
 
-#: ../data/gui/preferences_window.ui.h:86
+#: ../data/gui/preferences_window.ui.h:82
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Ma c'helaouiñ pa c'hoarvez gant un darempred:"
 
-#: ../data/gui/preferences_window.ui.h:87
+#: ../data/gui/preferences_window.ui.h:83
 #, fuzzy
 msgid "Notify me about it"
 msgstr "_Kelaouiñ ac'hanon"
 
-#: ../data/gui/preferences_window.ui.h:88
+#: ../data/gui/preferences_window.ui.h:84
 #, fuzzy
 msgid "Notify on new _GMail email"
 msgstr "Ma c'helaouiñ evit ar c'hemennadennoù _Gmail nevez"
 
-#: ../data/gui/preferences_window.ui.h:89
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Only when pending events"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:90
+#: ../data/gui/preferences_window.ui.h:86
 #, fuzzy
 msgid "Personal Events"
 msgstr "Titouroù hiniennel"
 
-#: ../data/gui/preferences_window.ui.h:91
+#: ../data/gui/preferences_window.ui.h:87
 msgid "Play _sounds"
 msgstr "_Seniñ"
 
-#: ../data/gui/preferences_window.ui.h:92
+#: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
 msgid "Pop it up"
 msgstr "Di_foupañ"
 
-#: ../data/gui/preferences_window.ui.h:93
+#: ../data/gui/preferences_window.ui.h:89
 msgid "Preferences"
 msgstr "Penndibaboù"
 
-#: ../data/gui/preferences_window.ui.h:94
+#: ../data/gui/preferences_window.ui.h:90
 msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:96
+#: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
 msgid "STUN server:"
 msgstr "Servijer:"
 
-#: ../data/gui/preferences_window.ui.h:97
+#: ../data/gui/preferences_window.ui.h:93
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Diskouez er _roll hepken"
+msgid "Show notification area icon:"
+msgstr "_Implij an arlun-gelaouiñ (trayicon)"
 
-#: ../data/gui/preferences_window.ui.h:98
+#: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
-msgid "Show systray:"
+msgid "Show only in roster"
 msgstr "Diskouez er _roll hepken"
 
-#: ../data/gui/preferences_window.ui.h:99
+#: ../data/gui/preferences_window.ui.h:95
 msgid "Sign _in"
 msgstr "_Lugañ"
 
-#: ../data/gui/preferences_window.ui.h:100
+#: ../data/gui/preferences_window.ui.h:96
 msgid "Sign _out"
 msgstr "_Dilugañ"
 
-#: ../data/gui/preferences_window.ui.h:101
+#: ../data/gui/preferences_window.ui.h:97
 msgid "Single window for everything"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:102
+#: ../data/gui/preferences_window.ui.h:98
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:103
+#: ../data/gui/preferences_window.ui.h:99
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "_Urzhiañ an darempredoù hervez o stad"
 
-#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
 msgid "Status"
 msgstr "Stad"
 
-#: ../data/gui/preferences_window.ui.h:105
+#: ../data/gui/preferences_window.ui.h:101
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "_Arlunioù-stad dre-ziouer:"
 
-#: ../data/gui/preferences_window.ui.h:106
+#: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:107
+#: ../data/gui/preferences_window.ui.h:103
 msgid "T_heme:"
 msgstr "_Gwiskadur:"
 
-#: ../data/gui/preferences_window.ui.h:108
+#: ../data/gui/preferences_window.ui.h:104
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2276,7 +2488,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:111
+#: ../data/gui/preferences_window.ui.h:107
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2284,130 +2496,134 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:114
+#: ../data/gui/preferences_window.ui.h:110
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Implij arlunioù an _dorioù"
 
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:111
+msgid "Use default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:112
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:113
 msgid "Video framerate"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:117
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Video input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:118
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Video output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:119
+#: ../data/gui/preferences_window.ui.h:116
 msgid "Video size"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:120
+#: ../data/gui/preferences_window.ui.h:117
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Pa resever un darvoud nevez"
 
-#: ../data/gui/preferences_window.ui.h:121
+#: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
 msgid "Your message:"
 msgstr "Fazi en ur lenn ar restr:"
 
-#: ../data/gui/preferences_window.ui.h:122
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your nickname:"
 msgstr "_A-raok al lesanv:"
 
-#: ../data/gui/preferences_window.ui.h:123
+#: ../data/gui/preferences_window.ui.h:120
 #, fuzzy
 msgid "_Away after:"
 msgstr "Bezañ lakaet da _ezvezant war-lerc'h:"
 
-#: ../data/gui/preferences_window.ui.h:124
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Furcher web:"
 
-#: ../data/gui/preferences_window.ui.h:125
+#: ../data/gui/preferences_window.ui.h:122
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "Titou_roù-stad ar flap:"
 
-#: ../data/gui/preferences_window.ui.h:126
+#: ../data/gui/preferences_window.ui.h:123
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Boulomelloù:"
 
-#: ../data/gui/preferences_window.ui.h:127
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_File manager:"
 msgstr "Merour _restroù:"
 
-#: ../data/gui/preferences_window.ui.h:128
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_Highlight misspelled words"
 msgstr "_Islinennañ ar fazioù reizhskrivañ"
 
-#: ../data/gui/preferences_window.ui.h:129
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Chom hep teurel pled eus ar c'hemennadennoù kaset gant tud dianav"
 
-#: ../data/gui/preferences_window.ui.h:130
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore rich content in incoming messages"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:131
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Log status changes of contacts"
 msgstr "_Menegiñ kemmoù stad an darempredoù e-barzh an istoradur"
 
-#: ../data/gui/preferences_window.ui.h:132
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Mail client:"
 msgstr "_Meziant posteliñ:"
 
-#: ../data/gui/preferences_window.ui.h:133
+#: ../data/gui/preferences_window.ui.h:130
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Bezañ lakaet evel _dihegerz war-lerc'h:"
 
-#: ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Open..."
 msgstr "_Digeriñ..."
 
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Reset to Default Colors"
 msgstr "_Distreiñ gant al livioù dre-ziouer"
 
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:133
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "Titou_roù-stad ar flap:"
 
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Status message:"
 msgstr "_Titour-stad:"
 
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:140
+#: ../data/gui/preferences_window.ui.h:137
 #, fuzzy
 msgid "in _group chats"
 msgstr "Ebarzhiñ ur _webgaoz"
 
-#: ../data/gui/preferences_window.ui.h:141
+#: ../data/gui/preferences_window.ui.h:138
 #, fuzzy
 msgid "in _roster"
 msgstr "Ket er roll"
 
-#: ../data/gui/preferences_window.ui.h:142
+#: ../data/gui/preferences_window.ui.h:139
 msgid "minutes"
 msgstr "munutenn"
 
@@ -2465,7 +2681,7 @@ msgstr "ID Jabber:"
 msgid "Order:"
 msgstr "Servijer:"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3436
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
 #, fuzzy
 msgid "Privacy List"
 msgstr "Roll argas"
@@ -2707,8 +2923,8 @@ msgstr "Dilemel ar gont diwar Gajim ha diwar ar _servijer"
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5492 ../src/roster_window.py:5622
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
+#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
 msgid "_Remove"
 msgstr "_Dilemel"
 
@@ -2754,61 +2970,65 @@ msgid "Help online"
 msgstr "Skoazell enlinenn"
 
 #: ../data/gui/roster_window.ui.h:8
+msgid "P_lugins"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:9
 #, fuzzy
 msgid "Profile, A_vatar"
 msgstr "Aelad, Avatar"
 
-#: ../data/gui/roster_window.ui.h:9
+#: ../data/gui/roster_window.ui.h:10
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "Diskouez an darempredoù _ezlinenn"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
 #, fuzzy
 msgid "Show Trans_ports"
 msgstr "Dorioù"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
 msgid "Show _Offline Contacts"
 msgstr "Diskouez an darempredoù _ezlinenn"
 
-#: ../data/gui/roster_window.ui.h:12 ../src/statusicon.py:326
+#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
 msgid "Show _Roster"
 msgstr "Diskouez ar _roll-darempredoù"
 
-#: ../data/gui/roster_window.ui.h:13
+#: ../data/gui/roster_window.ui.h:14
 #, 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/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
 #: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Oberoù"
 
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
 msgid "_Contents"
 msgstr "_Endalc'hadoù"
 
-#: ../data/gui/roster_window.ui.h:18 ../src/disco.py:1502
+#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
 msgid "_Edit"
 msgstr "_Aozañ"
 
-#: ../data/gui/roster_window.ui.h:19
+#: ../data/gui/roster_window.ui.h:20
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Help"
 msgstr "_Skoazell"
 
-#: ../data/gui/roster_window.ui.h:22
+#: ../data/gui/roster_window.ui.h:23
 #, fuzzy
 msgid "_Send Single Message..."
 msgstr "Kas ur gemennadenn _simpl..."
 
-#: ../data/gui/roster_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:25
 msgid "_View"
 msgstr ""
 
@@ -2827,12 +3047,12 @@ msgid "_Add contact"
 msgstr "Ouzhpennañ un _darempred"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5634
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
 #, fuzzy
 msgid "_Information"
 msgstr "Titouroù"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1353
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
 msgid "_Search"
 msgstr "_Klask"
 
@@ -2852,10 +3072,6 @@ msgstr "En em enrollañ war"
 msgid "_Cancel"
 msgstr "_Nullañ"
 
-#: ../data/gui/single_message_window.ui.h:2
-msgid "From:"
-msgstr "Digant:"
-
 #: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Respont d'ar gemennadenn-mañ"
@@ -2872,10 +3088,6 @@ msgstr "Kas ur gemennadenn"
 msgid "Send message and close window"
 msgstr "Kas ar gemennadenn ha serriñ ar prenestr"
 
-#: ../data/gui/single_message_window.ui.h:7
-msgid "Subject:"
-msgstr "Titl:"
-
 #: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Da:"
@@ -3102,26 +3314,36 @@ msgstr "Flaperez Gajim"
 msgid "Jabber IM Client"
 msgstr "Flaperez Jabber"
 
-#: ../src/adhoc_commands.py:314
+#: ../src/adhoc_commands.py:323
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Titouroù"
 
-#: ../src/adhoc_commands.py:315
+#: ../src/adhoc_commands.py:324
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:351 ../src/adhoc_commands.py:374
+#: ../src/adhoc_commands.py:370
+#, fuzzy
+msgid "Invalid Form"
+msgstr "Road direizh"
+
+#: ../src/adhoc_commands.py:371
+#, fuzzy
+msgid "The form is not filled correctly."
+msgstr "Bez ez eus arouezioù difennet en anv ar sal pe hini ar servijer."
+
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:360
+#: ../src/adhoc_commands.py:399
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:471
+#: ../src/adhoc_commands.py:513
 msgid "Service returned an error."
 msgstr ""
 
@@ -3149,7 +3371,7 @@ msgstr "Er strollad"
 msgid "Text"
 msgstr "Texte"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:945
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
 msgid "Color"
 msgstr ""
 
@@ -3186,240 +3408,240 @@ msgstr[1] ""
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "English"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Belarusian"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Bulgarian"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Breton"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Czech"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "German"
 msgstr "Hollek"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Greek"
 msgstr "Glas"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "British"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Esperanto"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Spanish"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Basque"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "French"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Croatian"
 msgstr "Chomlec'h"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Italian"
 msgstr "Stouet"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian (b)"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Dutch"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Polish"
 msgstr "_Embann"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Portuguese"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Russian"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Serbian"
 msgstr "Hollek"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Slovak"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Swedish"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:479
+#: ../src/chat_control.py:496
 msgid "Spelling language"
 msgstr ""
 
 #. we are not connected
-#: ../src/chat_control.py:511 ../src/chat_control.py:720
+#: ../src/chat_control.py:528 ../src/chat_control.py:737
 msgid "A connection is not available"
 msgstr "N'eus ket tu da gevreañ"
 
-#: ../src/chat_control.py:512 ../src/chat_control.py:721
+#: ../src/chat_control.py:529 ../src/chat_control.py:738
 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:927
+#: ../src/chat_control.py:944
 #, fuzzy
 msgid "Underline"
 msgstr "Islinennañ"
 
-#: ../src/chat_control.py:928
+#: ../src/chat_control.py:945
 #, fuzzy
 msgid "Strike"
 msgstr "Lesanv"
 
-#: ../src/chat_control.py:951
+#: ../src/chat_control.py:968
 #, fuzzy
 msgid "Font"
 msgstr "_Nodrezh:"
 
-#: ../src/chat_control.py:960
+#: ../src/chat_control.py:977
 #, fuzzy
 msgid "Clear formating"
 msgstr "Titouroù"
 
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1055
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:1039
+#: ../src/chat_control.py:1056
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1503 ../src/chat_control.py:1987
+#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "War enaou emañ ar sifrañ"
 
 #. Add to roster
-#: ../src/chat_control.py:1528 ../src/common/contacts.py:158
+#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
 #: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:245 ../src/dialogs.py:1064 ../src/dialogs.py:2078
-#: ../src/dialogs.py:2107 ../src/gui_interface.py:674
+#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
+#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
 #: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1610 ../src/roster_window.py:1612
-#: ../src/roster_window.py:1942 ../src/roster_window.py:3289
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
+#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
+#: ../src/roster_window.py:3382
 msgid "Not in Roster"
 msgstr "Ket er roll"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1575
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Ur roll eus an treuzkasoù oberiant, echu pe arsavet"
 
-#: ../src/chat_control.py:1561
+#: ../src/chat_control.py:1578
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1656
+#: ../src/chat_control.py:1677
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:1869
 #, 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:1967 ../src/dialogs.py:4866
+#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1968
+#: ../src/chat_control.py:1991
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1977
+#: ../src/chat_control.py:2000
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Lazhet eo ar sifrañ"
 
-#: ../src/chat_control.py:2003
+#: ../src/chat_control.py:2026
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:2028
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2051
 #, fuzzy
 msgid "and authenticated"
 msgstr "Implij an diskleriañ"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2032
+#: ../src/chat_control.py:2055
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Implij an diskleriañ"
@@ -3427,58 +3649,66 @@ 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:2039
+#: ../src/chat_control.py:2062
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2182
+#: ../src/chat_control.py:2205
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2191
+#: ../src/chat_control.py:2215
+msgid "This session WILL be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2217
+msgid "This session WILL NOT be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2226
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Sifret eo ar gemennadenn-mañ]"
 
-#: ../src/chat_control.py:2194
+#: ../src/chat_control.py:2229
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2196
+#: ../src/chat_control.py:2231
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2201
+#: ../src/chat_control.py:2236
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2203
+#: ../src/chat_control.py:2238
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Lazhet eo ar sifrañ"
 
-#: ../src/chat_control.py:2241 ../src/chat_control.py:2254
+#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Sifret eo ar gemennadenn-mañ]"
 
-#: ../src/chat_control.py:2247
+#: ../src/chat_control.py:2288
 #, 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:2519
+#: ../src/chat_control.py:2566
 #, 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:2520
+#: ../src/chat_control.py:2567
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3486,22 +3716,20 @@ msgstr ""
 "Ma serrit ar prenestr-mañ ha n'eo ket enaouet an istoradur, e vo kollet ar "
 "gemennadenn."
 
-#: ../src/chat_control.py:2663 ../src/common/connection_handlers.py:1635
-#: ../src/common/connection_handlers.py:1758
-#: ../src/common/connection_handlers.py:1960
-#: ../src/common/connection_handlers.py:2110 ../src/common/connection.py:452
+#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
 #: ../src/gajim.py:159 ../src/session.py:138
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2664
+#: ../src/chat_control.py:2714
 #, 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:2906
+#: ../src/chat_control.py:2962
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s a zo bremañ %(status)s"
@@ -3515,28 +3743,28 @@ msgstr "o krouiñ titourva an istoradur"
 msgid "creating cache database"
 msgstr "o krouiñ titourva an istoradur"
 
-#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
-#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
-#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
-#: ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
 #, 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:275 ../src/common/check_paths.py:282
-#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
-#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
-#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:333
+#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
+#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
+#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
 msgid "Gajim will now exit"
 msgstr "Emañ Gajim o vont da guitaat diouzhtu"
 
-#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
+#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
 #, 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:342
+#: ../src/common/check_paths.py:351
 #, python-format
 msgid "creating %s directory"
 msgstr "a grou ar renkell %s"
@@ -3607,9 +3835,9 @@ msgstr ""
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:801
-#: ../src/roster_window.py:1614 ../src/roster_window.py:1616
-#: ../src/roster_window.py:5251
+#: ../src/common/helpers.py:57 ../src/roster_window.py:815
+#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
+#: ../src/roster_window.py:5323
 #, fuzzy
 msgid "Groupchats"
 msgstr "Flapoù a-stroll"
@@ -3674,7 +3902,8 @@ msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
 #: ../src/common/config.py:88
-msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgid ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
 #: ../src/common/config.py:93
@@ -3728,9 +3957,9 @@ msgid ""
 msgstr ""
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:501
-#: ../src/common/optparser.py:290 ../src/common/optparser.py:486
-#: ../src/common/optparser.py:520 ../src/gui_interface.py:3370
+#: ../src/common/config.py:106 ../src/common/config.py:505
+#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
+#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
 #, fuzzy
 msgid "default"
 msgstr "Dilemel"
@@ -3925,7 +4154,7 @@ 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:197
-msgid "Notify of events in the system trayicon."
+msgid "Notify of events in the notification area."
 msgstr ""
 
 #: ../src/common/config.py:203
@@ -3962,7 +4191,7 @@ msgstr ""
 #: ../src/common/config.py:221
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
+"setting is taken into account only if notification icon is used."
 msgstr ""
 
 #: ../src/common/config.py:222
@@ -4196,7 +4425,7 @@ msgstr ""
 #: ../src/common/config.py:270
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
-"systray icon."
+"notification icon."
 msgstr ""
 
 #: ../src/common/config.py:271
@@ -4363,207 +4592,214 @@ msgstr ""
 msgid "Message that is sent to contacts you want to add"
 msgstr "Leuniit an titouroù diwar-benn an darempred da ouzhpennañ"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:374
+msgid "Last time we syncronized with logs from server."
+msgstr ""
+
+#: ../src/common/config.py:436
 #, fuzzy
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "N'eus ket tu da implij OpenPGP war an urzhiataer-mañ"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:437 ../src/common/config.py:440
+#: ../src/common/config.py:438 ../src/common/config.py:441
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:447
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:448
 msgid "'yes', 'no', or 'both'"
 msgstr ""
 
-#: ../src/common/config.py:448 ../src/common/config.py:450
-#: ../src/common/config.py:451 ../src/common/config.py:454
-#: ../src/common/config.py:455
+#: ../src/common/config.py:449 ../src/common/config.py:451
+#: ../src/common/config.py:452 ../src/common/config.py:455
+#: ../src/common/config.py:456
 msgid "'yes', 'no' or ''"
 msgstr ""
 
-#: ../src/common/config.py:461 ../src/common/pep.py:157
+#: ../src/common/config.py:460
+msgid ""
+"State whether plugins should be activated on exit (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
+msgstr ""
+
+#: ../src/common/config.py:465 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "O kousket"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back soon"
 msgstr "Distro 'benn nebeut"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back in some minutes."
 msgstr "Distro 'vin a-benn un nebeut munutennoù.."
 
-#: ../src/common/config.py:463 ../src/common/pep.py:127
+#: ../src/common/config.py:467 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "O tebriñ"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:467
 msgid "I'm eating, so leave me a message."
 msgstr "O tebriñ 'maon, neuze laoskit ur gemennadenn."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "I'm watching a movie."
 msgstr "O sellout ouzh ur film 'maon."
 
-#: ../src/common/config.py:465 ../src/common/pep.py:186
+#: ../src/common/config.py:469 ../src/common/pep.py:186
 msgid "Working"
 msgstr "O labourat"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:469
 msgid "I'm working."
 msgstr "O labourat 'maon."
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "Phone"
 msgstr "Pellgomz"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "I'm on the phone."
 msgstr "Ouzh ar pellgomz emaon."
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "Out"
 msgstr "Er-maez"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Er-maez emaon o profitañ eus ar vuhez"
 
-#: ../src/common/config.py:478
+#: ../src/common/config.py:482
 #, fuzzy
 msgid "I'm available."
 msgstr "Hegerz"
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:483
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Prest da flapiñ"
 
-#: ../src/common/config.py:480 ../src/config.py:1600
+#: ../src/common/config.py:484 ../src/config.py:1600
 msgid "Be right back."
 msgstr "Distro a-benn nebeut."
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:485
 #, fuzzy
 msgid "I'm not available."
 msgstr "Dihegerz"
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:486
 msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:483 ../src/common/config.py:484
+#: ../src/common/config.py:487 ../src/common/config.py:488
 msgid "Bye!"
 msgstr ""
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:498
 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:495
+#: ../src/common/config.py:499
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: ../src/common/config.py:504 ../src/common/optparser.py:304
+#: ../src/common/config.py:508 ../src/common/optparser.py:308
 msgid "green"
 msgstr "Glas"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:290
+#: ../src/common/config.py:512 ../src/common/optparser.py:294
 msgid "grocery"
 msgstr ""
 
-#: ../src/common/config.py:512
+#: ../src/common/config.py:516
 msgid "human"
 msgstr "Mab-den"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:520
 msgid "marine"
 msgstr "Glas-mor"
 
-#: ../src/common/connection_handlers.py:84
+#: ../src/common/connection_handlers.py:94
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 #, fuzzy
 msgid "Unable to load idle module"
 msgstr "Impossible de rejoindre le salon"
 
-#: ../src/common/connection_handlers.py:117
+#: ../src/common/connection_handlers.py:127
 #, 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:124
+#: ../src/common/connection_handlers.py:134
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Gant berzh eo bet embannet ar vCard"
 
-#: ../src/common/connection_handlers.py:125
+#: ../src/common/connection_handlers.py:135
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 #, fuzzy
 msgid "Registration failed"
 msgstr "échec lors de la publication de votre vCard"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:445
-#: ../src/common/connection_handlers.py:1633
-#: ../src/common/connection_handlers.py:1756
-#: ../src/common/connection_handlers.py:1957
-#: ../src/common/connection_handlers.py:2108 ../src/common/connection.py:449
+#: ../src/common/connection_handlers.py:466
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
 #: ../src/gajim.py:341
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:678 ../src/common/connection.py:1472
+#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
 msgid "Invisibility not supported"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:679 ../src/common/connection.py:1473
+#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1446 ../src/common/connection.py:253
-#: ../src/config.py:2091 ../src/config.py:2100 ../src/config.py:2168
-#: ../src/config.py:3560 ../src/dataforms_widget.py:597 ../src/dialogs.py:2931
+#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
+#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
+#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
 msgid "Invalid Jabber ID"
 msgstr "ID jabber direizh"
 
-#: ../src/common/connection_handlers.py:1447
+#: ../src/common/connection_handlers.py:1405
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1636
-#: ../src/common/connection_handlers.py:1759
-#: ../src/common/connection_handlers.py:1961
-#: ../src/common/connection_handlers.py:2111 ../src/common/connection.py:453
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
 #: ../src/gajim.py:160 ../src/session.py:139
 #, python-format
 msgid ""
@@ -4571,93 +4807,6 @@ msgid ""
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1805
-#, fuzzy, python-format
-msgid "Nickname not allowed: %s"
-msgstr "N'eus ket bet kavet al lesanv : %s"
-
-#: ../src/common/connection_handlers.py:1902
-#: ../src/common/connection_handlers.py:1911
-#: ../src/common/connection_handlers.py:1918
-#: ../src/common/connection_handlers.py:1922
-#: ../src/common/connection_handlers.py:1926
-#: ../src/common/connection_handlers.py:1931 ../src/gui_interface.py:139
-#, fuzzy
-msgid "Unable to join group chat"
-msgstr "Impossible de rejoindre le salon"
-
-#: ../src/common/connection_handlers.py:1903
-#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:1912
-#, fuzzy, python-format
-msgid "You are banned from group chat %s."
-msgstr "Vous êtes banni de ce salon."
-
-#: ../src/common/connection_handlers.py:1919
-#, fuzzy, python-format
-msgid "Group chat %s does not exist."
-msgstr "Ce salon n'existe pas."
-
-#: ../src/common/connection_handlers.py:1923
-#, fuzzy
-msgid "Group chat creation is restricted."
-msgstr "La création de salon est réservée aux administrateurs."
-
-#: ../src/common/connection_handlers.py:1927
-#, 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:1932
-#, 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:1976
-#, fuzzy
-msgid "Room has been destroyed"
-msgstr "Dilamet eo bet an aotre"
-
-#: ../src/common/connection_handlers.py:1984
-#, python-format
-msgid "You can join this room instead: %s"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:2020
-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:2041
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "nous sommes maintenant inscrits chez %s"
-
-#: ../src/common/connection_handlers.py:2043
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "Requête de désinscription de la part de %s"
-
-#: ../src/common/connection_handlers.py:2045
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "nous ne sommes plus dans la liste de %s"
-
-#: ../src/common/connection_handlers.py:2240
-#, fuzzy, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"je Jid %s ne respecte pas la norma RFC. Il ne sera pas ajouté a votre liste "
-"de contact. Utiliser un outil de gestion de liste de contact tel que http://"
-"jru.jabberstudio.org/ pour le supprimer"
-
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr ""
@@ -4788,28 +4937,28 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:254 ../src/dialogs.py:2932
+#: ../src/common/connection.py:256 ../src/dialogs.py:2948
 #, 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:276
+#: ../src/common/connection.py:278
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:281
 #, 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:331
+#: ../src/common/connection.py:333
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Sifret eo ar gemennadenn-mañ]"
 
-#: ../src/common/connection.py:439
+#: ../src/common/connection.py:441
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4818,150 +4967,150 @@ msgstr ""
 "Titl : %s\n"
 "%s"
 
-#: ../src/common/connection.py:807
+#: ../src/common/connection.py:809
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Kollet eo bet al lugadenn gant ar gont \"%s\""
 
-#: ../src/common/connection.py:808
+#: ../src/common/connection.py:810
 msgid "Reconnect manually."
 msgstr ""
 
-#: ../src/common/connection.py:820
+#: ../src/common/connection.py:822
 #, 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:854
+#: ../src/common/connection.py:856
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:867
+#: ../src/common/connection.py:869
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Aozadur D-Bus dianav: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:882
+#: ../src/common/connection.py:884
 msgid "Invalid answer"
 msgstr "Respont direizh"
 
-#: ../src/common/connection.py:883
+#: ../src/common/connection.py:885
 #, 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:1165 ../src/common/connection.py:1294
-#: ../src/common/connection.py:1784
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
+#: ../src/common/connection.py:1792
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Dibosupl eo en em lugañ da \"%s\""
 
-#: ../src/common/connection.py:1166 ../src/gui_interface.py:755
+#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
 msgid "Check your connection or try again later."
 msgstr "Gwiriekait ho lugadenn pe klaskit diwezhatoc'h."
 
-#: ../src/common/connection.py:1171
+#: ../src/common/connection.py:1173
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Enrollet e-barzh: %s"
 
-#: ../src/common/connection.py:1184
+#: ../src/common/connection.py:1186
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Kevreadenn"
 
-#: ../src/common/connection.py:1215 ../src/common/connection.py:1274
+#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Dibosupl eo en em lugañ da \"%s\""
 
-#: ../src/common/connection.py:1216 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
 #, 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:1241
+#: ../src/common/connection.py:1243
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1244
+#: ../src/common/connection.py:1246
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1248
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Aozadur D-Bus dianav: %s"
 
-#: ../src/common/connection.py:1295
+#: ../src/common/connection.py:1297
 msgid "Check your connection or try again later"
 msgstr "Gwiriekait ho lugadenn pe klaskit en-dro diwezhatoc'h"
 
-#: ../src/common/connection.py:1324
+#: ../src/common/connection.py:1329
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "C'hwitet an diskleriadenn gant \"%s\""
 
-#: ../src/common/connection.py:1326
+#: ../src/common/connection.py:1331
 msgid "Please check your login and password for correctness."
 msgstr "Gwiriekait ho ker-kuzh hag anv-lugañ."
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1400
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "fazi en ur gas %s ( %s )"
 
-#: ../src/common/connection.py:1396
+#: ../src/common/connection.py:1401
 #, 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:1650
+#: ../src/common/connection.py:1658
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1653
+#: ../src/common/connection.py:1661
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Darempredoù"
 
-#: ../src/common/connection.py:1799 ../src/common/connection.py:1822
+#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
 msgid "Not fetched because of invisible status"
 msgstr ""
 
-#: ../src/common/connection.py:2254
+#: ../src/common/connection.py:2262
 #, fuzzy
 msgid "Unregister failed"
 msgstr "échec lors de la publication de votre vCard"
 
-#: ../src/common/connection.py:2255
+#: ../src/common/connection.py:2263
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
 #: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:674
+#: ../src/gui_interface.py:551
 msgid "Observers"
 msgstr "Sellerien"
 
 #: ../src/common/contacts.py:139 ../src/common/contacts.py:366
 #: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1499 ../src/gui_interface.py:424
-#: ../src/roster_window.py:840 ../src/roster_window.py:1525
-#: ../src/roster_window.py:1606 ../src/roster_window.py:1608
-#: ../src/roster_window.py:1769
+#: ../src/disco.py:1517 ../src/roster_window.py:854
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
+#: ../src/roster_window.py:2466
 msgid "Transports"
 msgstr "Dorioù"
 
@@ -5203,207 +5352,223 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:148
+msgid "Username must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:153
 msgid "Invalid character in username."
 msgstr "Arouezenn ziereizh en anv-arveriad-ez"
 
-#: ../src/common/helpers.py:156
-msgid "Server address required."
-msgstr "Chomlec'h ar servijer dre ret"
+#: ../src/common/helpers.py:159
+msgid "Server must be between 1 and 1023 chars"
+msgstr ""
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 msgid "Invalid character in hostname."
 msgstr "Arouezenn zireizh en anv-ostiz."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:166
+msgid "Server address required."
+msgstr "Chomlec'h ar servijer dre ret"
+
+#: ../src/common/helpers.py:170
+msgid "Resource must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:175
 msgid "Invalid character in resource."
 msgstr ""
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:215
 msgid "_Busy"
 msgstr ""
 
-#: ../src/common/helpers.py:211 ../src/tooltips.py:195
+#: ../src/common/helpers.py:217 ../src/tooltips.py:195
 msgid "Busy"
 msgstr ""
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:220
 msgid "_Not Available"
 msgstr "D_ihegerz"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:225
 msgid "_Free for Chat"
 msgstr "_Prest da flapiñ"
 
-#: ../src/common/helpers.py:221 ../src/tooltips.py:191
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Free for Chat"
 msgstr "Prest da flapiñ"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:230
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "_Hegerz"
 
-#: ../src/common/helpers.py:226 ../src/tooltips.py:189
+#: ../src/common/helpers.py:232 ../src/tooltips.py:189
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Diskouez an eur:"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:234
 msgid "Connecting"
 msgstr "O lugañ"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:237
 msgid "A_way"
 msgstr "E_zvezant"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:242
 msgid "_Offline"
 msgstr "_Ezlinenn"
 
-#: ../src/common/helpers.py:238 ../src/tooltips.py:199
+#: ../src/common/helpers.py:244 ../src/tooltips.py:199
 msgid "Offline"
 msgstr "Ezlinenn"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:247
 msgid "_Invisible"
 msgstr "_Diwelus"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:253
 msgid "?contact has status:Unknown"
 msgstr "Dianav"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:255
 msgid "?contact has status:Has errors"
 msgstr "fazi"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:260
 msgid "?Subscription we already have:None"
 msgstr "Hini ebet"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:262
 msgid "To"
 msgstr "Da"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
+msgid "From"
+msgstr "Digant"
+
+#: ../src/common/helpers.py:266
 msgid "Both"
 msgstr "An daou"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:274
 msgid "?Ask (for Subscription):None"
 msgstr "Hini ebet"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:276
 msgid "Subscribe"
 msgstr "Emezelañ"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:285
 msgid "?Group Chat Contact Role:None"
 msgstr "Hini ebet"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:288
 msgid "Moderators"
 msgstr "Kasourien"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:290
 msgid "Moderator"
 msgstr "Kasour-ez"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:293
 msgid "Participants"
 msgstr "Perzhidi"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:295
 msgid "Participant"
 msgstr "Perzhiad-ez"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:298
 msgid "Visitors"
 msgstr "Gweladennerien"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:300
 msgid "Visitor"
 msgstr "Gweladenner-ez"
 
-#: ../src/common/helpers.py:300 ../src/tooltips.py:210
+#: ../src/common/helpers.py:306 ../src/tooltips.py:210
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Hini ebet"
 
-#: ../src/common/helpers.py:302 ../src/tooltips.py:216
+#: ../src/common/helpers.py:308 ../src/tooltips.py:216
 #, fuzzy
 msgid "Owner"
 msgstr "_Perc'hener-ez"
 
-#: ../src/common/helpers.py:304 ../src/tooltips.py:214
+#: ../src/common/helpers.py:310 ../src/tooltips.py:214
 #, fuzzy
 msgid "Administrator"
 msgstr "_Merour-ez"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:212
+#: ../src/common/helpers.py:312 ../src/tooltips.py:212
 #, fuzzy
 msgid "Member"
 msgstr "_Ezel"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:351
 msgid "is paying attention to the conversation"
 msgstr "a zo aketus d'ar gaozeadenn"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:353
 msgid "is doing something else"
 msgstr "a ra un dra bennak all"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:355
 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:352
+#: ../src/common/helpers.py:358
 msgid "paused composing a message"
 msgstr "a zo paouezet da skrivañ ar gemennadenn"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:360
 msgid "has closed the chat window or tab"
 msgstr "he/en deus serret ar prenestr-flapiñ pe an ivinell"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:619
+#: ../src/common/helpers.py:625
 #, python-format
 msgid "%s GiB"
 msgstr "%s Go"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:622
+#: ../src/common/helpers.py:628
 #, python-format
 msgid "%s GB"
 msgstr "%s Go"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:626
+#: ../src/common/helpers.py:632
 #, python-format
 msgid "%s MiB"
 msgstr "%s Mo"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:629
+#: ../src/common/helpers.py:635
 #, python-format
 msgid "%s MB"
 msgstr "%s Mo"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:633
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s KiB"
 msgstr "%s Ko"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:636
+#: ../src/common/helpers.py:642
 #, python-format
 msgid "%s KB"
 msgstr "%s Ko"
 
 #. B means bytes
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:645
 #, python-format
 msgid "%s B"
 msgstr "%s o"
@@ -5446,12 +5611,12 @@ msgstr "Gajim - %s"
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:111
+#: ../src/common/jingle_rtp.py:107
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Kefluniañ ar webgaoz"
 
-#: ../src/common/jingle_rtp.py:112
+#: ../src/common/jingle_rtp.py:108
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5463,30 +5628,30 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:209
+#: ../src/common/jingle_rtp.py:205
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:210
+#: ../src/common/jingle_rtp.py:206
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Fazi en ur lenn ar restr:"
 
-#: ../src/common/jingle_rtp.py:336
+#: ../src/common/jingle_rtp.py:335
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:339
+#: ../src/common/jingle_rtp.py:338
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:382
+#: ../src/common/jingle_rtp.py:381
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:390
+#: ../src/common/jingle_rtp.py:389
 msgid "video output"
 msgstr ""
 
@@ -5563,11 +5728,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "fazi: dibosupl eo digeriñ %s evit lenn"
 
-#: ../src/common/optparser.py:299 ../src/common/optparser.py:300
+#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
 msgid "cyan"
 msgstr "Cyan"
 
-#: ../src/common/optparser.py:379
+#: ../src/common/optparser.py:383
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "o krouiñ titourva an istoradur"
@@ -6301,63 +6466,63 @@ msgid ""
 msgstr ""
 
 #. we're not english
-#: ../src/common/stanza_session.py:303
+#: ../src/common/stanza_session.py:423
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:178
+#: ../src/common/zeroconf/connection_zeroconf.py:181
 msgid "Avahi error"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:179
+#: ../src/common/zeroconf/connection_zeroconf.py:182
 #, python-format
 msgid ""
 "%s\n"
 "Link-local messaging might not work properly."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:190
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:199
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 #, fuzzy
 msgid "Could not start local service"
 msgstr "Dibosupl eo kargañ ar skeudenn"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 #, fuzzy, python-format
 msgid "Unable to bind to port %d."
 msgstr "Impossible de rejoindre le salon"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-#: ../src/common/zeroconf/connection_zeroconf.py:283
-#: ../src/common/zeroconf/connection_zeroconf.py:294
-#: ../src/common/zeroconf/connection_zeroconf.py:308
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:286
+#: ../src/common/zeroconf/connection_zeroconf.py:297
+#: ../src/common/zeroconf/connection_zeroconf.py:311
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:282
-#: ../src/common/zeroconf/connection_zeroconf.py:293
-#: ../src/common/zeroconf/connection_zeroconf.py:307
+#: ../src/common/zeroconf/connection_zeroconf.py:285
+#: ../src/common/zeroconf/connection_zeroconf.py:296
+#: ../src/common/zeroconf/connection_zeroconf.py:310
 #, 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:325
+#: ../src/common/zeroconf/connection_zeroconf.py:328
 #, 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:335
+#: ../src/common/zeroconf/connection_zeroconf.py:338
 msgid "Contact is offline. Your message could not be sent."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:363
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6378,17 +6543,17 @@ msgstr "Titour-stad"
 msgid "Enabled"
 msgstr "Enaouiñ"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3078
+#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
 #, fuzzy
 msgid "Default"
 msgstr "Dilemel"
 
-#: ../src/config.py:739 ../src/dialogs.py:1395
+#: ../src/config.py:733 ../src/dialogs.py:1409
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "N'eus ket tu da gevreañ"
 
-#: ../src/config.py:740
+#: ../src/config.py:734
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6404,9 +6569,9 @@ msgid "status message text"
 msgstr "korf ar gemennadenn stad"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2383 ../src/dialogs.py:2449
-#: ../src/dialogs.py:3215 ../src/disco.py:866 ../src/disco.py:1726
-#: ../src/disco.py:2030 ../src/history_window.py:90
+#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
+#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
+#: ../src/disco.py:2048 ../src/history_window.py:90
 msgid "Name"
 msgstr "Anv"
 
@@ -6440,7 +6605,7 @@ msgstr "N'ho peus kont bev ebet"
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1976 ../src/config.py:2509 ../src/config.py:2545
+#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
 msgid "You are currently connected to the server"
 msgstr "Luget oc'h d'ar servijer"
 
@@ -6477,136 +6642,136 @@ msgstr "N'hell ket anv ar gont chom goullo."
 msgid "Account name cannot contain spaces."
 msgstr "N'hell ket anv ar gont kaout esaouennoù."
 
-#: ../src/config.py:2072
+#: ../src/config.py:2074
 #, fuzzy
 msgid "Rename Account"
 msgstr "Merañ ar c'hontoù"
 
-#: ../src/config.py:2073
+#: ../src/config.py:2075
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Roit ho ker-kuzh GPG evit ar gont %s."
 
-#: ../src/config.py:2101
+#: ../src/config.py:2103
 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:2318 ../src/config.py:3606
+#: ../src/config.py:2320 ../src/config.py:3623
 msgid "Invalid entry"
 msgstr "Road direizh"
 
-#: ../src/config.py:2319 ../src/config.py:3607
+#: ../src/config.py:2321 ../src/config.py:3624
 msgid "Custom port must be a port number."
 msgstr "Ar porzh personelaet a rank bezañ un niverenn borzh"
 
-#: ../src/config.py:2340
+#: ../src/config.py:2342
 msgid "Failed to get secret keys"
 msgstr "Fazi en ur dapout an alc'hwezhioù kuzh"
 
-#: ../src/config.py:2341
+#: ../src/config.py:2343
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Bez ez eus bet ur gudenn en ur gargañ hoc'h alc'hwezhioù-kuzh OpenPGP."
 
-#: ../src/config.py:2375
+#: ../src/config.py:2377
 msgid "OpenPGP Key Selection"
 msgstr "Dibab un alc'hwezh OpenPGP"
 
-#: ../src/config.py:2376
+#: ../src/config.py:2378
 msgid "Choose your OpenPGP key"
 msgstr "Dibabit hoc'h alc'hwezh OpenPGP"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2385
 msgid "No such account available"
 msgstr "Kont dihegerz"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2386
 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:2391 ../src/dialogs.py:2136 ../src/dialogs.py:2371
-#: ../src/dialogs.py:2557 ../src/disco.py:511 ../src/profile_window.py:339
+#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
+#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
 msgid "You are not connected to the server"
 msgstr "N'oc'h ket luget d'ar servijer"
 
-#: ../src/config.py:2392
+#: ../src/config.py:2394
 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:2396
+#: ../src/config.py:2398
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:2397
+#: ../src/config.py:2399
 #, 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:2510 ../src/config.py:2546
+#: ../src/config.py:2512 ../src/config.py:2548
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Rankout a rit bezañ diluget evit cheñch anv ar gont."
 
-#: ../src/config.py:2515
+#: ../src/config.py:2517
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Anv-kont implijet dija"
 
-#: ../src/config.py:2516
+#: ../src/config.py:2518
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2673
+#: ../src/config.py:2675
 #, python-format
 msgid "Edit %s"
 msgstr "Kemmañ %s"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2677
 #, python-format
 msgid "Register to %s"
 msgstr "Emezelañ war %s"
 
 #. list at the beginning
-#: ../src/config.py:2711
+#: ../src/config.py:2713
 msgid "Ban List"
 msgstr "Roll argas"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2714
 msgid "Member List"
 msgstr "Roll an izili"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2714
 msgid "Owner List"
 msgstr "Roll ar perc'hennerien"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2715
 msgid "Administrator List"
 msgstr "Roll ar verourien"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2763 ../src/disco.py:873 ../src/history_manager.py:201
+#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2773
+#: ../src/config.py:2789
 msgid "Reason"
 msgstr "Abeg"
 
-#: ../src/config.py:2780
+#: ../src/config.py:2796
 msgid "Nick"
 msgstr "Lesanv"
 
-#: ../src/config.py:2786
+#: ../src/config.py:2802
 msgid "Role"
 msgstr "Perzh"
 
-#: ../src/config.py:2813
+#: ../src/config.py:2829
 msgid "Banning..."
 msgstr "Oc'h argas..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2815
+#: ../src/config.py:2831
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6614,11 +6779,11 @@ msgstr ""
 "<b>Piv a fell deoc'h argas ?</b>\n"
 "\n"
 
-#: ../src/config.py:2817
+#: ../src/config.py:2833
 msgid "Adding Member..."
 msgstr "Oc'h ouzhpennañ un ezel..."
 
-#: ../src/config.py:2818
+#: ../src/config.py:2834
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6626,11 +6791,11 @@ msgstr ""
 "<b>Piv a fell deoc'h lakaat da ezel ?</b>\n"
 "\n"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2836
 msgid "Adding Owner..."
 msgstr "Oc'h ouzhpennañ ur perc'henn..."
 
-#: ../src/config.py:2821
+#: ../src/config.py:2837
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -6639,11 +6804,11 @@ msgstr ""
 "<b>Piv a fell deoc'h lakaat da berc'henn ?</b>\n"
 "\n"
 
-#: ../src/config.py:2823
+#: ../src/config.py:2839
 msgid "Adding Administrator..."
 msgstr "Oc'h ouzhpennañ ur v-merour-ez..."
 
-#: ../src/config.py:2824
+#: ../src/config.py:2840
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6651,7 +6816,7 @@ msgstr ""
 "<b>Piv a fell deoc'h lakaat da verour-ez ?</b>\n"
 "\n"
 
-#: ../src/config.py:2825
+#: ../src/config.py:2841
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6669,86 +6834,86 @@ msgstr ""
 "pseudo@domaine,\n"
 "domaine/ressource, ou les adresses comprenant un sous-domaine)."
 
-#: ../src/config.py:2926
+#: ../src/config.py:2943
 #, python-format
 msgid "Removing %s account"
 msgstr "Lemel ar gont %s"
 
-#: ../src/config.py:2941
+#: ../src/config.py:2958
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Lazhet eo ar sifrañ"
 
-#: ../src/config.py:2942
+#: ../src/config.py:2959
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2955 ../src/gui_interface.py:1132
-#: ../src/gui_interface.py:1243
+#: ../src/config.py:2972 ../src/gui_interface.py:311
+#: ../src/gui_interface.py:1048
 msgid "Password Required"
 msgstr "Ger-kuzh ret"
 
-#: ../src/config.py:2956 ../src/gui_interface.py:1223
+#: ../src/config.py:2973 ../src/gui_interface.py:1028
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Roit ho ker-kuzh evit ar gont %s"
 
-#: ../src/config.py:2957 ../src/gui_interface.py:1243
+#: ../src/config.py:2974 ../src/gui_interface.py:1048
 msgid "Save password"
 msgstr "Enrollañ ar ger-kuzh"
 
-#: ../src/config.py:2967
+#: ../src/config.py:2984
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Luget eo ar gont \"%s\" d'ar servijer"
 
-#: ../src/config.py:2968
+#: ../src/config.py:2985
 msgid "If you remove it, the connection will be lost."
 msgstr "Ma tilamit anezhañ, e voc'h diluget."
 
-#: ../src/config.py:2982
+#: ../src/config.py:2999
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Kevreadenn"
 
-#: ../src/config.py:2983
+#: ../src/config.py:3000
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Petra a fell deoc'h ober?"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3001
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Dilemel ar gont diwar Gajim _hepken"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3002
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3078
+#: ../src/config.py:3095
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Diskouez an eur:"
 
-#: ../src/config.py:3079
+#: ../src/config.py:3096
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:3080
+#: ../src/config.py:3097
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Diskouez an eur:"
 
-#: ../src/config.py:3150
+#: ../src/config.py:3167
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Flap a-stroll"
 
-#: ../src/config.py:3183
+#: ../src/config.py:3200
 msgid "This bookmark has invalid data"
 msgstr "Bez ez eus titouroù direizh er sined-mañ"
 
-#: ../src/config.py:3184
+#: ../src/config.py:3201
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6756,31 +6921,31 @@ msgstr ""
 "sined-mañ."
 
 #. invalid char
-#: ../src/config.py:3302 ../src/dialogs.py:1934
+#: ../src/config.py:3319 ../src/dialogs.py:1950
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/config.py:3303 ../src/config.py:3317 ../src/config.py:3331
+#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
 #, fuzzy
 msgid "Character not allowed"
 msgstr "N'eus ket bet kavet al lesanv : %s"
 
-#: ../src/config.py:3316 ../src/config.py:3582
+#: ../src/config.py:3333 ../src/config.py:3599
 #, fuzzy
 msgid "Invalid server"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/config.py:3330
+#: ../src/config.py:3347
 #, fuzzy
 msgid "Invalid room"
 msgstr "Road direizh"
 
-#: ../src/config.py:3498
+#: ../src/config.py:3515
 msgid "Account has been added successfully"
 msgstr "Gant berzh eo bet ouzhpennet ar gont!"
 
-#: ../src/config.py:3499 ../src/config.py:3505
+#: ../src/config.py:3516 ../src/config.py:3522
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6791,34 +6956,34 @@ msgstr ""
 "Araoket, pe hen ober diwezhatoc'h en ur glikañ war Kontoù er meuziad Aozañ "
 "eus ar prenestr pennañ."
 
-#: ../src/config.py:3504
+#: ../src/config.py:3521
 msgid "Your new account has been created successfully"
 msgstr "Gant berzh eo bet krouet ho kont nevez!"
 
-#: ../src/config.py:3543
+#: ../src/config.py:3560
 msgid "Invalid username"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/config.py:3545
+#: ../src/config.py:3562
 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:3583
+#: ../src/config.py:3600
 #, 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:3639 ../src/gui_interface.py:1904
+#: ../src/config.py:3656 ../src/gui_interface.py:1693
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Darempred er roll dija"
 
-#: ../src/config.py:3640 ../src/gui_interface.py:1905
+#: ../src/config.py:3657 ../src/gui_interface.py:1694
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3717
+#: ../src/config.py:3734
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6828,7 +6993,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3723 ../src/gui_interface.py:1932
+#: ../src/config.py:3740 ../src/gui_interface.py:1721
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6836,74 +7001,83 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3755 ../src/config.py:3789
+#: ../src/config.py:3772 ../src/config.py:3806
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Bez ez eus bet ur fazi en ur grouiñ ar gont"
 
-#: ../src/config.py:3854
+#: ../src/config.py:3871
 msgid "Account name is in use"
 msgstr "Implijet eo an anv-kont dija"
 
-#: ../src/config.py:3855
+#: ../src/config.py:3872
 msgid "You already have an account using this name."
 msgstr "Bez ho peus ur gont gant an anv-se dija."
 
-#: ../src/config.py:4009
+#: ../src/config.py:3991
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/config.py:3992
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#: ../src/config.py:4036
 msgid "Active"
 msgstr "Oberiant"
 
-#: ../src/config.py:4017
+#: ../src/config.py:4044
 msgid "Event"
 msgstr "Darvoud"
 
-#: ../src/config.py:4052
+#: ../src/config.py:4079
 msgid "First Message Received"
 msgstr "Kemennadenn gentañ"
 
-#: ../src/config.py:4053
+#: ../src/config.py:4080
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Kemennadenn da-heul"
 
-#: ../src/config.py:4055
+#: ../src/config.py:4082
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Kemennadenn da-heul"
 
-#: ../src/config.py:4056
+#: ../src/config.py:4083
 msgid "Contact Connected"
 msgstr "Darempred luget"
 
-#: ../src/config.py:4057
+#: ../src/config.py:4084
 msgid "Contact Disconnected"
 msgstr "Darempred diluget"
 
-#: ../src/config.py:4058
+#: ../src/config.py:4085
 msgid "Message Sent"
 msgstr "Kemennadenn gaset"
 
-#: ../src/config.py:4059
+#: ../src/config.py:4086
 msgid "Group Chat Message Highlight"
 msgstr "Message d'un Salon mis en Sur-brillance"
 
-#: ../src/config.py:4060
+#: ../src/config.py:4087
 msgid "Group Chat Message Received"
 msgstr "Kemennadenn digant ur sal-flapiñ"
 
-#: ../src/config.py:4061
+#: ../src/config.py:4088
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Resevet ar bedadenn"
 
-#: ../src/conversation_textview.py:600
+#: ../src/conversation_textview.py:601
 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:619
+#: ../src/conversation_textview.py:620
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6912,46 +7086,46 @@ 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:739
+#: ../src/conversation_textview.py:740
 #, fuzzy
 msgid "_Quote"
 msgstr "_Kuitaat"
 
-#: ../src/conversation_textview.py:746
+#: ../src/conversation_textview.py:747
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Oberoù evit \"%s\""
 
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Read _Wikipedia Article"
 msgstr "Lenn pennad _Wikipedia"
 
-#: ../src/conversation_textview.py:763
+#: ../src/conversation_textview.py:765
 msgid "Look it up in _Dictionary"
 msgstr "Klask er _geriadur"
 
-#: ../src/conversation_textview.py:780
+#: ../src/conversation_textview.py:782
 #, 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:793
+#: ../src/conversation_textview.py:795
 #, 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:796
+#: ../src/conversation_textview.py:798
 msgid "Web _Search for it"
 msgstr "Web_klask"
 
-#: ../src/conversation_textview.py:802
+#: ../src/conversation_textview.py:804
 msgid "Open as _Link"
 msgstr ""
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1296
+#: ../src/conversation_textview.py:1298
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6959,86 +7133,90 @@ msgstr[0] "Dec'h"
 msgstr[1] "Dec'h"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1344 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Sujed: %s\n"
 
-#: ../src/dataforms_widget.py:544
+#: ../src/dataforms_widget.py:545
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Impossible de rejoindre le salon"
 
-#: ../src/dataforms_widget.py:546
+#: ../src/dataforms_widget.py:547
 #, python-format
 msgid "Media type not supported: %s"
 msgstr ""
 
-#: ../src/dataforms_widget.py:601
+#: ../src/dataforms_widget.py:562
+msgid "This field is required"
+msgstr ""
+
+#: ../src/dataforms_widget.py:607
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Flaperez Jabber"
 
-#: ../src/dataforms_widget.py:602
+#: ../src/dataforms_widget.py:608
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:613
+#: ../src/dataforms_widget.py:619
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:616 ../src/dataforms_widget.py:618
+#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:82
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Anv an darempred: <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:84
 #, fuzzy, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:195
 msgid "Group"
 msgstr "Strollad"
 
-#: ../src/dialogs.py:201
+#: ../src/dialogs.py:202
 msgid "In the group"
 msgstr "Er strollad"
 
-#: ../src/dialogs.py:292
+#: ../src/dialogs.py:293
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:297
+#: ../src/dialogs.py:298
 msgid "Contact name"
 msgstr "Anv an darempred"
 
-#: ../src/dialogs.py:469
+#: ../src/dialogs.py:470
 #, fuzzy
 msgid "Set Mood"
 msgstr "Lakaat MOTD"
 
-#: ../src/dialogs.py:589
+#: ../src/dialogs.py:590
 #, python-format
 msgid "%s Status Message"
 msgstr "Titour-stad %s"
 
-#: ../src/dialogs.py:603
+#: ../src/dialogs.py:604
 msgid "Status Message"
 msgstr "Titour-stad"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:794
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Titour-stad"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:795
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
@@ -7046,111 +7224,112 @@ msgstr ""
 "Implijet e vez an anv-mañ gant unan eus ho kontoù dija. Dibabit un anv all "
 "marplij."
 
-#: ../src/dialogs.py:802
+#: ../src/dialogs.py:803
 msgid "Save as Preset Status Message"
 msgstr "Enrollañ evel titour-stad rakenrollet"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:804
 msgid "Please type a name for this status message"
 msgstr "Roit un anv d'an titour-stad-mañ"
 
-#: ../src/dialogs.py:831
+#: ../src/dialogs.py:832
 #, fuzzy
 msgid "AIM Address:"
 msgstr "_Chomlec'h:"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:833
 msgid "GG Number:"
 msgstr ""
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:834
 msgid "ICQ Number:"
 msgstr ""
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:835
 #, fuzzy
 msgid "MSN Address:"
 msgstr "_Chomlec'h:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:836
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Chomlec'h 2:"
 
-#: ../src/dialogs.py:872
+#: ../src/dialogs.py:873
 #, 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:875
+#: ../src/dialogs.py:876
 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:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
+#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
+#: ../src/dialogs.py:3464
 msgid "Invalid User ID"
 msgstr "ID-arveriad-ez direizh"
 
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1052
 msgid "The user ID must not contain a resource."
 msgstr ""
 
-#: ../src/dialogs.py:1051
+#: ../src/dialogs.py:1057
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Laouen 'vefen d'ho ouzhpennañ em roll-darempredoù."
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1071
 msgid "Contact already in roster"
 msgstr "Darempred er roll dija"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1072
 msgid "This contact is already listed in your roster."
 msgstr "Emañ an darempred en ho roll-darempredoù dija."
 
-#: ../src/dialogs.py:1112
+#: ../src/dialogs.py:1118
 #, fuzzy
 msgid "User ID:"
 msgstr "ID arveriad-ez:"
 
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1189
 msgid "A GTK+ jabber client"
 msgstr "Ur flaperez jabber e GTK+"
 
-#: ../src/dialogs.py:1176
+#: ../src/dialogs.py:1190
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1191
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1187
+#: ../src/dialogs.py:1201
 #, fuzzy
 msgid "Current Developers:"
 msgstr "Diorroerien kent:"
 
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1203
 msgid "Past Developers:"
 msgstr "Diorroerien kent:"
 
-#: ../src/dialogs.py:1195
+#: ../src/dialogs.py:1209
 msgid "THANKS:"
 msgstr "TRUGAREZ DA:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1215
 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:1213
+#: ../src/dialogs.py:1227
 msgid "translator-credits"
 msgstr ""
 "Troet e brezhoneg gant\n"
 "Giulia Fraboulet <djoulia@gmail.com>"
 
-#: ../src/dialogs.py:1396
+#: ../src/dialogs.py:1410
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7159,109 +7338,109 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1935 ../src/dialogs.py:2322
+#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
 #, 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:2053
+#: ../src/dialogs.py:2069
 #, 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:2056
+#: ../src/dialogs.py:2072
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Goulenn enskrivañ digant %s"
 
-#: ../src/dialogs.py:2131 ../src/gui_interface.py:2672
+#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
 #, fuzzy, python-format
 msgid "You are already in group chat %s"
 msgstr "Emaoc'h er webgaoz %s dija"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2153
 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:2178
+#: ../src/dialogs.py:2194
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Ebarzhiñ ur sal-flapiñ gant ar gont %s"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2325
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Anv-kont direizh"
 
-#: ../src/dialogs.py:2310
+#: ../src/dialogs.py:2326
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Rankout a rit krouiñ ur gont a-raok gellout flapiñ gant tud all."
 
-#: ../src/dialogs.py:2321
+#: ../src/dialogs.py:2337
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/dialogs.py:2326 ../src/dialogs.py:2332
-#: ../src/groupchat_control.py:1832
+#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
+#: ../src/groupchat_control.py:1847
 #, fuzzy
 msgid "Invalid group chat Jabber ID"
 msgstr "ID jabber direizh"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2343
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "Bez ez eus arouezioù difennet en anv ar sal pe hini ar servijer."
 
-#: ../src/dialogs.py:2333 ../src/groupchat_control.py:1833
+#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
 #, 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:2340
+#: ../src/dialogs.py:2356
 msgid "This is not a group chat"
 msgstr ""
 
-#: ../src/dialogs.py:2341
+#: ../src/dialogs.py:2357
 #, fuzzy, python-format
 msgid "%s is not the name of a group chat."
 msgstr "A guzha an nozelennoù er prenestr flapiñ"
 
-#: ../src/dialogs.py:2372
+#: ../src/dialogs.py:2388
 #, 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:2386
+#: ../src/dialogs.py:2402
 msgid "Server"
 msgstr "Servijer"
 
-#: ../src/dialogs.py:2421
+#: ../src/dialogs.py:2437
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Luget eo ar gont \"%s\" d'ar servijer"
 
-#: ../src/dialogs.py:2422
+#: ../src/dialogs.py:2438
 #, 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:2446
+#: ../src/dialogs.py:2462
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2523
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Kregiñ da flapiñ gant ar gont %s"
 
-#: ../src/dialogs.py:2509
+#: ../src/dialogs.py:2525
 msgid "Start Chat"
 msgstr "Kregiñ da flapiñ"
 
-#: ../src/dialogs.py:2510
+#: ../src/dialogs.py:2526
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -7271,170 +7450,170 @@ msgstr ""
 "dezhañ:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2536 ../src/dialogs.py:2917 ../src/dialogs.py:3129
+#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
 msgid "Connection not available"
 msgstr "N'eus ket tu en em lugañ"
 
-#: ../src/dialogs.py:2537 ../src/dialogs.py:2918 ../src/dialogs.py:3130
+#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Gwiriekait oc'h luget gant \"%s\"."
 
-#: ../src/dialogs.py:2546 ../src/dialogs.py:2549
+#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
 #, fuzzy
 msgid "Invalid JID"
 msgstr "ID jabber direizh"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2565
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:2558
+#: ../src/dialogs.py:2574
 msgid "Without a connection, you can not change your password."
 msgstr "Rankout a rit bezañ luget evit cheñch ger-kuzh."
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "Invalid password"
 msgstr "Ger-kuzh direizh"
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "You must enter a password."
 msgstr "Rankout a rit reiñ ur ger-kuzh."
 
-#: ../src/dialogs.py:2581
+#: ../src/dialogs.py:2597
 msgid "Passwords do not match"
 msgstr "Ne glot ket ar gerioù-kuzh"
 
-#: ../src/dialogs.py:2582
+#: ../src/dialogs.py:2598
 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."
 
 #. default value
-#: ../src/dialogs.py:2619 ../src/notify.py:247 ../src/notify.py:473
+#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
 msgid "Contact Signed In"
 msgstr "Darempred luget"
 
-#: ../src/dialogs.py:2621 ../src/notify.py:255 ../src/notify.py:475
+#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
 msgid "Contact Signed Out"
 msgstr "Darempred diluget"
 
 #. chat message
-#: ../src/dialogs.py:2623 ../src/notify.py:277 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
 msgid "New Message"
 msgstr "Kemennadenn nevez"
 
 #. single message
-#: ../src/dialogs.py:2623 ../src/notify.py:259 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
 msgid "New Single Message"
 msgstr "Kemennadenn simpl nevez"
 
 #. private message
-#: ../src/dialogs.py:2624 ../src/notify.py:265 ../src/notify.py:478
+#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
 msgid "New Private Message"
 msgstr "Kemennadenn hiniennel nevez"
 
-#: ../src/dialogs.py:2624 ../src/gui_interface.py:1358 ../src/notify.py:487
+#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
 msgid "New E-mail"
 msgstr "Postel nevez"
 
-#: ../src/dialogs.py:2626 ../src/gui_interface.py:1420 ../src/notify.py:480
+#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
 msgid "File Transfer Request"
 msgstr "Goulenn treuzkas"
 
-#: ../src/dialogs.py:2628 ../src/gui_interface.py:1320
-#: ../src/gui_interface.py:1389 ../src/notify.py:482
+#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
+#: ../src/gui_interface.py:1186 ../src/notify.py:482
 msgid "File Transfer Error"
 msgstr "Fazi treuzkas"
 
-#: ../src/dialogs.py:2630 ../src/gui_interface.py:1466
-#: ../src/gui_interface.py:1489 ../src/gui_interface.py:1506
+#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
+#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
 #: ../src/notify.py:484
 msgid "File Transfer Completed"
 msgstr "Echu an treuzkasadenn"
 
-#: ../src/dialogs.py:2631 ../src/gui_interface.py:1469 ../src/notify.py:485
+#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
 msgid "File Transfer Stopped"
 msgstr "Sac'het an treuzkas"
 
-#: ../src/dialogs.py:2633 ../src/gui_interface.py:1152 ../src/notify.py:489
+#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
 msgid "Groupchat Invitation"
 msgstr "Pedadenn evit ur sal-flapiñ"
 
-#: ../src/dialogs.py:2635 ../src/notify.py:239 ../src/notify.py:491
+#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Darempred diluget"
 
-#: ../src/dialogs.py:2836
+#: ../src/dialogs.py:2852
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Kemennadenn simpl gant ar gont %s"
 
-#: ../src/dialogs.py:2838
+#: ../src/dialogs.py:2854
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Kemennadenn simpl gant ar gont %s"
 
-#: ../src/dialogs.py:2840
+#: ../src/dialogs.py:2856
 msgid "Single Message"
 msgstr "Kemennadenn simpl"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2843
+#: ../src/dialogs.py:2859
 #, python-format
 msgid "Send %s"
 msgstr "Kas %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:2882
 #, python-format
 msgid "Received %s"
 msgstr "%s resevet"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2889
+#: ../src/dialogs.py:2905
 #, 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:2968
+#: ../src/dialogs.py:2984
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:2985
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s a skrivas:\n"
 
-#: ../src/dialogs.py:3028
+#: ../src/dialogs.py:3044
 #, python-format
 msgid "XML Console for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3046
 msgid "XML Console"
 msgstr ""
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "add"
 msgstr "Chomlec'h"
 
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "modify"
 msgstr "_Kemmañ"
 
-#: ../src/dialogs.py:3160
+#: ../src/dialogs.py:3176
 #, fuzzy
 msgid "remove"
 msgstr "_Dilemel"
 
-#: ../src/dialogs.py:3188
+#: ../src/dialogs.py:3204
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7442,166 +7621,199 @@ msgid ""
 msgstr "Me blijfe din ouzhpennañ ac'hanoc'h em roll-darempredoù."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3204 ../src/dialogs.py:3250
+#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
 #, fuzzy
 msgid "Add"
 msgstr "Chomlec'h"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3206 ../src/dialogs.py:3281
+#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
 #, fuzzy
 msgid "Modify"
 msgstr "_Kemmañ"
 
-#: ../src/dialogs.py:3212
+#: ../src/dialogs.py:3228
 #, fuzzy
 msgid "Jabber ID"
 msgstr "ID Jabber:"
 
-#: ../src/dialogs.py:3218
+#: ../src/dialogs.py:3234
 #, fuzzy
 msgid "Groups"
 msgstr "Strollad"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3342
 #, 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:3340
+#: ../src/dialogs.py:3356
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "Ouzhpennañ un _darempred"
 
-#: ../src/dialogs.py:3377
+#: ../src/dialogs.py:3393
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Dilemel an darempred diouzh ar roll"
 
-#: ../src/dialogs.py:3430
+#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#, python-format
+msgid "Archiving Preferences for %s"
+msgstr ""
+
+#: ../src/dialogs.py:3473
+#, fuzzy
+msgid "Invalid expire value"
+msgstr "Anv-arveriad-ez direizh"
+
+#: ../src/dialogs.py:3474
+msgid "Expire must be a valid positive integer."
+msgstr ""
+
+#: ../src/dialogs.py:3521
+msgid "There is an error with the form"
+msgstr ""
+
+#: ../src/dialogs.py:3732
+msgid "There is an error"
+msgstr ""
+
+#: ../src/dialogs.py:3796
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:3434
+#: ../src/dialogs.py:3800
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3490
+#: ../src/dialogs.py:3856
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3861
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Taolennadur: %s"
 
-#: ../src/dialogs.py:3539
+#: ../src/dialogs.py:3905
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Furmad ul linenn</b>"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:4016
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Furmad ul linenn</b>"
 
-#: ../src/dialogs.py:3750
+#: ../src/dialogs.py:4116
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3752
+#: ../src/dialogs.py:4118
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Flapoù prevez"
 
-#: ../src/dialogs.py:3822
+#: ../src/dialogs.py:4188
 #, fuzzy
 msgid "Invalid List Name"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4189
 #, 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:3855
+#: ../src/dialogs.py:4221
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Vous êtes banni de ce salon."
 
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4224
 #, 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:3860
+#: ../src/dialogs.py:4226
 #, 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:3868
+#: ../src/dialogs.py:4234
 #, python-format
 msgid "Comment: %s"
 msgstr "Evezhiadenn: %s"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4236
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3932
+#: ../src/dialogs.py:4298
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:3942 ../src/dialogs.py:3985 ../src/dialogs.py:4041
+#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
+#: ../src/dialogs.py:4495
 msgid "All files"
 msgstr "An holl restroù"
 
-#: ../src/dialogs.py:3947
+#: ../src/dialogs.py:4313
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:3975
+#: ../src/dialogs.py:4341
 msgid "Choose Sound"
 msgstr "Dibabit ur son"
 
-#: ../src/dialogs.py:3990
+#: ../src/dialogs.py:4356
 msgid "Wav Sounds"
 msgstr "Sonioù wav"
 
-#: ../src/dialogs.py:4028
+#: ../src/dialogs.py:4394
 msgid "Choose Image"
 msgstr "Dibabit ur skeudenn"
 
-#: ../src/dialogs.py:4046
+#: ../src/dialogs.py:4412
 msgid "Images"
 msgstr "Skeudennoù"
 
-#: ../src/dialogs.py:4113
+#: ../src/dialogs.py:4482
+#, fuzzy
+msgid "Choose Archive"
+msgstr "Dibabit ur skeudenn"
+
+#: ../src/dialogs.py:4500
+#, fuzzy
+msgid "Zip files"
+msgstr "An holl restroù"
+
+#: ../src/dialogs.py:4525
 #, python-format
 msgid "When %s becomes:"
 msgstr "Pa teu %s da vezañ:"
 
-#: ../src/dialogs.py:4115
+#: ../src/dialogs.py:4527
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Oc'h ouzhpennañ ur gelaouenn nevez evit %s"
 
-#: ../src/dialogs.py:4190
+#: ../src/dialogs.py:4602
 #, fuzzy
 msgid "Condition"
 msgstr "Kevreadenn"
 
-#: ../src/dialogs.py:4310
+#: ../src/dialogs.py:4722
 msgid "when I am "
 msgstr ""
 
-#: ../src/dialogs.py:4786
+#: ../src/dialogs.py:5198
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7609,38 +7821,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4789
+#: ../src/dialogs.py:5201
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4795 ../src/dialogs.py:4879
+#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4801
+#: ../src/dialogs.py:5213
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4806
+#: ../src/dialogs.py:5218
 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:4809 ../src/dialogs.py:4860 ../src/dialogs.py:4873
+#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4814
+#: ../src/dialogs.py:5226
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4825
+#: ../src/dialogs.py:5237
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4826
+#: ../src/dialogs.py:5238
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7650,44 +7862,44 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4827
+#: ../src/dialogs.py:5239
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4861
+#: ../src/dialogs.py:5273
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4867
+#: ../src/dialogs.py:5279
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4874
+#: ../src/dialogs.py:5286
 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:4880
+#: ../src/dialogs.py:5292
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:4945
+#: ../src/dialogs.py:5357
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4947
+#: ../src/dialogs.py:5359
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4949
+#: ../src/dialogs.py:5361
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4953
+#: ../src/dialogs.py:5365
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7703,24 +7915,24 @@ msgstr "Traoù all"
 msgid "Conference"
 msgstr "Kendiviz"
 
-#: ../src/disco.py:512
+#: ../src/disco.py:513
 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:589
+#: ../src/disco.py:600
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Merañ servijoù ar gont %s"
 
-#: ../src/disco.py:591
+#: ../src/disco.py:602
 msgid "Service Discovery"
 msgstr "Merañ ar servijoù"
 
-#: ../src/disco.py:741
+#: ../src/disco.py:758
 msgid "The service could not be found"
 msgstr "N'eo ket bet kavet ar servij"
 
-#: ../src/disco.py:742
+#: ../src/disco.py:759
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7728,98 +7940,98 @@ msgstr ""
 "N'eus servij ebet er chomlec'h roet, pe ne respont ket. Gwiriekait ar "
 "chomlec'h ha klaskit en-dro."
 
-#: ../src/disco.py:746 ../src/disco.py:1082
+#: ../src/disco.py:763 ../src/disco.py:1100
 msgid "The service is not browsable"
 msgstr "N'eus ket tu furchal er servij"
 
-#: ../src/disco.py:747
+#: ../src/disco.py:764
 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:786 ../src/disco.py:796
+#: ../src/disco.py:804 ../src/disco.py:814
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/disco.py:850
+#: ../src/disco.py:868
 #, 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:894
+#: ../src/disco.py:912
 msgid "_Browse"
 msgstr "_Furchal"
 
-#: ../src/disco.py:1083
+#: ../src/disco.py:1101
 msgid "This service does not contain any items to browse."
 msgstr "N'eus elfenn ebet da furchal er servij-mañ."
 
-#: ../src/disco.py:1323
+#: ../src/disco.py:1341
 #, fuzzy
 msgid "_Execute Command"
 msgstr "urzhiad"
 
-#: ../src/disco.py:1333 ../src/disco.py:1504
+#: ../src/disco.py:1351 ../src/disco.py:1522
 msgid "Re_gister"
 msgstr "_Emezelañ"
 
-#: ../src/disco.py:1545
+#: ../src/disco.py:1563
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr ""
 
 #. Users column
-#: ../src/disco.py:1736
+#: ../src/disco.py:1754
 msgid "Users"
 msgstr "Arveridi"
 
 #. Description column
-#: ../src/disco.py:1744
+#: ../src/disco.py:1762
 msgid "Description"
 msgstr "Taolennadur"
 
 #. Id column
-#: ../src/disco.py:1752
+#: ../src/disco.py:1770
 msgid "Id"
 msgstr ""
 
-#: ../src/disco.py:1817 ../src/gui_interface.py:3182
+#: ../src/disco.py:1835 ../src/gui_interface.py:2995
 msgid "Bookmark already set"
 msgstr "Sined lakaet dija"
 
-#: ../src/disco.py:1818 ../src/gui_interface.py:3183
+#: ../src/disco.py:1836 ../src/gui_interface.py:2996
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Emañ ar flap \"%s\" en ho sinedoù dija."
 
-#: ../src/disco.py:1827 ../src/gui_interface.py:3197
+#: ../src/disco.py:1845 ../src/gui_interface.py:3010
 msgid "Bookmark has been added successfully"
 msgstr "Gant berzh eo bet ouzhpennet ar sined"
 
-#: ../src/disco.py:1828 ../src/gui_interface.py:3198
+#: ../src/disco.py:1846 ../src/gui_interface.py:3011
 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:2039
+#: ../src/disco.py:2057
 #, fuzzy
 msgid "Subscribed"
 msgstr "Emezelañ"
 
-#: ../src/disco.py:2047
+#: ../src/disco.py:2065
 #, fuzzy
 msgid "Node"
 msgstr "Hini ebet"
 
-#: ../src/disco.py:2111
+#: ../src/disco.py:2129
 msgid "New post"
 msgstr ""
 
-#: ../src/disco.py:2117
+#: ../src/disco.py:2135
 msgid "_Subscribe"
 msgstr "_Koumanantiñ"
 
-#: ../src/disco.py:2123
+#: ../src/disco.py:2141
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "_Koumanantiñ"
@@ -7996,14 +8208,14 @@ msgstr ""
 
 #: ../src/features_window.py:95
 msgid ""
-"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
-"in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 
 #: ../src/features_window.py:96
 msgid ""
-"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
+"You have to set 'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 
 #: ../src/features_window.py:97
@@ -8162,33 +8374,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:342 ../src/gtkgui_helpers.py:902
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 msgid "This file already exists"
 msgstr "Bez ez eus eus ar restr-mañ dija"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 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:369 ../src/gtkgui_helpers.py:914
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -8291,30 +8503,30 @@ msgid ""
 "Run anyway?"
 msgstr ""
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
 #, 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:80
+#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
 msgid "command"
 msgstr "urzhiad"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "diskouez ar skoazell evit an urzhiad"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Diskouez pe kuzhat ar prenestr pennañ"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
 #, 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:93
+#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
 #, fuzzy
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
@@ -8322,6 +8534,13 @@ msgid ""
 msgstr ""
 "A ziskouez ur roll eus an holl zarempredoù, pep darempred war ul linenn."
 
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
+#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
+#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
+#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
 #: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
 #: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
 #: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
@@ -8333,41 +8552,33 @@ msgstr ""
 msgid "account"
 msgstr "kont"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "diskouez darempredoù ar gont roet hepken"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "A ziskouez roll ar c'hontoù enrollet"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
 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:109
+#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
 msgid "status"
 msgstr "stad"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106
 #, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"accoun't previous status"
+msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "unan eus: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
-msgid "message"
-msgstr "kemennadenn"
-
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "titour stad"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8375,48 +8586,22 @@ 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:117
-#, fuzzy
-msgid "Changes the priority of account or accounts"
-msgstr "A cheñch stad ar gont pe ar c'hontoù"
-
-#: ../src/gajim-remote.py:119
-msgid "priority"
-msgstr ""
-
-#: ../src/gajim-remote.py:119
-#, fuzzy
-msgid "priority you want to give to the account"
-msgstr "Fellout a ra din emezelañ evit krouiñ ur gont"
-
-#: ../src/gajim-remote.py:121
-#, fuzzy
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-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:127
+#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
 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:129
+#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID an darempred ho peus c'hoant flapiñ gantañ"
 
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
 #: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 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:134
-msgid "message content. The account must be specified or \"\""
-msgstr ""
-
-#: ../src/gajim-remote.py:139
+#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -8427,29 +8612,34 @@ 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-plugin.py:127 ../src/gajim-remote-plugin.py:140
 #: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID an darempred hag a resevo ar gemennadenn"
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
+#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "korf ar gemennadenn"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "alc'hwezh pgp"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
+#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
 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:152
+#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -8460,146 +8650,291 @@ 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:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 #, fuzzy
 msgid "subject"
 msgstr "Titl"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 #, fuzzy
 msgid "message subject"
 msgstr "Kemennadenn gaset"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID an darempred hag a resevo ar gemennadenn"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Evit kargañ titouroù-munut un darempred"
 
+#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
+#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
 #: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
 #: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID an darempred"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Evit kargañ titouroù-munut ur gont"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Anv ar gont"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Kas ur restr d'un darempred"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "file"
 msgstr "restr"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Treug ar restr"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
 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:196
+#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Roll an holl zibaboù hag o zalvoudoù"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "A laka talvoud an 'alc'hwezh' da 'dalvoud'."
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "alc'hwezh=talvoud"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 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:207
+#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "A zilam un elfenn dibab"
 
-#: ../src/gajim-remote.py:209
-msgid "key"
-msgstr "touchenn"
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "key"
+msgstr "touchenn"
+
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "name of the preference to be deleted"
+msgstr "anv an dibab da zilemel"
+
+#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+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-plugin.py:202 ../src/gajim-remote.py:218
+msgid "Removes contact from roster"
+msgstr "Dilemel an darempred diouzh ar roll"
+
+#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+msgid "Adds contact to roster"
+msgstr "Ouzhennañ an darempred d'ar roll"
+
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#, fuzzy
+msgid "Adds new contact to this account"
+msgstr "Ouzhpennañ un darempred nevez d'ar gont-mañ."
+
+#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+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-plugin.py:226
+#, fuzzy
+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-plugin.py:233 ../src/gajim-remote.py:249
+#, fuzzy
+msgid "Returns number of unread messages"
+msgstr "A ro an niver a gemennadennoù chomet dilenn"
+
+#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+msgid "Opens 'Start Chat' dialog"
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#, fuzzy
+msgid "Starts chat, using this account"
+msgstr "Kregiñ da flapiñ gant ar gont %s"
+
+#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+msgid "Sends custom XML"
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+msgid "XML to send"
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
+msgid "Handle a xmpp:/ uri"
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
+msgid "uri"
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#, fuzzy
+msgid "Join a MUC room"
+msgstr "_Ebarzhiñ ur webgaoz nevez"
+
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+#, fuzzy
+msgid "room"
+msgstr "Digant"
+
+#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+#, fuzzy
+msgid "nick"
+msgstr "Lesanv"
+
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+#, fuzzy
+msgid "password"
+msgstr "Ger-kuzh:"
+
+#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+msgid "Check if Gajim is running"
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
+#: ../src/gajim-remote.py:300
+#, fuzzy
+msgid "Shows or hides the ipython window"
+msgstr "Diskouez pe kuzhat ar prenestr pennañ"
+
+#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+msgid "Missing argument \"contact_jid\""
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#, python-format
+msgid ""
+"'%s' is not in your roster.\n"
+"Please specify account for sending the message."
+msgstr ""
+"N'emañ ket '%s' en hor roll darempredoù.\n"
+"Resisait ar gont evit kas ur gemennadenn."
+
+#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+msgid "You have no active account"
+msgstr "N'ho peus kont bev ebet"
 
-#: ../src/gajim-remote.py:209
-msgid "name of the preference to be deleted"
-msgstr "anv an dibab da zilemel"
+#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+msgid "It seems Gajim is not running. So you can't use gajim-remote."
+msgstr ""
 
-#: ../src/gajim-remote.py:213
-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-plugin.py:412
+#, python-format
+msgid ""
+"Usage: %s %s %s \n"
+"\t %s"
+msgstr ""
+"Implij: %s %s %s \n"
+"\t %s"
 
-#: ../src/gajim-remote.py:218
-msgid "Removes contact from roster"
-msgstr "Dilemel an darempred diouzh ar roll"
+#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+msgid "Arguments:"
+msgstr "Arguments :"
 
-#: ../src/gajim-remote.py:227
-msgid "Adds contact to roster"
-msgstr "Ouzhennañ an darempred d'ar roll"
+#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#, python-format
+msgid "%s not found"
+msgstr "N'eo ket bet kavet %s"
 
-#: ../src/gajim-remote.py:229
-msgid "jid"
+#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
+#, python-format
+msgid ""
+"Usage: %s command [arguments]\n"
+"Command is one of:\n"
 msgstr ""
+"Implij: %s urzhiad [arguments]\n"
+"urzhiad eo unan eus :\n"
 
-#: ../src/gajim-remote.py:230
-#, fuzzy
-msgid "Adds new contact to this account"
-msgstr "Ouzhpennañ un darempred nevez d'ar gont-mañ."
-
-#: ../src/gajim-remote.py:235
-msgid "Returns current status (the global one unless account is specified)"
+#: ../src/gajim-remote-plugin.py:496
+#, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
 msgstr ""
-"A ro ar stad red (an hini hollek, nemet ez eus bet resisaet ur gont bennak)"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote-plugin.py:500
+#, python-format
 msgid ""
-"Returns current status message (the global one unless account is specified)"
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
 msgstr ""
-"A gas an titour-stad red (an hini hollek, nemet ez eus bet resisaet ur gont "
-"bennak)"
 
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
 #, fuzzy
-msgid "Returns number of unread messages"
-msgstr "A ro an niver a gemennadennoù chomet dilenn"
+msgid "Wrong uri"
+msgstr "Ger-kuzh faos"
 
-#: ../src/gajim-remote.py:253
-msgid "Opens 'Start Chat' dialog"
+#: ../src/gajim-remote.py:109
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
+msgstr "unan eus: offline, online, chat, away, xa, dnd, invisible "
+
+#: ../src/gajim-remote.py:117
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "A cheñch stad ar gont pe ar c'hontoù"
+
+#: ../src/gajim-remote.py:119
+msgid "priority"
 msgstr ""
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:119
 #, fuzzy
-msgid "Starts chat, using this account"
-msgstr "Kregiñ da flapiñ gant ar gont %s"
+msgid "priority you want to give to the account"
+msgstr "Fellout a ra din emezelañ evit krouiñ ur gont"
 
-#: ../src/gajim-remote.py:259
-msgid "Sends custom XML"
+#: ../src/gajim-remote.py:121
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
 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:261
-msgid "XML to send"
+#: ../src/gajim-remote.py:134
+msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:242
 msgid ""
-"Account in which the xml will be sent; if not specified, xml will be sent to "
-"all accounts"
+"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:268
 #, fuzzy
@@ -8617,14 +8952,6 @@ msgid ""
 "be set for all accounts"
 msgstr ""
 
-#: ../src/gajim-remote.py:277
-msgid "Handle a xmpp:/ uri"
-msgstr ""
-
-#: ../src/gajim-remote.py:279
-msgid "uri"
-msgstr ""
-
 #: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr ""
@@ -8638,36 +8965,16 @@ msgstr ""
 msgid "Message content"
 msgstr "korf ar gemennadenn"
 
-#: ../src/gajim-remote.py:286
-#, fuzzy
-msgid "Join a MUC room"
-msgstr "_Ebarzhiñ ur webgaoz nevez"
-
-#: ../src/gajim-remote.py:288
-#, fuzzy
-msgid "room"
-msgstr "Digant"
-
 #: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "Room JID"
 msgstr "Webgaoz:"
 
-#: ../src/gajim-remote.py:289
-#, fuzzy
-msgid "nick"
-msgstr "Lesanv"
-
 #: ../src/gajim-remote.py:289
 #, fuzzy
 msgid "Nickname to use"
 msgstr "N'eus ket bet kavet al lesanv : %s"
 
-#: ../src/gajim-remote.py:290
-#, fuzzy
-msgid "password"
-msgstr "Ger-kuzh:"
-
 #: ../src/gajim-remote.py:290
 #, fuzzy
 msgid "Password to enter the room"
@@ -8677,36 +8984,6 @@ msgstr "Ne glot ket ar gerioù-kuzh"
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:296
-msgid "Check if Gajim is running"
-msgstr ""
-
-#: ../src/gajim-remote.py:300
-#, fuzzy
-msgid "Shows or hides the ipython window"
-msgstr "Diskouez pe kuzhat ar prenestr pennañ"
-
-#: ../src/gajim-remote.py:327
-msgid "Missing argument \"contact_jid\""
-msgstr ""
-
-#: ../src/gajim-remote.py:348
-#, python-format
-msgid ""
-"'%s' is not in your roster.\n"
-"Please specify account for sending the message."
-msgstr ""
-"N'emañ ket '%s' en hor roll darempredoù.\n"
-"Resisait ar gont evit kas ur gemennadenn."
-
-#: ../src/gajim-remote.py:351
-msgid "You have no active account"
-msgstr "N'ho peus kont bev ebet"
-
-#: ../src/gajim-remote.py:404
-msgid "It seems Gajim is not running. So you can't use gajim-remote."
-msgstr ""
-
 #: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
@@ -8714,24 +8991,6 @@ msgid ""
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:435
-msgid "Arguments:"
-msgstr "Arguments :"
-
-#: ../src/gajim-remote.py:439
-#, python-format
-msgid "%s not found"
-msgstr "N'eo ket bet kavet %s"
-
-#: ../src/gajim-remote.py:445
-#, python-format
-msgid ""
-"Usage: %s command [arguments]\n"
-"Command is one of:\n"
-msgstr ""
-"Implij: %s urzhiad [arguments]\n"
-"urzhiad eo unan eus :\n"
-
 #: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
@@ -8750,11 +9009,6 @@ msgstr ""
 msgid "No uri given"
 msgstr ""
 
-#: ../src/gajim-remote.py:540
-#, fuzzy
-msgid "Wrong uri"
-msgstr "Ger-kuzh faos"
-
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Gwiskadur"
@@ -8781,203 +9035,201 @@ msgstr "N'hellit ket dilemel ar gwiskadur red"
 msgid "Please first choose another for your current theme."
 msgstr "Dibabit ur gwiskadur all da gentañ."
 
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:170
 msgid "Sending private message failed"
 msgstr "Kas ar gemennadenn brevez c'hwitet"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:171
+#: ../src/groupchat_control.py:172
 #, 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:450
+#: ../src/groupchat_control.py:455
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Cheñch _lesanv"
 
-#: ../src/groupchat_control.py:631
+#: ../src/groupchat_control.py:636
 #, fuzzy
 msgid "Conversation with "
 msgstr "Istoradur ar gaoz"
 
-#: ../src/groupchat_control.py:633
+#: ../src/groupchat_control.py:638
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Kevreadenn"
 
-#. Can be a message (see handle_event_gc_config_change in
-#. gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1272 ../src/gui_interface.py:1080
+#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1286
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1288
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Gant berzh eo bet krouet ho kont nevez!"
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1291
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1287
+#: ../src/groupchat_control.py:1297
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s a zo bet skarzhet : %(reason)s"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1300
 #, 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:1300
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s a zo argaset : %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1312
 #, 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:1314 ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
 #, python-format
 msgid "You are now known as %s"
 msgstr "Anavezet oc'h bremañ gant an anv %s"
 
-#: ../src/groupchat_control.py:1330 ../src/gui_interface.py:919
+#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s a zo bremañ %s"
 
-#: ../src/groupchat_control.py:1372 ../src/groupchat_control.py:1377
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1392
 #, 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:1374
+#: ../src/groupchat_control.py:1383
 msgid "affiliation changed"
 msgstr ""
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1388
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1394
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1470
+#: ../src/groupchat_control.py:1477
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1474
+#: ../src/groupchat_control.py:1481
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1489
+#: ../src/groupchat_control.py:1496
 #, 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:1493
+#: ../src/groupchat_control.py:1500
 #, 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:1522
+#: ../src/groupchat_control.py:1530
 #, python-format
 msgid "%s has left"
 msgstr "Aet eo kuit %s"
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1535
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Er strollad"
 
-#: ../src/groupchat_control.py:1529 ../src/gui_interface.py:946
+#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
 #: ../src/history_window.py:447 ../src/notify.py:234
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s a zo bremañ %(status)s"
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1774
 #, 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:1761
+#: ../src/groupchat_control.py:1776
 #, 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:1765 ../src/gui_interface.py:1216
-#: ../src/gui_interface.py:1992 ../src/gui_interface.py:2029
-#: ../src/gui_interface.py:2064 ../src/message_window.py:224
-#: ../src/roster_window.py:2739 ../src/roster_window.py:3399
-#: ../src/roster_window.py:4123
+#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
+#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
+#: ../src/gui_interface.py:1853 ../src/message_window.py:224
+#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
+#: ../src/roster_window.py:4195
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Chom hep goulenn ket"
 
-#: ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:1814
 msgid "Changing Subject"
 msgstr "Cheñch ar sujed"
 
-#: ../src/groupchat_control.py:1800
+#: ../src/groupchat_control.py:1815
 msgid "Please specify the new subject:"
 msgstr "Skrivit ar sujed nevez:"
 
-#: ../src/groupchat_control.py:1807
+#: ../src/groupchat_control.py:1822
 msgid "Changing Nickname"
 msgstr "Cheñch lesanv"
 
-#: ../src/groupchat_control.py:1808
+#: ../src/groupchat_control.py:1823
 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:1839
+#: ../src/groupchat_control.py:1854
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Taolennadur: %s"
 
-#: ../src/groupchat_control.py:1840
+#: ../src/groupchat_control.py:1855
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1842
+#: ../src/groupchat_control.py:1857
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2028
+#: ../src/groupchat_control.py:2046
 #, python-format
 msgid "Kicking %s"
 msgstr "Skarzhañ %s"
 
-#: ../src/groupchat_control.py:2029 ../src/groupchat_control.py:2356
+#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
 msgid "You may specify a reason below:"
 msgstr "Bez e c'hellit reiñ un abeg amañ dindan:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2355
+#: ../src/groupchat_control.py:2373
 #, python-format
 msgid "Banning %s"
 msgstr "Argas %s"
@@ -9001,55 +9253,65 @@ msgid "Details"
 msgstr "Munudoù"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
+#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Fazi: dibosupl eo digeriñ %s evit e lenn"
 
-#: ../src/gtkgui_helpers.py:400
+#: ../src/gtkgui_helpers.py:404
 msgid "Error reading file:"
 msgstr "Fazi en ur lenn ar restr:"
 
-#: ../src/gtkgui_helpers.py:403
+#: ../src/gtkgui_helpers.py:407
 msgid "Error parsing file:"
 msgstr ""
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:444
+#: ../src/gtkgui_helpers.py:448
 #, 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:818
+#: ../src/gtkgui_helpers.py:822
 msgid "Gajim is not the default Jabber client"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:819
+#: ../src/gtkgui_helpers.py:823
 #, fuzzy
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Voulez-vous l'écraser ?"
 
-#: ../src/gtkgui_helpers.py:820
+#: ../src/gtkgui_helpers.py:824
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:887
+#: ../src/gtkgui_helpers.py:891
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:888
+#: ../src/gtkgui_helpers.py:892
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:924
+#: ../src/gtkgui_helpers.py:928
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Enrollañ ar restr dindan..."
 
-#: ../src/gui_interface.py:140
+#. we are banned
+#. group chat does not exist
+#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
+#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
+#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
+#: ../src/gui_interface.py:348
+#, fuzzy
+msgid "Unable to join group chat"
+msgstr "Impossible de rejoindre le salon"
+
+#: ../src/gui_interface.py:138
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9060,166 +9322,196 @@ msgstr ""
 "par un autre occupant.\n"
 "Veuillez entrer un autre surnom ci-dessous :"
 
-#: ../src/gui_interface.py:143
+#: ../src/gui_interface.py:141
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:159
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Degemer a rit ar goulenn-mañ?"
 
-#: ../src/gui_interface.py:161
+#: ../src/gui_interface.py:160
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Degemer a rit ar goulenn-mañ?"
 
-#: ../src/gui_interface.py:164
+#: ../src/gui_interface.py:163
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Aotre HTTP (%s) evit %s (id : %s)"
 
-#: ../src/gui_interface.py:213 ../src/notify.py:493
+#: ../src/gui_interface.py:209 ../src/notify.py:493
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Kevreadenn"
 
-#: ../src/gui_interface.py:606 ../src/gui_interface.py:610
+#: ../src/gui_interface.py:312
+#, 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/gui_interface.py:324
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/gui_interface.py:333
+#, fuzzy, python-format
+msgid "You are banned from group chat %s."
+msgstr "Vous êtes banni de ce salon."
+
+#: ../src/gui_interface.py:338
+#, fuzzy, python-format
+msgid "Group chat %s does not exist."
+msgstr "Ce salon n'existe pas."
+
+#: ../src/gui_interface.py:341
+#, fuzzy
+msgid "Group chat creation is restricted."
+msgstr "La création de salon est réservée aux administrateurs."
+
+#: ../src/gui_interface.py:344
+#, 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/gui_interface.py:349
+#, fuzzy, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Vous n'êtes pas dans la liste des membres."
+
+#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s : %(message)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:621 ../src/gui_interface.py:636
+#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "fazi en ur gas %s ( %s )"
 
-#: ../src/gui_interface.py:663 ../src/notify.py:495
+#: ../src/gui_interface.py:540 ../src/notify.py:495
 #, fuzzy
 msgid "Subscription request"
 msgstr "Goulenn koumanantiñ"
 
-#: ../src/gui_interface.py:688
+#: ../src/gui_interface.py:565
 msgid "Authorization accepted"
 msgstr "Aotre degmeret"
 
-#: ../src/gui_interface.py:689
+#: ../src/gui_interface.py:566
 #, 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/gui_interface.py:702
+#: ../src/gui_interface.py:579
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Dilamet eo bet ho aotre digant \"%s\""
 
-#: ../src/gui_interface.py:703
+#: ../src/gui_interface.py:580
 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/gui_interface.py:727 ../src/notify.py:497
+#: ../src/gui_interface.py:604 ../src/notify.py:497
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Koumanantiñ"
 
-#: ../src/gui_interface.py:754
+#: ../src/gui_interface.py:631
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "N'eus ket tu da dizhout \"%s\""
 
-#: ../src/gui_interface.py:1015
+#: ../src/gui_interface.py:859
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1083
+#: ../src/gui_interface.py:926
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gui_interface.py:1085
+#: ../src/gui_interface.py:928
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gui_interface.py:1087
+#: ../src/gui_interface.py:930
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:1091
+#: ../src/gui_interface.py:934
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1093
+#: ../src/gui_interface.py:936
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1095
+#: ../src/gui_interface.py:938
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1098
+#: ../src/gui_interface.py:941
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1101
+#: ../src/gui_interface.py:944
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1133
-#, 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/gui_interface.py:1180
+#: ../src/gui_interface.py:985
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gui_interface.py:1182 ../src/gui_interface.py:1189
+#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Luget oc'h hep hoc'h alc'hwezh OpenPGP."
 
-#: ../src/gui_interface.py:1184
+#: ../src/gui_interface.py:989
 msgid "Your passphrase is incorrect"
 msgstr "Direizh eo ho ker-kuzh"
 
-#: ../src/gui_interface.py:1188
+#: ../src/gui_interface.py:993
 #, fuzzy
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Direizh eo ho ker-kuzh"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid "GPG key not trusted"
 msgstr ""
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
 msgstr ""
 
-#: ../src/gui_interface.py:1226
+#: ../src/gui_interface.py:1031
 msgid ""
 "Gnome Keyring is installed but not                 correctly started "
 "(environment variable probably not                 correctly set)"
 msgstr ""
 
-#: ../src/gui_interface.py:1330
+#: ../src/gui_interface.py:1131
 #, fuzzy, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Postel nevez war %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1332
+#: ../src/gui_interface.py:1133
 #, 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/gui_interface.py:1345
+#: ../src/gui_interface.py:1146
 #, python-format
 msgid ""
 "\n"
@@ -9229,103 +9521,103 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1418
+#: ../src/gui_interface.py:1215
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "Fellout a ra da %s kas deoc'h ur restr."
 
-#: ../src/gui_interface.py:1455 ../src/roster_window.py:1856
+#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Dilemel an darempred diouzh ar roll"
 
-#: ../src/gui_interface.py:1458 ../src/roster_window.py:1858
+#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
 #, fuzzy
 msgid "Error opening file"
 msgstr "Fazi en ur lenn ar restr:"
 
-#: ../src/gui_interface.py:1490
+#: ../src/gui_interface.py:1287
 #, 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/gui_interface.py:1494
+#: ../src/gui_interface.py:1291
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Arsavet eo an treuskas eus %(filename)s digant %(name)s."
 
-#: ../src/gui_interface.py:1507
+#: ../src/gui_interface.py:1304
 #, 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/gui_interface.py:1511
+#: ../src/gui_interface.py:1308
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Arsavet eo an treuzkas eus %(filename)s da %(name)s."
 
-#: ../src/gui_interface.py:1623
+#: ../src/gui_interface.py:1426
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gui_interface.py:1630
+#: ../src/gui_interface.py:1433
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Da _bep kemennadenn:"
 
-#: ../src/gui_interface.py:1702
+#: ../src/gui_interface.py:1505
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:1703
+#: ../src/gui_interface.py:1506
 #, fuzzy
 msgid "Please type a new username for your local account"
 msgstr "<b>Leuniit an titouroù evit ho kont nevez</b>"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1519
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gui_interface.py:1729
+#: ../src/gui_interface.py:1532
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gui_interface.py:1740
+#: ../src/gui_interface.py:1543
 msgid "Error."
 msgstr ""
 
-#: ../src/gui_interface.py:1768
+#: ../src/gui_interface.py:1556
 msgid "Resource Conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:1769
+#: ../src/gui_interface.py:1557
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1816
+#: ../src/gui_interface.py:1604
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "Fellout a ra da %s kas deoc'h ur restr."
 
-#: ../src/gui_interface.py:1819
+#: ../src/gui_interface.py:1607
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Goulenn treuzkas"
 
-#: ../src/gui_interface.py:1927
+#: ../src/gui_interface.py:1716
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1928
+#: ../src/gui_interface.py:1717
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9333,15 +9625,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1936
+#: ../src/gui_interface.py:1725
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1956
+#: ../src/gui_interface.py:1745
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gui_interface.py:1957
+#: ../src/gui_interface.py:1746
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9352,13 +9644,13 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gui_interface.py:1987 ../src/gui_interface.py:2024
-#: ../src/gui_interface.py:2060
+#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
+#: ../src/gui_interface.py:1849
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Kevreadenn"
 
-#: ../src/gui_interface.py:1988
+#: ../src/gui_interface.py:1777
 #, fuzzy
 msgid ""
 "You are about to connect to the server with an insecure connection. This "
@@ -9366,18 +9658,18 @@ msgid ""
 "want to do that?"
 msgstr "Rankout a rit krouiñ ur gont a-raok gellout flapiñ gant tud all."
 
-#: ../src/gui_interface.py:1991 ../src/gui_interface.py:2028
-#: ../src/gui_interface.py:2063
+#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
+#: ../src/gui_interface.py:1852
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gui_interface.py:2025
+#: ../src/gui_interface.py:1814
 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/gui_interface.py:2061
+#: ../src/gui_interface.py:1850
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9385,59 +9677,59 @@ msgid ""
 msgstr "Rankout a rit krouiñ ur gont a-raok gellout flapiñ gant tud all."
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2624 ../src/gui_interface.py:2647
+#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Lazhet eo ar sifrañ"
 
-#: ../src/gui_interface.py:2625
+#: ../src/gui_interface.py:2423
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2648
+#: ../src/gui_interface.py:2446
 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/gui_interface.py:2679 ../src/roster_window.py:3560
+#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
 #, 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/gui_interface.py:3058
+#: ../src/gui_interface.py:2871
 msgid "Could not save your settings and preferences"
 msgstr "Dibosupl eo enrollañ ho tibarzhioù ha dibaboù"
 
-#: ../src/gui_interface.py:3592
+#: ../src/gui_interface.py:3411
 msgid "Passphrase Required"
 msgstr "Ger-kuzh ret"
 
-#: ../src/gui_interface.py:3593
+#: ../src/gui_interface.py:3412
 #, 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/gui_interface.py:3607
+#: ../src/gui_interface.py:3426
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gui_interface.py:3608
+#: ../src/gui_interface.py:3427
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Luget e voc'h da %s hep OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3617
+#: ../src/gui_interface.py:3436
 msgid "Wrong Passphrase"
 msgstr "Ger-kuzh faos"
 
-#: ../src/gui_interface.py:3618
+#: ../src/gui_interface.py:3437
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Adroit ho ker-kuzh GPG pe pouezit war Nullañ."
 
@@ -9476,6 +9768,11 @@ msgstr "Lesanv"
 msgid "Message"
 msgstr "Kemennadenn"
 
+#. holds subject
+#: ../src/history_manager.py:188 ../src/history_manager.py:219
+msgid "Subject"
+msgstr "Titl"
+
 #: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -9571,19 +9868,19 @@ msgstr "N'oc'h ket luget d'ar servijer"
 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:484
+#: ../src/message_window.py:485
 msgid "Chats"
 msgstr "Flapoù"
 
-#: ../src/message_window.py:486
+#: ../src/message_window.py:487
 msgid "Group Chats"
 msgstr "Flapoù a-stroll"
 
-#: ../src/message_window.py:488
+#: ../src/message_window.py:489
 msgid "Private Chats"
 msgstr "Flapoù prevez"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:495
 msgid "Messages"
 msgstr "Kemennadennoù"
 
@@ -9640,59 +9937,59 @@ msgstr "Kemennadenn nevez digant %(nickname)s"
 msgid "Ignore"
 msgstr "_Kenderc'hel"
 
-#: ../src/profile_window.py:57
+#: ../src/profile_window.py:58
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2935
+#: ../src/profile_window.py:111 ../src/roster_window.py:3001
 #, fuzzy
 msgid "File is empty"
 msgstr "Treug ar restr"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2938
+#: ../src/profile_window.py:114 ../src/roster_window.py:3004
 #, fuzzy
 msgid "File does not exist"
 msgstr "Ce salon n'existe pas."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2940 ../src/roster_window.py:2951
+#: ../src/profile_window.py:128 ../src/profile_window.py:144
+#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
 msgid "Could not load image"
 msgstr "Dibosupl eo kargañ ar skeudenn"
 
-#: ../src/profile_window.py:214
+#: ../src/profile_window.py:215
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Titouroù"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:216
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Stumm : BBBB-MM-DD"
 
-#: ../src/profile_window.py:269
+#: ../src/profile_window.py:270
 #, fuzzy
 msgid "Information received"
 msgstr "Resevet ar bedadenn"
 
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:341
 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:353
+#: ../src/profile_window.py:354
 msgid "Sending profile..."
 msgstr ""
 
-#: ../src/profile_window.py:368
+#: ../src/profile_window.py:369
 msgid "Information NOT published"
 msgstr ""
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:376
 msgid "vCard publication failed"
 msgstr "C'hwitet eo embannadur ar vCard"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:377
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9700,51 +9997,51 @@ msgstr ""
 "Bez ez eus bet ur fazi en ur embann ho titouroù hiniennel, klaskit en-dro "
 "diwezhatoc'h."
 
-#: ../src/roster_window.py:256 ../src/roster_window.py:1012
+#: ../src/roster_window.py:262 ../src/roster_window.py:1026
 msgid "Merged accounts"
 msgstr "Kontoù strollet"
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1942
 msgid "Authorization has been sent"
 msgstr "Kaset eo bet an aotre"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1943
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Anavezout a raio \"%s\" ho stad adalek bremañ."
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1966
 msgid "Subscription request has been sent"
 msgstr "Kaset eo bet ar goulenn goumanantiñ"
 
-#: ../src/roster_window.py:1944
+#: ../src/roster_window.py:1967
 #, 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:1958
+#: ../src/roster_window.py:1981
 msgid "Authorization has been removed"
 msgstr "Dilamet eo bet an aotre"
 
-#: ../src/roster_window.py:1959
+#: ../src/roster_window.py:1982
 #, 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:1986
+#: ../src/roster_window.py:2009
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:1987
+#: ../src/roster_window.py:2010
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Luget e voc'h da %s hep OpenPGP."
 
-#: ../src/roster_window.py:2199 ../src/roster_window.py:3496
+#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
 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:2200 ../src/roster_window.py:3497
+#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9752,39 +10049,39 @@ 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:2226
+#: ../src/roster_window.py:2249
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2288
+#: ../src/roster_window.py:2311
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2289
+#: ../src/roster_window.py:2312
 #, 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:2290
+#: ../src/roster_window.py:2313
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2373
+#: ../src/roster_window.py:2396
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Nullañ an treuzkas"
 
-#: ../src/roster_window.py:2374
+#: ../src/roster_window.py:2397
 msgid ""
-"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2405 ../src/roster_window.py:2653
+#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
 msgid "You have unread messages"
 msgstr "Kemennadennoù nevez ho peus"
 
-#: ../src/roster_window.py:2406
+#: ../src/roster_window.py:2429
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9792,17 +10089,17 @@ msgid ""
 msgstr ""
 "Posubl e vo lenn ar gemennadennoù diwezhatoc'h m'emañ an istoradur war enaou."
 
-#: ../src/roster_window.py:2654
+#: ../src/roster_window.py:2720
 #, 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:2657
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Dilamet e vo an nor \"%s\""
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2724
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -9811,12 +10108,12 @@ msgstr ""
 "N'helloc'h ket mui kas pe resev kemennadennoù d'an darempredoù liammet gant "
 "an nor-mañ."
 
-#: ../src/roster_window.py:2661
+#: ../src/roster_window.py:2727
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Dilamet e vo an nor \"%s\""
 
-#: ../src/roster_window.py:2666
+#: ../src/roster_window.py:2732
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9825,73 +10122,73 @@ msgstr ""
 "N'helloc'h ket mui kas pe resev kemennadennoù d'an darempredoù liammet gant "
 "an nor-mañ."
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2800
 #, fuzzy
 msgid "You are about to block a contact. 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:2736
+#: ../src/roster_window.py:2802
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2827
+#: ../src/roster_window.py:2893
 #, fuzzy
 msgid "Rename Contact"
 msgstr "Darempredoù"
 
-#: ../src/roster_window.py:2828
+#: ../src/roster_window.py:2894
 #, 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:2835
+#: ../src/roster_window.py:2901
 #, fuzzy
 msgid "Rename Group"
 msgstr "_Adenvel"
 
-#: ../src/roster_window.py:2836
+#: ../src/roster_window.py:2902
 #, 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:2881
+#: ../src/roster_window.py:2947
 #, fuzzy
 msgid "Remove Group"
 msgstr "_Dilemel"
 
-#: ../src/roster_window.py:2882
+#: ../src/roster_window.py:2948
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: ../src/roster_window.py:2883
+#: ../src/roster_window.py:2949
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Dilemel an darempred diouzh ar roll"
 
-#: ../src/roster_window.py:2922
+#: ../src/roster_window.py:2988
 msgid "Assign OpenPGP Key"
 msgstr "Assigner une clé OpenPGP"
 
-#: ../src/roster_window.py:2923
+#: ../src/roster_window.py:2989
 #, fuzzy
 msgid "Select a key to apply to the contact"
 msgstr "Dibabit un alc'hwezh da"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3372
 #, 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:3308
+#: ../src/roster_window.py:3374
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3313
+#: ../src/roster_window.py:3379
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9900,12 +10197,12 @@ msgstr ""
 "ac'hanoc'h evel pa vefec'h ezlinenn."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3319
+#: ../src/roster_window.py:3385
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Petra a fell deoc'h ober?"
 
-#: ../src/roster_window.py:3323
+#: ../src/roster_window.py:3389
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9913,17 +10210,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:3326
+#: ../src/roster_window.py:3392
 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:3330
+#: ../src/roster_window.py:3396
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Dilamet e vo an darempred \"%s\" diouzh ar roll"
 
-#: ../src/roster_window.py:3335
+#: ../src/roster_window.py:3401
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9932,68 +10229,68 @@ 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:3393
+#: ../src/roster_window.py:3459
 #, fuzzy
 msgid ""
 "You are about to send a custom status. 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:3395
+#: ../src/roster_window.py:3461
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he or she will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3414
+#: ../src/roster_window.py:3480
 msgid "No account available"
 msgstr "Kont ebet hegerz"
 
-#: ../src/roster_window.py:3415
+#: ../src/roster_window.py:3481
 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:4023
+#: ../src/roster_window.py:4095
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: ../src/roster_window.py:4025
+#: ../src/roster_window.py:4097
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: ../src/roster_window.py:4117
+#: ../src/roster_window.py:4189
 #, 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:4119
+#: ../src/roster_window.py:4191
 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:4234
+#: ../src/roster_window.py:4306
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Restr direizh"
 
-#: ../src/roster_window.py:4246
+#: ../src/roster_window.py:4318
 #, 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:4361
+#: ../src/roster_window.py:4433
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Kas %s"
 
-#: ../src/roster_window.py:4367
+#: ../src/roster_window.py:4439
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Strollañ %s ha %s"
@@ -10003,155 +10300,155 @@ msgstr "Strollañ %s ha %s"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4816 ../src/roster_window.py:4889
-#: ../src/roster_window.py:4898 ../src/statusicon.py:246
-#: ../src/statusicon.py:293 ../src/statusicon.py:299
+#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
+#: ../src/roster_window.py:4970 ../src/statusicon.py:263
+#: ../src/statusicon.py:310 ../src/statusicon.py:316
 #, python-format
 msgid "using account %s"
 msgstr "en ur implij ar gont %s"
 
 #. add
-#: ../src/roster_window.py:4905
+#: ../src/roster_window.py:4977
 #, python-format
 msgid "to %s account"
 msgstr "d'ar gont %s"
 
 #. disco
-#: ../src/roster_window.py:4910
+#: ../src/roster_window.py:4982
 #, python-format
 msgid "using %s account"
 msgstr "en ur implij ar gont %s"
 
-#: ../src/roster_window.py:4948 ../src/statusicon.py:309
+#: ../src/roster_window.py:5020 ../src/statusicon.py:326
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "Merañ ar sinedoù..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4968
+#: ../src/roster_window.py:5040
 #, python-format
 msgid "of account %s"
 msgstr "eus ar gont %s"
 
-#: ../src/roster_window.py:5009
+#: ../src/roster_window.py:5081
 #, python-format
 msgid "for account %s"
 msgstr "evit ar gont %s"
 
-#: ../src/roster_window.py:5069 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
 msgid "_Change Status Message"
 msgstr "_Kemmañ an titour-stad"
 
-#: ../src/roster_window.py:5102
+#: ../src/roster_window.py:5174
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Embann"
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5176
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Embann"
 
-#: ../src/roster_window.py:5107
+#: ../src/roster_window.py:5179
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Dizoleiñ ar servijoù..."
 
-#: ../src/roster_window.py:5252
+#: ../src/roster_window.py:5324
 msgid "_Maximize All"
 msgstr ""
 
-#: ../src/roster_window.py:5262 ../src/roster_window.py:5436
+#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "_Kas ur gemennadenn d'ar servijer"
 
-#: ../src/roster_window.py:5270
+#: ../src/roster_window.py:5342
 msgid "To all users"
 msgstr ""
 
-#: ../src/roster_window.py:5274
+#: ../src/roster_window.py:5346
 #, fuzzy
 msgid "To all online users"
 msgstr "Utilisateurs En _Ligne"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5456
+#: ../src/roster_window.py:5528
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Darempredoù"
 
 #. Edit Groups
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5537
 msgid "Edit _Groups"
 msgstr "Kemmañ ar _strolladoù"
 
 #. Send single message
-#: ../src/roster_window.py:5520
+#: ../src/roster_window.py:5592
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Kas ur gemennadenn simpl"
 
 #. Execute Command
-#: ../src/roster_window.py:5567
+#: ../src/roster_window.py:5639
 msgid "Execute Command..."
 msgstr ""
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5577
+#: ../src/roster_window.py:5649
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Dorioù"
 
 #. Modify Transport
-#: ../src/roster_window.py:5586
+#: ../src/roster_window.py:5658
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Dorioù"
 
 #. Rename
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5668
 msgid "_Rename"
 msgstr "_Adenvel"
 
-#: ../src/roster_window.py:5656
+#: ../src/roster_window.py:5728
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5665
+#: ../src/roster_window.py:5737
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Darempred diluget"
 
-#: ../src/roster_window.py:5672
+#: ../src/roster_window.py:5744
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Darempred diluget"
 
 #. History manager
-#: ../src/roster_window.py:5754
+#: ../src/roster_window.py:5833
 msgid "History Manager"
 msgstr "Merour an istoradur"
 
-#: ../src/roster_window.py:5765
+#: ../src/roster_window.py:5844
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "Ebarzhiñ ur sal-flapiñ"
 
-#: ../src/roster_window.py:5938
+#: ../src/roster_window.py:6019
 msgid "Change Status Message..."
 msgstr "Kemmañ an titour-stad..."
 
-#: ../src/search_window.py:94
+#: ../src/search_window.py:105
 msgid "Waiting for results"
 msgstr ""
 
-#: ../src/search_window.py:132 ../src/search_window.py:210
+#: ../src/search_window.py:143 ../src/search_window.py:220
 msgid "Error in received dataform"
 msgstr ""
 
 #. No result
-#: ../src/search_window.py:166 ../src/search_window.py:202
+#: ../src/search_window.py:177 ../src/search_window.py:212
 msgid "No result"
 msgstr ""
 
@@ -10164,21 +10461,22 @@ msgstr ""
 msgid "Subject: %s"
 msgstr "Sujed: %s\n"
 
-#: ../src/session.py:433 ../src/session.py:468
+#: ../src/session.py:447 ../src/session.py:491
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:435
+#: ../src/session.py:448
 #, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
+"The remote client wants '\n"
+"                            'to negotiate an session with these features:\n"
 "\n"
 "%s\n"
 "\n"
 "Are these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:469
+#: ../src/session.py:492
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10188,16 +10486,16 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/statusicon.py:210
+#: ../src/statusicon.py:227
 msgid "_Change Status Message..."
 msgstr "_Kemmañ an titour-stad..."
 
-#: ../src/statusicon.py:322
+#: ../src/statusicon.py:339
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Ket er roll"
 
-#: ../src/statusicon.py:333
+#: ../src/statusicon.py:350
 msgid "Hide this menu"
 msgstr "Kuzhat ar meuziad-mañ"
 
@@ -10339,41 +10637,41 @@ msgstr ""
 "N'eus ket bet kaset titouroù munut gant ar servij-mañ.\n"
 "Sur 'walc'h eo torr pe kamm"
 
-#: ../src/vcard.py:251
+#: ../src/vcard.py:265
 msgid "?Client:Unknown"
 msgstr "Dianav"
 
-#: ../src/vcard.py:253
+#: ../src/vcard.py:267
 msgid "?OS:Unknown"
 msgstr "Dianav"
 
-#: ../src/vcard.py:274
+#: ../src/vcard.py:288
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "Dianav"
 
-#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
+#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
 #, python-format
 msgid "since %s"
 msgstr "dibaoe %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:345
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:349
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Poelladoù</b>"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:357
 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:345
+#: ../src/vcard.py:359
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10381,30 +10679,71 @@ msgstr ""
 "Dedennet oc'h gant bezañs an darempred-mañ, met hennezh/hounnez n'eo ket "
 "gant ho hini"
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:361
 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:349
+#: ../src/vcard.py:363
 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:356
+#: ../src/vcard.py:370
 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:358
+#: ../src/vcard.py:372
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
+#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
 msgid " resource with priority "
 msgstr ""
 
+#, fuzzy
+#~ msgid "_Show event in systray"
+#~ msgstr "Diskouez er _roll hepken"
+
+#, fuzzy
+#~ msgid "Autodetect on every Gajim startup"
+#~ msgstr "K_evreañ en ur loc'hañ Gajim"
+
+#, fuzzy
+#~ msgid "Show systray:"
+#~ msgstr "Diskouez er _roll hepken"
+
+#, fuzzy
+#~ msgid "Nickname not allowed: %s"
+#~ msgstr "N'eus ket bet kavet al lesanv : %s"
+
+#, fuzzy
+#~ msgid "Room has been destroyed"
+#~ msgstr "Dilamet eo bet an aotre"
+
+#~ msgid "I would like to add you to my roster."
+#~ msgstr "Laouen 'vefen d'ho ouzhpennañ em roll-darempredoù."
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "nous sommes maintenant inscrits chez %s"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "Requête de désinscription de la part de %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "nous ne sommes plus dans la liste de %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "je Jid %s ne respecte pas la norma RFC. Il ne sera pas ajouté a votre "
+#~ "liste de contact. Utiliser un outil de gestion de liste de contact tel "
+#~ "que http://jru.jabberstudio.org/ pour le supprimer"
+
 #~ msgid "Account Modification"
 #~ msgstr "Kemmañ ar gont"
 
@@ -10466,34 +10805,6 @@ msgstr ""
 #~ msgid "gtk-delete"
 #~ msgstr "Dilemel"
 
-#, fuzzy
-#~ msgid "Add this contact to roster (Ctrl+D)"
-#~ msgstr "Ouzhennañ an darempred d'ar roll"
-
-#, fuzzy
-#~ msgid "Bookmark this room (Ctrl+B)"
-#~ msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
-
-#, fuzzy
-#~ msgid "Change your nickname (Ctrl+N)"
-#~ msgstr "Cheñch _lesanv"
-
-#, fuzzy
-#~ msgid "Invite contacts to the conversation (Ctrl+G)"
-#~ msgstr "a zo aketus d'ar gaozeadenn"
-
-#, fuzzy
-#~ msgid "Show a list of emoticons (Alt+M)"
-#~ msgstr "Klikit evit enlakaat ur boulomell (Alt+M)"
-
-#, fuzzy
-#~ msgid "Show a list of formattings"
-#~ msgstr "Klikit evit enlakaat ur boulomell (Alt+M)"
-
-#, fuzzy
-#~ msgid "Show a menu of advanced functions (Alt+D)"
-#~ msgstr "Klikit evit enlakaat ur boulomell (Alt+M)"
-
 #~ msgid ""
 #~ "All chat states\n"
 #~ "Composing only\n"
@@ -10520,9 +10831,6 @@ msgstr ""
 #~ msgid "gtk-cancel"
 #~ msgstr "Dilemel"
 
-#~ msgid "_Preferences"
-#~ msgstr "_Penndibaboù"
-
 #~ msgid "_Quit"
 #~ msgstr "_Kuitaat"
 
@@ -10877,9 +11185,6 @@ msgstr ""
 #~ msgid "The auto not available status message"
 #~ msgstr "An emc'hemennadenn evit ar stad \"Dihegerz\""
 
-#~ msgid "Use t_rayicon (aka. notification area icon)"
-#~ msgstr "_Implij an arlun-gelaouiñ (trayicon)"
-
 #~ msgid ""
 #~ "When a new event (message, file transfer request etc..) is received, the "
 #~ "following methods may be used to inform you about it. Please note that "
@@ -10982,13 +11287,6 @@ msgstr ""
 #~ "Support du gestionnaire de sessions indisponible (module gnome.ui "
 #~ "manquant)"
 
-#~ msgid ""
-#~ "Usage: %s %s %s \n"
-#~ "\t %s"
-#~ msgstr ""
-#~ "Implij: %s %s %s \n"
-#~ "\t %s"
-
 #~ msgid "Private Chat"
 #~ msgstr "Flap prevez"
 
diff --git a/po/cs.po b/po/cs.po
index cd94a389e672c346c159cb4a51e7a02c2eea3714..882cae4522e9abdbcb70c3d63e6691cb3928dddc 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -17,11 +17,15 @@
 # scippio <scippio@berounet.cz>, 2008.
 # Pihhan <pihhan@seznam.cz>, 2009.
 #
+#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 11:28+0200\n"
+"POT-Creation-Date: 2010-10-01 20:39+0200\n"
 "PO-Revision-Date: 2010-01-22 14:35+0100\n"
 "Last-Translator: Petr Menšík <pihhan@cipis.net>\n"
 "Language-Team: <>\n"
@@ -42,7 +46,7 @@ msgid "_Add Contact..."
 msgstr "Přid_at kontakt..."
 
 # FIXME: chtelo by to cesky vyraz pro service discovery
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:17
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
 msgid "_Discover Services"
 msgstr "_Prohlížet služby"
 
@@ -62,7 +66,7 @@ msgstr "_Otevři schránku Gmailu"
 msgid "_Personal Events"
 msgstr "Osobní údaje"
 
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:23
+#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
 msgid "_Start Chat..."
 msgstr "_Začít rozhovor"
 
@@ -94,10 +98,6 @@ msgid "<b>Please select a server</b>"
 msgstr "<b>Prosím Vyberte server</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid "@"
-msgstr ""
-
-#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
@@ -105,97 +105,97 @@ msgstr ""
 "Přidat tento certifikát do důvěryhodných.\n"
 "SHA1 otisk certifikátu:\n"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:10
 msgid "Anon_ymous authentication"
 msgstr "Anon_ymní autentizace"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Connect when I press Finish"
 msgstr "Připojit když stisknu Dokončit"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Průvodce vytváření účtu"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "I already have an account I want to _use"
 msgstr "Už mám účet který bych rád(a) použil(a)"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I want to _register for a new account"
 msgstr "Chtěl(a) bych za_registrovat nový účet"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:16
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 #: ../data/gui/accounts_window.ui.h:28
 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/gui/account_creation_wizard_window.ui.h:17
+#: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Spravovat..."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:18
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
 #: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2263 ../src/config.py:2342
-#: ../src/config.py:2355 ../src/config.py:3596 ../src/config.py:3671
-#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513
-#: ../src/dialogs.py:526 ../src/roster_window.py:2890
-#: ../src/roster_window.py:2896 ../src/roster_window.py:2901
+#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
+#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
+#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
+#: ../src/dialogs.py:527 ../src/roster_window.py:2956
+#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
 msgid "None"
 msgstr "Žádný"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:19
+#: ../data/gui/account_creation_wizard_window.ui.h:18
 msgid "Prox_y:"
 msgstr "Prox_y:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #: ../data/gui/accounts_window.ui.h:48
 msgid "Save pass_word"
 msgstr "Uložit _heslo"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:21
+#: ../data/gui/account_creation_wizard_window.ui.h:20
 msgid "Set my profile when I connect"
 msgstr "Nastavit profil, když se připojuji"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:22
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Use custom hostname/port"
 msgstr "Použít vlastní jméno počítače/port"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:23
+#: ../data/gui/account_creation_wizard_window.ui.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/gui/account_creation_wizard_window.ui.h:25
-#: ../data/gui/roster_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:16
 msgid "_Advanced"
 msgstr "_Rozšířené"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:25
 msgid "_Finish"
 msgstr "_Dokončit"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:27
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Hostname:"
 msgstr "Počítač: "
 
-#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #: ../data/gui/accounts_window.ui.h:62
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:28
 #: ../data/gui/accounts_window.ui.h:64
 msgid "_Password:"
 msgstr "_Heslo:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:29
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:31
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Server:"
 msgstr "_Server:"
 
@@ -303,17 +303,17 @@ msgstr "Křestní:"
 #. No configured account
 #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
 #: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592
-#: ../src/notify.py:608
+#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
+#: ../src/notify.py:616
 msgid "Gajim"
 msgstr "Gajim"
 
 #. FIXME: Ugly workaround.
 #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
 #. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:61
-#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121
-#: ../src/roster_window.py:2832 ../src/roster_window.py:5379
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
+#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
 msgid "General"
 msgstr "Obecné"
 
@@ -369,7 +369,7 @@ msgstr "Informace o Vás, jak jsou uloženy na serveru"
 
 #: ../data/gui/accounts_window.ui.h:35
 #: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:830
+#: ../src/dialogs.py:831
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -383,7 +383,7 @@ msgid "Mer_ge accounts"
 msgstr "_Spojit účty"
 
 #: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2356
+#: ../src/config.py:2358
 msgid "No key selected"
 msgstr "Není zvolen žádný klíč"
 
@@ -410,7 +410,7 @@ msgid "Priority will change automatically according to your status."
 msgstr "Priorita se automaticky změní podle vašeho stavu."
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5329
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
 msgid "Re_name"
 msgstr "Přejme_novat"
 
@@ -635,38 +635,43 @@ msgid "Deletes Message of the Day"
 msgstr "Smaže zprávu dne"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
+#, fuzzy
+msgid "Edit Archi_ving Preferences"
+msgstr "_Nastavení"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Edit _Privacy Lists..."
 msgstr "Upravit kontrolu soukromí..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sends a message to users currently connected to this server"
 msgstr "Poslat zprávu momentálně připojeným uživatelům tohoto serveru"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Set MOTD..."
 msgstr "Nastavit MOTD"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Nastaví Zprávu dne"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Show _XML Console"
 msgstr "Zobrazit _XML konzoli"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "Update MOTD..."
 msgstr "Upravit MOTD"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "Upraví Zprávu dne"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:11
 msgid "_Administrator"
 msgstr "_Správce"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:11
+#: ../data/gui/advanced_menuitem_menu.ui.h:12
 msgid "_Send Server Message..."
 msgstr "Ode_slat zprávu serveru"
 
@@ -700,7 +705,7 @@ msgid "All statuses"
 msgstr "VÅ¡echny stavy"
 
 #: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:233
+#: ../src/common/commands.py:106 ../src/common/helpers.py:239
 #: ../src/tooltips.py:193
 msgid "Away"
 msgstr "Pryč"
@@ -753,7 +758,7 @@ msgid "Have "
 msgstr "Má"
 
 #: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:249
 msgid "Invisible"
 msgstr "Neviditelný"
 
@@ -762,7 +767,7 @@ msgid "Launch a command"
 msgstr "Provést příkaz"
 
 #: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:216 ../src/tooltips.py:197
+#: ../src/common/helpers.py:222 ../src/tooltips.py:197
 msgid "Not Available"
 msgstr "Nedostupný"
 
@@ -806,12 +811,13 @@ msgid "_Disable existing sound for this event"
 msgstr "_Vypnout existující zvuky pro tuto událost"
 
 #: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in roster"
+#, fuzzy
+msgid "_Disable showing event in notification area"
 msgstr "_Vypnout zobrazování události v rosteru"
 
 #: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in systray"
-msgstr "_Vypnout zobrazování události vy systrayi"
+msgid "_Disable showing event in roster"
+msgstr "_Vypnout zobrazování události v rosteru"
 
 #: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
@@ -822,12 +828,13 @@ msgid "_Open chat window with user"
 msgstr "_Otevři okno rozhovoru s uživatelem"
 
 #: ../data/gui/advanced_notifications_window.ui.h:35
-msgid "_Show event in roster"
+#, fuzzy
+msgid "_Show event in notification area"
 msgstr "_Zobrazit událost v rosteru"
 
 #: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in systray"
-msgstr "_Zobrazit událost v systrayi"
+msgid "_Show event in roster"
+msgstr "_Zobrazit událost v rosteru"
 
 #: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
@@ -855,6 +862,45 @@ msgstr "Skupiny"
 msgid "when I'm in"
 msgstr "když jsem v "
 
+#: ../data/gui/archiving_preferences_window.ui.h:1
+msgid "<i>Method Auto</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "<i>Method Local</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:3
+msgid "<i>Method Manual</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:4
+#, fuzzy
+msgid "Auto"
+msgstr "Automaticky vstoupit"
+
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Concede"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "Forbid"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:7
+#, fuzzy
+msgid "No"
+msgstr "Žádný"
+
+#: ../data/gui/archiving_preferences_window.ui.h:8
+#, fuzzy
+msgid "Prefer"
+msgstr "Nastavení"
+
+#: ../data/gui/archiving_preferences_window.ui.h:9
+msgid "Yes"
+msgstr ""
+
 #: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Položka:"
@@ -881,8 +927,8 @@ msgstr "Blokované Kontakty"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5348
-#: ../src/roster_window.py:5476 ../src/roster_window.py:5609
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
+#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
 msgid "_Unblock"
 msgstr "_Odblokovat"
 
@@ -971,7 +1017,7 @@ msgid "_Start Chat"
 msgstr "_Začít rozhovor"
 
 #. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4184
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
 msgid "#"
 msgstr "č."
 
@@ -1019,13 +1065,49 @@ msgstr ""
 msgid "9"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:13
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Přidat kontakt do Seznamu (Ctrl+D)"
+
 #: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Procházet historii diskuze (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:15
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Pozvat kontakty k rozhovoru (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Zobraz seznam smajlíků (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
+msgid "Show a list of formattings"
+msgstr "Zobrazit seznam formátování"
+
+#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Zobrazit nabídku rozšířených funkcí (Alt+D)"
+
+#: ../data/gui/chat_control.ui.h:19
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr "Zobrazit profil kontaktu (Ctrl+I)"
+
+#: ../data/gui/chat_control.ui.h:20
+msgid "Toggle audio session"
+msgstr "Přepnout audio"
+
+#: ../data/gui/chat_control.ui.h:21
+msgid "Toggle video session"
+msgstr "Přepnout video"
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
 #: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "Ode_slat"
 
-#: ../data/gui/chat_control.ui.h:15 ../data/gui/groupchat_control.ui.h:3
+#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
 msgid "label"
 msgstr ""
 
@@ -1075,8 +1157,8 @@ msgstr "Upravit _skupiny"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5284
-#: ../src/roster_window.py:5444
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
+#: ../src/roster_window.py:5516
 msgid "In_vite to"
 msgstr "_Pozvat do"
 
@@ -1088,8 +1170,8 @@ msgstr "Pozvat kontakt"
 msgid "Remo_ve"
 msgstr "Odst_ranit"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5294
-#: ../src/roster_window.py:5533
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
+#: ../src/roster_window.py:5605
 msgid "Send Cus_tom Status"
 msgstr "Poslat vlastní stav"
 
@@ -1122,8 +1204,8 @@ msgid "_Allow him/her to see my status"
 msgstr "_Dovol kontaktu vidět můj stav"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5482 ../src/roster_window.py:5612
+#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
+#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
 msgid "_Block"
 msgstr "_Blokovat"
 
@@ -1133,8 +1215,8 @@ msgstr "_Zakaž mu/jí vidět můj stav"
 
 #: ../data/gui/contact_context_menu.ui.h:20
 #: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:21
-#: ../src/roster_window.py:5683
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
+#: ../src/roster_window.py:5755
 msgid "_History"
 msgstr "_Historie"
 
@@ -1268,7 +1350,7 @@ msgstr "<b>Barvy stavů u záložek rozhovoru</b>"
 msgid "Account row"
 msgstr "Účet"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:925
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
 msgid "Bold"
 msgstr "Tučné"
 
@@ -1306,7 +1388,7 @@ msgstr "Skupina"
 msgid "Inactive"
 msgstr "Neaktivní"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:926
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
 msgid "Italic"
 msgstr "Latinka"
 
@@ -1355,7 +1437,7 @@ msgstr "Změnit _předmět"
 msgid "Configure _Room..."
 msgstr "Nastavit _místnost"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1782
+#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
 msgid "_Bookmark"
 msgstr "_Záložky"
 
@@ -1415,19 +1497,31 @@ msgstr "_Odeslat soukromou zprávu"
 msgid "_Voice"
 msgstr "_Hlas"
 
+#: ../data/gui/groupchat_control.ui.h:1
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Přidat tuto místnost do záložek"
+
+#: ../data/gui/groupchat_control.ui.h:3
+msgid "Change the room's subject (Alt+T)"
+msgstr "Změnit téma místnosti (Alt+T)"
+
+#: ../data/gui/groupchat_control.ui.h:4
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Změ_nit přezdívku"
+
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Vytvoř nový zápis"
 
-#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
-msgid "From"
-msgstr "Odesílatel"
+#: ../data/gui/groups_post_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:2
+msgid "From:"
+msgstr "Odesílatel:"
 
-#. holds subject
-#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
-#: ../src/history_manager.py:219
-msgid "Subject"
-msgstr "Předmět"
+#: ../data/gui/groups_post_window.ui.h:3
+#: ../data/gui/single_message_window.ui.h:7
+msgid "Subject:"
+msgstr "Předmět:"
 
 #: ../data/gui/history_manager.ui.h:1
 msgid ""
@@ -1444,8 +1538,8 @@ msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Vítejte do Gajimova Správce Historie</b></big>"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3208
-#: ../src/dialogs.py:3305
+#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
+#: ../src/dialogs.py:3321
 msgid "Delete"
 msgstr "Smazat"
 
@@ -1503,12 +1597,75 @@ msgstr "Najít:"
 msgid "_Log conversation history"
 msgstr "_Zaznamenat historii konverzace"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
+msgid "approve"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:2
+msgid "body"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:3
+msgid "concede"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:4
+msgid "expire"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:5
+msgid "false"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:6
+msgid "forbid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:7
+#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+msgid "jid"
+msgstr "jid"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:8
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
+#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
+msgid "message"
+msgstr "zpráva"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
+msgid "oppose"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
+#, fuzzy
+msgid "otr"
+msgstr "Ostatní"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:11
+msgid "prefer"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:12
+msgid "require"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:13
+msgid "save"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:14
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
 msgid "Bro_wse Rooms"
 msgstr "_Prohlížet"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2180
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
 msgid "Join Group Chat"
 msgstr "Připojit se do diskuze"
 
@@ -1546,8 +1703,8 @@ msgstr "Server:"
 msgid "_Bookmark this room"
 msgstr "Přidat tuto místnost do záložek"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1341
-#: ../src/disco.py:1786
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../src/disco.py:1804
 msgid "_Join"
 msgstr "_Vstoupit"
 
@@ -1651,6 +1808,75 @@ msgstr "_Uživatel:"
 msgid "Passphrase"
 msgstr "Heslo"
 
+#: ../data/gui/plugins_window.ui.h:1
+msgid "&lt;empty&gt;"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:2
+msgid "<empty>"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:3
+#, fuzzy
+msgid "Authors:"
+msgstr "Au_torizuj"
+
+#: ../data/gui/plugins_window.ui.h:4
+#, fuzzy
+msgid "Available"
+msgstr "Přip_ojen"
+
+#: ../data/gui/plugins_window.ui.h:5
+#, fuzzy
+msgid "Configure"
+msgstr "_Nastavit"
+
+#: ../data/gui/plugins_window.ui.h:6
+#, fuzzy
+msgid "Descrition:"
+msgstr "Popis:"
+
+#: ../data/gui/plugins_window.ui.h:7
+msgid "Homepage:"
+msgstr "Dom. stránka:"
+
+#: ../data/gui/plugins_window.ui.h:8
+msgid "Install"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:9
+#, fuzzy
+msgid "Installed"
+msgstr "Stagnuje"
+
+#: ../data/gui/plugins_window.ui.h:10
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:11
+msgid "Plugins"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:12
+msgid "Uninstall"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:13
+#, fuzzy
+msgid "Version:"
+msgstr "GTK+ verze: "
+
+#: ../data/gui/plugins_window.ui.h:14
+msgid "button"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:15
+#, fuzzy
+msgid "homepage url"
+msgstr "Dom. stránka:"
+
 #: ../data/gui/popup_notification_window.ui.h:1
 #, fuzzy
 msgid "Event Type"
@@ -1779,121 +2005,101 @@ msgid "Always"
 msgstr "Pryč"
 
 #: ../data/gui/preferences_window.ui.h:31
-#, fuzzy
-msgid "Always use GNOME default applications"
-msgstr "Vždy použít OS/X výchozí aplikace"
-
-#: ../data/gui/preferences_window.ui.h:32
-#, fuzzy
-msgid "Always use KDE default applications"
-msgstr "Vždy použít OS/X výchozí aplikace"
-
-#: ../data/gui/preferences_window.ui.h:33
-#, fuzzy
-msgid "Always use Xfce default applications"
-msgstr "Vždy použít OS/X výchozí aplikace"
-
-#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Ptej se na stav při:"
 
-#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
 msgid "Audio / Video"
 msgstr "Audio / Video"
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:33
 msgid "Audio input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Audio output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:38
-#, fuzzy
-msgid "Autodetect on every Gajim startup"
-msgstr "_Připojit po startu Gajimu"
-
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:35
 msgid "Chat message:"
 msgstr "Zpráva diskuze:"
 
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:36
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Vždy při startu zkontroluj, zda je Gajim _výchozí Jabber klient"
 
-#: ../data/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:37
 #, fuzzy
 msgid "Composing only"
 msgstr "Píšu zprávu"
 
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:38
 msgid "Configure color and font of the interface"
 msgstr "Nastav barvu a písmo uživatelského rozhraní"
 
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:39
 msgid "Contact's message:"
 msgstr "Zpráva kontaktu:"
 
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:40
 msgid "Contact's nickname:"
 msgstr "Přezdívka kontaktu:"
 
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:41
 msgid "Custom"
 msgstr "Vlastní"
 
-#: ../data/gui/preferences_window.ui.h:46
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Detached roster with chat grouped by account"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Detached roster with detached chats"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:45
 msgid "Detached roster with single chat"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
-#: ../src/config.py:671
+#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
+#: ../src/config.py:665
 msgid "Disabled"
 msgstr "Vypnuto"
 
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:47
 msgid "Display _activity of contacts in roster"
 msgstr "Zobrazovat čin_nosti kontaktů v seznamu"
 
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:48
 msgid "Display _extra email details"
 msgstr "Zobraz _podrobnosti emailu"
 
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:49
 #, fuzzy
 msgid "Display _location of contacts in roster"
 msgstr "Zobrazovat _nálady kontaktů v seznamu"
 
-#: ../data/gui/preferences_window.ui.h:54
+#: ../data/gui/preferences_window.ui.h:50
 msgid "Display _tunes of contacts in roster"
 msgstr "Zobrazovat _hudbu kontaktů v seznamu"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display a_vatars of contacts in roster"
 msgstr "Zobrazovat a_vatary kontaktů v seznamu"
 
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display m_ood of contacts in roster"
 msgstr "Zobrazovat _nálady kontaktů v seznamu"
 
-#: ../data/gui/preferences_window.ui.h:57
+#: ../data/gui/preferences_window.ui.h:53
 msgid "Display status _messages of contacts in roster"
 msgstr "Zobrazovat p_opis stavu kontaktů v Seznamu"
 
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:54
 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 "
@@ -1903,7 +2109,7 @@ msgstr ""
 "vztahující se k rozhovoru. Tady můžete nastavit, které stavy rozhovoru "
 "chcete zobrazovat v oknech rozhovoru."
 
-#: ../data/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:55
 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 "
@@ -1913,7 +2119,7 @@ msgstr ""
 "vztahující se k rozhovoru. Tady můžete nastavit, které stavy rozhovoru "
 "chcete posílat svému protějšku."
 
-#: ../data/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:56
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1921,17 +2127,17 @@ msgstr ""
 "Gajim Vás upozorní o přávě odpojených kontaktech pomocí popupu v pravém "
 "dolním rohu obrazovky"
 
-#: ../data/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:58
 msgid "Hide all buttons in chat windows"
 msgstr "Skryje tlačítka v okně diskuze."
 
-#: ../data/gui/preferences_window.ui.h:63
+#: ../data/gui/preferences_window.ui.h:59
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
 msgstr "Pokud je zaškrtnuto, Gajim se připojí do této místnosti při spuštění"
 
-#: ../data/gui/preferences_window.ui.h:64
+#: ../data/gui/preferences_window.ui.h:60
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1939,13 +2145,13 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim uvede také informaci o odesilateli zprávy nového "
 "emailu"
 
-#: ../data/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:61
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Pokud je zaškrtnuto, Gajim změnít stav na 'Pryč' pokud je počítač nepoužíván."
 
-#: ../data/gui/preferences_window.ui.h:66
+#: ../data/gui/preferences_window.ui.h:62
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1953,7 +2159,7 @@ msgstr ""
 "Pokud je zaškrtnuto, Gajim změní stav na 'Nedostupný' pokud se počítač "
 "nepoužívá delší dobu"
 
-#: ../data/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1961,7 +2167,7 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim bude zobrazovat avatary kontaktů v okně Seznamu a v "
 "diskuzích"
 
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1969,14 +2175,14 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim bude zobrazovat popisy stavů kontaktů pod jménem v "
 "okně Seznamu a v diskuzích"
 
-#: ../data/gui/preferences_window.ui.h:69
+#: ../data/gui/preferences_window.ui.h:65
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "Pokud zaškrtnuto, Gajim bude zobrazovat avatary kontaktů v okně Seznamu a v "
 "diskuzích"
 
-#: ../data/gui/preferences_window.ui.h:70
+#: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the location of contacts in the roster window"
@@ -1984,21 +2190,21 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim bude zobrazovat avatary kontaktů v okně Seznamu a v "
 "diskuzích"
 
-#: ../data/gui/preferences_window.ui.h:71
+#: ../data/gui/preferences_window.ui.h:67
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
 "Pokud zaškrtnuto, Gajim bude zobrazovat avatary kontaktů v okně Seznamu a v "
 "diskuzích"
 
-#: ../data/gui/preferences_window.ui.h:72
+#: ../data/gui/preferences_window.ui.h:68
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Pokud zaškrtnuto, Gajim bude zobrazovat avatary kontaktů v okně Seznamu a v "
 "diskuzích"
 
-#: ../data/gui/preferences_window.ui.h:73
+#: ../data/gui/preferences_window.ui.h:69
 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 "
@@ -2008,7 +2214,7 @@ msgstr ""
 "nastavení jazyk přes pravé tlačítko na vstupním poli, tak se použije výchozí "
 "jazyk pro tento kontakt nebo diskuzi."
 
-#: ../data/gui/preferences_window.ui.h:74
+#: ../data/gui/preferences_window.ui.h:70
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -2018,7 +2224,7 @@ msgstr ""
 "rozvahou, protože tato volba zakáže všechny zprávy od kontaktů, které ještě "
 "nemáte v rosteru"
 
-#: ../data/gui/preferences_window.ui.h:75
+#: ../data/gui/preferences_window.ui.h:71
 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 "
@@ -2028,7 +2234,7 @@ msgstr ""
 "použití E2E musí protějšek souhlasit se záznamem, jinak zprávy nebudou "
 "zaznamenávány."
 
-#: ../data/gui/preferences_window.ui.h:76
+#: ../data/gui/preferences_window.ui.h:72
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -2036,7 +2242,7 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim uvede také informaci o odesilateli zprávy nového "
 "emailu"
 
-#: ../data/gui/preferences_window.ui.h:77
+#: ../data/gui/preferences_window.ui.h:73
 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, "
@@ -2046,7 +2252,7 @@ msgstr ""
 "z MSN bude mít odpovídající ikonu msn pro stavy připojen, pryč, nerušit, "
 "atd...)"
 
-#: ../data/gui/preferences_window.ui.h:78
+#: ../data/gui/preferences_window.ui.h:74
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -2054,7 +2260,7 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim se nebude pokáždé ptát na zprávu stavu. Místo toho "
 "použije výchozí nadefinovanou zprávu."
 
-#: ../data/gui/preferences_window.ui.h:79
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2062,45 +2268,45 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim nahradí ascii smajlíky jako ':)' za ekvivalentní "
 "animované nebo statické grafické smajlíky"
 
-#: ../data/gui/preferences_window.ui.h:80
+#: ../data/gui/preferences_window.ui.h:76
 msgid "Log _encrypted chat session"
 msgstr "Logovat šifrované rozhovory"
 
-#: ../data/gui/preferences_window.ui.h:81
+#: ../data/gui/preferences_window.ui.h:77
 msgid "Ma_ke message windows compact"
 msgstr "Udělej o_kna zpráv kompaktní"
 
-#: ../data/gui/preferences_window.ui.h:82
+#: ../data/gui/preferences_window.ui.h:78
 msgid "Ma_nage..."
 msgstr "Sp_ravovat..."
 
-#: ../data/gui/preferences_window.ui.h:83
+#: ../data/gui/preferences_window.ui.h:79
 #, fuzzy
 msgid "Never"
 msgstr "Server"
 
-#: ../data/gui/preferences_window.ui.h:84
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Notifications"
 msgstr "Upozornění"
 
-#: ../data/gui/preferences_window.ui.h:85
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Notify me about contacts that sign _in"
 msgstr "Upozorni mě na kontakty které se přihlásí"
 
-#: ../data/gui/preferences_window.ui.h:86
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Notify me about contacts that sign _out"
 msgstr "Upozorni mě na kontakty které se odhlásí"
 
-#: ../data/gui/preferences_window.ui.h:87
+#: ../data/gui/preferences_window.ui.h:83
 #, fuzzy
 msgid "Notify me about it"
 msgstr "Upozorni mě na kontakty které se odhlásí"
 
-#: ../data/gui/preferences_window.ui.h:88
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notify on new _GMail email"
 msgstr "Upozorni při novém _GMail emailu"
 
-#: ../data/gui/preferences_window.ui.h:89
+#: ../data/gui/preferences_window.ui.h:85
 #, fuzzy
 msgid "Only when pending events"
 msgstr ""
@@ -2109,55 +2315,56 @@ msgstr ""
 "Vždy"
 
 # FIXME: snad je to ok?
-#: ../data/gui/preferences_window.ui.h:90
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Personal Events"
 msgstr "Moje události"
 
-#: ../data/gui/preferences_window.ui.h:91
+#: ../data/gui/preferences_window.ui.h:87
 msgid "Play _sounds"
 msgstr "Přehrávat _zvuky"
 
-#: ../data/gui/preferences_window.ui.h:92
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Pop it up"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:93
+#: ../data/gui/preferences_window.ui.h:89
 msgid "Preferences"
 msgstr "Nastavení"
 
-#: ../data/gui/preferences_window.ui.h:94
+#: ../data/gui/preferences_window.ui.h:90
 msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:96
+#: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
 msgid "STUN server:"
 msgstr "Server:"
 
-#: ../data/gui/preferences_window.ui.h:97
+#: ../data/gui/preferences_window.ui.h:93
+#, fuzzy
+msgid "Show notification area icon:"
+msgstr "Notification-daemon"
+
+#: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
 msgid "Show only in roster"
 msgstr "_Zobrazit událost v rosteru"
 
-#: ../data/gui/preferences_window.ui.h:98
-msgid "Show systray:"
-msgstr "Zobraz oznamovací oblast:"
-
-#: ../data/gui/preferences_window.ui.h:99
+#: ../data/gui/preferences_window.ui.h:95
 msgid "Sign _in"
 msgstr "_Přihlásí"
 
-#: ../data/gui/preferences_window.ui.h:100
+#: ../data/gui/preferences_window.ui.h:96
 msgid "Sign _out"
 msgstr "_Odhlásí"
 
-#: ../data/gui/preferences_window.ui.h:101
+#: ../data/gui/preferences_window.ui.h:97
 msgid "Single window for everything"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:102
+#: ../data/gui/preferences_window.ui.h:98
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2165,27 +2372,27 @@ msgstr ""
 "Některé zprávy mohou obsahovat formátování (odsazení, barvy aj.). Pokud je "
 "zaškrtnuto, Gajim zobrazí pouze čistý text."
 
-#: ../data/gui/preferences_window.ui.h:103
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sort contacts by status"
 msgstr "Seřadit podle stavu"
 
-#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
 msgid "Status"
 msgstr "Stav"
 
-#: ../data/gui/preferences_window.ui.h:105
+#: ../data/gui/preferences_window.ui.h:101
 msgid "Status _iconset:"
 msgstr "Výchozí _ikony stavů:"
 
-#: ../data/gui/preferences_window.ui.h:106
+#: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Styl"
 
-#: ../data/gui/preferences_window.ui.h:107
+#: ../data/gui/preferences_window.ui.h:103
 msgid "T_heme:"
 msgstr "_Téma:"
 
-#: ../data/gui/preferences_window.ui.h:108
+#: ../data/gui/preferences_window.ui.h:104
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2197,7 +2404,7 @@ msgstr ""
 "$S se nahradí za předchozí popis stavu\n"
 "$T se nahradí dobou nečinnosti před zapnutím stavu Pryč"
 
-#: ../data/gui/preferences_window.ui.h:111
+#: ../data/gui/preferences_window.ui.h:107
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2209,119 +2416,124 @@ msgstr ""
 "$S se nahradí za předchozí popis stavu\n"
 "$T se nahradí dobou nečinnosti před zapnutím stavu Nedostupný"
 
-#: ../data/gui/preferences_window.ui.h:114
+#: ../data/gui/preferences_window.ui.h:110
 msgid "Use _transports icons"
 msgstr "Používat ikony _transportů"
 
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:111
+#, fuzzy
+msgid "Use default applications"
+msgstr "Vždy použít OS/X výchozí aplikace"
+
+#: ../data/gui/preferences_window.ui.h:112
 msgid "Use system _default"
 msgstr "Použij nastavení _systému"
 
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:113
 msgid "Video framerate"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:117
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Video input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:118
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Video output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:119
+#: ../data/gui/preferences_window.ui.h:116
 msgid "Video size"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:120
+#: ../data/gui/preferences_window.ui.h:117
 msgid "When new event is received:"
 msgstr "Když je přijata nová zpráva"
 
-#: ../data/gui/preferences_window.ui.h:121
+#: ../data/gui/preferences_window.ui.h:118
 msgid "Your message:"
 msgstr "Vaše zpráva:"
 
-#: ../data/gui/preferences_window.ui.h:122
+#: ../data/gui/preferences_window.ui.h:119
 msgid "Your nickname:"
 msgstr "Vaše přezdívka:"
 
-#: ../data/gui/preferences_window.ui.h:123
+#: ../data/gui/preferences_window.ui.h:120
 msgid "_Away after:"
 msgstr "_Automaticky pryč po:"
 
-#: ../data/gui/preferences_window.ui.h:124
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Prohlížeč:"
 
-#: ../data/gui/preferences_window.ui.h:125
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Display chat state notifications:"
 msgstr "Zobrazovat _události stavu rozhovoru:"
 
-#: ../data/gui/preferences_window.ui.h:126
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Emoticons:"
 msgstr "_Smajlíky:"
 
-#: ../data/gui/preferences_window.ui.h:127
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_File manager:"
 msgstr "_Správce souborů:"
 
-#: ../data/gui/preferences_window.ui.h:128
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_Highlight misspelled words"
 msgstr "Zvýrazňovat _slova s překlepy"
 
-#: ../data/gui/preferences_window.ui.h:129
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorovat události od kontaktů mimo můj Seznam"
 
-#: ../data/gui/preferences_window.ui.h:130
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignoruj formátování v příchozích zprávách"
 
-#: ../data/gui/preferences_window.ui.h:131
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Log status changes of contacts"
 msgstr "Zaznamenávat změny _stavu kontaktů"
 
-#: ../data/gui/preferences_window.ui.h:132
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Mail client:"
 msgstr "E-_mailový klient:"
 
-#: ../data/gui/preferences_window.ui.h:133
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Not available after:"
 msgstr "Automaticky _nedostupný po:"
 
-#: ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Open..."
 msgstr "_Otevřít..."
 
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Reset to Default Colors"
 msgstr "_Vrátit k výchozím barvám"
 
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Send chat state notifications:"
 msgstr "Zobrazovat _události stavu rozhovoru:"
 
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Status message:"
 msgstr "_Stav:"
 
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_URL highlight:"
 msgstr "Zvýraznění _URL:"
 
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_Window behavior:"
 msgstr "Chování _okna"
 
-#: ../data/gui/preferences_window.ui.h:140
+#: ../data/gui/preferences_window.ui.h:137
 msgid "in _group chats"
 msgstr "v _diskuzích"
 
-#: ../data/gui/preferences_window.ui.h:141
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _roster"
 msgstr "v _rosteru"
 
-#: ../data/gui/preferences_window.ui.h:142
+#: ../data/gui/preferences_window.ui.h:139
 msgid "minutes"
 msgstr "minutách"
 
@@ -2373,7 +2585,7 @@ msgstr "Jabber ID"
 msgid "Order:"
 msgstr "Pořadí:"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3436
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
 msgid "Privacy List"
 msgstr "Nastavení Soukromí"
 
@@ -2584,8 +2796,8 @@ msgstr "Odstranit účet z Gajimu i ze _serveru"
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5492 ../src/roster_window.py:5622
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
+#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
 msgid "_Remove"
 msgstr "Odst_ranit"
 
@@ -2629,56 +2841,60 @@ msgid "Help online"
 msgstr "Nápověda online"
 
 #: ../data/gui/roster_window.ui.h:8
+msgid "P_lugins"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:9
 msgid "Profile, A_vatar"
 msgstr "Profil, A_vatar"
 
-#: ../data/gui/roster_window.ui.h:9
+#: ../data/gui/roster_window.ui.h:10
 msgid "Show Only _Active Contacts"
 msgstr "Zobrazit pouze _aktivní kontakty"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
 msgid "Show Trans_ports"
 msgstr "Zobrazuj trans_porty"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
 msgid "Show _Offline Contacts"
 msgstr "Zobrazit _odpojené kontakty"
 
-#: ../data/gui/roster_window.ui.h:12 ../src/statusicon.py:326
+#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
 msgid "Show _Roster"
 msgstr "Zobrazit _Seznam"
 
-#: ../data/gui/roster_window.ui.h:13
+#: ../data/gui/roster_window.ui.h:14
 msgid "_Accounts"
 msgstr "Úč_ty"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
 #: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Akce"
 
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
 msgid "_Contents"
 msgstr "_Obsah"
 
-#: ../data/gui/roster_window.ui.h:18 ../src/disco.py:1502
+#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
 msgid "_Edit"
 msgstr "_Úpravy"
 
-#: ../data/gui/roster_window.ui.h:19
+#: ../data/gui/roster_window.ui.h:20
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Help"
 msgstr "_Nápověda"
 
-#: ../data/gui/roster_window.ui.h:22
+#: ../data/gui/roster_window.ui.h:23
 msgid "_Send Single Message..."
 msgstr "Odeslat jednoduchou _zprávu..."
 
-#: ../data/gui/roster_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:25
 msgid "_View"
 msgstr "_Zobraz"
 
@@ -2695,11 +2911,11 @@ msgid "_Add contact"
 msgstr "Přidat _kontakt"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5634
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
 msgid "_Information"
 msgstr "Informace o kontaktu"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1353
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
 msgid "_Search"
 msgstr "_Najít"
 
@@ -2719,10 +2935,6 @@ msgstr "Zaregistrovat"
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: ../data/gui/single_message_window.ui.h:2
-msgid "From:"
-msgstr "Odesílatel:"
-
 #: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Odpovědět na tuto zprávu"
@@ -2739,10 +2951,6 @@ msgstr "Odeslat zprávu"
 msgid "Send message and close window"
 msgstr "Odeslat zprávu a zavřít okno"
 
-#: ../data/gui/single_message_window.ui.h:7
-msgid "Subject:"
-msgstr "Předmět:"
-
 #: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Příjemce:"
@@ -2950,25 +3158,35 @@ msgstr "Gajim Instant Messenger"
 msgid "Jabber IM Client"
 msgstr "Jabber IM klient"
 
-#: ../src/adhoc_commands.py:314
+#: ../src/adhoc_commands.py:323
 msgid "Cancel confirmation"
 msgstr "Zrušit ověření"
 
-#: ../src/adhoc_commands.py:315
+#: ../src/adhoc_commands.py:324
 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:351 ../src/adhoc_commands.py:374
+#: ../src/adhoc_commands.py:370
+#, fuzzy
+msgid "Invalid Form"
+msgstr "Neplatná místnost"
+
+#: ../src/adhoc_commands.py:371
+#, fuzzy
+msgid "The form is not filled correctly."
+msgstr "Jabber ID diskuze obsahuje nepřijatelné znaky."
+
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
 msgid "Service sent malformed data"
 msgstr "Služba odeslala chybné data"
 
-#: ../src/adhoc_commands.py:360
+#: ../src/adhoc_commands.py:399
 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:471
+#: ../src/adhoc_commands.py:513
 msgid "Service returned an error."
 msgstr "Služba vrátila chybu."
 
@@ -2993,7 +3211,7 @@ msgstr "Číslo"
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:945
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
 msgid "Color"
 msgstr "Barva"
 
@@ -3031,184 +3249,184 @@ msgstr[2] "Dostal(a) jste novou položku: "
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "English"
 msgstr "Angličtina"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Belarusian"
 msgstr "Běloruština"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Bulgarian"
 msgstr "Bulharština"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Breton"
 msgstr "Bretonština"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Czech"
 msgstr "Čeština"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "German"
 msgstr "Němčina"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Greek"
 msgstr "Řečtina"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "British"
 msgstr "Britština"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Spanish"
 msgstr "Španělština"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Basque"
 msgstr "Baskičtina"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "French"
 msgstr "Francouzština"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Croatian"
 msgstr "Chorvatština"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Italian"
 msgstr "Italština"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian (b)"
 msgstr "Norština (b)"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Dutch"
 msgstr "Holandština"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian"
 msgstr "Norština"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Polish"
 msgstr "Polština"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Portuguese"
 msgstr "Portugalština"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Brazilian Portuguese"
 msgstr "Brazilská portugalština"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Russian"
 msgstr "Ruština"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Serbian"
 msgstr "Srbština"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Slovak"
 msgstr "Slovenština"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Swedish"
 msgstr "Švédština"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Chinese (Ch)"
 msgstr "Čínština"
 
-#: ../src/chat_control.py:479
+#: ../src/chat_control.py:496
 msgid "Spelling language"
 msgstr "Kontrola jazyka"
 
 #. we are not connected
-#: ../src/chat_control.py:511 ../src/chat_control.py:720
+#: ../src/chat_control.py:528 ../src/chat_control.py:737
 msgid "A connection is not available"
 msgstr "Spojení není dostupné"
 
-#: ../src/chat_control.py:512 ../src/chat_control.py:721
+#: ../src/chat_control.py:529 ../src/chat_control.py:738
 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:927
+#: ../src/chat_control.py:944
 msgid "Underline"
 msgstr "Podtrhnout"
 
-#: ../src/chat_control.py:928
+#: ../src/chat_control.py:945
 msgid "Strike"
 msgstr "Přeškrtnout"
 
-#: ../src/chat_control.py:951
+#: ../src/chat_control.py:968
 msgid "Font"
 msgstr "Font"
 
-#: ../src/chat_control.py:960
+#: ../src/chat_control.py:977
 msgid "Clear formating"
 msgstr "Smazat formátování"
 
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1055
 msgid "Really send file?"
 msgstr "Opravdu odeslat soubor?"
 
-#: ../src/chat_control.py:1039
+#: ../src/chat_control.py:1056
 #, 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:1503 ../src/chat_control.py:1987
+#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
 msgid "GPG encryption enabled"
 msgstr "GPG Šifrování zapnuto"
 
 #. Add to roster
-#: ../src/chat_control.py:1528 ../src/common/contacts.py:158
+#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
 #: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:245 ../src/dialogs.py:1064 ../src/dialogs.py:2078
-#: ../src/dialogs.py:2107 ../src/gui_interface.py:674
+#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
+#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
 #: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1610 ../src/roster_window.py:1612
-#: ../src/roster_window.py:1942 ../src/roster_window.py:3289
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
+#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
+#: ../src/roster_window.py:3382
 msgid "Not in Roster"
 msgstr "Není v Rosteru"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1575
 msgid "This contact does not support file transfer."
 msgstr "Tento kontakt nepodporuje přenos souborů."
 
-#: ../src/chat_control.py:1561
+#: ../src/chat_control.py:1578
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr "Musíš znát skutečné JID kontaktu, aby mu bylo možné  poslat souboru."
 
-#: ../src/chat_control.py:1656
+#: ../src/chat_control.py:1677
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s stav: %(state)s, důvod: %(reason)s"
 
-#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:1869
 #, 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:1967 ../src/dialogs.py:4866
+#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
 msgid "No GPG key assigned"
 msgstr "Nepřiřazen GPG klíč"
 
-#: ../src/chat_control.py:1968
+#: ../src/chat_control.py:1991
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3216,50 +3434,50 @@ msgstr ""
 "Tento kontakt nemá přiřazen GPG klíč. Proto nemůžeš šifrovat pomocí GPG "
 "zprávy."
 
-#: ../src/chat_control.py:1977
+#: ../src/chat_control.py:2000
 msgid "GPG encryption disabled"
 msgstr "GPG Šifrování vypnuto"
 
-#: ../src/chat_control.py:2003
+#: ../src/chat_control.py:2026
 msgid "Session WILL be logged"
 msgstr "Sezení BUDE logováno"
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:2028
 msgid "Session WILL NOT be logged"
 msgstr "Sezení NEBUDE logováno"
 
 #. encryption %s active
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is"
 msgstr "je"
 
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is NOT"
 msgstr "NENÍ"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will"
 msgstr "bude"
 
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will NOT"
 msgstr "NEBUDE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2051
 msgid "and authenticated"
 msgstr "a autentizovaný"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2032
+#: ../src/chat_control.py:2055
 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:2039
+#: ../src/chat_control.py:2062
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3268,62 +3486,69 @@ msgstr ""
 "Šifrování %(type)s %(status)s aktivní %(authenticated)s.\n"
 "Váš rozhovor %(logged)s zaznamenáván."
 
-#: ../src/chat_control.py:2182
+#: ../src/chat_control.py:2205
 msgid "Session negotiation cancelled"
 msgstr "Sezení bylo zrušeno"
 
-#: ../src/chat_control.py:2191
+#: ../src/chat_control.py:2215
+msgid "This session WILL be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2217
+#, fuzzy
+msgid "This session WILL NOT be archived on server"
+msgstr "Sezení NEBUDE logováno"
+
+#: ../src/chat_control.py:2226
 msgid "This session is encrypted"
 msgstr "Toto sezení je šifrované"
 
-#: ../src/chat_control.py:2194
+#: ../src/chat_control.py:2229
 msgid " and WILL be logged"
 msgstr "a BUDE zaznamenáváno"
 
-#: ../src/chat_control.py:2196
+#: ../src/chat_control.py:2231
 msgid " and WILL NOT be logged"
 msgstr "a NEBUDE zaznamenáváno"
 
-#: ../src/chat_control.py:2201
+#: ../src/chat_control.py:2236
 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:2203
+#: ../src/chat_control.py:2238
 msgid "E2E encryption disabled"
 msgstr "E2E Šifrování vypnuto"
 
-#: ../src/chat_control.py:2241 ../src/chat_control.py:2254
+#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
 msgid "The following message was NOT encrypted"
 msgstr "Následující zpráva NEBYLA šifrovaná"
 
-#: ../src/chat_control.py:2247
+#: ../src/chat_control.py:2288
 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:2519
+#: ../src/chat_control.py:2566
 #, 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:2520
+#: ../src/chat_control.py:2567
 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:2663 ../src/common/connection_handlers.py:1635
-#: ../src/common/connection_handlers.py:1758
-#: ../src/common/connection_handlers.py:1960
-#: ../src/common/connection_handlers.py:2110 ../src/common/connection.py:452
+#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
 #: ../src/gajim.py:159 ../src/session.py:138
 msgid "Database Error"
 msgstr "Chyba Databáze"
 
-#: ../src/chat_control.py:2664
+#: ../src/chat_control.py:2714
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3332,7 +3557,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:2906
+#: ../src/chat_control.py:2962
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s je nyní %(status)s"
@@ -3346,28 +3571,28 @@ msgstr "vytvářím databázi historie"
 msgid "creating cache database"
 msgstr "vytvářím databázi historie"
 
-#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
-#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
-#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
-#: ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
 #, 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:275 ../src/common/check_paths.py:282
-#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
-#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
-#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:333
+#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
+#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
+#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
 msgid "Gajim will now exit"
 msgstr "Gajim se nyní ukončí"
 
-#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
+#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
 #, 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:342
+#: ../src/common/check_paths.py:351
 #, python-format
 msgid "creating %s directory"
 msgstr "vytvářím adresář %s "
@@ -3431,9 +3656,9 @@ msgstr "Vyber diskuze, které chceš opustit"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:801
-#: ../src/roster_window.py:1614 ../src/roster_window.py:1616
-#: ../src/roster_window.py:5251
+#: ../src/common/helpers.py:57 ../src/roster_window.py:815
+#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
+#: ../src/roster_window.py:5323
 msgid "Groupchats"
 msgstr "Diskuze"
 
@@ -3493,7 +3718,9 @@ 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:88
-msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+#, fuzzy
+msgid ""
+"When to show notification area 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'."
@@ -3545,9 +3772,9 @@ msgstr ""
 "Seznam (oddělené mezerami) řádků (účtů a skupin), které budou \"zhroucené\"."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:501
-#: ../src/common/optparser.py:290 ../src/common/optparser.py:486
-#: ../src/common/optparser.py:520 ../src/gui_interface.py:3370
+#: ../src/common/config.py:106 ../src/common/config.py:505
+#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
+#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
 msgid "default"
 msgstr "výchozí"
 
@@ -3771,7 +3998,8 @@ msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard říká KiB = 1024 bytů, KB = 1000 bytů."
 
 #: ../src/common/config.py:197
-msgid "Notify of events in the system trayicon."
+#, fuzzy
+msgid "Notify of events in the notification area."
 msgstr "Upozorni na události v systémovém trayi."
 
 #: ../src/common/config.py:203
@@ -3807,9 +4035,10 @@ msgid ""
 msgstr "Středníkem oddělený seznam slov, které budou zvýrazněny v diskuzích."
 
 #: ../src/common/config.py:221
+#, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
+"setting is taken into account only if notification icon is used."
 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."
@@ -4080,9 +4309,10 @@ msgstr ""
 "smazány."
 
 #: ../src/common/config.py:270
+#, fuzzy
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
-"systray icon."
+"notification icon."
 msgstr ""
 "Je-li povoleno, Upozorňovací démon přidá upozornění do systémové lišty."
 
@@ -4273,112 +4503,123 @@ msgstr ""
 msgid "Message that is sent to contacts you want to add"
 msgstr "Prosím vyplňte údaje o kontaktu, který chcete přidat"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:374
+msgid "Last time we syncronized with logs from server."
+msgstr ""
+
+#: ../src/common/config.py:436
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Je OpenPGP povoleno pro tento kontakt?"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:437
 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:437 ../src/common/config.py:440
+#: ../src/common/config.py:438 ../src/common/config.py:441
 msgid "Language for which we want to check misspelled words"
 msgstr "Jazyk, pro který chcete kontrolovat překlepy ve slovech"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:447
 msgid "all or space separated status"
 msgstr "všechny nebo mezerou oddělené stavy"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:448
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', nebo 'both'"
 
-#: ../src/common/config.py:448 ../src/common/config.py:450
-#: ../src/common/config.py:451 ../src/common/config.py:454
-#: ../src/common/config.py:455
+#: ../src/common/config.py:449 ../src/common/config.py:451
+#: ../src/common/config.py:452 ../src/common/config.py:455
+#: ../src/common/config.py:456
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' nebo ''"
 
-#: ../src/common/config.py:461 ../src/common/pep.py:157
+#: ../src/common/config.py:460
+msgid ""
+"State whether plugins should be activated on exit (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
+msgstr ""
+
+#: ../src/common/config.py:465 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Spím"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back soon"
 msgstr "Hned jsem zpět"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back in some minutes."
 msgstr "Jsem zpátky za pár minut."
 
-#: ../src/common/config.py:463 ../src/common/pep.py:127
+#: ../src/common/config.py:467 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Jím"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:467
 msgid "I'm eating, so leave me a message."
 msgstr "Právě jím, prosím zanechte mi zprávu."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "I'm watching a movie."
 msgstr "Dívám se na film."
 
-#: ../src/common/config.py:465 ../src/common/pep.py:186
+#: ../src/common/config.py:469 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Pracuji"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:469
 msgid "I'm working."
 msgstr "Právě pracuji."
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "I'm on the phone."
 msgstr "Zrovna telefonuji."
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "Out"
 msgstr "Venku"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "I'm out enjoying life."
 msgstr "Užívám si života venku."
 
-#: ../src/common/config.py:478
+#: ../src/common/config.py:482
 msgid "I'm available."
 msgstr "Jsem dostupný."
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:483
 msgid "I'm free for chat."
 msgstr "Hledám někoho na pokec."
 
-#: ../src/common/config.py:480 ../src/config.py:1600
+#: ../src/common/config.py:484 ../src/config.py:1600
 msgid "Be right back."
 msgstr "Hned jsem zpět."
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:485
 msgid "I'm not available."
 msgstr "Nejsem dostupný."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:486
 msgid "Do not disturb."
 msgstr "Nerušit."
 
-#: ../src/common/config.py:483 ../src/common/config.py:484
+#: ../src/common/config.py:487 ../src/common/config.py:488
 msgid "Bye!"
 msgstr "Zdar!"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:498
 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."
@@ -4386,88 +4627,84 @@ 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:495
+#: ../src/common/config.py:499
 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:504 ../src/common/optparser.py:304
+#: ../src/common/config.py:508 ../src/common/optparser.py:308
 msgid "green"
 msgstr "zelený"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:290
+#: ../src/common/config.py:512 ../src/common/optparser.py:294
 msgid "grocery"
 msgstr "potraviny"
 
-#: ../src/common/config.py:512
+#: ../src/common/config.py:516
 msgid "human"
 msgstr "člověk"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:520
 msgid "marine"
 msgstr "mariňák"
 
-#: ../src/common/connection_handlers.py:84
+#: ../src/common/connection_handlers.py:94
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Nelze nahrát idle modul"
 
-#: ../src/common/connection_handlers.py:117
+#: ../src/common/connection_handlers.py:127
 #, 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:124
+#: ../src/common/connection_handlers.py:134
 msgid "Registration succeeded"
 msgstr "Registrace úspěšná"
 
-#: ../src/common/connection_handlers.py:125
+#: ../src/common/connection_handlers.py:135
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registrace k agentu %s uspěla"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 msgid "Registration failed"
 msgstr "Registrace selhala"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 "Registrace s agentem %(agent)s failed with error %(error)s: %(error_msg)s"
 
-#: ../src/common/connection_handlers.py:445
-#: ../src/common/connection_handlers.py:1633
-#: ../src/common/connection_handlers.py:1756
-#: ../src/common/connection_handlers.py:1957
-#: ../src/common/connection_handlers.py:2108 ../src/common/connection.py:449
+#: ../src/common/connection_handlers.py:466
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
 #: ../src/gajim.py:341
 msgid "Disk Write Error"
 msgstr "Chyba zápisu na disk (možná je plný?)"
 
-#: ../src/common/connection_handlers.py:678 ../src/common/connection.py:1472
+#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
 msgid "Invisibility not supported"
 msgstr "Neviditelnost není podporována"
 
-#: ../src/common/connection_handlers.py:679 ../src/common/connection.py:1473
+#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Účet %s nepodporuje neviditelnost."
 
-#: ../src/common/connection_handlers.py:1446 ../src/common/connection.py:253
-#: ../src/config.py:2091 ../src/config.py:2100 ../src/config.py:2168
-#: ../src/config.py:3560 ../src/dataforms_widget.py:597 ../src/dialogs.py:2931
+#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
+#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
+#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
 msgid "Invalid Jabber ID"
 msgstr "Neplatné Jabber ID"
 
-#: ../src/common/connection_handlers.py:1447
+#: ../src/common/connection_handlers.py:1405
 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:1636
-#: ../src/common/connection_handlers.py:1759
-#: ../src/common/connection_handlers.py:1961
-#: ../src/common/connection_handlers.py:2111 ../src/common/connection.py:453
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
 #: ../src/gajim.py:160 ../src/session.py:139
 #, python-format
 msgid ""
@@ -4477,89 +4714,6 @@ 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:1805
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Přezdívka nepovolena: %s"
-
-#: ../src/common/connection_handlers.py:1902
-#: ../src/common/connection_handlers.py:1911
-#: ../src/common/connection_handlers.py:1918
-#: ../src/common/connection_handlers.py:1922
-#: ../src/common/connection_handlers.py:1926
-#: ../src/common/connection_handlers.py:1931 ../src/gui_interface.py:139
-msgid "Unable to join group chat"
-msgstr "Nelze se připojit se do diskuze"
-
-#: ../src/common/connection_handlers.py:1903
-#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr "V %s byl dosažen maximální počet uživatelů"
-
-#: ../src/common/connection_handlers.py:1912
-#, 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:1919
-#, python-format
-msgid "Group chat %s does not exist."
-msgstr "Diskuze %s neexistuje."
-
-#: ../src/common/connection_handlers.py:1923
-msgid "Group chat creation is restricted."
-msgstr "Vytváření místností není povoleno."
-
-#: ../src/common/connection_handlers.py:1927
-#, 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:1932
-#, 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:1976
-msgid "Room has been destroyed"
-msgstr "Místnost byla zničena"
-
-#: ../src/common/connection_handlers.py:1984
-#, 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:2020
-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:2041
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "jsme nyní zapsáni k %s"
-
-#: ../src/common/connection_handlers.py:2043
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "Žádost o zrušení autorizace od %s"
-
-#: ../src/common/connection_handlers.py:2045
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "byla nám zrušena autorizace od %s"
-
-#: ../src/common/connection_handlers.py:2240
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"JID %s neodpovídá RFC. Nebude přidáno do tvého rosteru. Použij nástroje pro "
-"správu rosteru jako je http://jru.jabberstudio.org/ k jeho odstranění"
-
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr "Nepodařilo se získat certifikát vydavatele"
@@ -4688,28 +4842,28 @@ 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:254 ../src/dialogs.py:2932
+#: ../src/common/connection.py:256 ../src/dialogs.py:2948
 #, 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:276
+#: ../src/common/connection.py:278
 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:279
+#: ../src/common/connection.py:281
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 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:331
+#: ../src/common/connection.py:333
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Tato zpráva je *zašifrovaná* (Viz :XEP:\"27\")]"
 
-#: ../src/common/connection.py:439
+#: ../src/common/connection.py:441
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4718,76 +4872,76 @@ msgstr ""
 "Předmět: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:807
+#: ../src/common/connection.py:809
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Spojení s účtem \"%s\" bylo ztraceno"
 
-#: ../src/common/connection.py:808
+#: ../src/common/connection.py:810
 msgid "Reconnect manually."
 msgstr "Znovu připojit ručně."
 
-#: ../src/common/connection.py:820
+#: ../src/common/connection.py:822
 #, 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:854
+#: ../src/common/connection.py:856
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s poskytnul rozdílný registrační formulář"
 
-#: ../src/common/connection.py:867
+#: ../src/common/connection.py:869
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Neznámá SSL chyba: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:882
+#: ../src/common/connection.py:884
 msgid "Invalid answer"
 msgstr "Neplatná odpověď"
 
-#: ../src/common/connection.py:883
+#: ../src/common/connection.py:885
 #, 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:1165 ../src/common/connection.py:1294
-#: ../src/common/connection.py:1784
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
+#: ../src/common/connection.py:1792
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nemůžu se připojit k \"%s\""
 
-#: ../src/common/connection.py:1166 ../src/gui_interface.py:755
+#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
 msgid "Check your connection or try again later."
 msgstr "Ověřte spojení nebo zkuste později."
 
-#: ../src/common/connection.py:1171
+#: ../src/common/connection.py:1173
 #, python-format
 msgid "Server replied: %s"
 msgstr "Server odpověděl: %s"
 
-#: ../src/common/connection.py:1184
+#: ../src/common/connection.py:1186
 msgid "Connection to proxy failed"
 msgstr "Spojení s proxy selhalo"
 
-#: ../src/common/connection.py:1215 ../src/common/connection.py:1274
+#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Selhalo připojení k účti %s"
 
-#: ../src/common/connection.py:1216 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
 #, 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:1241
+#: ../src/common/connection.py:1243
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Autentizace certifikátu %s je neplatná."
 
-#: ../src/common/connection.py:1244
+#: ../src/common/connection.py:1246
 #, python-format
 msgid ""
 "\n"
@@ -4796,7 +4950,7 @@ msgstr ""
 "\n"
 "SSL Error: <b>%s</b>"
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1248
 #, python-format
 msgid ""
 "\n"
@@ -4805,24 +4959,24 @@ msgstr ""
 "\n"
 "Neznámá SSL chyba: %d"
 
-#: ../src/common/connection.py:1295
+#: ../src/common/connection.py:1297
 msgid "Check your connection or try again later"
 msgstr "Ověřte připojení nebo zkuste později"
 
-#: ../src/common/connection.py:1324
+#: ../src/common/connection.py:1329
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentizace selhala s \"%s\""
 
-#: ../src/common/connection.py:1326
+#: ../src/common/connection.py:1331
 msgid "Please check your login and password for correctness."
 msgstr "Prosím zkontrolujte správnost jména a hesla."
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1400
 msgid "Error while removing privacy list"
 msgstr "Chyba při odebírání privacy listu"
 
-#: ../src/common/connection.py:1396
+#: ../src/common/connection.py:1401
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4831,39 +4985,39 @@ 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:1650
+#: ../src/common/connection.py:1658
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Odeslán kontakt: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1653
+#: ../src/common/connection.py:1661
 msgid "Sent contacts:"
 msgstr "Odeslány kontakty:"
 
-#: ../src/common/connection.py:1799 ../src/common/connection.py:1822
+#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
 msgid "Not fetched because of invisible status"
 msgstr "Nestáhnuto z důvodu stavu neviditelnosti"
 
-#: ../src/common/connection.py:2254
+#: ../src/common/connection.py:2262
 msgid "Unregister failed"
 msgstr "Odregistrace selhala"
 
-#: ../src/common/connection.py:2255
+#: ../src/common/connection.py:2263
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr "Zrušení registrace ze serveru %(server)s selhalo: %(error)s"
 
 #: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:674
+#: ../src/gui_interface.py:551
 msgid "Observers"
 msgstr "Přihlížející"
 
 #: ../src/common/contacts.py:139 ../src/common/contacts.py:366
 #: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1499 ../src/gui_interface.py:424
-#: ../src/roster_window.py:840 ../src/roster_window.py:1525
-#: ../src/roster_window.py:1606 ../src/roster_window.py:1608
-#: ../src/roster_window.py:1769
+#: ../src/disco.py:1517 ../src/roster_window.py:854
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
+#: ../src/roster_window.py:2466
 msgid "Transports"
 msgstr "Transporty"
 
@@ -5088,203 +5242,219 @@ msgstr "Konec týdne"
 msgid "Weekend!"
 msgstr "Víkend!"
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:148
+msgid "Username must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:153
 msgid "Invalid character in username."
 msgstr "Neplatný znak v uživatelském jméně."
 
-#: ../src/common/helpers.py:156
-msgid "Server address required."
-msgstr "Je potřeba adresa serveru."
+#: ../src/common/helpers.py:159
+msgid "Server must be between 1 and 1023 chars"
+msgstr ""
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 msgid "Invalid character in hostname."
 msgstr "Neplatný znak v hostname."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:166
+msgid "Server address required."
+msgstr "Je potřeba adresa serveru."
+
+#: ../src/common/helpers.py:170
+msgid "Resource must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:175
 msgid "Invalid character in resource."
 msgstr "Neplatný znak ve zdroji."
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:215
 msgid "_Busy"
 msgstr "_Nerušit"
 
-#: ../src/common/helpers.py:211 ../src/tooltips.py:195
+#: ../src/common/helpers.py:217 ../src/tooltips.py:195
 msgid "Busy"
 msgstr "Nerušit"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:220
 msgid "_Not Available"
 msgstr "Ne_dostupný"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:225
 msgid "_Free for Chat"
 msgstr "_Ukecaný"
 
-#: ../src/common/helpers.py:221 ../src/tooltips.py:191
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Free for Chat"
 msgstr "Ukecaný"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:230
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?transfer status:Pozastaveno"
 
-#: ../src/common/helpers.py:226 ../src/tooltips.py:189
+#: ../src/common/helpers.py:232 ../src/tooltips.py:189
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?transfer status:Pozastaveno"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:234
 msgid "Connecting"
 msgstr "Připojuji se"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:237
 msgid "A_way"
 msgstr "_Pryč"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:242
 msgid "_Offline"
 msgstr "_Odpojen"
 
-#: ../src/common/helpers.py:238 ../src/tooltips.py:199
+#: ../src/common/helpers.py:244 ../src/tooltips.py:199
 msgid "Offline"
 msgstr "Odpojen"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:247
 msgid "_Invisible"
 msgstr "Ne_viditelný"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:253
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Neznámý"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:255
 msgid "?contact has status:Has errors"
 msgstr "stav"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:260
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Žádná"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:262
 msgid "To"
 msgstr "Příjemce"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
+msgid "From"
+msgstr "Odesílatel"
+
+#: ../src/common/helpers.py:266
 msgid "Both"
 msgstr "Oboustranná"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:274
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Není"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:276
 msgid "Subscribe"
 msgstr "Žádat autorizaci"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:285
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Žádná"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:288
 msgid "Moderators"
 msgstr "Moderátoři"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:290
 msgid "Moderator"
 msgstr "Moderátor"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:293
 msgid "Participants"
 msgstr "Účastníci"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:295
 msgid "Participant"
 msgstr "Účastník"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:298
 msgid "Visitors"
 msgstr "Návštěvníci"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:300
 msgid "Visitor"
 msgstr "Návštěvník"
 
-#: ../src/common/helpers.py:300 ../src/tooltips.py:210
+#: ../src/common/helpers.py:306 ../src/tooltips.py:210
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Žádná"
 
-#: ../src/common/helpers.py:302 ../src/tooltips.py:216
+#: ../src/common/helpers.py:308 ../src/tooltips.py:216
 msgid "Owner"
 msgstr "Vlastník"
 
-#: ../src/common/helpers.py:304 ../src/tooltips.py:214
+#: ../src/common/helpers.py:310 ../src/tooltips.py:214
 msgid "Administrator"
 msgstr "Správce"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:212
+#: ../src/common/helpers.py:312 ../src/tooltips.py:212
 msgid "Member"
 msgstr "ÄŒlen"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:351
 msgid "is paying attention to the conversation"
 msgstr "věnuje pozornost rozhovoru"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:353
 msgid "is doing something else"
 msgstr "dělá něco jiného"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:355
 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:352
+#: ../src/common/helpers.py:358
 msgid "paused composing a message"
 msgstr "pozastavil(a) psaní zprávy"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:360
 msgid "has closed the chat window or tab"
 msgstr "zavřel(a) okno zprávy"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:619
+#: ../src/common/helpers.py:625
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:622
+#: ../src/common/helpers.py:628
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:626
+#: ../src/common/helpers.py:632
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:629
+#: ../src/common/helpers.py:635
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:633
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:636
+#: ../src/common/helpers.py:642
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:645
 #, python-format
 msgid "%s B"
 msgstr "%s B"
@@ -5329,12 +5499,12 @@ msgstr "Gajim - %s"
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:111
+#: ../src/common/jingle_rtp.py:107
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Nastavení místnosti"
 
-#: ../src/common/jingle_rtp.py:112
+#: ../src/common/jingle_rtp.py:108
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5346,30 +5516,30 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:209
+#: ../src/common/jingle_rtp.py:205
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:210
+#: ../src/common/jingle_rtp.py:206
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Chybová zpráva: %s"
 
-#: ../src/common/jingle_rtp.py:336
+#: ../src/common/jingle_rtp.py:335
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:339
+#: ../src/common/jingle_rtp.py:338
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:382
+#: ../src/common/jingle_rtp.py:381
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:390
+#: ../src/common/jingle_rtp.py:389
 msgid "video output"
 msgstr ""
 
@@ -5447,11 +5617,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "chyba: nemůžu otevřít %s pro čtení"
 
-#: ../src/common/optparser.py:299 ../src/common/optparser.py:300
+#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
 msgid "cyan"
 msgstr "azurová"
 
-#: ../src/common/optparser.py:379
+#: ../src/common/optparser.py:383
 msgid "migrating logs database to indices"
 msgstr "převádím záznamy historie k použítí indexů"
 
@@ -6136,7 +6306,7 @@ msgid ""
 msgstr "Možná máš puštěnou jinou instanci Gajimu. Přenos souborů bude zrušen."
 
 #. we're not english
-#: ../src/common/stanza_session.py:303
+#: ../src/common/stanza_session.py:423
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6144,11 +6314,11 @@ msgstr ""
 "[Tato zpráva je součástí šifrovaného sezení. Pokud vidíte tuto zprávu, tak "
 "je něco špatně.]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:178
+#: ../src/common/zeroconf/connection_zeroconf.py:181
 msgid "Avahi error"
 msgstr "Chyba Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:179
+#: ../src/common/zeroconf/connection_zeroconf.py:182
 #, python-format
 msgid ""
 "%s\n"
@@ -6157,44 +6327,44 @@ msgstr ""
 "%s\n"
 "Zasílání lokálních zpráv nemusí fungovat správně."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:190
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Zkontrolujte zda je Avahi nebo Bonjour nainstalováno."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:199
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Could not start local service"
 msgstr "Nepodařilo se spustit lokální službu"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Nemůžu naslouchat na portu %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-#: ../src/common/zeroconf/connection_zeroconf.py:283
-#: ../src/common/zeroconf/connection_zeroconf.py:294
-#: ../src/common/zeroconf/connection_zeroconf.py:308
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:286
+#: ../src/common/zeroconf/connection_zeroconf.py:297
+#: ../src/common/zeroconf/connection_zeroconf.py:311
 msgid "Please check if avahi-daemon is running."
 msgstr "Zkontrolujte, zda avahi-daemon běží."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:282
-#: ../src/common/zeroconf/connection_zeroconf.py:293
-#: ../src/common/zeroconf/connection_zeroconf.py:307
+#: ../src/common/zeroconf/connection_zeroconf.py:285
+#: ../src/common/zeroconf/connection_zeroconf.py:296
+#: ../src/common/zeroconf/connection_zeroconf.py:310
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Nemůžu změnit stav účtu \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:325
+#: ../src/common/zeroconf/connection_zeroconf.py:328
 msgid "Your message could not be sent."
 msgstr "Vaše zpráva nemohla být odeslána."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:335
+#: ../src/common/zeroconf/connection_zeroconf.py:338
 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:360
+#: ../src/common/zeroconf/connection_zeroconf.py:363
 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."
@@ -6213,16 +6383,16 @@ msgstr "Výchozí Zpráva"
 msgid "Enabled"
 msgstr "Povolit"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3078
+#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
 msgid "Default"
 msgstr "Výchozí"
 
-#: ../src/config.py:739 ../src/dialogs.py:1395
+#: ../src/config.py:733 ../src/dialogs.py:1409
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Slovník pro jazyk %s není dostupný"
 
-#: ../src/config.py:740
+#: ../src/config.py:734
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6240,9 +6410,9 @@ msgid "status message text"
 msgstr "text stavu"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2383 ../src/dialogs.py:2449
-#: ../src/dialogs.py:3215 ../src/disco.py:866 ../src/disco.py:1726
-#: ../src/disco.py:2030 ../src/history_window.py:90
+#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
+#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
+#: ../src/disco.py:2048 ../src/history_window.py:90
 msgid "Name"
 msgstr "Jméno"
 
@@ -6276,7 +6446,7 @@ 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:1976 ../src/config.py:2509 ../src/config.py:2545
+#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
 msgid "You are currently connected to the server"
 msgstr "Nejste přávě připojen(a) k serveru"
 
@@ -6310,131 +6480,131 @@ msgstr "Jméno účtu nemůže být prázdné."
 msgid "Account name cannot contain spaces."
 msgstr "Jméno účtu nesmí obsahovat mezery."
 
-#: ../src/config.py:2072
+#: ../src/config.py:2074
 msgid "Rename Account"
 msgstr "Přejmenovat účet"
 
-#: ../src/config.py:2073
+#: ../src/config.py:2075
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Zadej nové jméno pro účet %s."
 
-#: ../src/config.py:2101
+#: ../src/config.py:2103
 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:2318 ../src/config.py:3606
+#: ../src/config.py:2320 ../src/config.py:3623
 msgid "Invalid entry"
 msgstr "Neplatný záznam"
 
-#: ../src/config.py:2319 ../src/config.py:3607
+#: ../src/config.py:2321 ../src/config.py:3624
 msgid "Custom port must be a port number."
 msgstr "Vlastní port musí být číslo portu."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2342
 msgid "Failed to get secret keys"
 msgstr "Selhalo získání privátního klíče"
 
-#: ../src/config.py:2341
+#: ../src/config.py:2343
 msgid "There is no OpenPGP secret key available."
 msgstr "Není dostupný tajný klíč OpenPGP."
 
-#: ../src/config.py:2375
+#: ../src/config.py:2377
 msgid "OpenPGP Key Selection"
 msgstr "Výběr OpenPGP klíče"
 
-#: ../src/config.py:2376
+#: ../src/config.py:2378
 msgid "Choose your OpenPGP key"
 msgstr "Vyberte Váš OpenPGP klíč"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2385
 msgid "No such account available"
 msgstr "Takový účet není dostupný"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2386
 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:2391 ../src/dialogs.py:2136 ../src/dialogs.py:2371
-#: ../src/dialogs.py:2557 ../src/disco.py:511 ../src/profile_window.py:339
+#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
+#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
 msgid "You are not connected to the server"
 msgstr "Nejste připojen(a) k serveru"
 
-#: ../src/config.py:2392
+#: ../src/config.py:2394
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez připojení nemůžete upravovat osobní údaje."
 
-#: ../src/config.py:2396
+#: ../src/config.py:2398
 msgid "Your server doesn't support Vcard"
 msgstr "Váš server nepodporuje vizitky."
 
-#: ../src/config.py:2397
+#: ../src/config.py:2399
 msgid "Your server can't save your personal information."
 msgstr "Váš server neumí uložit Vaše osobní informace."
 
-#: ../src/config.py:2510 ../src/config.py:2546
+#: ../src/config.py:2512 ../src/config.py:2548
 msgid "To disable the account, you must be disconnected."
 msgstr "Chcete-li deaktivovat účet, musíte se nejdříve odpojit."
 
-#: ../src/config.py:2515
+#: ../src/config.py:2517
 msgid "Account Local already exists."
 msgstr "Účet Local už existuje."
 
-#: ../src/config.py:2516
+#: ../src/config.py:2518
 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:2673
+#: ../src/config.py:2675
 #, python-format
 msgid "Edit %s"
 msgstr "Uprav %s"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2677
 #, python-format
 msgid "Register to %s"
 msgstr "Registrovat k %s"
 
 #. list at the beginning
-#: ../src/config.py:2711
+#: ../src/config.py:2713
 msgid "Ban List"
 msgstr "Ban List"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2714
 msgid "Member List"
 msgstr "Seznam členů"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2714
 msgid "Owner List"
 msgstr "Seznam vlastníků"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2715
 msgid "Administrator List"
 msgstr "Seznam správců"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2763 ../src/disco.py:873 ../src/history_manager.py:201
+#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2773
+#: ../src/config.py:2789
 msgid "Reason"
 msgstr "Důvod"
 
-#: ../src/config.py:2780
+#: ../src/config.py:2796
 msgid "Nick"
 msgstr "Přezdívka"
 
-#: ../src/config.py:2786
+#: ../src/config.py:2802
 msgid "Role"
 msgstr "Postavení"
 
-#: ../src/config.py:2813
+#: ../src/config.py:2829
 msgid "Banning..."
 msgstr "Zakazuji..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2815
+#: ../src/config.py:2831
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6442,37 +6612,37 @@ msgstr ""
 "<b>Koho chcete zakázat?</b>\n"
 "\n"
 
-#: ../src/config.py:2817
+#: ../src/config.py:2833
 msgid "Adding Member..."
 msgstr "Přidávám člena..."
 
-#: ../src/config.py:2818
+#: ../src/config.py:2834
 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:2820
+#: ../src/config.py:2836
 msgid "Adding Owner..."
 msgstr "Přidávám vlastníka..."
 
-#: ../src/config.py:2821
+#: ../src/config.py:2837
 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:2823
+#: ../src/config.py:2839
 msgid "Adding Administrator..."
 msgstr "Přidávám správce..."
 
-#: ../src/config.py:2824
+#: ../src/config.py:2840
 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:2825
+#: ../src/config.py:2841
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6488,83 +6658,83 @@ msgstr ""
 "4. doména (doména samotná odpovídá, stejně jako kterýkoliv uživatel@doména,\n"
 "doména/zdroj, nebo adresa obsahující poddoménu)."
 
-#: ../src/config.py:2926
+#: ../src/config.py:2943
 #, python-format
 msgid "Removing %s account"
 msgstr "Odstraňuju účet %s"
 
-#: ../src/config.py:2941
+#: ../src/config.py:2958
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Smajlíci byly vypnuty"
 
-#: ../src/config.py:2942
+#: ../src/config.py:2959
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2955 ../src/gui_interface.py:1132
-#: ../src/gui_interface.py:1243
+#: ../src/config.py:2972 ../src/gui_interface.py:311
+#: ../src/gui_interface.py:1048
 msgid "Password Required"
 msgstr "Vyžadováno heslo"
 
-#: ../src/config.py:2956 ../src/gui_interface.py:1223
+#: ../src/config.py:2973 ../src/gui_interface.py:1028
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Zadejte heslo pro účet %s"
 
-#: ../src/config.py:2957 ../src/gui_interface.py:1243
+#: ../src/config.py:2974 ../src/gui_interface.py:1048
 msgid "Save password"
 msgstr "Uložit heslo"
 
-#: ../src/config.py:2967
+#: ../src/config.py:2984
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Účet \"%s\" se připojil k serveru"
 
-#: ../src/config.py:2968
+#: ../src/config.py:2985
 msgid "If you remove it, the connection will be lost."
 msgstr "Pokud jej smažete, připojení bude ztraceno."
 
-#: ../src/config.py:2982
+#: ../src/config.py:2999
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Spojení s proxy selhalo"
 
-#: ../src/config.py:2983
+#: ../src/config.py:3000
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Co by jste rád(a) dělal(a)?"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3001
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Odstranit účet _pouze z Gajimu"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3002
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3078
+#: ../src/config.py:3095
 msgid "?print_status:All"
 msgstr "?print_status:VÅ¡echny"
 
-#: ../src/config.py:3079
+#: ../src/config.py:3096
 msgid "Enter and leave only"
 msgstr "Pouze při vstupu a výstupu"
 
-#: ../src/config.py:3080
+#: ../src/config.py:3097
 msgid "?print_status:None"
 msgstr "?print_status:Žádný"
 
-#: ../src/config.py:3150
+#: ../src/config.py:3167
 msgid "New Group Chat"
 msgstr "Nová diskuze"
 
-#: ../src/config.py:3183
+#: ../src/config.py:3200
 msgid "This bookmark has invalid data"
 msgstr "Tato záložka má neplatná data"
 
-#: ../src/config.py:3184
+#: ../src/config.py:3201
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6572,27 +6742,27 @@ msgstr ""
 "záložku."
 
 #. invalid char
-#: ../src/config.py:3302 ../src/dialogs.py:1934
+#: ../src/config.py:3319 ../src/dialogs.py:1950
 msgid "Invalid nickname"
 msgstr "Neplatné uživatelské jméno"
 
-#: ../src/config.py:3303 ../src/config.py:3317 ../src/config.py:3331
+#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
 msgid "Character not allowed"
 msgstr "Znak nebyl povolen"
 
-#: ../src/config.py:3316 ../src/config.py:3582
+#: ../src/config.py:3333 ../src/config.py:3599
 msgid "Invalid server"
 msgstr "Neplatný server"
 
-#: ../src/config.py:3330
+#: ../src/config.py:3347
 msgid "Invalid room"
 msgstr "Neplatná místnost"
 
-#: ../src/config.py:3498
+#: ../src/config.py:3515
 msgid "Account has been added successfully"
 msgstr "Účet byl úspěšně přidán"
 
-#: ../src/config.py:3499 ../src/config.py:3505
+#: ../src/config.py:3516 ../src/config.py:3522
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6602,32 +6772,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:3504
+#: ../src/config.py:3521
 msgid "Your new account has been created successfully"
 msgstr "Váš účet byl úspěšně vytvořen"
 
-#: ../src/config.py:3543
+#: ../src/config.py:3560
 msgid "Invalid username"
 msgstr "Neplatné uživatelské jméno"
 
-#: ../src/config.py:3545
+#: ../src/config.py:3562
 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:3583
+#: ../src/config.py:3600
 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:3639 ../src/gui_interface.py:1904
+#: ../src/config.py:3656 ../src/gui_interface.py:1693
 msgid "Certificate Already in File"
 msgstr "Certifikát je již v souboru"
 
-#: ../src/config.py:3640 ../src/gui_interface.py:1905
+#: ../src/config.py:3657 ../src/gui_interface.py:1694
 #, 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:3717
+#: ../src/config.py:3734
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6642,7 +6812,7 @@ msgstr ""
 "SSL Chyba: %(error)s\n"
 "Přesto se chcete k serveru připojit?"
 
-#: ../src/config.py:3723 ../src/gui_interface.py:1932
+#: ../src/config.py:3740 ../src/gui_interface.py:1721
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6653,63 +6823,72 @@ msgstr ""
 "SHA1 otisk certifikátu:\n"
 "%s"
 
-#: ../src/config.py:3755 ../src/config.py:3789
+#: ../src/config.py:3772 ../src/config.py:3806
 msgid "An error occurred during account creation"
 msgstr "Nastala chyba při vytváření účtu"
 
-#: ../src/config.py:3854
+#: ../src/config.py:3871
 msgid "Account name is in use"
 msgstr "Jméno účtu se používá"
 
-#: ../src/config.py:3855
+#: ../src/config.py:3872
 msgid "You already have an account using this name."
 msgstr "Již máte účet s tímto jménem."
 
-#: ../src/config.py:4009
+#: ../src/config.py:3991
+msgid "PEP node was not removed"
+msgstr "PEP uzel nebyl smazán"
+
+#: ../src/config.py:3992
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr "PEP uzel %(node)s se nepodařilo odstranit: %(message)s"
+
+#: ../src/config.py:4036
 msgid "Active"
 msgstr "Aktivní"
 
-#: ../src/config.py:4017
+#: ../src/config.py:4044
 msgid "Event"
 msgstr "Událost"
 
-#: ../src/config.py:4052
+#: ../src/config.py:4079
 msgid "First Message Received"
 msgstr "První zpráva přijata"
 
-#: ../src/config.py:4053
+#: ../src/config.py:4080
 msgid "Next Message Received Focused"
 msgstr "Další zpráva přijata zvýrazněná"
 
-#: ../src/config.py:4055
+#: ../src/config.py:4082
 msgid "Next Message Received Unfocused"
 msgstr "Další zpráva přijata nezvýrazněná"
 
-#: ../src/config.py:4056
+#: ../src/config.py:4083
 msgid "Contact Connected"
 msgstr "Kontakt se připojil"
 
-#: ../src/config.py:4057
+#: ../src/config.py:4084
 msgid "Contact Disconnected"
 msgstr "Kontakt se odpojil"
 
-#: ../src/config.py:4058
+#: ../src/config.py:4085
 msgid "Message Sent"
 msgstr "Zpráva odeslána"
 
-#: ../src/config.py:4059
+#: ../src/config.py:4086
 msgid "Group Chat Message Highlight"
 msgstr "Zvýraznění zprávy v diskuzi"
 
-#: ../src/config.py:4060
+#: ../src/config.py:4087
 msgid "Group Chat Message Received"
 msgstr "Přijetí zprávy v diskuzi"
 
-#: ../src/config.py:4061
+#: ../src/config.py:4088
 msgid "GMail Email Received"
 msgstr "Přišel GMail Email"
 
-#: ../src/conversation_textview.py:600
+#: ../src/conversation_textview.py:601
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6719,7 +6898,7 @@ msgstr ""
 "stranou. Pokud zůstává dlouho, zpráva je pravděpodobně\n"
 "ztracena."
 
-#: ../src/conversation_textview.py:619
+#: ../src/conversation_textview.py:620
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6727,45 +6906,45 @@ msgstr ""
 "Text pod touto čarou označuje to, co bylo řečeno \n"
 "po posledním čtení této diskuze"
 
-#: ../src/conversation_textview.py:739
+#: ../src/conversation_textview.py:740
 #, fuzzy
 msgid "_Quote"
 msgstr "_Konec"
 
-#: ../src/conversation_textview.py:746
+#: ../src/conversation_textview.py:747
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Akce pro \"%s\""
 
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Read _Wikipedia Article"
 msgstr "Číst článkek na _Wikipedia"
 
-#: ../src/conversation_textview.py:763
+#: ../src/conversation_textview.py:765
 msgid "Look it up in _Dictionary"
 msgstr "Vyhledat ve _slovníku"
 
-#: ../src/conversation_textview.py:780
+#: ../src/conversation_textview.py:782
 #, 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:793
+#: ../src/conversation_textview.py:795
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL pro hledání na webu chybí \"%s\""
 
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 msgid "Web _Search for it"
 msgstr "_Hledat na Webu"
 
-#: ../src/conversation_textview.py:802
+#: ../src/conversation_textview.py:804
 msgid "Open as _Link"
 msgstr "Otevřít jako _Odkaz"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1296
+#: ../src/conversation_textview.py:1298
 #, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6774,188 +6953,193 @@ msgstr[1] "před %i dny"
 msgstr[2] "před %i dny"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1344 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Předmět: %s\n"
 
-#: ../src/dataforms_widget.py:544
+#: ../src/dataforms_widget.py:545
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Nelze nahrát idle modul"
 
-#: ../src/dataforms_widget.py:546
+#: ../src/dataforms_widget.py:547
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Neviditelnost není podporována"
 
-#: ../src/dataforms_widget.py:601
+#: ../src/dataforms_widget.py:562
+msgid "This field is required"
+msgstr ""
+
+#: ../src/dataforms_widget.py:607
 msgid "Jabber ID already in list"
 msgstr "Jabber ID je již na seznamu"
 
-#: ../src/dataforms_widget.py:602
+#: ../src/dataforms_widget.py:608
 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:613
+#: ../src/dataforms_widget.py:619
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:616 ../src/dataforms_widget.py:618
+#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Jméno kontaktu: <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:195
 msgid "Group"
 msgstr "Skupina"
 
-#: ../src/dialogs.py:201
+#: ../src/dialogs.py:202
 msgid "In the group"
 msgstr "Ve skupinÄ›"
 
-#: ../src/dialogs.py:292
+#: ../src/dialogs.py:293
 msgid "KeyID"
 msgstr "ID klíče"
 
-#: ../src/dialogs.py:297
+#: ../src/dialogs.py:298
 msgid "Contact name"
 msgstr "Jméno kontaktu"
 
-#: ../src/dialogs.py:469
+#: ../src/dialogs.py:470
 msgid "Set Mood"
 msgstr "Nastavit Náladu"
 
-#: ../src/dialogs.py:589
+#: ../src/dialogs.py:590
 #, python-format
 msgid "%s Status Message"
 msgstr "Text stavu %s"
 
-#: ../src/dialogs.py:603
+#: ../src/dialogs.py:604
 msgid "Status Message"
 msgstr "Text stavu"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:794
 msgid "Overwrite Status Message?"
 msgstr "Přepsat Text stavu?"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:795
 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:802
+#: ../src/dialogs.py:803
 msgid "Save as Preset Status Message"
 msgstr "Uložit jako přednastavený stav"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:804
 msgid "Please type a name for this status message"
 msgstr "Napište jméno pro tento stav"
 
-#: ../src/dialogs.py:831
+#: ../src/dialogs.py:832
 msgid "AIM Address:"
 msgstr "AIM adresa:"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:833
 msgid "GG Number:"
 msgstr "GG číslo: "
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:834
 msgid "ICQ Number:"
 msgstr "ICQ číslo: "
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:835
 msgid "MSN Address:"
 msgstr "MSN adresa:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:836
 msgid "Yahoo! Address:"
 msgstr "Yahoo! adresa:"
 
-#: ../src/dialogs.py:872
+#: ../src/dialogs.py:873
 #, 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:875
+#: ../src/dialogs.py:876
 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:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
+#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
+#: ../src/dialogs.py:3464
 msgid "Invalid User ID"
 msgstr "Neplatný identifikátor uživatele"
 
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1052
 msgid "The user ID must not contain a resource."
 msgstr "User ID nesmí obsahovat zdroj."
 
-#: ../src/dialogs.py:1051
+#: ../src/dialogs.py:1057
 msgid "You cannot add yourself to your roster."
 msgstr "Rád(a) bych si tě přidal(a) do seznamu."
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1071
 msgid "Contact already in roster"
 msgstr "Kontakt už je v Seznamu"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1072
 msgid "This contact is already listed in your roster."
 msgstr "Tento kontakt už je obsažen ve Vašem seznamu."
 
-#: ../src/dialogs.py:1112
+#: ../src/dialogs.py:1118
 msgid "User ID:"
 msgstr "Uživatel:"
 
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1189
 msgid "A GTK+ jabber client"
 msgstr "GTK+ Jabber client"
 
-#: ../src/dialogs.py:1176
+#: ../src/dialogs.py:1190
 msgid "GTK+ Version:"
 msgstr "GTK+ verze: "
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1191
 msgid "PyGTK Version:"
 msgstr "PyGTK verze: "
 
-#: ../src/dialogs.py:1187
+#: ../src/dialogs.py:1201
 msgid "Current Developers:"
 msgstr "Aktivní vývojáři:"
 
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1203
 msgid "Past Developers:"
 msgstr "Vysloužilí vývojáři:"
 
-#: ../src/dialogs.py:1195
+#: ../src/dialogs.py:1209
 msgid "THANKS:"
 msgstr "DÍKY:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1215
 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:1213
+#: ../src/dialogs.py:1227
 msgid "translator-credits"
 msgstr ""
 "Petr Menšík <pihhan@seznam.cz>\n"
 "scippio <scippio@berounet.cz>"
 
-#: ../src/dialogs.py:1396
+#: ../src/dialogs.py:1410
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6966,99 +7150,99 @@ msgstr ""
 "Musíš nainstalovat %s slovník k použití kontroly pravopisu, nebo vybrat jiný "
 "jazyk nastavením volby speller_language."
 
-#: ../src/dialogs.py:1935 ../src/dialogs.py:2322
+#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
 msgid "The nickname has not allowed characters."
 msgstr "Jabber ID diskuze obsahuje nepřijatelné znaky."
 
-#: ../src/dialogs.py:2053
+#: ../src/dialogs.py:2069
 #, 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:2056
+#: ../src/dialogs.py:2072
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Žádost o autorizaci od %s"
 
-#: ../src/dialogs.py:2131 ../src/gui_interface.py:2672
+#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Už jsi v místnosti %s"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2153
 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:2178
+#: ../src/dialogs.py:2194
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Vstoupit do diskuze z účtu %s"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2325
 msgid "Invalid Account"
 msgstr "Neplatný účtu"
 
-#: ../src/dialogs.py:2310
+#: ../src/dialogs.py:2326
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Musíte vybrat účet, ze kterého chcete vstoupit do diskuze."
 
-#: ../src/dialogs.py:2321
+#: ../src/dialogs.py:2337
 msgid "Invalid Nickname"
 msgstr "Neplatné uživatelské jméno"
 
-#: ../src/dialogs.py:2326 ../src/dialogs.py:2332
-#: ../src/groupchat_control.py:1832
+#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
+#: ../src/groupchat_control.py:1847
 msgid "Invalid group chat Jabber ID"
 msgstr "Neplatné Jabber ID diskuzní místnosti"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2343
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "JProsím zadejte Jabber ID diskuze ve formě místnost@server."
 
-#: ../src/dialogs.py:2333 ../src/groupchat_control.py:1833
+#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Jabber ID diskuze obsahuje nepřijatelné znaky."
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2356
 msgid "This is not a group chat"
 msgstr "Tohle není diskuze"
 
-#: ../src/dialogs.py:2341
+#: ../src/dialogs.py:2357
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s není jméno diskuze."
 
-#: ../src/dialogs.py:2372
+#: ../src/dialogs.py:2388
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Nemůžete měnit heslo, pokud nejste připojen(a)."
 
-#: ../src/dialogs.py:2386
+#: ../src/dialogs.py:2402
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2421
+#: ../src/dialogs.py:2437
 msgid "This account is not connected to the server"
 msgstr "Tento účet není připojen k serveru"
 
-#: ../src/dialogs.py:2422
+#: ../src/dialogs.py:2438
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Nemůžete synchronyzovat účet pokud nění připojen."
 
-#: ../src/dialogs.py:2446
+#: ../src/dialogs.py:2462
 msgid "Synchronise"
 msgstr "Synchronizovat"
 
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2523
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Začít rozhovor z účtu %s"
 
-#: ../src/dialogs.py:2509
+#: ../src/dialogs.py:2525
 msgid "Start Chat"
 msgstr "Začít rozhovor"
 
-#: ../src/dialogs.py:2510
+#: ../src/dialogs.py:2526
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7066,165 +7250,165 @@ msgstr ""
 "Vyplňte Jabber ID nebo přezdívku kontaktu, se kterým chcete začít rozhovor:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2536 ../src/dialogs.py:2917 ../src/dialogs.py:3129
+#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
 msgid "Connection not available"
 msgstr "Spojení není dostupné"
 
-#: ../src/dialogs.py:2537 ../src/dialogs.py:2918 ../src/dialogs.py:3130
+#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
 #, 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:2546 ../src/dialogs.py:2549
+#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
 msgid "Invalid JID"
 msgstr "Neplatné JID"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2565
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nemůžu dekódovat \"%s\"."
 
-#: ../src/dialogs.py:2558
+#: ../src/dialogs.py:2574
 msgid "Without a connection, you can not change your password."
 msgstr "Nemůžete měnit heslo, pokud nejste připojen(a)."
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "Invalid password"
 msgstr "Neplatné heslo"
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "You must enter a password."
 msgstr "Musíte zadat heslo."
 
-#: ../src/dialogs.py:2581
+#: ../src/dialogs.py:2597
 msgid "Passwords do not match"
 msgstr "Hesla se neshodují"
 
-#: ../src/dialogs.py:2582
+#: ../src/dialogs.py:2598
 msgid "The passwords typed in both fields must be identical."
 msgstr "Hesla zadaná v obou políčkách musí být identická."
 
 #. default value
-#: ../src/dialogs.py:2619 ../src/notify.py:247 ../src/notify.py:473
+#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
 msgid "Contact Signed In"
 msgstr "Kontakt se přihlásil"
 
-#: ../src/dialogs.py:2621 ../src/notify.py:255 ../src/notify.py:475
+#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
 msgid "Contact Signed Out"
 msgstr "Kontakt se odhlásil"
 
 #. chat message
-#: ../src/dialogs.py:2623 ../src/notify.py:277 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
 msgid "New Message"
 msgstr "Nová zpráva"
 
 #. single message
-#: ../src/dialogs.py:2623 ../src/notify.py:259 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
 msgid "New Single Message"
 msgstr "Nová jednoduché zpráva"
 
 #. private message
-#: ../src/dialogs.py:2624 ../src/notify.py:265 ../src/notify.py:478
+#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
 msgid "New Private Message"
 msgstr "Nová soukromá zpráva"
 
-#: ../src/dialogs.py:2624 ../src/gui_interface.py:1358 ../src/notify.py:487
+#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
 msgid "New E-mail"
 msgstr "Nový E-mail"
 
-#: ../src/dialogs.py:2626 ../src/gui_interface.py:1420 ../src/notify.py:480
+#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
 msgid "File Transfer Request"
 msgstr "Žádost o přenos souboru"
 
-#: ../src/dialogs.py:2628 ../src/gui_interface.py:1320
-#: ../src/gui_interface.py:1389 ../src/notify.py:482
+#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
+#: ../src/gui_interface.py:1186 ../src/notify.py:482
 msgid "File Transfer Error"
 msgstr "Chyba přenosu souboru"
 
-#: ../src/dialogs.py:2630 ../src/gui_interface.py:1466
-#: ../src/gui_interface.py:1489 ../src/gui_interface.py:1506
+#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
+#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
 #: ../src/notify.py:484
 msgid "File Transfer Completed"
 msgstr "Přenos souboru dokončen"
 
-#: ../src/dialogs.py:2631 ../src/gui_interface.py:1469 ../src/notify.py:485
+#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
 msgid "File Transfer Stopped"
 msgstr "Přenos souboru zastaven"
 
-#: ../src/dialogs.py:2633 ../src/gui_interface.py:1152 ../src/notify.py:489
+#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
 msgid "Groupchat Invitation"
 msgstr "Skupinová pozvánka"
 
-#: ../src/dialogs.py:2635 ../src/notify.py:239 ../src/notify.py:491
+#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
 msgid "Contact Changed Status"
 msgstr "Kontakt změnil stav"
 
-#: ../src/dialogs.py:2836
+#: ../src/dialogs.py:2852
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Jednoduchá zpráva z účtu %s"
 
-#: ../src/dialogs.py:2838
+#: ../src/dialogs.py:2854
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Jednoduchá zpráva z účtu %s"
 
-#: ../src/dialogs.py:2840
+#: ../src/dialogs.py:2856
 msgid "Single Message"
 msgstr "Jednoduchá zpráva"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2843
+#: ../src/dialogs.py:2859
 #, python-format
 msgid "Send %s"
 msgstr "Odeslat %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:2882
 #, python-format
 msgid "Received %s"
 msgstr "Přijaté %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2889
+#: ../src/dialogs.py:2905
 #, 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:2968
+#: ../src/dialogs.py:2984
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:2985
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napsal(a):\n"
 
-#: ../src/dialogs.py:3028
+#: ../src/dialogs.py:3044
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konzole pro %s"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3046
 msgid "XML Console"
 msgstr "XML Konzole"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 msgid "add"
 msgstr "přidat"
 
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 msgid "modify"
 msgstr "upravit"
 
-#: ../src/dialogs.py:3160
+#: ../src/dialogs.py:3176
 msgid "remove"
 msgstr "odebrat"
 
-#: ../src/dialogs.py:3188
+#: ../src/dialogs.py:3204
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7234,154 +7418,188 @@ msgstr ""
 "vašeho rosteru."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3204 ../src/dialogs.py:3250
+#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
 msgid "Add"
 msgstr "Přidat"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3206 ../src/dialogs.py:3281
+#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
 msgid "Modify"
 msgstr "Upravit"
 
-#: ../src/dialogs.py:3212
+#: ../src/dialogs.py:3228
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3218
+#: ../src/dialogs.py:3234
 msgid "Groups"
 msgstr "Skupiny"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3342
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s mi doporučila přidat si Vás od mého rosteru."
 
-#: ../src/dialogs.py:3340
+#: ../src/dialogs.py:3356
 #, python-format
 msgid "Added  %s contacts"
 msgstr "Přidáno %s kontaktů"
 
-#: ../src/dialogs.py:3377
+#: ../src/dialogs.py:3393
 #, python-format
 msgid "Removed  %s contacts"
 msgstr "Odstraněno %s kontaktů"
 
-#: ../src/dialogs.py:3430
+#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#, python-format
+msgid "Archiving Preferences for %s"
+msgstr ""
+
+#: ../src/dialogs.py:3473
+#, fuzzy
+msgid "Invalid expire value"
+msgstr "Neplatné jméno serveru"
+
+#: ../src/dialogs.py:3474
+msgid "Expire must be a valid positive integer."
+msgstr ""
+
+#: ../src/dialogs.py:3521
+msgid "There is an error with the form"
+msgstr ""
+
+#: ../src/dialogs.py:3732
+#, fuzzy
+msgid "There is an error"
+msgstr "Služba vrátila chybu."
+
+#: ../src/dialogs.py:3796
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Soukromý seznam <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3434
+#: ../src/dialogs.py:3800
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Soukromý seznam pro %s"
 
-#: ../src/dialogs.py:3490
+#: ../src/dialogs.py:3856
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Pořadí: %(order)s, akce: %(action)s, typ: %(type)s, hodnota: %(value)s"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3861
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Pořadí: %(order)s, akce: %(action)s"
 
-#: ../src/dialogs.py:3539
+#: ../src/dialogs.py:3905
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Upravit pravidlo</b>"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:4016
 msgid "<b>Add a rule</b>"
 msgstr "<b>Přidat pravidlo</b>"
 
-#: ../src/dialogs.py:3750
+#: ../src/dialogs.py:4116
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Soukromý seznam pro %s"
 
-#: ../src/dialogs.py:3752
+#: ../src/dialogs.py:4118
 msgid "Privacy Lists"
 msgstr "Soukromý Seznam"
 
-#: ../src/dialogs.py:3822
+#: ../src/dialogs.py:4188
 msgid "Invalid List Name"
 msgstr "Neplatné jméno seznamu"
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4189
 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:3855
+#: ../src/dialogs.py:4221
 msgid "You are invited to a groupchat"
 msgstr "Jste pozván do diskuze"
 
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4224
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact Vás pozval(a) do místnosti %(room_jid)s"
 
-#: ../src/dialogs.py:3860
+#: ../src/dialogs.py:4226
 #, 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:3868
+#: ../src/dialogs.py:4234
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentář: %s"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4236
 msgid "Do you want to accept the invitation?"
 msgstr "Chcete přijmout pozvání?"
 
-#: ../src/dialogs.py:3932
+#: ../src/dialogs.py:4298
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:3942 ../src/dialogs.py:3985 ../src/dialogs.py:4041
+#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
+#: ../src/dialogs.py:4495
 msgid "All files"
 msgstr "VÅ¡echny soubory"
 
-#: ../src/dialogs.py:3947
+#: ../src/dialogs.py:4313
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:3975
+#: ../src/dialogs.py:4341
 msgid "Choose Sound"
 msgstr "Vyberte zvuk"
 
-#: ../src/dialogs.py:3990
+#: ../src/dialogs.py:4356
 msgid "Wav Sounds"
 msgstr "Waw soubory"
 
-#: ../src/dialogs.py:4028
+#: ../src/dialogs.py:4394
 msgid "Choose Image"
 msgstr "Vyberte obrázek"
 
-#: ../src/dialogs.py:4046
+#: ../src/dialogs.py:4412
 msgid "Images"
 msgstr "Obrázky"
 
-#: ../src/dialogs.py:4113
+#: ../src/dialogs.py:4482
+#, fuzzy
+msgid "Choose Archive"
+msgstr "Vyberte obrázek"
+
+#: ../src/dialogs.py:4500
+#, fuzzy
+msgid "Zip files"
+msgstr "VÅ¡echny soubory"
+
+#: ../src/dialogs.py:4525
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kdy %s může být:"
 
-#: ../src/dialogs.py:4115
+#: ../src/dialogs.py:4527
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Přidávám zvláštní notifikaci pro %s"
 
-#: ../src/dialogs.py:4190
+#: ../src/dialogs.py:4602
 msgid "Condition"
 msgstr "Podmínka"
 
-#: ../src/dialogs.py:4310
+#: ../src/dialogs.py:4722
 msgid "when I am "
 msgstr "když jsem "
 
-#: ../src/dialogs.py:4786
+#: ../src/dialogs.py:5198
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7392,19 +7610,19 @@ msgstr ""
 "\n"
 "Krátký Autentizační řetězec pro toto sezení je: <b>%(sas)s</b>"
 
-#: ../src/dialogs.py:4789
+#: ../src/dialogs.py:5201
 msgid "You have already verified this contact's identity."
 msgstr "Už jste prověřoval identitu tohoto kontaktu."
 
-#: ../src/dialogs.py:4795 ../src/dialogs.py:4879
+#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
 msgid "Contact's identity verified"
 msgstr "Identita kontaktu ověřena"
 
-#: ../src/dialogs.py:4801
+#: ../src/dialogs.py:5213
 msgid "Verify again..."
 msgstr "Ověřit znovu"
 
-#: ../src/dialogs.py:4806
+#: ../src/dialogs.py:5218
 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 "
@@ -7414,19 +7632,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:4809 ../src/dialogs.py:4860 ../src/dialogs.py:4873
+#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
 msgid "Contact's identity NOT verified"
 msgstr "Identita kontaktu NENÍ ověřena"
 
-#: ../src/dialogs.py:4814
+#: ../src/dialogs.py:5226
 msgid "Verify..."
 msgstr "Ověřit..."
 
-#: ../src/dialogs.py:4825
+#: ../src/dialogs.py:5237
 msgid "Have you verified the contact's identity?"
 msgstr "Ověřil(a) jste identitu kontaktu?"
 
-#: ../src/dialogs.py:4826
+#: ../src/dialogs.py:5238
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7440,21 +7658,21 @@ msgstr ""
 "Autentizační řetězec (SAS) jako vy.\n"
 "Krátký Autentizační řetězec: <b>%(sas)s</b>"
 
-#: ../src/dialogs.py:4827
+#: ../src/dialogs.py:5239
 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:4861
+#: ../src/dialogs.py:5273
 #, 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:4867
+#: ../src/dialogs.py:5279
 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:4874
+#: ../src/dialogs.py:5286
 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."
@@ -7463,7 +7681,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:4880
+#: ../src/dialogs.py:5292
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7471,19 +7689,19 @@ msgstr ""
 "Tento kontakt má přiřazen GPG klíč a tomuto klíči důvěřujete, zprávy tedy "
 "budou šifrované."
 
-#: ../src/dialogs.py:4945
+#: ../src/dialogs.py:5357
 msgid "an audio and video"
 msgstr "audio a video"
 
-#: ../src/dialogs.py:4947
+#: ../src/dialogs.py:5359
 msgid "an audio"
 msgstr "audio"
 
-#: ../src/dialogs.py:4949
+#: ../src/dialogs.py:5361
 msgid "a video"
 msgstr "video"
 
-#: ../src/dialogs.py:4953
+#: ../src/dialogs.py:5365
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7499,24 +7717,24 @@ msgstr "Ostatní"
 msgid "Conference"
 msgstr "Diskuze"
 
-#: ../src/disco.py:512
+#: ../src/disco.py:513
 msgid "Without a connection, you can not browse available services"
 msgstr "Bez spojení nemůžete prohlížet dostupné služby"
 
-#: ../src/disco.py:589
+#: ../src/disco.py:600
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Procházení služeb s použitím účtu %s"
 
-#: ../src/disco.py:591
+#: ../src/disco.py:602
 msgid "Service Discovery"
 msgstr "Service Discovery"
 
-#: ../src/disco.py:741
+#: ../src/disco.py:758
 msgid "The service could not be found"
 msgstr "Tato služba nebyla nalezena"
 
-#: ../src/disco.py:742
+#: ../src/disco.py:759
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7524,93 +7742,93 @@ msgstr ""
 "Služba na zadané adrese neexistuje, nebo neodpovídá. Zkontrolujte adresu a "
 "opakujte znovu."
 
-#: ../src/disco.py:746 ../src/disco.py:1082
+#: ../src/disco.py:763 ../src/disco.py:1100
 msgid "The service is not browsable"
 msgstr "Službu nelze prohlížet"
 
-#: ../src/disco.py:747
+#: ../src/disco.py:764
 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:786 ../src/disco.py:796
+#: ../src/disco.py:804 ../src/disco.py:814
 msgid "Invalid Server Name"
 msgstr "Neplatné jméno serveru"
 
-#: ../src/disco.py:850
+#: ../src/disco.py:868
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Procházím %(address)s pomocí účtu %(account)s"
 
-#: ../src/disco.py:894
+#: ../src/disco.py:912
 msgid "_Browse"
 msgstr "_Prohlížet"
 
-#: ../src/disco.py:1083
+#: ../src/disco.py:1101
 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:1323
+#: ../src/disco.py:1341
 msgid "_Execute Command"
 msgstr "Spustit _příkaz..."
 
-#: ../src/disco.py:1333 ../src/disco.py:1504
+#: ../src/disco.py:1351 ../src/disco.py:1522
 msgid "Re_gister"
 msgstr "Re_gistrace"
 
-#: ../src/disco.py:1545
+#: ../src/disco.py:1563
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skenuji %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1736
+#: ../src/disco.py:1754
 msgid "Users"
 msgstr "Uživatelé"
 
 #. Description column
-#: ../src/disco.py:1744
+#: ../src/disco.py:1762
 msgid "Description"
 msgstr "Popis"
 
 #. Id column
-#: ../src/disco.py:1752
+#: ../src/disco.py:1770
 msgid "Id"
 msgstr "č."
 
-#: ../src/disco.py:1817 ../src/gui_interface.py:3182
+#: ../src/disco.py:1835 ../src/gui_interface.py:2995
 msgid "Bookmark already set"
 msgstr "Záložka je už nastavena"
 
-#: ../src/disco.py:1818 ../src/gui_interface.py:3183
+#: ../src/disco.py:1836 ../src/gui_interface.py:2996
 #, 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:1827 ../src/gui_interface.py:3197
+#: ../src/disco.py:1845 ../src/gui_interface.py:3010
 msgid "Bookmark has been added successfully"
 msgstr "Záložka byla úspěšně přidána"
 
-#: ../src/disco.py:1828 ../src/gui_interface.py:3198
+#: ../src/disco.py:1846 ../src/gui_interface.py:3011
 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:2039
+#: ../src/disco.py:2057
 msgid "Subscribed"
 msgstr "Autorizován"
 
-#: ../src/disco.py:2047
+#: ../src/disco.py:2065
 msgid "Node"
 msgstr "Uzel"
 
-#: ../src/disco.py:2111
+#: ../src/disco.py:2129
 msgid "New post"
 msgstr "Nový záznam"
 
-#: ../src/disco.py:2117
+#: ../src/disco.py:2135
 msgid "_Subscribe"
 msgstr "_Žádat autorizaci"
 
-#: ../src/disco.py:2123
+#: ../src/disco.py:2141
 msgid "_Unsubscribe"
 msgstr "_Zrušit autorizaci"
 
@@ -7781,17 +7999,19 @@ msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Převede LaTeX výraz mezi $$ $$."
 
 #: ../src/features_window.py:95
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
-"in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
 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
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
+"You have to set 'use_latex' to True in the Advanced Configuration Editor."
 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í."
@@ -7951,33 +8171,33 @@ msgstr "Popis: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s Vám chce poslat soubor:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Nemohu přepsat existující soubor \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
 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:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 msgid "This file already exists"
 msgstr "Tento soubor už existuje"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 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:369 ../src/gtkgui_helpers.py:914
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Adresář \"%s\" není zapisovatelný"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
 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."
 
@@ -8080,28 +8300,28 @@ msgstr ""
 "Jiná instance Gajimu pravděpodobně již běží\n"
 "Přesto spustit?"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
 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:80
+#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
 msgid "command"
 msgstr "příkaz"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "zobraz nápovědu k příkazu"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Zobrazí nebo skryje okno Seznamu"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Zobrazí okno s další nepřečtenou událostí"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8109,6 +8329,13 @@ msgstr ""
 "Vytiskne seznam všech kontaktů v rosteru. Každý kontakt se objeví na "
 "samostatném řádku"
 
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
+#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
+#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
+#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
 #: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
 #: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
 #: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
@@ -8120,42 +8347,34 @@ msgstr ""
 msgid "account"
 msgstr "účet"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "zobraz pouze kontakty zadaného účtu"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Vypíše seznam registrovaných účtů"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
 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:109
+#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
 msgid "status"
 msgstr "stav"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106
 #, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"accoun't previous status"
+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:110 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
-msgid "message"
-msgstr "zpráva"
-
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "text stavu"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8163,44 +8382,20 @@ 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:117
-msgid "Changes the priority of account or accounts"
-msgstr "Změní prioritu jednoho nebo více účtů"
-
-#: ../src/gajim-remote.py:119
-msgid "priority"
-msgstr "priorita"
-
-#: ../src/gajim-remote.py:119
-msgid "priority you want to give to the account"
-msgstr "priorita vámi přidělená účtu"
-
-#: ../src/gajim-remote.py:121
-#, fuzzy
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-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:127
+#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
 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:129
+#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID kontaktu, se kterým chcete komunikovat"
 
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
 #: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 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:134
-msgid "message content. The account must be specified or \"\""
-msgstr "obsah zprávy. Účet musí být uveden, nebo prázdné \"\""
-
-#: ../src/gajim-remote.py:139
+#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
 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 "
@@ -8210,29 +8405,34 @@ msgstr ""
 "volitelné. Pokud chcete nastavit pouze 'account' bez 'OpenPGP key', nastavte "
 "prostÄ› 'OpenPGP key' na ''."
 
+#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
 #: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID kontaktu, který obdrží zprávu"
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
+#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "Tělo zprávy"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "pgp klíč"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "pokud bude uvedeno, zpráva bude zašifrována tímto veřejným klíčem"
 
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
+#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "pokud bude uvedeno, zpráva bude odeslána z tohoto účtu"
 
-#: ../src/gajim-remote.py:152
+#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
 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 "
@@ -8242,141 +8442,281 @@ msgstr ""
 "jsou volitelné. Pokud chcete nastavit pouze 'account' bez 'OpenPGP key', "
 "nastavte prostÄ› 'OpenPGP key' na ''."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "předmět"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "předmět zprávy"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Poslat novou zprávu do diskuze ke které jste připojeni."
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "JID diskuze do které přijde zpráva"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Získej detailní informace o kontaktu"
 
+#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
+#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
 #: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
 #: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID kontaktu"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Získej detailní informace o účtu"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Jméno účtu"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Pošle soubor kontaktu"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "file"
 msgstr "soubor"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Cesta k souboru"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "pokud bude uvedeno, zpráva bude odeslána z tohoto účtu"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Vypíše všechna nastavení a jejich hodnoty"
 
 # FIXME: opravit, pokud je mozne prekladat i key & value
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Nastaví hodnotu klíče 'key' na hodnotu 'value'"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "klíč=hodnota"
 
 # FIXME: opet
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'klíč' je jméno volby, 'hodnota' je hodnota která se nastavuje"
 
-#: ../src/gajim-remote.py:207
-msgid "Deletes a preference item"
-msgstr "Smaže položku nastavení"
+#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
+msgid "Deletes a preference item"
+msgstr "Smaže položku nastavení"
+
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "key"
+msgstr "klíč"
+
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "name of the preference to be deleted"
+msgstr "jméno volby, která bude smazána"
+
+#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+msgid "Writes the current state of Gajim preferences to the .config file"
+msgstr "Zapíše aktuální nastavení do souboru .config"
+
+#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
+msgid "Removes contact from roster"
+msgstr "Odstraní kontakt ze Seznamu"
+
+#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+msgid "Adds contact to roster"
+msgstr "Přidat kontakt do Seznamu"
+
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+msgid "Adds new contact to this account"
+msgstr "Přidá nový kontakt do tohoto účtu"
+
+#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+msgid "Returns current status (the global one unless account is specified)"
+msgstr "Vrátí aktuální stav (globální, pokud není uveden účet)"
+
+#: ../src/gajim-remote-plugin.py:226
+#, fuzzy
+msgid ""
+"Returns current status message(the global one unless account is specified)"
+msgstr "Vrací aktuální popis stavu (globální, pokud není uveden účet)"
+
+#: ../src/gajim-remote-plugin.py:233 ../src/gajim-remote.py:249
+msgid "Returns number of unread messages"
+msgstr "Vrací počet nepřečtených zpráv"
+
+#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+msgid "Opens 'Start Chat' dialog"
+msgstr "Otevře dialog 'Začít rozhovor'"
+
+#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+msgid "Starts chat, using this account"
+msgstr "Začít rozhovor z tohoto účtu"
+
+#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+msgid "Sends custom XML"
+msgstr "Poslat vlastní XML"
+
+#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+msgid "XML to send"
+msgstr "XML k odeslání"
+
+#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+"Účet, ze kterého bude xml odesláno; pokud nebude uvedeno, xml bude odeslání "
+"ze všech účtů"
+
+#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
+msgid "Handle a xmpp:/ uri"
+msgstr "Obsluhovat xmpp:/ uri"
+
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
+msgid "uri"
+msgstr "uri"
+
+#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+msgid "Join a MUC room"
+msgstr "_Vstoupit do místnosti MUC"
+
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+msgid "room"
+msgstr "místnost"
+
+#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+msgid "nick"
+msgstr "přezdívka"
+
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+msgid "password"
+msgstr "heslo"
+
+#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+msgid "Check if Gajim is running"
+msgstr "Zkontrolujte, zda Gajim již běží."
+
+#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
+#: ../src/gajim-remote.py:300
+msgid "Shows or hides the ipython window"
+msgstr "Zobrazí nebo skryje okno ipythonu"
+
+#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+msgid "Missing argument \"contact_jid\""
+msgstr "Chybí parametry \"contact_jid\""
+
+#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#, python-format
+msgid ""
+"'%s' is not in your roster.\n"
+"Please specify account for sending the message."
+msgstr ""
+"'%s' není ve vašem Seznamu.\n"
+"Prosím uveďte účet, přes který bude odeslána zpráva."
+
+#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+msgid "You have no active account"
+msgstr "Nemáte aktivní účet"
 
-#: ../src/gajim-remote.py:209
-msgid "key"
-msgstr "klíč"
+#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+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:209
-msgid "name of the preference to be deleted"
-msgstr "jméno volby, která bude smazána"
+#: ../src/gajim-remote-plugin.py:412
+#, python-format
+msgid ""
+"Usage: %s %s %s \n"
+"\t %s"
+msgstr ""
+"Použití: %s %s %s \n"
+"\t %s"
 
-#: ../src/gajim-remote.py:213
-msgid "Writes the current state of Gajim preferences to the .config file"
-msgstr "Zapíše aktuální nastavení do souboru .config"
+#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+msgid "Arguments:"
+msgstr "Parametry:"
 
-#: ../src/gajim-remote.py:218
-msgid "Removes contact from roster"
-msgstr "Odstraní kontakt ze Seznamu"
+#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#, python-format
+msgid "%s not found"
+msgstr "%s nebyl nalezen"
 
-#: ../src/gajim-remote.py:227
-msgid "Adds contact to roster"
-msgstr "Přidat kontakt do Seznamu"
+#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
+#, python-format
+msgid ""
+"Usage: %s command [arguments]\n"
+"Command is one of:\n"
+msgstr ""
+"Použití: %s příkaz [parametry]\n"
+"Příkaz je jeden z:\n"
 
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "jid"
+#: ../src/gajim-remote-plugin.py:496
+#, fuzzy, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Příliš mnoho parametrů. \n"
+"Napište \"%(basename)s help %(command)s\" pro více informací"
 
-#: ../src/gajim-remote.py:230
-msgid "Adds new contact to this account"
-msgstr "Přidá nový kontakt do tohoto účtu"
+#: ../src/gajim-remote-plugin.py:500
+#, fuzzy, python-format
+msgid ""
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Parametr \"%(arg)s\" nebyl uveden. \n"
+"Napište \"%(basename)s help %(command)s\" pro více informací"
 
-#: ../src/gajim-remote.py:235
-msgid "Returns current status (the global one unless account is specified)"
-msgstr "Vrátí aktuální stav (globální, pokud není uveden účet)"
+#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
+msgid "Wrong uri"
+msgstr "Nesprávné uri"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:109
+#, fuzzy
 msgid ""
-"Returns current status message (the global one unless account is specified)"
-msgstr "Vrací aktuální popis stavu (globální, pokud není uveden účet)"
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
+msgstr ""
+"jeden z: odpojen, připojen, ukecaný, pryč, nedostupný, nerušit, neviditelný "
 
-#: ../src/gajim-remote.py:249
-msgid "Returns number of unread messages"
-msgstr "Vrací počet nepřečtených zpráv"
+#: ../src/gajim-remote.py:117
+msgid "Changes the priority of account or accounts"
+msgstr "Změní prioritu jednoho nebo více účtů"
 
-#: ../src/gajim-remote.py:253
-msgid "Opens 'Start Chat' dialog"
-msgstr "Otevře dialog 'Začít rozhovor'"
+#: ../src/gajim-remote.py:119
+msgid "priority"
+msgstr "priorita"
 
-#: ../src/gajim-remote.py:255
-msgid "Starts chat, using this account"
-msgstr "Začít rozhovor z tohoto účtu"
+#: ../src/gajim-remote.py:119
+msgid "priority you want to give to the account"
+msgstr "priorita vámi přidělená účtu"
 
-#: ../src/gajim-remote.py:259
-msgid "Sends custom XML"
-msgstr "Poslat vlastní XML"
+#: ../src/gajim-remote.py:121
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+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:261
-msgid "XML to send"
-msgstr "XML k odeslání"
+#: ../src/gajim-remote.py:134
+msgid "message content. The account must be specified or \"\""
+msgstr "obsah zprávy. Účet musí být uveden, nebo prázdné \"\""
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:242
 msgid ""
-"Account in which the xml will be sent; if not specified, xml will be sent to "
-"all accounts"
-msgstr ""
-"Účet, ze kterého bude xml odesláno; pokud nebude uvedeno, xml bude odeslání "
-"ze všech účtů"
+"Returns current status message (the global one unless account is specified)"
+msgstr "Vrací aktuální popis stavu (globální, pokud není uveden účet)"
 
 #: ../src/gajim-remote.py:268
 #, fuzzy
@@ -8397,14 +8737,6 @@ msgstr ""
 "Účet, ze kterého bude xml odesláno; pokud nebude uvedeno, xml bude odeslání "
 "ze všech účtů"
 
-#: ../src/gajim-remote.py:277
-msgid "Handle a xmpp:/ uri"
-msgstr "Obsluhovat xmpp:/ uri"
-
-#: ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "uri"
-
 #: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr "URI k obsluze"
@@ -8417,30 +8749,14 @@ msgstr "Účet s kterým chcete manipulovat"
 msgid "Message content"
 msgstr "Obsah zprávy"
 
-#: ../src/gajim-remote.py:286
-msgid "Join a MUC room"
-msgstr "_Vstoupit do místnosti MUC"
-
-#: ../src/gajim-remote.py:288
-msgid "room"
-msgstr "místnost"
-
 #: ../src/gajim-remote.py:288
 msgid "Room JID"
 msgstr "JID Místnosti"
 
-#: ../src/gajim-remote.py:289
-msgid "nick"
-msgstr "přezdívka"
-
 #: ../src/gajim-remote.py:289
 msgid "Nickname to use"
 msgstr "Přezdívka kterou chete použít"
 
-#: ../src/gajim-remote.py:290
-msgid "password"
-msgstr "heslo"
-
 #: ../src/gajim-remote.py:290
 msgid "Password to enter the room"
 msgstr "Heslo pro vstup do místnosti"
@@ -8449,35 +8765,6 @@ msgstr "Heslo pro vstup do místnosti"
 msgid "Account from which you want to enter the room"
 msgstr "Účet z kterého chcete vstoupit do místnosti"
 
-#: ../src/gajim-remote.py:296
-msgid "Check if Gajim is running"
-msgstr "Zkontrolujte, zda Gajim již běží."
-
-#: ../src/gajim-remote.py:300
-msgid "Shows or hides the ipython window"
-msgstr "Zobrazí nebo skryje okno ipythonu"
-
-#: ../src/gajim-remote.py:327
-msgid "Missing argument \"contact_jid\""
-msgstr "Chybí parametry \"contact_jid\""
-
-#: ../src/gajim-remote.py:348
-#, python-format
-msgid ""
-"'%s' is not in your roster.\n"
-"Please specify account for sending the message."
-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:351
-msgid "You have no active account"
-msgstr "Nemáte aktivní účet"
-
-#: ../src/gajim-remote.py:404
-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:431
 #, python-format
 msgid ""
@@ -8487,24 +8774,6 @@ msgstr ""
 "Použití: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:435
-msgid "Arguments:"
-msgstr "Parametry:"
-
-#: ../src/gajim-remote.py:439
-#, python-format
-msgid "%s not found"
-msgstr "%s nebyl nalezen"
-
-#: ../src/gajim-remote.py:445
-#, python-format
-msgid ""
-"Usage: %s command [arguments]\n"
-"Command is one of:\n"
-msgstr ""
-"Použití: %s příkaz [parametry]\n"
-"Příkaz je jeden z:\n"
-
 #: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
@@ -8527,10 +8796,6 @@ msgstr ""
 msgid "No uri given"
 msgstr ""
 
-#: ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Nesprávné uri"
-
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Téma"
@@ -8556,178 +8821,176 @@ msgstr "Nemůžete smazat právě používané téma"
 msgid "Please first choose another for your current theme."
 msgstr "Vyberte prosím napřed jiné téma."
 
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:170
 msgid "Sending private message failed"
 msgstr "Odesílání soukromé zprávy selhalo"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:171
+#: ../src/groupchat_control.py:172
 #, python-format
 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:450
+#: ../src/groupchat_control.py:455
 msgid "Insert Nickname"
 msgstr "Vložit přezdívku"
 
-#: ../src/groupchat_control.py:631
+#: ../src/groupchat_control.py:636
 msgid "Conversation with "
 msgstr "Rozhovor s"
 
-#: ../src/groupchat_control.py:633
+#: ../src/groupchat_control.py:638
 msgid "Continued conversation"
 msgstr "Pokračování v rozhovoru"
 
-#. Can be a message (see handle_event_gc_config_change in
-#. gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1272 ../src/gui_interface.py:1080
+#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Každý návštěvník uvidí váš úplný JID"
 
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1286
 msgid "Room logging is enabled"
 msgstr "Zaznamenávání historie je povoleno"
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1288
 msgid "A new room has been created"
 msgstr "Nová místnost byla vytvořena"
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1291
 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:1287
+#: ../src/groupchat_control.py:1297
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s byli vyhozeni: %(reason)s"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1300
 #, 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:1300
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s byli zakázáni: %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1312
 #, 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:1314 ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
 #, python-format
 msgid "You are now known as %s"
 msgstr "Jste nyní znám(a) jako %s"
 
-#: ../src/groupchat_control.py:1330 ../src/gui_interface.py:919
+#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s se přejmenoval na %(new_nick)s"
 
-#: ../src/groupchat_control.py:1372 ../src/groupchat_control.py:1377
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1392
 #, 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:1374
+#: ../src/groupchat_control.py:1383
 msgid "affiliation changed"
 msgstr "Příslušnost:"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1388
 msgid "room configuration changed to members-only"
 msgstr "nastavení místnosti se změnilo na vstup pouze členům"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1394
 msgid "system shutdown"
 msgstr "vypnout systém"
 
-#: ../src/groupchat_control.py:1470
+#: ../src/groupchat_control.py:1477
 #, 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:1474
+#: ../src/groupchat_control.py:1481
 #, 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:1489
+#: ../src/groupchat_control.py:1496
 #, 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:1493
+#: ../src/groupchat_control.py:1500
 #, 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:1522
+#: ../src/groupchat_control.py:1530
 #, python-format
 msgid "%s has left"
 msgstr "%s odešel(a)"
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1535
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s vstoupil do místnosti"
 
-#: ../src/groupchat_control.py:1529 ../src/gui_interface.py:946
+#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
 #: ../src/history_window.py:447 ../src/notify.py:234
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s je nyní %(status)s"
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1774
 #, 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:1761
+#: ../src/groupchat_control.py:1776
 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:1765 ../src/gui_interface.py:1216
-#: ../src/gui_interface.py:1992 ../src/gui_interface.py:2029
-#: ../src/gui_interface.py:2064 ../src/message_window.py:224
-#: ../src/roster_window.py:2739 ../src/roster_window.py:3399
-#: ../src/roster_window.py:4123
+#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
+#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
+#: ../src/gui_interface.py:1853 ../src/message_window.py:224
+#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
+#: ../src/roster_window.py:4195
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "Příště _nezobrazovat"
 
-#: ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:1814
 msgid "Changing Subject"
 msgstr "Měním Téma"
 
-#: ../src/groupchat_control.py:1800
+#: ../src/groupchat_control.py:1815
 msgid "Please specify the new subject:"
 msgstr "Prosím zadejte nové téma:"
 
-#: ../src/groupchat_control.py:1807
+#: ../src/groupchat_control.py:1822
 msgid "Changing Nickname"
 msgstr "Měním přezdívku"
 
-#: ../src/groupchat_control.py:1808
+#: ../src/groupchat_control.py:1823
 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:1839
+#: ../src/groupchat_control.py:1854
 #, python-format
 msgid "Destroying %s"
 msgstr "Likviduji: %s"
 
-#: ../src/groupchat_control.py:1840
+#: ../src/groupchat_control.py:1855
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8735,22 +8998,22 @@ msgstr ""
 "Místnost bude s konečnou platností zničena.\n"
 "Můžete specifikovat důvod zničení:"
 
-#: ../src/groupchat_control.py:1842
+#: ../src/groupchat_control.py:1857
 msgid "You may also enter an alternate venue:"
 msgstr "Také můžete specifikovat náhradní místo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2028
+#: ../src/groupchat_control.py:2046
 #, python-format
 msgid "Kicking %s"
 msgstr "Vyhazuji %s"
 
-#: ../src/groupchat_control.py:2029 ../src/groupchat_control.py:2356
+#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
 msgid "You may specify a reason below:"
 msgstr "Můžete uvést důvod níže:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2355
+#: ../src/groupchat_control.py:2373
 #, python-format
 msgid "Banning %s"
 msgstr "Zakazuji %s"
@@ -8775,54 +9038,63 @@ msgid "Details"
 msgstr "Detaily"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
+#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Chyba: nemůžu otevřít %s pro čtení"
 
-#: ../src/gtkgui_helpers.py:400
+#: ../src/gtkgui_helpers.py:404
 msgid "Error reading file:"
 msgstr "Chyba při čtení souboru:"
 
-#: ../src/gtkgui_helpers.py:403
+#: ../src/gtkgui_helpers.py:407
 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:444
+#: ../src/gtkgui_helpers.py:448
 #, 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:818
+#: ../src/gtkgui_helpers.py:822
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim není výchozí Jabber klient"
 
-#: ../src/gtkgui_helpers.py:819
+#: ../src/gtkgui_helpers.py:823
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Chcete nastavit Gajim jako výchozí Jabber klient?"
 
-#: ../src/gtkgui_helpers.py:820
+#: ../src/gtkgui_helpers.py:824
 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:887
+#: ../src/gtkgui_helpers.py:891
 msgid "Extension not supported"
 msgstr "Rozšíření není podporováno"
 
-#: ../src/gtkgui_helpers.py:888
+#: ../src/gtkgui_helpers.py:892
 #, 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:924
+#: ../src/gtkgui_helpers.py:928
 msgid "Save Image as..."
 msgstr "Uložit obrázek jako..."
 
-#: ../src/gui_interface.py:140
+#. we are banned
+#. group chat does not exist
+#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
+#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
+#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
+#: ../src/gui_interface.py:348
+msgid "Unable to join group chat"
+msgstr "Nelze se připojit se do diskuze"
+
+#: ../src/gui_interface.py:138
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8833,58 +9105,92 @@ msgstr ""
 "zaregistrována někým jiným.\n"
 "Níže vyber jinou přezdívku:"
 
-#: ../src/gui_interface.py:143
+#: ../src/gui_interface.py:141
 msgid "Always use this nickname when there is a conflict"
 msgstr "Vždy při konfliktu použij tuto přezdívku."
 
-#: ../src/gui_interface.py:159
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Chcete přijmout tuto žádost?"
 
-#: ../src/gui_interface.py:161
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Chcete přijmout tuto žádost na účtě %s?"
 
-#: ../src/gui_interface.py:164
+#: ../src/gui_interface.py:163
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Autorizace pro %(url)s (id: %(id)s)"
 
-#: ../src/gui_interface.py:213 ../src/notify.py:493
+#: ../src/gui_interface.py:209 ../src/notify.py:493
 msgid "Connection Failed"
 msgstr "Spojení selhalo"
 
-#: ../src/gui_interface.py:606 ../src/gui_interface.py:610
+#: ../src/gui_interface.py:312
+#, 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, prosím."
+
+#: ../src/gui_interface.py:324
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr "V %s byl dosažen maximální počet uživatelů"
+
+#: ../src/gui_interface.py:333
+#, python-format
+msgid "You are banned from group chat %s."
+msgstr "Máš zakázán přístup do diskuze %s."
+
+#: ../src/gui_interface.py:338
+#, python-format
+msgid "Group chat %s does not exist."
+msgstr "Diskuze %s neexistuje."
+
+#: ../src/gui_interface.py:341
+msgid "Group chat creation is restricted."
+msgstr "Vytváření místností není povoleno."
+
+#: ../src/gui_interface.py:344
+#, 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/gui_interface.py:349
+#, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Nejsi v seznamu členů diskuze %s."
+
+#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Chyba %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:621 ../src/gui_interface.py:636
+#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "chyba při odesílání %s ( %s )"
 
-#: ../src/gui_interface.py:663 ../src/notify.py:495
+#: ../src/gui_interface.py:540 ../src/notify.py:495
 msgid "Subscription request"
 msgstr "Žádost o autorizaci"
 
-#: ../src/gui_interface.py:688
+#: ../src/gui_interface.py:565
 msgid "Authorization accepted"
 msgstr "Autorizace přijata"
 
-#: ../src/gui_interface.py:689
+#: ../src/gui_interface.py:566
 #, 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/gui_interface.py:702
+#: ../src/gui_interface.py:579
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" Vám odebral autorizaci"
 
-#: ../src/gui_interface.py:703
+#: ../src/gui_interface.py:580
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8892,59 +9198,54 @@ msgstr ""
 "Vždy uvidíte jeho nebo ji odpojeného/odpojenou.\n"
 "Opravdu jeho/ji chcete odstrani ze seznamu kontaktů?"
 
-#: ../src/gui_interface.py:727 ../src/notify.py:497
+#: ../src/gui_interface.py:604 ../src/notify.py:497
 msgid "Unsubscribed"
 msgstr "Autorizace zrušena"
 
-#: ../src/gui_interface.py:754
+#: ../src/gui_interface.py:631
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt s \"%s\" nebyl navázán"
 
-#: ../src/gui_interface.py:1015
+#: ../src/gui_interface.py:859
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s nastavil předmět na %(subject)s"
 
-#: ../src/gui_interface.py:1083
+#: ../src/gui_interface.py:926
 msgid "Room now shows unavailable member"
 msgstr "Místnost nyní zobrazuje nedostupné členy"
 
-#: ../src/gui_interface.py:1085
+#: ../src/gui_interface.py:928
 msgid "room now does not show unavailable members"
 msgstr "místnost nyní nezobrazuje nedostupné členy"
 
-#: ../src/gui_interface.py:1087
+#: ../src/gui_interface.py:930
 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/gui_interface.py:1091
+#: ../src/gui_interface.py:934
 msgid "Room logging is now enabled"
 msgstr "Zaznamenávání historie je zapnuto"
 
-#: ../src/gui_interface.py:1093
+#: ../src/gui_interface.py:936
 msgid "Room logging is now disabled"
 msgstr "Zaznamenávání historie je vypnuto"
 
-#: ../src/gui_interface.py:1095
+#: ../src/gui_interface.py:938
 msgid "Room is now non-anonymous"
 msgstr "Místnost není anonymní"
 
-#: ../src/gui_interface.py:1098
+#: ../src/gui_interface.py:941
 msgid "Room is now semi-anonymous"
 msgstr "Místnost je částečně anonymní"
 
-#: ../src/gui_interface.py:1101
+#: ../src/gui_interface.py:944
 msgid "Room is now fully-anonymous"
 msgstr "Místnost je plně anonymní"
 
-#: ../src/gui_interface.py:1133
-#, 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, prosím."
-
-#: ../src/gui_interface.py:1180
+#: ../src/gui_interface.py:985
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -8952,23 +9253,23 @@ msgstr ""
 "Nastavily jste Gajim aby používal GPG agenta, ale žádný GPG agent není "
 "spuštěný nebo vrátil chybné heslo.\n"
 
-#: ../src/gui_interface.py:1182 ../src/gui_interface.py:1189
+#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Momentálně jste připojen(a) bez vašeho OpenPGP klíče."
 
-#: ../src/gui_interface.py:1184
+#: ../src/gui_interface.py:989
 msgid "Your passphrase is incorrect"
 msgstr "Vaše heslo je neplatné"
 
-#: ../src/gui_interface.py:1188
+#: ../src/gui_interface.py:993
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Heslo OpenGPG není platné"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid "GPG key not trusted"
 msgstr "GPG klíč není důvěryhodný"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
@@ -8976,7 +9277,7 @@ msgstr ""
 "GPG klíč použitý k šifrování rozhovoru není důvěryhodný. Opravdu chcete "
 "šifrovat tuto zprávu?"
 
-#: ../src/gui_interface.py:1226
+#: ../src/gui_interface.py:1031
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not                 correctly started "
@@ -8985,12 +9286,12 @@ msgstr ""
 "Gnome Keyring je nainstalován ale není správně spuštěn (proměná prostředí "
 "není asi správně nastavena)"
 
-#: ../src/gui_interface.py:1330
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nový E-mail pro %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1332
+#: ../src/gui_interface.py:1133
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -8998,7 +9299,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/gui_interface.py:1345
+#: ../src/gui_interface.py:1146
 #, python-format
 msgid ""
 "\n"
@@ -9013,42 +9314,42 @@ msgstr ""
 "Předmět: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1418
+#: ../src/gui_interface.py:1215
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s Vám chce poslat soubor."
 
-#: ../src/gui_interface.py:1455 ../src/roster_window.py:1856
+#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
 msgid "Remote contact stopped transfer"
 msgstr "Protějšek zastavil přenos"
 
-#: ../src/gui_interface.py:1458 ../src/roster_window.py:1858
+#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
 msgid "Error opening file"
 msgstr "Chyba při čtení souboru"
 
-#: ../src/gui_interface.py:1490
+#: ../src/gui_interface.py:1287
 #, 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/gui_interface.py:1494
+#: ../src/gui_interface.py:1291
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Přenos souboru %(filename)s od %(name)s byl zastaven."
 
-#: ../src/gui_interface.py:1507
+#: ../src/gui_interface.py:1304
 #, 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/gui_interface.py:1511
+#: ../src/gui_interface.py:1308
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Přenos souboru %(filename)s pro %(name)s byl zastaven."
 
-#: ../src/gui_interface.py:1623
+#: ../src/gui_interface.py:1426
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -9057,56 +9358,56 @@ msgstr ""
 "Nepodařilo se dešifrovat zprávu od %s\n"
 "Možná je falešná."
 
-#: ../src/gui_interface.py:1630
+#: ../src/gui_interface.py:1433
 msgid "Unable to decrypt message"
 msgstr "Nepodařilo se dešifrovat zprávu"
 
-#: ../src/gui_interface.py:1702
+#: ../src/gui_interface.py:1505
 msgid "Username Conflict"
 msgstr "Konflikt uživatelských jmen"
 
-#: ../src/gui_interface.py:1703
+#: ../src/gui_interface.py:1506
 msgid "Please type a new username for your local account"
 msgstr "Prosím zadejte nové uživatelské jméno pro lokální účet"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1519
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gui_interface.py:1729
+#: ../src/gui_interface.py:1532
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gui_interface.py:1740
+#: ../src/gui_interface.py:1543
 msgid "Error."
 msgstr "Chyba."
 
-#: ../src/gui_interface.py:1768
+#: ../src/gui_interface.py:1556
 msgid "Resource Conflict"
 msgstr "Konflikt Zdrojů"
 
-#: ../src/gui_interface.py:1769
+#: ../src/gui_interface.py:1557
 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ý"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1816
+#: ../src/gui_interface.py:1604
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s chce zahájit hlasový rozhovor. "
 
-#: ../src/gui_interface.py:1819
+#: ../src/gui_interface.py:1607
 msgid "Voice Chat Request"
 msgstr "Žádost o hlasový rozhovor"
 
-#: ../src/gui_interface.py:1927
+#: ../src/gui_interface.py:1716
 msgid "Error verifying SSL certificate"
 msgstr "Chyba ověřování SSL certifikátu"
 
-#: ../src/gui_interface.py:1928
+#: ../src/gui_interface.py:1717
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9116,15 +9417,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/gui_interface.py:1936
+#: ../src/gui_interface.py:1725
 msgid "Ignore this error for this certificate."
 msgstr "Ignorovat tuto chybu certifikátu."
 
-#: ../src/gui_interface.py:1956
+#: ../src/gui_interface.py:1745
 msgid "SSL certificate error"
 msgstr "Chyba SSL certifikátu"
 
-#: ../src/gui_interface.py:1957
+#: ../src/gui_interface.py:1746
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9141,12 +9442,12 @@ msgstr ""
 "\n"
 "Chcete se stále připojit a aktualizovat otisk certifikátu?"
 
-#: ../src/gui_interface.py:1987 ../src/gui_interface.py:2024
-#: ../src/gui_interface.py:2060
+#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
+#: ../src/gui_interface.py:1849
 msgid "Insecure connection"
 msgstr "Nezabezpečené Spojení"
 
-#: ../src/gui_interface.py:1988
+#: ../src/gui_interface.py:1777
 #, fuzzy
 msgid ""
 "You are about to connect to the server with an insecure connection. This "
@@ -9156,12 +9457,12 @@ msgstr ""
 "Abyste nemuseli posílat heslo nezabezpečeným připojením nainstalujte si "
 "PyOpenSSL. Jste si jisti, že to chcete udělat?"
 
-#: ../src/gui_interface.py:1991 ../src/gui_interface.py:2028
-#: ../src/gui_interface.py:2063
+#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
+#: ../src/gui_interface.py:1852
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ano, chci se připojit nezabezpečeně"
 
-#: ../src/gui_interface.py:2025
+#: ../src/gui_interface.py:1814
 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?"
@@ -9169,7 +9470,7 @@ msgstr ""
 "Abyste nemuseli posílat heslo nezabezpečeným připojením nainstalujte si "
 "PyOpenSSL. Jste si jisti, že to chcete udělat?"
 
-#: ../src/gui_interface.py:2061
+#: ../src/gui_interface.py:1850
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9179,11 +9480,11 @@ msgstr ""
 "to skutečně chcete udělat?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2624 ../src/gui_interface.py:2647
+#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
 msgid "Emoticons disabled"
 msgstr "Smajlíci byly vypnuty"
 
-#: ../src/gui_interface.py:2625
+#: ../src/gui_interface.py:2423
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -9191,7 +9492,7 @@ msgstr ""
 "Vámi nastavené téma pro smajlíky nebylo nalezeno, proto budou smajlíci "
 "vypnuty "
 
-#: ../src/gui_interface.py:2648
+#: ../src/gui_interface.py:2446
 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 "
@@ -9201,41 +9502,41 @@ msgstr ""
 "aktualizovat formát v souboru emoticons.py. Viz.: http://trac.gajim.org/wiki/"
 "Emoticons "
 
-#: ../src/gui_interface.py:2679 ../src/roster_window.py:3560
+#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
 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/gui_interface.py:3058
+#: ../src/gui_interface.py:2871
 msgid "Could not save your settings and preferences"
 msgstr "Nelze uložit Vaše nastavení"
 
-#: ../src/gui_interface.py:3592
+#: ../src/gui_interface.py:3411
 msgid "Passphrase Required"
 msgstr "Heslo Vyžadováno"
 
-#: ../src/gui_interface.py:3593
+#: ../src/gui_interface.py:3412
 #, 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/gui_interface.py:3607
+#: ../src/gui_interface.py:3426
 msgid "GPG key expired"
 msgstr "GPG klíč vypršel"
 
-#: ../src/gui_interface.py:3608
+#: ../src/gui_interface.py:3427
 #, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Váš GPG klíč vypršel, k %s budete připojen(a) bez OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3617
+#: ../src/gui_interface.py:3436
 msgid "Wrong Passphrase"
 msgstr "Nesprávné heslo"
 
-#: ../src/gui_interface.py:3618
+#: ../src/gui_interface.py:3437
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Prosím zopakujte Vaše heslo pro GPG klíč, nebo stiskněte Zrušit."
 
@@ -9273,6 +9574,11 @@ msgstr "Přezdívka"
 msgid "Message"
 msgstr "Zpráva"
 
+#. holds subject
+#: ../src/history_manager.py:188 ../src/history_manager.py:219
+msgid "Subject"
+msgstr "Předmět"
+
 #: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -9369,19 +9675,19 @@ msgstr "Chystáte se zavřít několik panelů"
 msgid "Do you really want to close them all?"
 msgstr "Opravdu je chcete všechny zavřít?"
 
-#: ../src/message_window.py:484
+#: ../src/message_window.py:485
 msgid "Chats"
 msgstr "Rozhovory"
 
-#: ../src/message_window.py:486
+#: ../src/message_window.py:487
 msgid "Group Chats"
 msgstr "Diskuze"
 
-#: ../src/message_window.py:488
+#: ../src/message_window.py:489
 msgid "Private Chats"
 msgstr "Soukromé rozhovory"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:495
 msgid "Messages"
 msgstr "Zprávy"
 
@@ -9437,107 +9743,107 @@ msgstr "Nová zpráva od %(nickname)s"
 msgid "Ignore"
 msgstr "Ignorovat"
 
-#: ../src/profile_window.py:57
+#: ../src/profile_window.py:58
 msgid "Retrieving profile..."
 msgstr "Stahuji profil..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2935
+#: ../src/profile_window.py:111 ../src/roster_window.py:3001
 msgid "File is empty"
 msgstr "Soubor je prázdný"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2938
+#: ../src/profile_window.py:114 ../src/roster_window.py:3004
 msgid "File does not exist"
 msgstr "Soubor neexistuje"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2940 ../src/roster_window.py:2951
+#: ../src/profile_window.py:128 ../src/profile_window.py:144
+#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
 msgid "Could not load image"
 msgstr "Nezdařilo se načtení obrázku"
 
-#: ../src/profile_window.py:214
+#: ../src/profile_window.py:215
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Informace o kontaktu"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:216
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Formát: RRRR-MM-DD"
 
-#: ../src/profile_window.py:269
+#: ../src/profile_window.py:270
 msgid "Information received"
 msgstr "Informace přijata"
 
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:341
 msgid "Without a connection you can not publish your contact information."
 msgstr "Bez opětovného připojení nemůžete zveřejnit Vaše osobní údaje."
 
-#: ../src/profile_window.py:353
+#: ../src/profile_window.py:354
 msgid "Sending profile..."
 msgstr "Odesílám profil..."
 
-#: ../src/profile_window.py:368
+#: ../src/profile_window.py:369
 msgid "Information NOT published"
 msgstr "Informace NEBYLY zveřejněny"
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:376
 msgid "vCard publication failed"
 msgstr "publikování vizitky se nezdařilo"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:377
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
 msgstr ""
 "Nastala chyba při publikování Vašich osobních údajů, zkuste to později znovu."
 
-#: ../src/roster_window.py:256 ../src/roster_window.py:1012
+#: ../src/roster_window.py:262 ../src/roster_window.py:1026
 msgid "Merged accounts"
 msgstr "Spojené účty"
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1942
 msgid "Authorization has been sent"
 msgstr "Autorizace byla odeslána"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1943
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nyní bude \"%s\" znát váš stav."
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1966
 msgid "Subscription request has been sent"
 msgstr "Žádost o autorizaci byla odeslána"
 
-#: ../src/roster_window.py:1944
+#: ../src/roster_window.py:1967
 #, 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:1958
+#: ../src/roster_window.py:1981
 msgid "Authorization has been removed"
 msgstr "Autorizace byla zrušena"
 
-#: ../src/roster_window.py:1959
+#: ../src/roster_window.py:1982
 #, 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:1986
+#: ../src/roster_window.py:2009
 msgid "GPG is not usable"
 msgstr "GPG je nepoužitelné"
 
-#: ../src/roster_window.py:1987
+#: ../src/roster_window.py:2010
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Budete připojen(a) k %s bez OpenPGP."
 
-#: ../src/roster_window.py:2199 ../src/roster_window.py:3496
+#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
 msgid "You are participating in one or more group chats"
 msgstr "Účinkujete v jedné nebo více diskuzích"
 
-#: ../src/roster_window.py:2200 ../src/roster_window.py:3497
+#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9546,38 +9852,38 @@ msgstr ""
 "si jistý(á), že se chcete stát neviditelným(ou)?"
 
 # FIXME: mozna nejak lepe? :/
-#: ../src/roster_window.py:2226
+#: ../src/roster_window.py:2249
 msgid "desync'ed"
 msgstr "nesynchronizováno"
 
-#: ../src/roster_window.py:2288
+#: ../src/roster_window.py:2311
 msgid "Really quit Gajim?"
 msgstr "Opravdu ukončit Gajim?"
 
-#: ../src/roster_window.py:2289
+#: ../src/roster_window.py:2312
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Opravdu chcete ukončit Gajim?"
 
-#: ../src/roster_window.py:2290
+#: ../src/roster_window.py:2313
 msgid "Always close Gajim"
 msgstr "Vždy zavřít Gajim"
 
-#: ../src/roster_window.py:2373
+#: ../src/roster_window.py:2396
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Zrušit přenos souboru"
 
-#: ../src/roster_window.py:2374
+#: ../src/roster_window.py:2397
 msgid ""
-"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2405 ../src/roster_window.py:2653
+#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
 msgid "You have unread messages"
 msgstr "Máte nepřečtené zprávy"
 
-#: ../src/roster_window.py:2406
+#: ../src/roster_window.py:2429
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9585,16 +9891,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:2654
+#: ../src/roster_window.py:2720
 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:2657
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" bude smazán"
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2724
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9602,11 +9908,11 @@ msgstr ""
 "Už více nebudete moci posílat i přijímat zprávy od kontaktů z tohoto "
 "transportu."
 
-#: ../src/roster_window.py:2661
+#: ../src/roster_window.py:2727
 msgid "Transports will be removed"
 msgstr "Transport bude smazán"
 
-#: ../src/roster_window.py:2666
+#: ../src/roster_window.py:2732
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9615,11 +9921,11 @@ msgstr ""
 "Už více nebudete moci posílat ani přijímat zprávy od kontaktů z těchto "
 "transportů:%s"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2800
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Chystáte se zablokovat kontakt. Určitě chcete pokračovat?"
 
-#: ../src/roster_window.py:2736
+#: ../src/roster_window.py:2802
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -9628,56 +9934,56 @@ msgstr ""
 "vám pošle."
 
 #. it's jid
-#: ../src/roster_window.py:2827
+#: ../src/roster_window.py:2893
 msgid "Rename Contact"
 msgstr "Přejmenovat kontakt"
 
-#: ../src/roster_window.py:2828
+#: ../src/roster_window.py:2894
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Zadej novou přezdívku pro kontakt %s."
 
-#: ../src/roster_window.py:2835
+#: ../src/roster_window.py:2901
 msgid "Rename Group"
 msgstr "Přejmenovat skupinu"
 
-#: ../src/roster_window.py:2836
+#: ../src/roster_window.py:2902
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Zadej nové jméno pro skupinu %s."
 
-#: ../src/roster_window.py:2881
+#: ../src/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Odstranit skupinu"
 
-#: ../src/roster_window.py:2882
+#: ../src/roster_window.py:2948
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Chceš smazat skupinu %s z rosteru?"
 
-#: ../src/roster_window.py:2883
+#: ../src/roster_window.py:2949
 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:2922
+#: ../src/roster_window.py:2988
 msgid "Assign OpenPGP Key"
 msgstr "Přiřadit OpenPGP klíč"
 
-#: ../src/roster_window.py:2923
+#: ../src/roster_window.py:2989
 msgid "Select a key to apply to the contact"
 msgstr "Vybrat klíč k použítí s kontaktem"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3372
 #, 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:3308
+#: ../src/roster_window.py:3374
 #, 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:3313
+#: ../src/roster_window.py:3379
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9686,11 +9992,11 @@ msgstr ""
 "odpojeného."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3319
+#: ../src/roster_window.py:3385
 msgid "Do you want to continue?"
 msgstr "Chcete pokračovat?"
 
-#: ../src/roster_window.py:3323
+#: ../src/roster_window.py:3389
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9698,16 +10004,16 @@ msgstr ""
 "Smazáním kontaktu také zrušíte autorizaci. Kontakt Vás tak vždy uvidí jako "
 "odpojeného."
 
-#: ../src/roster_window.py:3326
+#: ../src/roster_window.py:3392
 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:3330
+#: ../src/roster_window.py:3396
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakty budou smazány z Vašeho rosteru"
 
-#: ../src/roster_window.py:3335
+#: ../src/roster_window.py:3401
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9716,13 +10022,13 @@ 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:3393
+#: ../src/roster_window.py:3459
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want  to continue?"
 msgstr "Chystáte se poslat vlastní stav. Určitě chcete pokračovat?"
 
-#: ../src/roster_window.py:3395
+#: ../src/roster_window.py:3461
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -9731,20 +10037,20 @@ msgstr ""
 "Tento kontakt váš dočasně uvidí jako %(status)s, ale pouze do první změny "
 "vašeho stavu. Poté uvidí váš globální stav."
 
-#: ../src/roster_window.py:3414
+#: ../src/roster_window.py:3480
 msgid "No account available"
 msgstr "Žádný účet není dostupný"
 
-#: ../src/roster_window.py:3415
+#: ../src/roster_window.py:3481
 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:4023
+#: ../src/roster_window.py:4095
 msgid "Metacontacts storage not supported by your server"
 msgstr "Uložení metakontaktů není podporováno serverem"
 
-#: ../src/roster_window.py:4025
+#: ../src/roster_window.py:4097
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9752,12 +10058,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:4117
+#: ../src/roster_window.py:4189
 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:4119
+#: ../src/roster_window.py:4191
 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 "
@@ -9767,11 +10073,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:4234
+#: ../src/roster_window.py:4306
 msgid "Invalid file URI:"
 msgstr "Neplatná cesta k souboru:"
 
-#: ../src/roster_window.py:4246
+#: ../src/roster_window.py:4318
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9779,12 +10085,12 @@ 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:4361
+#: ../src/roster_window.py:4433
 #, python-format
 msgid "Send %s to %s"
 msgstr "Odeslat %s %s"
 
-#: ../src/roster_window.py:4367
+#: ../src/roster_window.py:4439
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Udělej %s a %s metakontaktem"
@@ -9794,145 +10100,145 @@ msgstr "Udělej %s a %s metakontaktem"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4816 ../src/roster_window.py:4889
-#: ../src/roster_window.py:4898 ../src/statusicon.py:246
-#: ../src/statusicon.py:293 ../src/statusicon.py:299
+#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
+#: ../src/roster_window.py:4970 ../src/statusicon.py:263
+#: ../src/statusicon.py:310 ../src/statusicon.py:316
 #, python-format
 msgid "using account %s"
 msgstr "pomocí účtu %s"
 
 #. add
-#: ../src/roster_window.py:4905
+#: ../src/roster_window.py:4977
 #, python-format
 msgid "to %s account"
 msgstr "do účtu %s"
 
 #. disco
-#: ../src/roster_window.py:4910
+#: ../src/roster_window.py:4982
 #, python-format
 msgid "using %s account"
 msgstr "pomocí účtu %s"
 
-#: ../src/roster_window.py:4948 ../src/statusicon.py:309
+#: ../src/roster_window.py:5020 ../src/statusicon.py:326
 msgid "_Manage Bookmarks..."
 msgstr "Spravovat _záložky..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4968
+#: ../src/roster_window.py:5040
 #, python-format
 msgid "of account %s"
 msgstr "účtu %s"
 
-#: ../src/roster_window.py:5009
+#: ../src/roster_window.py:5081
 #, python-format
 msgid "for account %s"
 msgstr "pro účet %s"
 
-#: ../src/roster_window.py:5069 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
 msgid "_Change Status Message"
 msgstr "Z_měnit popis stavu"
 
-#: ../src/roster_window.py:5102
+#: ../src/roster_window.py:5174
 msgid "Publish Tune"
 msgstr "_Zveřejnit hudbu"
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5176
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Zveřejnit hudbu"
 
-#: ../src/roster_window.py:5107
+#: ../src/roster_window.py:5179
 msgid "Configure Services..."
 msgstr "_Nastavit služby..."
 
-#: ../src/roster_window.py:5252
+#: ../src/roster_window.py:5324
 msgid "_Maximize All"
 msgstr "_Maximalizovat VÅ¡e"
 
-#: ../src/roster_window.py:5262 ../src/roster_window.py:5436
+#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
 msgid "Send Group M_essage"
 msgstr "Ode_slat skupinovou zprávu"
 
-#: ../src/roster_window.py:5270
+#: ../src/roster_window.py:5342
 msgid "To all users"
 msgstr "Všem uživatelům"
 
-#: ../src/roster_window.py:5274
+#: ../src/roster_window.py:5346
 msgid "To all online users"
 msgstr "Všem dostupným uživatelům"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5456
+#: ../src/roster_window.py:5528
 msgid "_Manage Contacts"
 msgstr "_Spravovat kontakty"
 
 #. Edit Groups
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5537
 msgid "Edit _Groups"
 msgstr "Upravit _skupiny"
 
 #. Send single message
-#: ../src/roster_window.py:5520
+#: ../src/roster_window.py:5592
 msgid "Send Single Message"
 msgstr "Ode_slat jednoduchou zprávu"
 
 #. Execute Command
-#: ../src/roster_window.py:5567
+#: ../src/roster_window.py:5639
 msgid "Execute Command..."
 msgstr "Provést příkaz..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5577
+#: ../src/roster_window.py:5649
 msgid "_Manage Transport"
 msgstr "Transporty"
 
 #. Modify Transport
-#: ../src/roster_window.py:5586
+#: ../src/roster_window.py:5658
 msgid "_Modify Transport"
 msgstr "_Upravit transport"
 
 #. Rename
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5668
 msgid "_Rename"
 msgstr "_Přejmenovat"
 
-#: ../src/roster_window.py:5656
+#: ../src/roster_window.py:5728
 msgid "_Maximize"
 msgstr "_Maximalizovat"
 
-#: ../src/roster_window.py:5665
+#: ../src/roster_window.py:5737
 msgid "_Reconnect"
 msgstr "_Znovu připojit"
 
-#: ../src/roster_window.py:5672
+#: ../src/roster_window.py:5744
 msgid "_Disconnect"
 msgstr "_Odpojit"
 
 #. History manager
-#: ../src/roster_window.py:5754
+#: ../src/roster_window.py:5833
 msgid "History Manager"
 msgstr "Správce historie"
 
-#: ../src/roster_window.py:5765
+#: ../src/roster_window.py:5844
 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:5938
+#: ../src/roster_window.py:6019
 msgid "Change Status Message..."
 msgstr "Změnit popis stavu..."
 
 # FIXME: hmm kdovi co to je..
-#: ../src/search_window.py:94
+#: ../src/search_window.py:105
 msgid "Waiting for results"
 msgstr "Čekání na výsledky"
 
-#: ../src/search_window.py:132 ../src/search_window.py:210
+#: ../src/search_window.py:143 ../src/search_window.py:220
 msgid "Error in received dataform"
 msgstr "Chyba v příchozím datagramu"
 
 #. No result
-#: ../src/search_window.py:166 ../src/search_window.py:202
+#: ../src/search_window.py:177 ../src/search_window.py:212
 msgid "No result"
 msgstr "Žádný výsledek"
 
@@ -9945,14 +10251,15 @@ msgstr "Chyba zápisu na disk"
 msgid "Subject: %s"
 msgstr "Předmět: %s"
 
-#: ../src/session.py:433 ../src/session.py:468
+#: ../src/session.py:447 ../src/session.py:491
 msgid "Confirm these session options"
 msgstr "Potvrdit volby pro toto sezení"
 
-#: ../src/session.py:435
+#: ../src/session.py:448
 #, fuzzy, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
+"The remote client wants '\n"
+"                            'to negotiate an session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -9964,7 +10271,7 @@ msgstr ""
 "\n"
 "\tJsou tyto volby přijatelné?"
 
-#: ../src/session.py:469
+#: ../src/session.py:492
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9979,16 +10286,16 @@ msgstr ""
 "\n"
 "Pokračovat v komunikaci?"
 
-#: ../src/statusicon.py:210
+#: ../src/statusicon.py:227
 msgid "_Change Status Message..."
 msgstr "_Změnit popis stavu..."
 
-#: ../src/statusicon.py:322
+#: ../src/statusicon.py:339
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "v _rosteru"
 
-#: ../src/statusicon.py:333
+#: ../src/statusicon.py:350
 msgid "Hide this menu"
 msgstr "Skryje toto menu"
 
@@ -10127,74 +10434,114 @@ msgstr ""
 "Tato služba nemůže odpovědět s více podrobnostmi.\n"
 "Pravděpodobně je stará nebo rozbitá"
 
-#: ../src/vcard.py:251
+#: ../src/vcard.py:265
 msgid "?Client:Unknown"
 msgstr "?Client:Neznámý"
 
-#: ../src/vcard.py:253
+#: ../src/vcard.py:267
 msgid "?OS:Unknown"
 msgstr "?OS:Neznámý"
 
-#: ../src/vcard.py:274
+#: ../src/vcard.py:288
 msgid "?Time:Unknown"
 msgstr "?Time:Neznámý"
 
-#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
+#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:345
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:349
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Vztah</b>"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:357
 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:345
+#: ../src/vcard.py:359
 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:347
+#: ../src/vcard.py:361
 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:349
+#: ../src/vcard.py:363
 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:356
+#: ../src/vcard.py:370
 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:358
+#: ../src/vcard.py:372
 msgid "There is no pending subscription request."
 msgstr "Není zde žádný nevyřízený požadavek."
 
-#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
+#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
 msgid " resource with priority "
 msgstr "zdroj s prioritou "
 
-#~ msgid "_Available"
-#~ msgstr "Přip_ojen"
+#~ msgid "_Disable showing event in systray"
+#~ msgstr "_Vypnout zobrazování události vy systrayi"
+
+#~ msgid "_Show event in systray"
+#~ msgstr "_Zobrazit událost v systrayi"
+
+#, fuzzy
+#~ msgid "Always use GNOME default applications"
+#~ msgstr "Vždy použít OS/X výchozí aplikace"
+
+#, fuzzy
+#~ msgid "Always use Xfce default applications"
+#~ msgstr "Vždy použít OS/X výchozí aplikace"
+
+#, fuzzy
+#~ msgid "Autodetect on every Gajim startup"
+#~ msgstr "_Připojit po startu Gajimu"
+
+#~ msgid "Show systray:"
+#~ msgstr "Zobraz oznamovací oblast:"
+
+#~ msgid "Nickname not allowed: %s"
+#~ msgstr "Přezdívka nepovolena: %s"
+
+#~ msgid "Room has been destroyed"
+#~ msgstr "Místnost byla zničena"
+
+#~ msgid "You can join this room instead: %s"
+#~ msgstr "Můžete se připojit do této místnosti: %s"
+
+#~ msgid "I would like to add you to my roster."
+#~ msgstr "Rád(a) bych si tě přidal(a) do seznamu."
 
-#~ msgid "PEP node was not removed"
-#~ msgstr "PEP uzel nebyl smazán"
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "jsme nyní zapsáni k %s"
 
-#~ msgid "PEP node %(node)s was not removed: %(message)s"
-#~ msgstr "PEP uzel %(node)s se nepodařilo odstranit: %(message)s"
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "Žádost o zrušení autorizace od %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "byla nám zrušena autorizace od %s"
+
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "JID %s neodpovídá RFC. Nebude přidáno do tvého rosteru. Použij nástroje "
+#~ "pro správu rosteru jako je http://jru.jabberstudio.org/ k jeho odstranění"
 
 #~ msgid "Account Modification"
 #~ msgstr "Úprava účtu"
@@ -10303,45 +10650,9 @@ msgstr "zdroj s prioritou "
 #~ msgid "gtk-delete"
 #~ msgstr "gtk-delete"
 
-#~ msgid "Add this contact to roster (Ctrl+D)"
-#~ msgstr "Přidat kontakt do Seznamu (Ctrl+D)"
-
-#~ msgid "Bookmark this room (Ctrl+B)"
-#~ msgstr "Přidat tuto místnost do záložek"
-
-#~ msgid "Browse the chat history (Ctrl+H)"
-#~ msgstr "Procházet historii diskuze (Ctrl+H)"
-
-#~ msgid "Change the room's subject (Alt+T)"
-#~ msgstr "Změnit téma místnosti (Alt+T)"
-
-#~ msgid "Change your nickname (Ctrl+N)"
-#~ msgstr "Změ_nit přezdívku"
-
-#~ msgid "Invite contacts to the conversation (Ctrl+G)"
-#~ msgstr "Pozvat kontakty k rozhovoru (Ctrl+G)"
-
 #~ msgid "Send a file (Ctrl+F)"
 #~ msgstr "Poslat soubor (Ctrl+F)"
 
-#~ msgid "Show a list of emoticons (Alt+M)"
-#~ msgstr "Zobraz seznam smajlíků (Alt+M)"
-
-#~ msgid "Show a list of formattings"
-#~ msgstr "Zobrazit seznam formátování"
-
-#~ msgid "Show a menu of advanced functions (Alt+D)"
-#~ msgstr "Zobrazit nabídku rozšířených funkcí (Alt+D)"
-
-#~ msgid "Show the contact's profile (Ctrl+I)"
-#~ msgstr "Zobrazit profil kontaktu (Ctrl+I)"
-
-#~ msgid "Toggle audio session"
-#~ msgstr "Přepnout audio"
-
-#~ msgid "Toggle video session"
-#~ msgstr "Přepnout video"
-
 #~ msgid ""
 #~ "All chat states\n"
 #~ "Composing only\n"
@@ -10401,9 +10712,6 @@ msgstr "zdroj s prioritou "
 #~ msgid "gtk-cancel"
 #~ msgstr "gtk-close"
 
-#~ msgid "_Preferences"
-#~ msgstr "_Nastavení"
-
 #~ msgid "_Quit"
 #~ msgstr "_Konec"
 
@@ -10751,9 +11059,6 @@ msgstr "zdroj s prioritou "
 #~ msgid "Given:"
 #~ msgstr "Křestní:"
 
-#~ msgid "Homepage:"
-#~ msgstr "Dom. stránka:"
-
 #~ msgid "Middle:"
 #~ msgstr "Prostřední:"
 
@@ -10840,10 +11145,6 @@ msgstr "zdroj s prioritou "
 #~ msgid "on_the_phone"
 #~ msgstr "Zrovna telefonuji."
 
-#, fuzzy
-#~ msgid "other"
-#~ msgstr "Ostatní"
-
 #, fuzzy
 #~ msgid "sleeping"
 #~ msgstr "Spím"
@@ -10901,9 +11202,6 @@ msgstr "zdroj s prioritou "
 #~ "Je potřeba python-gnome2-extras nebo zkompilovaný gtkspell modul ze "
 #~ "zdrojáků Gajima."
 
-#~ msgid "Notification-daemon"
-#~ msgstr "Notification-daemon"
-
 #~ msgid "Idle"
 #~ msgstr "Nečinný"
 
@@ -10942,13 +11240,6 @@ msgstr "zdroj s prioritou "
 #~ msgid "Session Management support not available (missing gnome.ui module)"
 #~ msgstr "Podpora Správce sezení není dostupná (schází gnome.ui modul)"
 
-#~ msgid ""
-#~ "Usage: %s %s %s \n"
-#~ "\t %s"
-#~ msgstr ""
-#~ "Použití: %s %s %s \n"
-#~ "\t %s"
-
 #~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 #~ msgstr ""
 #~ "Neexistující příkaz: /%s (chceš-li poslat tohle, napiš před to /say)"
diff --git a/po/da.po b/po/da.po
index acff2488d8b6219258be0c19ffd6541834669ab7..4937d9136f1eeb2b978bc5e42f7994ecc5437a14 100644
--- a/po/da.po
+++ b/po/da.po
@@ -3,11 +3,15 @@
 # This file is distributed under the same license as the Gajim package.
 #
 # Niels Felsted Thorsen <felsted@fsfe.org>, 2007, 2009.
+#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.13\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 11:28+0200\n"
+"POT-Creation-Date: 2010-10-01 20:39+0200\n"
 "PO-Revision-Date: 2009-11-18 19:33+0100\n"
 "Last-Translator: Niels Felsted Thorsen <felsted@fsfe.org>\n"
 "Language-Team:  <>\n"
@@ -26,7 +30,7 @@ msgstr "Deltag i en _Gruppe Samtale..."
 msgid "_Add Contact..."
 msgstr "_Tilføj Kontakt..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:17
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
 msgid "_Discover Services"
 msgstr "Op_dag Tjenester"
 
@@ -46,7 +50,7 @@ msgstr "_Ã…bn Gmail Indboks"
 msgid "_Personal Events"
 msgstr "_Personlige hændelser"
 
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:23
+#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
 msgid "_Start Chat..."
 msgstr "_Start Samtale..."
 
@@ -78,10 +82,6 @@ msgid "<b>Please select a server</b>"
 msgstr "<b>Vælg venligst en server<b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid "@"
-msgstr "@"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
@@ -89,64 +89,64 @@ msgstr ""
 "Tilføj dette certifikat til listen af certifikater du stoler på.\n"
 "SHA1 fingeraftryk af certifikatet:\n"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:10
 msgid "Anon_ymous authentication"
 msgstr "Anonym godkendelse"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Connect when I press Finish"
 msgstr "Tilslut når jeg trykke Færdig"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Konto Oprettelses Guide"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "I already have an account I want to _use"
 msgstr "Jeg har allerede en konto jeg vil br_uge"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I want to _register for a new account"
 msgstr "Jeg vil _registrere en ny konto"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:16
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 #: ../data/gui/accounts_window.ui.h:28
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Hvis valgt vil Gajim huske adgangskoden for denne konto"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:17
+#: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "HÃ¥ndter..."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:18
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
 #: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2263 ../src/config.py:2342
-#: ../src/config.py:2355 ../src/config.py:3596 ../src/config.py:3671
-#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513
-#: ../src/dialogs.py:526 ../src/roster_window.py:2890
-#: ../src/roster_window.py:2896 ../src/roster_window.py:2901
+#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
+#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
+#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
+#: ../src/dialogs.py:527 ../src/roster_window.py:2956
+#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
 msgid "None"
 msgstr "Ingen"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:19
+#: ../data/gui/account_creation_wizard_window.ui.h:18
 msgid "Prox_y:"
 msgstr "Pro_xy:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #: ../data/gui/accounts_window.ui.h:48
 msgid "Save pass_word"
 msgstr "Gem adgangs_kode"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:21
+#: ../data/gui/account_creation_wizard_window.ui.h:20
 msgid "Set my profile when I connect"
 msgstr "Sæt min profil når jeg tilslutter"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:22
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Use custom hostname/port"
 msgstr "Brug tilpasset værtsnavn/port"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:23
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -154,34 +154,34 @@ msgstr ""
 "Du behøver en konto for at tilslutte dig\n"
 "til Jabber netværket"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-#: ../data/gui/roster_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:16
 msgid "_Advanced"
 msgstr "_Avanceret"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:25
 msgid "_Finish"
 msgstr "_Færdig"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:27
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Hostname:"
 msgstr "_Værtsnavn:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #: ../data/gui/accounts_window.ui.h:62
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:28
 #: ../data/gui/accounts_window.ui.h:64
 msgid "_Password:"
 msgstr "_Adgangskode"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:29
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:31
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Server:"
 msgstr "_Server:"
 
@@ -290,17 +290,17 @@ msgstr "Fornavn:"
 #. No configured account
 #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
 #: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592
-#: ../src/notify.py:608
+#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
+#: ../src/notify.py:616
 msgid "Gajim"
 msgstr "Gajim"
 
 #. FIXME: Ugly workaround.
 #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
 #. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:61
-#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121
-#: ../src/roster_window.py:2832 ../src/roster_window.py:5379
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
+#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
 msgid "General"
 msgstr "General"
 
@@ -359,7 +359,7 @@ msgstr "Information om dig, som er gemt på serveren"
 
 #: ../data/gui/accounts_window.ui.h:35
 #: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:830
+#: ../src/dialogs.py:831
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -373,7 +373,7 @@ msgid "Mer_ge accounts"
 msgstr "Fle_t kontoer"
 
 #: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2356
+#: ../src/config.py:2358
 msgid "No key selected"
 msgstr "Ingen nøgle er valgt"
 
@@ -400,7 +400,7 @@ msgid "Priority will change automatically according to your status."
 msgstr "Prioritet vil automatisk ændres ifølge din status."
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5329
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
 msgid "Re_name"
 msgstr "Om_døb"
 
@@ -626,38 +626,43 @@ msgid "Deletes Message of the Day"
 msgstr "Slet Dagens Besked"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
+#, fuzzy
+msgid "Edit Archi_ving Preferences"
+msgstr "_Indstillinger"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Edit _Privacy Lists..."
 msgstr "Rediger _Privatlivs Liste..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sends a message to users currently connected to this server"
 msgstr "Send en besked til brugere som er tilsluttet denne server"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Set MOTD..."
 msgstr "Sæt MOTD..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Sæt Dagens Besked"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Show _XML Console"
 msgstr "Vis _XML Konsol"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "Update MOTD..."
 msgstr "Opdater MOTD..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "Opdater Dagens Besked"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:11
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:11
+#: ../data/gui/advanced_menuitem_menu.ui.h:12
 msgid "_Send Server Message..."
 msgstr "_Send Server Besked..."
 
@@ -691,7 +696,7 @@ msgid "All statuses"
 msgstr "Status For Alle"
 
 #: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:233
+#: ../src/common/commands.py:106 ../src/common/helpers.py:239
 #: ../src/tooltips.py:193
 msgid "Away"
 msgstr "Borte"
@@ -744,7 +749,7 @@ msgid "Have "
 msgstr "Har"
 
 #: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:249
 msgid "Invisible"
 msgstr "Usynlig"
 
@@ -753,7 +758,7 @@ msgid "Launch a command"
 msgstr "Kør en kommando"
 
 #: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:216 ../src/tooltips.py:197
+#: ../src/common/helpers.py:222 ../src/tooltips.py:197
 msgid "Not Available"
 msgstr "Ikke Tilgængelig"
 
@@ -798,12 +803,13 @@ msgid "_Disable existing sound for this event"
 msgstr "_Deaktivér nuværende lyd for denne hændelse"
 
 #: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in roster"
+#, fuzzy
+msgid "_Disable showing event in notification area"
 msgstr "_Deaktivér visning af hændelse i kontaktvinduet"
 
 #: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in systray"
-msgstr "_Deaktivér visning af hændelse i systembakken"
+msgid "_Disable showing event in roster"
+msgstr "_Deaktivér visning af hændelse i kontaktvinduet"
 
 #: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
@@ -814,12 +820,13 @@ msgid "_Open chat window with user"
 msgstr "_Ã…bn samtale vindue med bruger"
 
 #: ../data/gui/advanced_notifications_window.ui.h:35
-msgid "_Show event in roster"
+#, fuzzy
+msgid "_Show event in notification area"
 msgstr "_Vis hændelse i kontaktvindue"
 
 #: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in systray"
-msgstr "_Vis hændelse i systembakken"
+msgid "_Show event in roster"
+msgstr "_Vis hændelse i kontaktvindue"
 
 #: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
@@ -847,6 +854,45 @@ msgstr "Grupper"
 msgid "when I'm in"
 msgstr "når jeg er i"
 
+#: ../data/gui/archiving_preferences_window.ui.h:1
+msgid "<i>Method Auto</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "<i>Method Local</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:3
+msgid "<i>Method Manual</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:4
+#, fuzzy
+msgid "Auto"
+msgstr "Bliv automatisk med"
+
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Concede"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "Forbid"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:7
+#, fuzzy
+msgid "No"
+msgstr "Ingen"
+
+#: ../data/gui/archiving_preferences_window.ui.h:8
+#, fuzzy
+msgid "Prefer"
+msgstr "Indstillinger"
+
+#: ../data/gui/archiving_preferences_window.ui.h:9
+msgid "Yes"
+msgstr ""
+
 #: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Indgang:"
@@ -873,8 +919,8 @@ msgstr "Blokerede Kontakter"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5348
-#: ../src/roster_window.py:5476 ../src/roster_window.py:5609
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
+#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
 msgid "_Unblock"
 msgstr "_Fjern blokering"
 
@@ -962,7 +1008,7 @@ msgid "_Start Chat"
 msgstr "_Start Samtale"
 
 #. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4184
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
 msgid "#"
 msgstr "#"
 
@@ -1010,13 +1056,50 @@ msgstr ""
 msgid "9"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:13
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Tilføj denne kontakt til kontaktvinduet (Ctrl+D)"
+
 #: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Gennemse samtale historik (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:15
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Inviter kontakter til samtalen (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Hvis en liste over følelsesikoner (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
+msgid "Show a list of formattings"
+msgstr "Hvis en liste over følelsesikoner"
+
+#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Vis en menu med avancerede funktioner (Alt+A)"
+
+#: ../data/gui/chat_control.ui.h:19
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr "Vis kontaktens profil (Ctrl+I)"
+
+#: ../data/gui/chat_control.ui.h:20
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:21
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
 #: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Send"
 
-#: ../data/gui/chat_control.ui.h:15 ../data/gui/groupchat_control.ui.h:3
+#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
 msgid "label"
 msgstr ""
 
@@ -1066,8 +1149,8 @@ msgstr "Ændre _Grupper..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5284
-#: ../src/roster_window.py:5444
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
+#: ../src/roster_window.py:5516
 msgid "In_vite to"
 msgstr "In_viter til"
 
@@ -1079,8 +1162,8 @@ msgstr "Inviter _Kontakter"
 msgid "Remo_ve"
 msgstr "_Fjern"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5294
-#: ../src/roster_window.py:5533
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
+#: ../src/roster_window.py:5605
 msgid "Send Cus_tom Status"
 msgstr "Send _Tilpasset Status"
 
@@ -1113,8 +1196,8 @@ msgid "_Allow him/her to see my status"
 msgstr "Till_ad ham/hende at se min status"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5482 ../src/roster_window.py:5612
+#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
+#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
 msgid "_Block"
 msgstr "_Bloker"
 
@@ -1124,8 +1207,8 @@ msgstr "_Nægt ham/hende at se min status"
 
 #: ../data/gui/contact_context_menu.ui.h:20
 #: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:21
-#: ../src/roster_window.py:5683
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
+#: ../src/roster_window.py:5755
 msgid "_History"
 msgstr "_Historie"
 
@@ -1258,7 +1341,7 @@ msgstr "<b>Samtalestatus Fane Farver</b>"
 msgid "Account row"
 msgstr "Konto"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:925
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
 msgid "Bold"
 msgstr "Fed"
 
@@ -1296,7 +1379,7 @@ msgstr "Gruppe"
 msgid "Inactive"
 msgstr "Ikke aktiv"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:926
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
 msgid "Italic"
 msgstr "Kursiv"
 
@@ -1344,7 +1427,7 @@ msgstr "Ændre _Emne..."
 msgid "Configure _Room..."
 msgstr "Tilpas _Rum..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1782
+#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
 msgid "_Bookmark"
 msgstr "_Bogmærke"
 
@@ -1404,19 +1487,31 @@ msgstr "_Send en Privat Besked"
 msgid "_Voice"
 msgstr "_Stemme"
 
+#: ../data/gui/groupchat_control.ui.h:1
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Bogmærk dette rom (Ctrl+B)"
+
+#: ../data/gui/groupchat_control.ui.h:3
+msgid "Change the room's subject (Alt+T)"
+msgstr "Ændre emne for rummet (Alt+T)"
+
+#: ../data/gui/groupchat_control.ui.h:4
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Ændre dit kælenavn (Ctrl+N)"
+
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Lav en ny post"
 
-#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
-msgid "From"
-msgstr "Fra"
+#: ../data/gui/groups_post_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:2
+msgid "From:"
+msgstr "Fra:"
 
-#. holds subject
-#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
-#: ../src/history_manager.py:219
-msgid "Subject"
-msgstr "Emne"
+#: ../data/gui/groups_post_window.ui.h:3
+#: ../data/gui/single_message_window.ui.h:7
+msgid "Subject:"
+msgstr "Emne:"
 
 #: ../data/gui/history_manager.ui.h:1
 msgid ""
@@ -1434,8 +1529,8 @@ msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Velkommen til Gajims Loghistorie HÃ¥ndterer</b></big>"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3208
-#: ../src/dialogs.py:3305
+#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
+#: ../src/dialogs.py:3321
 msgid "Delete"
 msgstr "Slet"
 
@@ -1493,12 +1588,75 @@ msgstr "Søg:"
 msgid "_Log conversation history"
 msgstr "_Log samtale historie"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
+msgid "approve"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:2
+msgid "body"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:3
+msgid "concede"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:4
+msgid "expire"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:5
+msgid "false"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:6
+msgid "forbid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:7
+#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+msgid "jid"
+msgstr "jid"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:8
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
+#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
+msgid "message"
+msgstr "besked"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
+msgid "oppose"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
+#, fuzzy
+msgid "otr"
+msgstr "Varm"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:11
+msgid "prefer"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:12
+msgid "require"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:13
+msgid "save"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:14
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
 msgid "Bro_wse Rooms"
 msgstr "_Gennemse"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2180
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
 msgid "Join Group Chat"
 msgstr "Bliv med i en Gruppe Samtale"
 
@@ -1536,8 +1694,8 @@ msgstr "Server:"
 msgid "_Bookmark this room"
 msgstr "Bogmærk dette rom"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1341
-#: ../src/disco.py:1786
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../src/disco.py:1804
 msgid "_Join"
 msgstr "_Bliv med:"
 
@@ -1641,6 +1799,75 @@ msgstr "_Brugernavn:"
 msgid "Passphrase"
 msgstr "PGP-løsen"
 
+#: ../data/gui/plugins_window.ui.h:1
+msgid "&lt;empty&gt;"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:2
+msgid "<empty>"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:3
+#, fuzzy
+msgid "Authors:"
+msgstr "Au_torisere"
+
+#: ../data/gui/plugins_window.ui.h:4
+#, fuzzy
+msgid "Available"
+msgstr "Ti_lgængelig"
+
+#: ../data/gui/plugins_window.ui.h:5
+#, fuzzy
+msgid "Configure"
+msgstr "_Konfigurere"
+
+#: ../data/gui/plugins_window.ui.h:6
+#, fuzzy
+msgid "Descrition:"
+msgstr "Beskrivelse: "
+
+#: ../data/gui/plugins_window.ui.h:7
+#, fuzzy
+msgid "Homepage:"
+msgstr "<b>Hjemmeside:</b>"
+
+#: ../data/gui/plugins_window.ui.h:8
+msgid "Install"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:9
+#, fuzzy
+msgid "Installed"
+msgstr "Hænger"
+
+#: ../data/gui/plugins_window.ui.h:10
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:11
+msgid "Plugins"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:12
+msgid "Uninstall"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:13
+#, fuzzy
+msgid "Version:"
+msgstr "GTK+ Version:"
+
+#: ../data/gui/plugins_window.ui.h:14
+msgid "button"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:15
+msgid "homepage url"
+msgstr ""
+
 #: ../data/gui/popup_notification_window.ui.h:1
 #, fuzzy
 msgid "Event Type"
@@ -1768,121 +1995,104 @@ msgid "Always"
 msgstr "Borte"
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Always use GNOME default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:32
-msgid "Always use KDE default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:33
-msgid "Always use Xfce default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Spørg om status besked når jeg:"
 
-#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
 msgid "Audio / Video"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:33
 msgid "Audio input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Audio output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:38
-#, fuzzy
-msgid "Autodetect on every Gajim startup"
-msgstr "T_ilslut når Gajim startes"
-
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:35
 msgid "Chat message:"
 msgstr "Samtale besked:"
 
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:36
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Alti_d kontroller om Gajim er standard Jabber klient ved start"
 
-#: ../data/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:37
 #, fuzzy
 msgid "Composing only"
 msgstr "Komponere"
 
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:38
 msgid "Configure color and font of the interface"
 msgstr "Konfigurér farve og skrifttyper for brugergrænsefladen"
 
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Samtale besked:"
 
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Kontakt navn"
 
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:41
 #, fuzzy
 msgid "Custom"
 msgstr "<b>Tilpasset Opsætning</b>"
 
-#: ../data/gui/preferences_window.ui.h:46
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Detached roster with chat grouped by account"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Detached roster with detached chats"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:45
 msgid "Detached roster with single chat"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
-#: ../src/config.py:671
+#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
+#: ../src/config.py:665
 msgid "Disabled"
 msgstr "Ikke aktiveret"
 
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:47
 msgid "Display _activity of contacts in roster"
 msgstr "Vis kontakternes _aktivitet i kontaktvinduet"
 
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:48
 msgid "Display _extra email details"
 msgstr "Vis _ekstra e-post detaljer"
 
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:49
 #, fuzzy
 msgid "Display _location of contacts in roster"
 msgstr "Vis kontakternes humør i kontaktvinduet"
 
-#: ../data/gui/preferences_window.ui.h:54
+#: ../data/gui/preferences_window.ui.h:50
 msgid "Display _tunes of contacts in roster"
 msgstr "Vis kontak_ternes melodier i kontaktvinduet"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display a_vatars of contacts in roster"
 msgstr "Vis kontakternes a_vatarer i kontaktvinduet"
 
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display m_ood of contacts in roster"
 msgstr "Vis kontakternes humør i kontaktvinduet"
 
-#: ../data/gui/preferences_window.ui.h:57
+#: ../data/gui/preferences_window.ui.h:53
 msgid "Display status _messages of contacts in roster"
 msgstr "Vis status _beskeder for kontakter i kontaktvinduet"
 
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:54
 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 "
@@ -1892,7 +2102,7 @@ msgstr ""
 "med en kontakt. Her kan du specificere hvilke typer samtalestatus du vil "
 "vise i samtalevinduerne."
 
-#: ../data/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:55
 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 "
@@ -1902,7 +2112,7 @@ msgstr ""
 "med en kontakt. Her kan du specificere hvilke typer samtalestatus du vil "
 "sende til modparten."
 
-#: ../data/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:56
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1910,31 +2120,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/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:58
 msgid "Hide all buttons in chat windows"
 msgstr "Skjul alle knapperne i samtale vinduer."
 
-#: ../data/gui/preferences_window.ui.h:63
+#: ../data/gui/preferences_window.ui.h:59
 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/gui/preferences_window.ui.h:64
+#: ../data/gui/preferences_window.ui.h:60
 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/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:61
 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/gui/preferences_window.ui.h:66
+#: ../data/gui/preferences_window.ui.h:62
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1942,7 +2152,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/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1950,7 +2160,7 @@ msgstr ""
 "Hvis valgt vil Gajim vise avatarer af kontakter i kontaktvinduet og i gruppe "
 "samtaler"
 
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1958,29 +2168,29 @@ msgstr ""
 "Hvis valgt vil Gajim vise status beskeder af kontakter under kontaktnavnet i "
 "kontaktvinduet og i gruppe samtaler"
 
-#: ../data/gui/preferences_window.ui.h:69
+#: ../data/gui/preferences_window.ui.h:65
 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/gui/preferences_window.ui.h:70
+#: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the location of contacts in the roster window"
 msgstr "Hvis valgt vil Gajim vise kontakternes humør i kontaktvinduet"
 
-#: ../data/gui/preferences_window.ui.h:71
+#: ../data/gui/preferences_window.ui.h:67
 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/gui/preferences_window.ui.h:72
+#: ../data/gui/preferences_window.ui.h:68
 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/gui/preferences_window.ui.h:73
+#: ../data/gui/preferences_window.ui.h:69
 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 "
@@ -1990,7 +2200,7 @@ msgstr ""
 "intet sprog er valgt ved at højreklikke i indtastningsfeltet, vil standard "
 "sproget blive brugt for denne kontakt eller gruppe samtale."
 
-#: ../data/gui/preferences_window.ui.h:74
+#: ../data/gui/preferences_window.ui.h:70
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -2000,7 +2210,7 @@ msgstr ""
 "kontakter. Brug med forsigtighed fordi det vil blokere alle beskeder fra "
 "alle kontakter som ikke er i kontaktvinduet."
 
-#: ../data/gui/preferences_window.ui.h:75
+#: ../data/gui/preferences_window.ui.h:71
 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 "
@@ -2010,7 +2220,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/gui/preferences_window.ui.h:76
+#: ../data/gui/preferences_window.ui.h:72
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -2018,7 +2228,7 @@ msgstr ""
 "Hvis valgt vil Gajim vise en påmindelse når en ny e-post er modtaget via "
 "Gmail"
 
-#: ../data/gui/preferences_window.ui.h:77
+#: ../data/gui/preferences_window.ui.h:73
 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, "
@@ -2028,7 +2238,7 @@ msgstr ""
 "kontakt fra MSN vil have det tilsvarende msn ikon for status tilsluttet, "
 "borte, Travlt, etc...)"
 
-#: ../data/gui/preferences_window.ui.h:78
+#: ../data/gui/preferences_window.ui.h:74
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -2036,7 +2246,7 @@ msgstr ""
 "Hvis aktiveret vil Gajim i spørge for en status besked. Den valgte standard "
 "besked vil blive brugt i stedet."
 
-#: ../data/gui/preferences_window.ui.h:79
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2044,45 +2254,45 @@ msgstr ""
 "Hvis valgt vil Gajim erstatte tekst smileys som denne ':)' med den "
 "tilsvarende animerede eller statiske grafiske følelsesikon"
 
-#: ../data/gui/preferences_window.ui.h:80
+#: ../data/gui/preferences_window.ui.h:76
 msgid "Log _encrypted chat session"
 msgstr "Log krypt_eret samtale session"
 
-#: ../data/gui/preferences_window.ui.h:81
+#: ../data/gui/preferences_window.ui.h:77
 msgid "Ma_ke message windows compact"
 msgstr "Gør samtalevinduer _kompakte"
 
-#: ../data/gui/preferences_window.ui.h:82
+#: ../data/gui/preferences_window.ui.h:78
 msgid "Ma_nage..."
 msgstr "HÃ¥_ndtere..."
 
-#: ../data/gui/preferences_window.ui.h:83
+#: ../data/gui/preferences_window.ui.h:79
 #, fuzzy
 msgid "Never"
 msgstr "Server"
 
-#: ../data/gui/preferences_window.ui.h:84
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Notifications"
 msgstr "PÃ¥mindelser"
 
-#: ../data/gui/preferences_window.ui.h:85
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Notify me about contacts that sign _in"
 msgstr "PÃ¥mind mig om kontakter logger _ind"
 
-#: ../data/gui/preferences_window.ui.h:86
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Notify me about contacts that sign _out"
 msgstr "PÃ¥mind mig om kontakter som logger u_d"
 
-#: ../data/gui/preferences_window.ui.h:87
+#: ../data/gui/preferences_window.ui.h:83
 #, fuzzy
 msgid "Notify me about it"
 msgstr "PÃ¥mind mig om kontakter som logger u_d"
 
-#: ../data/gui/preferences_window.ui.h:88
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notify on new _GMail email"
 msgstr "PÃ¥mind mig ved ny _GMail e-post"
 
-#: ../data/gui/preferences_window.ui.h:89
+#: ../data/gui/preferences_window.ui.h:85
 #, fuzzy
 msgid "Only when pending events"
 msgstr ""
@@ -2090,55 +2300,55 @@ msgstr ""
 "Kun ved ventende hændelser\n"
 "Altid"
 
-#: ../data/gui/preferences_window.ui.h:90
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Personal Events"
 msgstr "Personlig Hændelser"
 
-#: ../data/gui/preferences_window.ui.h:91
+#: ../data/gui/preferences_window.ui.h:87
 msgid "Play _sounds"
 msgstr "Afspil _lyde"
 
-#: ../data/gui/preferences_window.ui.h:92
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Pop it up"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:93
+#: ../data/gui/preferences_window.ui.h:89
 msgid "Preferences"
 msgstr "Indstillinger"
 
-#: ../data/gui/preferences_window.ui.h:94
+#: ../data/gui/preferences_window.ui.h:90
 msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:96
+#: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
 msgid "STUN server:"
 msgstr "Server:"
 
-#: ../data/gui/preferences_window.ui.h:97
+#: ../data/gui/preferences_window.ui.h:93
+msgid "Show notification area icon:"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
 msgid "Show only in roster"
 msgstr "_Vis hændelse i kontaktvindue"
 
-#: ../data/gui/preferences_window.ui.h:98
-msgid "Show systray:"
-msgstr "Vis systembakken:"
-
-#: ../data/gui/preferences_window.ui.h:99
+#: ../data/gui/preferences_window.ui.h:95
 msgid "Sign _in"
 msgstr "Logge _ind"
 
-#: ../data/gui/preferences_window.ui.h:100
+#: ../data/gui/preferences_window.ui.h:96
 msgid "Sign _out"
 msgstr "Log _af"
 
-#: ../data/gui/preferences_window.ui.h:101
+#: ../data/gui/preferences_window.ui.h:97
 msgid "Single window for everything"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:102
+#: ../data/gui/preferences_window.ui.h:98
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2147,27 +2357,27 @@ msgstr ""
 "valgt\n"
 "vil Gajim kun vise den rå tekst."
 
-#: ../data/gui/preferences_window.ui.h:103
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sort contacts by status"
 msgstr "Sorter kontakter efter status"
 
-#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
 msgid "Status"
 msgstr "Status"
 
-#: ../data/gui/preferences_window.ui.h:105
+#: ../data/gui/preferences_window.ui.h:101
 msgid "Status _iconset:"
 msgstr "Status _ikonsæt:"
 
-#: ../data/gui/preferences_window.ui.h:106
+#: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Stil"
 
-#: ../data/gui/preferences_window.ui.h:107
+#: ../data/gui/preferences_window.ui.h:103
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/gui/preferences_window.ui.h:108
+#: ../data/gui/preferences_window.ui.h:104
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2179,7 +2389,7 @@ msgstr ""
 "$S vil blive erstattet med den forrige status besked\n"
 "$T vil blive erstattet med auto-away tidsudløb"
 
-#: ../data/gui/preferences_window.ui.h:111
+#: ../data/gui/preferences_window.ui.h:107
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2191,121 +2401,125 @@ msgstr ""
 "$S vil blive erstattet med den forrige status besked\n"
 "$T vil blive erstattet med auto-not-available timeout"
 
-#: ../data/gui/preferences_window.ui.h:114
+#: ../data/gui/preferences_window.ui.h:110
 msgid "Use _transports icons"
 msgstr "Brug _transportens ikonsæt"
 
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:111
+msgid "Use default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:112
 msgid "Use system _default"
 msgstr "Brug system stan_dard"
 
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:113
 msgid "Video framerate"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:117
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Video input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:118
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Video output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:119
+#: ../data/gui/preferences_window.ui.h:116
 msgid "Video size"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:120
+#: ../data/gui/preferences_window.ui.h:117
 msgid "When new event is received:"
 msgstr "Når en ny hændelse er modtaget:"
 
-#: ../data/gui/preferences_window.ui.h:121
+#: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
 msgid "Your message:"
 msgstr "Fejl besked: %s"
 
-#: ../data/gui/preferences_window.ui.h:122
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your nickname:"
 msgstr "Kælenavn:"
 
-#: ../data/gui/preferences_window.ui.h:123
+#: ../data/gui/preferences_window.ui.h:120
 msgid "_Away after:"
 msgstr "_Væk efter:"
 
-#: ../data/gui/preferences_window.ui.h:124
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Netlæser:"
 
-#: ../data/gui/preferences_window.ui.h:125
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Display chat state notifications:"
 msgstr "Vis samtalestatus påmin_delser:"
 
-#: ../data/gui/preferences_window.ui.h:126
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Emoticons:"
 msgstr "Føl_elsesikoner:"
 
-#: ../data/gui/preferences_window.ui.h:127
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_File manager:"
 msgstr "_Filhåndterer:"
 
-#: ../data/gui/preferences_window.ui.h:128
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_Highlight misspelled words"
 msgstr "Frem_hæv stavefejl"
 
-#: ../data/gui/preferences_window.ui.h:129
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorer hændelser fra kontakter som ikke er i kontaktvinduet"
 
-#: ../data/gui/preferences_window.ui.h:130
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignorer rigt indhold i indkommende beskeder"
 
-#: ../data/gui/preferences_window.ui.h:131
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Log status changes of contacts"
 msgstr "_Log status ændringer hos kontakter"
 
-#: ../data/gui/preferences_window.ui.h:132
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Mail client:"
 msgstr "_E-post klient:"
 
-#: ../data/gui/preferences_window.ui.h:133
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Not available after:"
 msgstr "Ikke tilgæ_ngelig efter:"
 
-#: ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Open..."
 msgstr "_Ã…bn..."
 
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Reset to Default Colors"
 msgstr "_Nulstil til Standard Farver"
 
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Send chat state notifications:"
 msgstr "_Send samtalestatus påmindelser:"
 
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Status message:"
 msgstr "_Status besked:"
 
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_URL highlight:"
 msgstr "_URL fremhævning:"
 
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_Window behavior:"
 msgstr "_Vinduets adfærd:"
 
-#: ../data/gui/preferences_window.ui.h:140
+#: ../data/gui/preferences_window.ui.h:137
 msgid "in _group chats"
 msgstr "i _gruppe samtaler"
 
-#: ../data/gui/preferences_window.ui.h:141
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _roster"
 msgstr "i _kontaktvinduet"
 
-#: ../data/gui/preferences_window.ui.h:142
+#: ../data/gui/preferences_window.ui.h:139
 msgid "minutes"
 msgstr "minutter"
 
@@ -2357,7 +2571,7 @@ msgstr "Jabber ID"
 msgid "Order:"
 msgstr "Bestil:"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3436
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
 msgid "Privacy List"
 msgstr "Privatlivs Liste"
 
@@ -2568,8 +2782,8 @@ msgstr "Fjern konto fra Gajim og fra _serveren"
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5492 ../src/roster_window.py:5622
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
+#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
 msgid "_Remove"
 msgstr "_Kan fjernes"
 
@@ -2615,56 +2829,60 @@ msgid "Help online"
 msgstr "Hjælp på net"
 
 #: ../data/gui/roster_window.ui.h:8
+msgid "P_lugins"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:9
 msgid "Profile, A_vatar"
 msgstr "Profil, A_vatar"
 
-#: ../data/gui/roster_window.ui.h:9
+#: ../data/gui/roster_window.ui.h:10
 msgid "Show Only _Active Contacts"
 msgstr "Vis Kun _Aktive Kontakter"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
 msgid "Show Trans_ports"
 msgstr "Vis Trans_porter"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
 msgid "Show _Offline Contacts"
 msgstr "Vis _Afkoblede Kontakter"
 
-#: ../data/gui/roster_window.ui.h:12 ../src/statusicon.py:326
+#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
 msgid "Show _Roster"
 msgstr "Vis _Kontaktvindue"
 
-#: ../data/gui/roster_window.ui.h:13
+#: ../data/gui/roster_window.ui.h:14
 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/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
 #: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Handlinger"
 
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
 msgid "_Contents"
 msgstr "_Indhold"
 
-#: ../data/gui/roster_window.ui.h:18 ../src/disco.py:1502
+#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../data/gui/roster_window.ui.h:19
+#: ../data/gui/roster_window.ui.h:20
 msgid "_FAQ"
 msgstr "_OSS"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Help"
 msgstr "_Hjælp"
 
-#: ../data/gui/roster_window.ui.h:22
+#: ../data/gui/roster_window.ui.h:23
 msgid "_Send Single Message..."
 msgstr "Send en Enkel _Besked..."
 
-#: ../data/gui/roster_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:25
 msgid "_View"
 msgstr "_Vis"
 
@@ -2681,11 +2899,11 @@ msgid "_Add contact"
 msgstr "Tilføj Kont_akt"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5634
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
 msgid "_Information"
 msgstr "_Information"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1353
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
 msgid "_Search"
 msgstr "_Søg"
 
@@ -2705,10 +2923,6 @@ msgstr "Registrer til"
 msgid "_Cancel"
 msgstr "_Afbryd"
 
-#: ../data/gui/single_message_window.ui.h:2
-msgid "From:"
-msgstr "Fra:"
-
 #: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Send et svar til denne besked"
@@ -2725,10 +2939,6 @@ msgstr "Send besked"
 msgid "Send message and close window"
 msgstr "Send besked og luk vinduet"
 
-#: ../data/gui/single_message_window.ui.h:7
-msgid "Subject:"
-msgstr "Emne:"
-
 #: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Til:"
@@ -2940,26 +3150,36 @@ msgstr "Gajim Instant Messenger"
 msgid "Jabber IM Client"
 msgstr "Jabber IM Klient"
 
-#: ../src/adhoc_commands.py:314
+#: ../src/adhoc_commands.py:323
 msgid "Cancel confirmation"
 msgstr "Annuller bekræftelse"
 
-#: ../src/adhoc_commands.py:315
+#: ../src/adhoc_commands.py:324
 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:351 ../src/adhoc_commands.py:374
+#: ../src/adhoc_commands.py:370
+#, fuzzy
+msgid "Invalid Form"
+msgstr "Ugyldig rum"
+
+#: ../src/adhoc_commands.py:371
+#, fuzzy
+msgid "The form is not filled correctly."
+msgstr "Kælenavnet har ikke tilladte tegn."
+
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
 msgid "Service sent malformed data"
 msgstr "Tjeneste sendte malformeret data"
 
-#: ../src/adhoc_commands.py:360
+#: ../src/adhoc_commands.py:399
 msgid "Service changed the session identifier."
 msgstr "Tjeneste ændrede sessionsnøglen."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:471
+#: ../src/adhoc_commands.py:513
 msgid "Service returned an error."
 msgstr "Tjeneste returnerede en fejl."
 
@@ -2984,7 +3204,7 @@ msgstr "Heltal"
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:945
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
 msgid "Color"
 msgstr "Farve"
 
@@ -3021,188 +3241,188 @@ msgstr[1] "Du har modtaget en nye hændelser (og %(count)d er ikke vist):"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "English"
 msgstr "Engelsk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Belarusian"
 msgstr "Belarusian"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Bulgarian"
 msgstr "Bulgarsk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Breton"
 msgstr "Bretonsk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Czech"
 msgstr "Tjekkisk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "German"
 msgstr "Tysk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Greek"
 msgstr "Græsk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "British"
 msgstr "Britisk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Spanish"
 msgstr "Spansk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Basque"
 msgstr "Baskisk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "French"
 msgstr "Fransk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Croatian"
 msgstr "Kroatisk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Italian"
 msgstr "Italiensk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian (b)"
 msgstr "Norsk (bokmål)"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Dutch"
 msgstr "Hollandsk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian"
 msgstr "Norsk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Polish"
 msgstr "Polsk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Portuguese"
 msgstr "Portugisisk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Brazilian Portuguese"
 msgstr "Brasiliansk Portugisisk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Russian"
 msgstr "Russisk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Slovak"
 msgstr "Slovakisk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Swedish"
 msgstr "Svensk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Chinese (Ch)"
 msgstr "Kinesisk"
 
-#: ../src/chat_control.py:479
+#: ../src/chat_control.py:496
 msgid "Spelling language"
 msgstr "Sprog for stavekontrollen"
 
 #. we are not connected
-#: ../src/chat_control.py:511 ../src/chat_control.py:720
+#: ../src/chat_control.py:528 ../src/chat_control.py:737
 msgid "A connection is not available"
 msgstr "En tilslutning er ikke tilgængelig"
 
-#: ../src/chat_control.py:512 ../src/chat_control.py:721
+#: ../src/chat_control.py:529 ../src/chat_control.py:738
 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:927
+#: ../src/chat_control.py:944
 msgid "Underline"
 msgstr "Understregning"
 
-#: ../src/chat_control.py:928
+#: ../src/chat_control.py:945
 msgid "Strike"
 msgstr "Streg"
 
-#: ../src/chat_control.py:951
+#: ../src/chat_control.py:968
 msgid "Font"
 msgstr "Font"
 
-#: ../src/chat_control.py:960
+#: ../src/chat_control.py:977
 msgid "Clear formating"
 msgstr "Fjern formatering"
 
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1055
 msgid "Really send file?"
 msgstr "Virkelig send denne fil?"
 
-#: ../src/chat_control.py:1039
+#: ../src/chat_control.py:1056
 #, 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:1503 ../src/chat_control.py:1987
+#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
 msgid "GPG encryption enabled"
 msgstr "GPG kryptering aktiveret"
 
 #. Add to roster
-#: ../src/chat_control.py:1528 ../src/common/contacts.py:158
+#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
 #: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:245 ../src/dialogs.py:1064 ../src/dialogs.py:2078
-#: ../src/dialogs.py:2107 ../src/gui_interface.py:674
+#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
+#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
 #: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1610 ../src/roster_window.py:1612
-#: ../src/roster_window.py:1942 ../src/roster_window.py:3289
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
+#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
+#: ../src/roster_window.py:3382
 msgid "Not in Roster"
 msgstr "Ikke i Kontaktvinduet"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1575
 msgid "This contact does not support file transfer."
 msgstr "Denne kontakt understøtter ikke fil overførsler."
 
-#: ../src/chat_control.py:1561
+#: ../src/chat_control.py:1578
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 "Du trænger den rigtige JID fra kontakten for at kunne sende ham eller hende "
 "en fil."
 
-#: ../src/chat_control.py:1656
+#: ../src/chat_control.py:1677
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:1869
 #, 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:1967 ../src/dialogs.py:4866
+#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
 msgid "No GPG key assigned"
 msgstr "Ingen GPG nøgle valgt"
 
-#: ../src/chat_control.py:1968
+#: ../src/chat_control.py:1991
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3210,50 +3430,50 @@ msgstr ""
 "Ingen GPG nøgle er valgt for denne kontakt. Derfor kan du ikke kryptere "
 "beskeder med GPG."
 
-#: ../src/chat_control.py:1977
+#: ../src/chat_control.py:2000
 msgid "GPG encryption disabled"
 msgstr "GPG kryptering ikke aktiveret"
 
-#: ../src/chat_control.py:2003
+#: ../src/chat_control.py:2026
 msgid "Session WILL be logged"
 msgstr "Session VIL blive logget"
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:2028
 msgid "Session WILL NOT be logged"
 msgstr "Session VIL IKKE blive logget"
 
 #. encryption %s active
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is"
 msgstr "er"
 
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is NOT"
 msgstr "er IKKE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will"
 msgstr "vil"
 
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will NOT"
 msgstr "vil IKKE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2051
 msgid "and authenticated"
 msgstr "og godkendt"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2032
+#: ../src/chat_control.py:2055
 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:2039
+#: ../src/chat_control.py:2062
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3262,23 +3482,32 @@ msgstr ""
 "%(type)s kryptering %(status)s aktiv %(authenticated)s.\n"
 "Din samtale session %(logged)s blive logget."
 
-#: ../src/chat_control.py:2182
+#: ../src/chat_control.py:2205
 msgid "Session negotiation cancelled"
 msgstr "Session forhandling annulleret"
 
-#: ../src/chat_control.py:2191
+#: ../src/chat_control.py:2215
+msgid "This session WILL be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2217
+#, fuzzy
+msgid "This session WILL NOT be archived on server"
+msgstr "Session VIL IKKE blive logget"
+
+#: ../src/chat_control.py:2226
 msgid "This session is encrypted"
 msgstr "Denne session er krypteret"
 
-#: ../src/chat_control.py:2194
+#: ../src/chat_control.py:2229
 msgid " and WILL be logged"
 msgstr " og VIL blive logget"
 
-#: ../src/chat_control.py:2196
+#: ../src/chat_control.py:2231
 msgid " and WILL NOT be logged"
 msgstr " og VIL IKKE blive logget"
 
-#: ../src/chat_control.py:2201
+#: ../src/chat_control.py:2236
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3286,25 +3515,25 @@ msgstr ""
 "Kontaktens identitet er ikke verificeret Tryk på skjold knappen for flere "
 "detaljer."
 
-#: ../src/chat_control.py:2203
+#: ../src/chat_control.py:2238
 msgid "E2E encryption disabled"
 msgstr "E2E kryptering ikke aktiveret"
 
-#: ../src/chat_control.py:2241 ../src/chat_control.py:2254
+#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
 msgid "The following message was NOT encrypted"
 msgstr "Den følgende besked var IKKE krypteret"
 
-#: ../src/chat_control.py:2247
+#: ../src/chat_control.py:2288
 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:2519
+#: ../src/chat_control.py:2566
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du har netop modtaget en besked fra \"%s\""
 
-#: ../src/chat_control.py:2520
+#: ../src/chat_control.py:2567
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3312,15 +3541,13 @@ msgstr ""
 "Hvis du lukker dette faneblad og ikke har aktiveret historie loggen, vil du\n"
 "miste denne besked."
 
-#: ../src/chat_control.py:2663 ../src/common/connection_handlers.py:1635
-#: ../src/common/connection_handlers.py:1758
-#: ../src/common/connection_handlers.py:1960
-#: ../src/common/connection_handlers.py:2110 ../src/common/connection.py:452
+#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
 #: ../src/gajim.py:159 ../src/session.py:138
 msgid "Database Error"
 msgstr "Database Fejl"
 
-#: ../src/chat_control.py:2664
+#: ../src/chat_control.py:2714
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3329,7 +3556,7 @@ msgstr ""
 "Database filen (%s) kan ikke læses. Prøv at reparere den eller fjerne den "
 "(hele historikken vil tabes)."
 
-#: ../src/chat_control.py:2906
+#: ../src/chat_control.py:2962
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s er nu %(status)s"
@@ -3343,28 +3570,28 @@ msgstr "opretter log database"
 msgid "creating cache database"
 msgstr "opretter log database"
 
-#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
-#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
-#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
-#: ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
 #, 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:275 ../src/common/check_paths.py:282
-#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
-#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
-#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:333
+#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
+#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
+#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
 msgid "Gajim will now exit"
 msgstr "Gajim vil nu slutte"
 
-#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
+#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
 #, 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:342
+#: ../src/common/check_paths.py:351
 #, python-format
 msgid "creating %s directory"
 msgstr "opretter %s katalog"
@@ -3428,9 +3655,9 @@ msgstr "Vælg de gruppesamtaler du vil forlade"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:801
-#: ../src/roster_window.py:1614 ../src/roster_window.py:1616
-#: ../src/roster_window.py:5251
+#: ../src/common/helpers.py:57 ../src/roster_window.py:815
+#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
+#: ../src/roster_window.py:5323
 msgid "Groupchats"
 msgstr "Gruppesamtaler"
 
@@ -3497,7 +3724,9 @@ msgstr ""
 "tilgængelig tid."
 
 #: ../src/common/config.py:88
-msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+#, fuzzy
+msgid ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 "Når skal systembakke ikonet vises? Kan være 'never', 'on_event', 'always'."
 
@@ -3549,9 +3778,9 @@ msgstr ""
 "kollapset."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:501
-#: ../src/common/optparser.py:290 ../src/common/optparser.py:486
-#: ../src/common/optparser.py:520 ../src/gui_interface.py:3370
+#: ../src/common/config.py:106 ../src/common/config.py:505
+#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
+#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
 msgid "default"
 msgstr "standard"
 
@@ -3781,7 +4010,8 @@ msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard siger KiB = 1024 byte, KB = 1000 byte."
 
 #: ../src/common/config.py:197
-msgid "Notify of events in the system trayicon."
+#, fuzzy
+msgid "Notify of events in the notification area."
 msgstr "Vis påmindelse af hændelser i statusfelt ikonet."
 
 #: ../src/common/config.py:203
@@ -3819,9 +4049,10 @@ msgstr ""
 "En semikolon-separeret liste af ord som vil blive fremhævet i gruppesamtaler."
 
 #: ../src/common/config.py:221
+#, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
+"setting is taken into account only if notification icon is used."
 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."
@@ -4098,9 +4329,10 @@ msgstr ""
 "slettet."
 
 #: ../src/common/config.py:270
+#, fuzzy
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
-"systray icon."
+"notification icon."
 msgstr ""
 "Hvis sandt vil påmindelses vinduer fra påmindelses dæmonen blive fæstet til "
 "ikonet i systembakken."
@@ -4303,11 +4535,15 @@ msgstr ""
 msgid "Message that is sent to contacts you want to add"
 msgstr "Fyld ind data for den kontakt som du vil tilføje"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:374
+msgid "Last time we syncronized with logs from server."
+msgstr ""
+
+#: ../src/common/config.py:436
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Er OpenPGP aktiveret for denne kontakt?"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4315,101 +4551,108 @@ msgstr ""
 "Skal Gajim automatisk starte en krypteret session med denne kontakt når det "
 "er muligt?"
 
-#: ../src/common/config.py:437 ../src/common/config.py:440
+#: ../src/common/config.py:438 ../src/common/config.py:441
 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:446
+#: ../src/common/config.py:447
 msgid "all or space separated status"
 msgstr "alt eller mellemrums separeret status"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:448
 msgid "'yes', 'no', or 'both'"
 msgstr "'ja', 'nej', eller 'begge'"
 
-#: ../src/common/config.py:448 ../src/common/config.py:450
-#: ../src/common/config.py:451 ../src/common/config.py:454
-#: ../src/common/config.py:455
+#: ../src/common/config.py:449 ../src/common/config.py:451
+#: ../src/common/config.py:452 ../src/common/config.py:455
+#: ../src/common/config.py:456
 msgid "'yes', 'no' or ''"
 msgstr "'ja', 'nej' eller ''"
 
-#: ../src/common/config.py:461 ../src/common/pep.py:157
+#: ../src/common/config.py:460
+msgid ""
+"State whether plugins should be activated on exit (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
+msgstr ""
+
+#: ../src/common/config.py:465 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back soon"
 msgstr "Snart tilbage"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back in some minutes."
 msgstr "Tilbage om få minutter."
 
-#: ../src/common/config.py:463 ../src/common/pep.py:127
+#: ../src/common/config.py:467 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Spiser"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:467
 msgid "I'm eating, so leave me a message."
 msgstr "Jeg spiser, så læg en besked."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "I'm watching a movie."
 msgstr "Jeg ser en film."
 
-#: ../src/common/config.py:465 ../src/common/pep.py:186
+#: ../src/common/config.py:469 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Arbejder"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:469
 msgid "I'm working."
 msgstr "Jeg arbejder."
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "I'm on the phone."
 msgstr "Jeg snakker i telefon."
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "Out"
 msgstr "Ude"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "I'm out enjoying life."
 msgstr "Jeg er ude og nyder livet."
 
-#: ../src/common/config.py:478
+#: ../src/common/config.py:482
 msgid "I'm available."
 msgstr "Jeg er tilgængelig."
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:483
 msgid "I'm free for chat."
 msgstr "Jeg er tilgængelig for en samtale."
 
-#: ../src/common/config.py:480 ../src/config.py:1600
+#: ../src/common/config.py:484 ../src/config.py:1600
 msgid "Be right back."
 msgstr "Er straks tilbage."
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:485
 msgid "I'm not available."
 msgstr "Jeg er ikke tilgængelig."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:486
 msgid "Do not disturb."
 msgstr "Ikke forstyr."
 
-#: ../src/common/config.py:483 ../src/common/config.py:484
+#: ../src/common/config.py:487 ../src/common/config.py:488
 msgid "Bye!"
 msgstr "Farvel!"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:498
 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."
@@ -4418,50 +4661,50 @@ msgstr ""
 "muc_highlight_words, eller når en gruppesamtale besked indeholder dit "
 "kælenavn."
 
-#: ../src/common/config.py:495
+#: ../src/common/config.py:499
 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:504 ../src/common/optparser.py:304
+#: ../src/common/config.py:508 ../src/common/optparser.py:308
 msgid "green"
 msgstr "grøn"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:290
+#: ../src/common/config.py:512 ../src/common/optparser.py:294
 msgid "grocery"
 msgstr "købmandsvarer"
 
-#: ../src/common/config.py:512
+#: ../src/common/config.py:516
 msgid "human"
 msgstr "menneske"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:520
 msgid "marine"
 msgstr "marint"
 
-#: ../src/common/connection_handlers.py:84
+#: ../src/common/connection_handlers.py:94
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Ikke i stand til at indlæse tomgangs modulet"
 
-#: ../src/common/connection_handlers.py:117
+#: ../src/common/connection_handlers.py:127
 #, 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:124
+#: ../src/common/connection_handlers.py:134
 msgid "Registration succeeded"
 msgstr "Tilslutning lykkedes"
 
-#: ../src/common/connection_handlers.py:125
+#: ../src/common/connection_handlers.py:135
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Tilslutning med agenten %s lykkedes"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 msgid "Registration failed"
 msgstr "Tilslutning fejlede"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -4469,38 +4712,34 @@ msgstr ""
 "Tilslutning med agenten %(agent)s mislykkedes med fejlen %(error)s: "
 "%(error_msg)s"
 
-#: ../src/common/connection_handlers.py:445
-#: ../src/common/connection_handlers.py:1633
-#: ../src/common/connection_handlers.py:1756
-#: ../src/common/connection_handlers.py:1957
-#: ../src/common/connection_handlers.py:2108 ../src/common/connection.py:449
+#: ../src/common/connection_handlers.py:466
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
 #: ../src/gajim.py:341
 msgid "Disk Write Error"
 msgstr "Disk skrivefejl"
 
-#: ../src/common/connection_handlers.py:678 ../src/common/connection.py:1472
+#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
 msgid "Invisibility not supported"
 msgstr "Usynlighed er ikke understøttet"
 
-#: ../src/common/connection_handlers.py:679 ../src/common/connection.py:1473
+#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Konto %s understøtter ikke usynlighed."
 
-#: ../src/common/connection_handlers.py:1446 ../src/common/connection.py:253
-#: ../src/config.py:2091 ../src/config.py:2100 ../src/config.py:2168
-#: ../src/config.py:3560 ../src/dataforms_widget.py:597 ../src/dialogs.py:2931
+#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
+#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
+#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
 msgid "Invalid Jabber ID"
 msgstr "Ugyldigt Jabber ID"
 
-#: ../src/common/connection_handlers.py:1447
+#: ../src/common/connection_handlers.py:1405
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr "En besked fra en ugyldig JID blev modtaget, den er blevet ignoreret."
 
-#: ../src/common/connection_handlers.py:1636
-#: ../src/common/connection_handlers.py:1759
-#: ../src/common/connection_handlers.py:1961
-#: ../src/common/connection_handlers.py:2111 ../src/common/connection.py:453
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
 #: ../src/gajim.py:160 ../src/session.py:139
 #, python-format
 msgid ""
@@ -4510,90 +4749,6 @@ 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:1805
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Kælenavn er ikke tilladt: %s"
-
-#: ../src/common/connection_handlers.py:1902
-#: ../src/common/connection_handlers.py:1911
-#: ../src/common/connection_handlers.py:1918
-#: ../src/common/connection_handlers.py:1922
-#: ../src/common/connection_handlers.py:1926
-#: ../src/common/connection_handlers.py:1931 ../src/gui_interface.py:139
-msgid "Unable to join group chat"
-msgstr "Ikke i stand til at deltage i gruppesamtale."
-
-#: ../src/common/connection_handlers.py:1903
-#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr "Maksimalt antal brugere for %s er nået"
-
-#: ../src/common/connection_handlers.py:1912
-#, python-format
-msgid "You are banned from group chat %s."
-msgstr "Du er bandlyst fra gruppesamtalen %s."
-
-#: ../src/common/connection_handlers.py:1919
-#, python-format
-msgid "Group chat %s does not exist."
-msgstr "Gruppesamtalen %s eksisterer ikke."
-
-#: ../src/common/connection_handlers.py:1923
-msgid "Group chat creation is restricted."
-msgstr "Gruppesamtale oprettelse er begrænset."
-
-#: ../src/common/connection_handlers.py:1927
-#, 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:1932
-#, 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:1976
-msgid "Room has been destroyed"
-msgstr "Rummet er blevet ødelagt"
-
-#: ../src/common/connection_handlers.py:1984
-#, 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:2020
-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:2041
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "vi abonnerer nu på %s"
-
-#: ../src/common/connection_handlers.py:2043
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "forespørsel om ophør på abonnement fra %s"
-
-#: ../src/common/connection_handlers.py:2045
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "nu abonnerer vi ikke længere på %s"
-
-#: ../src/common/connection_handlers.py:2240
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"JID %s er ikke RFC føjelig. Den vil ikke blive tilføjet til dit "
-"kontaktvindue. Brug kontaktvindue håndterings redskaber som http://jru."
-"jabberstudio.org/ til at fjerne det."
-
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr "Ikke i stand til at skaffer udstedelses certifikat"
@@ -4722,28 +4877,28 @@ msgstr "Nøglebrug indeholder ikke certifikat signering"
 msgid "Application verification failure"
 msgstr "Kunne ikke verificere programmet"
 
-#: ../src/common/connection.py:254 ../src/dialogs.py:2932
+#: ../src/common/connection.py:256 ../src/dialogs.py:2948
 #, 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 en besked til %s, denne JID er ikke gyldig."
 
-#: ../src/common/connection.py:276
+#: ../src/common/connection.py:278
 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:279
+#: ../src/common/connection.py:281
 #, 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:331
+#: ../src/common/connection.py:333
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Denne besked er *krypteret* (Se :XEP:`27`]"
 
-#: ../src/common/connection.py:439
+#: ../src/common/connection.py:441
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4752,79 +4907,79 @@ msgstr ""
 "Emne: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:807
+#: ../src/common/connection.py:809
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Tilslutning til konto \"%s\" er blevet afbrudt"
 
-#: ../src/common/connection.py:808
+#: ../src/common/connection.py:810
 msgid "Reconnect manually."
 msgstr "Tilslut manuelt."
 
-#: ../src/common/connection.py:820
+#: ../src/common/connection.py:822
 #, 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:854
+#: ../src/common/connection.py:856
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Serveren %s gav en anderledes registreringsform"
 
-#: ../src/common/connection.py:867
+#: ../src/common/connection.py:869
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Ukendt SSL fejl: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:882
+#: ../src/common/connection.py:884
 msgid "Invalid answer"
 msgstr "Forkert svar"
 
-#: ../src/common/connection.py:883
+#: ../src/common/connection.py:885
 #, 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:1165 ../src/common/connection.py:1294
-#: ../src/common/connection.py:1784
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
+#: ../src/common/connection.py:1792
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kunne ikke tilslutte til \"%s\""
 
-#: ../src/common/connection.py:1166 ../src/gui_interface.py:755
+#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
 msgid "Check your connection or try again later."
 msgstr "Kontroller din tilslutning eller forsøg igen senere."
 
-#: ../src/common/connection.py:1171
+#: ../src/common/connection.py:1173
 #, python-format
 msgid "Server replied: %s"
 msgstr "Server svarede: %s"
 
-#: ../src/common/connection.py:1184
+#: ../src/common/connection.py:1186
 msgid "Connection to proxy failed"
 msgstr "Tilslutning til proxy fejlede"
 
-#: ../src/common/connection.py:1215 ../src/common/connection.py:1274
+#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Kunne ikke tilslutte til kontoen %s"
 
-#: ../src/common/connection.py:1216 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
 #, 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:1241
+#: ../src/common/connection.py:1243
 #, 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:1244
+#: ../src/common/connection.py:1246
 #, python-format
 msgid ""
 "\n"
@@ -4833,7 +4988,7 @@ msgstr ""
 "\n"
 "SSL Fejl: <b>%s</b>"
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1248
 #, python-format
 msgid ""
 "\n"
@@ -4842,24 +4997,24 @@ msgstr ""
 "\n"
 "Ukendt SSL fejl: %d"
 
-#: ../src/common/connection.py:1295
+#: ../src/common/connection.py:1297
 msgid "Check your connection or try again later"
 msgstr "Kontroller din tilslutning eller prøv igen senere"
 
-#: ../src/common/connection.py:1324
+#: ../src/common/connection.py:1329
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Godkendelse fejlede med \"%s\""
 
-#: ../src/common/connection.py:1326
+#: ../src/common/connection.py:1331
 msgid "Please check your login and password for correctness."
 msgstr "Venligst kontroller om dit logind og adgangskode er korrekt."
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1400
 msgid "Error while removing privacy list"
 msgstr "Fejl under fjernelse af privatlivs liste"
 
-#: ../src/common/connection.py:1396
+#: ../src/common/connection.py:1401
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4868,39 +5023,39 @@ 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:1650
+#: ../src/common/connection.py:1658
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Sendt kontakt: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1653
+#: ../src/common/connection.py:1661
 msgid "Sent contacts:"
 msgstr "Sendte kontakter:"
 
-#: ../src/common/connection.py:1799 ../src/common/connection.py:1822
+#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
 msgid "Not fetched because of invisible status"
 msgstr "Ikke hentet på grund af usynlig status"
 
-#: ../src/common/connection.py:2254
+#: ../src/common/connection.py:2262
 msgid "Unregister failed"
 msgstr "Tilslutning fejlede"
 
-#: ../src/common/connection.py:2255
+#: ../src/common/connection.py:2263
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr "Frakobling fra serveren %(server)s mislykkedes: %(error)s"
 
 #: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:674
+#: ../src/gui_interface.py:551
 msgid "Observers"
 msgstr "Iagttagere"
 
 #: ../src/common/contacts.py:139 ../src/common/contacts.py:366
 #: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1499 ../src/gui_interface.py:424
-#: ../src/roster_window.py:840 ../src/roster_window.py:1525
-#: ../src/roster_window.py:1606 ../src/roster_window.py:1608
-#: ../src/roster_window.py:1769
+#: ../src/disco.py:1517 ../src/roster_window.py:854
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
+#: ../src/roster_window.py:2466
 msgid "Transports"
 msgstr "Transporter"
 
@@ -5127,203 +5282,219 @@ msgstr "Slutten af ugen"
 msgid "Weekend!"
 msgstr "Weekend!"
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:148
+msgid "Username must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:153
 msgid "Invalid character in username."
 msgstr "Ugyldig karakter i brugernavn."
 
-#: ../src/common/helpers.py:156
-msgid "Server address required."
-msgstr "Server adresse påkrævet."
+#: ../src/common/helpers.py:159
+msgid "Server must be between 1 and 1023 chars"
+msgstr ""
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 msgid "Invalid character in hostname."
 msgstr "Ugyldig karakter i værtsnavn."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:166
+msgid "Server address required."
+msgstr "Server adresse påkrævet."
+
+#: ../src/common/helpers.py:170
+msgid "Resource must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:175
 msgid "Invalid character in resource."
 msgstr "Ugyldig karakter i ressource."
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:215
 msgid "_Busy"
 msgstr "_Travlt"
 
-#: ../src/common/helpers.py:211 ../src/tooltips.py:195
+#: ../src/common/helpers.py:217 ../src/tooltips.py:195
 msgid "Busy"
 msgstr "Travlt"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:220
 msgid "_Not Available"
 msgstr "_Ikke tilgængelig"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:225
 msgid "_Free for Chat"
 msgstr "_Tilgængelig for samtale"
 
-#: ../src/common/helpers.py:221 ../src/tooltips.py:191
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Free for Chat"
 msgstr "Tilgængelig for samtale"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:230
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?transfer status:Midlertidig stoppet"
 
-#: ../src/common/helpers.py:226 ../src/tooltips.py:189
+#: ../src/common/helpers.py:232 ../src/tooltips.py:189
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?transfer status:Midlertidig stoppet"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:234
 msgid "Connecting"
 msgstr "Tilslutter"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:237
 msgid "A_way"
 msgstr "_Væk"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:242
 msgid "_Offline"
 msgstr "_Afkoblet"
 
-#: ../src/common/helpers.py:238 ../src/tooltips.py:199
+#: ../src/common/helpers.py:244 ../src/tooltips.py:199
 msgid "Offline"
 msgstr "Afkoblet"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:247
 msgid "_Invisible"
 msgstr "_Usynlig"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:253
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Ukendt"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:255
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Har fejl"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:260
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Intet"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:262
 msgid "To"
 msgstr "Til"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
+msgid "From"
+msgstr "Fra"
+
+#: ../src/common/helpers.py:266
 msgid "Both"
 msgstr "Begge"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:274
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Intet"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:276
 msgid "Subscribe"
 msgstr "Abonner"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:285
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:288
 msgid "Moderators"
 msgstr "Moderatorer"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:290
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:293
 msgid "Participants"
 msgstr "Deltagere"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:295
 msgid "Participant"
 msgstr "Deltager"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:298
 msgid "Visitors"
 msgstr "Besøgende"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:300
 msgid "Visitor"
 msgstr "Besøgende"
 
-#: ../src/common/helpers.py:300 ../src/tooltips.py:210
+#: ../src/common/helpers.py:306 ../src/tooltips.py:210
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Ingen"
 
-#: ../src/common/helpers.py:302 ../src/tooltips.py:216
+#: ../src/common/helpers.py:308 ../src/tooltips.py:216
 msgid "Owner"
 msgstr "Ejer"
 
-#: ../src/common/helpers.py:304 ../src/tooltips.py:214
+#: ../src/common/helpers.py:310 ../src/tooltips.py:214
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:212
+#: ../src/common/helpers.py:312 ../src/tooltips.py:212
 msgid "Member"
 msgstr "Medlem"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:351
 msgid "is paying attention to the conversation"
 msgstr "er opmærksom på samtalen"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:353
 msgid "is doing something else"
 msgstr "gør noget andet"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:355
 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:352
+#: ../src/common/helpers.py:358
 msgid "paused composing a message"
 msgstr "holder pause med at komponere en besked"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:360
 msgid "has closed the chat window or tab"
 msgstr "har lukket samtalevinduet eller fanebladet"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:619
+#: ../src/common/helpers.py:625
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:622
+#: ../src/common/helpers.py:628
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:626
+#: ../src/common/helpers.py:632
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:629
+#: ../src/common/helpers.py:635
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:633
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:636
+#: ../src/common/helpers.py:642
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:645
 #, python-format
 msgid "%s B"
 msgstr "%s B"
@@ -5366,12 +5537,12 @@ msgstr "Gajim - %s"
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:111
+#: ../src/common/jingle_rtp.py:107
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Rum Konfigurering"
 
-#: ../src/common/jingle_rtp.py:112
+#: ../src/common/jingle_rtp.py:108
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5383,30 +5554,30 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:209
+#: ../src/common/jingle_rtp.py:205
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:210
+#: ../src/common/jingle_rtp.py:206
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Fejl besked: %s"
 
-#: ../src/common/jingle_rtp.py:336
+#: ../src/common/jingle_rtp.py:335
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:339
+#: ../src/common/jingle_rtp.py:338
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:382
+#: ../src/common/jingle_rtp.py:381
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:390
+#: ../src/common/jingle_rtp.py:389
 msgid "video output"
 msgstr ""
 
@@ -5483,11 +5654,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "fejl: kan ikke åbne %s for læsning"
 
-#: ../src/common/optparser.py:299 ../src/common/optparser.py:300
+#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:379
+#: ../src/common/optparser.py:383
 msgid "migrating logs database to indices"
 msgstr "flytter log databasen til flere indeks"
 
@@ -6160,7 +6331,7 @@ msgstr ""
 "annulleret."
 
 #. we're not english
-#: ../src/common/stanza_session.py:303
+#: ../src/common/stanza_session.py:423
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6168,11 +6339,11 @@ msgstr ""
 "[Dette er en del af en krypteret session. Hvis du ser denne besked gik noget "
 "galt.]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:178
+#: ../src/common/zeroconf/connection_zeroconf.py:181
 msgid "Avahi error"
 msgstr "Avahi fejl"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:179
+#: ../src/common/zeroconf/connection_zeroconf.py:182
 #, python-format
 msgid ""
 "%s\n"
@@ -6181,44 +6352,44 @@ msgstr ""
 "%s\n"
 "Link-local beskeder vil sandsynligvis ikke virke ordentligt."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:190
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Kontroller venligst om Avahi eller Bonjour er installeret."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:199
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Could not start local service"
 msgstr "Kunne ikke starte lokal tjeneste"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Ikke i stand til at tildele port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-#: ../src/common/zeroconf/connection_zeroconf.py:283
-#: ../src/common/zeroconf/connection_zeroconf.py:294
-#: ../src/common/zeroconf/connection_zeroconf.py:308
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:286
+#: ../src/common/zeroconf/connection_zeroconf.py:297
+#: ../src/common/zeroconf/connection_zeroconf.py:311
 msgid "Please check if avahi-daemon is running."
 msgstr "Kontroller venligst om avahi-dæmonen kører."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:282
-#: ../src/common/zeroconf/connection_zeroconf.py:293
-#: ../src/common/zeroconf/connection_zeroconf.py:307
+#: ../src/common/zeroconf/connection_zeroconf.py:285
+#: ../src/common/zeroconf/connection_zeroconf.py:296
+#: ../src/common/zeroconf/connection_zeroconf.py:310
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Kunne ikke ændre status på kontoen \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:325
+#: ../src/common/zeroconf/connection_zeroconf.py:328
 msgid "Your message could not be sent."
 msgstr "Din besked kunne ikke sendes."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:335
+#: ../src/common/zeroconf/connection_zeroconf.py:338
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakt er afkoblet. Din besked kunne ikke sendes."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:363
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6239,16 +6410,16 @@ msgstr "Standard Besked"
 msgid "Enabled"
 msgstr "Aktiveret"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3078
+#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:739 ../src/dialogs.py:1395
+#: ../src/config.py:733 ../src/dialogs.py:1409
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Ordbog for sproget %s er ikke tilgængelig"
 
-#: ../src/config.py:740
+#: ../src/config.py:734
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6266,9 +6437,9 @@ msgid "status message text"
 msgstr "status besked tekst"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2383 ../src/dialogs.py:2449
-#: ../src/dialogs.py:3215 ../src/disco.py:866 ../src/disco.py:1726
-#: ../src/disco.py:2030 ../src/history_window.py:90
+#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
+#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
+#: ../src/disco.py:2048 ../src/history_window.py:90
 msgid "Name"
 msgstr "Navn"
 
@@ -6303,7 +6474,7 @@ 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:1976 ../src/config.py:2509 ../src/config.py:2545
+#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
 msgid "You are currently connected to the server"
 msgstr "Du er for øjeblikket tilsluttet til serveren"
 
@@ -6339,131 +6510,131 @@ msgstr "Kontonavnet kan ikke være tomt."
 msgid "Account name cannot contain spaces."
 msgstr "Kontonavnet kan ikke indeholde mellemrom."
 
-#: ../src/config.py:2072
+#: ../src/config.py:2074
 msgid "Rename Account"
 msgstr "Omdøb Konto"
 
-#: ../src/config.py:2073
+#: ../src/config.py:2075
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Indtast et nyt navn for kontoen %s"
 
-#: ../src/config.py:2101
+#: ../src/config.py:2103
 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:2318 ../src/config.py:3606
+#: ../src/config.py:2320 ../src/config.py:3623
 msgid "Invalid entry"
 msgstr "Ugyldig indgang"
 
-#: ../src/config.py:2319 ../src/config.py:3607
+#: ../src/config.py:2321 ../src/config.py:3624
 msgid "Custom port must be a port number."
 msgstr "Personlig port må være et port nummer."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2342
 msgid "Failed to get secret keys"
 msgstr "Forsøg på at hente krypteringsnøgler mislykkedes"
 
-#: ../src/config.py:2341
+#: ../src/config.py:2343
 msgid "There is no OpenPGP secret key available."
 msgstr "Der er ikke nogen hemmelig OpenPGP nøgle tilgængelig."
 
-#: ../src/config.py:2375
+#: ../src/config.py:2377
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Nøgle Valg"
 
-#: ../src/config.py:2376
+#: ../src/config.py:2378
 msgid "Choose your OpenPGP key"
 msgstr "Vælg din OpenPGP Nøgle"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2385
 msgid "No such account available"
 msgstr "Ingen konto ved det navn er tilgængelig"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2386
 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:2391 ../src/dialogs.py:2136 ../src/dialogs.py:2371
-#: ../src/dialogs.py:2557 ../src/disco.py:511 ../src/profile_window.py:339
+#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
+#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilsluttet til serveren"
 
-#: ../src/config.py:2392
+#: ../src/config.py:2394
 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:2396
+#: ../src/config.py:2398
 msgid "Your server doesn't support Vcard"
 msgstr "Din server understøtter ikke Vcard"
 
-#: ../src/config.py:2397
+#: ../src/config.py:2399
 msgid "Your server can't save your personal information."
 msgstr "Din server kan ikke gemme din personlige information."
 
-#: ../src/config.py:2510 ../src/config.py:2546
+#: ../src/config.py:2512 ../src/config.py:2548
 msgid "To disable the account, you must be disconnected."
 msgstr "For at deaktivere din konto må du afbryde din tilslutning."
 
-#: ../src/config.py:2515
+#: ../src/config.py:2517
 msgid "Account Local already exists."
 msgstr "Den Lokale Konto eksisterer allerede."
 
-#: ../src/config.py:2516
+#: ../src/config.py:2518
 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:2673
+#: ../src/config.py:2675
 #, python-format
 msgid "Edit %s"
 msgstr "Rediger %s"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2677
 #, python-format
 msgid "Register to %s"
 msgstr "Registrer til %s"
 
 #. list at the beginning
-#: ../src/config.py:2711
+#: ../src/config.py:2713
 msgid "Ban List"
 msgstr "Liste over bandlyste"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2714
 msgid "Member List"
 msgstr "Medlems Liste"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2714
 msgid "Owner List"
 msgstr "Ejer Liste"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2715
 msgid "Administrator List"
 msgstr "Administrator Liste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2763 ../src/disco.py:873 ../src/history_manager.py:201
+#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2773
+#: ../src/config.py:2789
 msgid "Reason"
 msgstr "Grund"
 
-#: ../src/config.py:2780
+#: ../src/config.py:2796
 msgid "Nick"
 msgstr "Kælenavne"
 
-#: ../src/config.py:2786
+#: ../src/config.py:2802
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2813
+#: ../src/config.py:2829
 msgid "Banning..."
 msgstr "Bandlysning..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2815
+#: ../src/config.py:2831
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6471,11 +6642,11 @@ msgstr ""
 "<b>Hvem vil du bandlyse?</b>\n"
 "\n"
 
-#: ../src/config.py:2817
+#: ../src/config.py:2833
 msgid "Adding Member..."
 msgstr "Tilføj Medlem..."
 
-#: ../src/config.py:2818
+#: ../src/config.py:2834
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6483,11 +6654,11 @@ msgstr ""
 "<b>Hvem vil du gøre til medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2836
 msgid "Adding Owner..."
 msgstr "Tilføj Ejer..."
 
-#: ../src/config.py:2821
+#: ../src/config.py:2837
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6495,11 +6666,11 @@ msgstr ""
 "<b>Hvem vil du gøre til ejer?</b>\n"
 "\n"
 
-#: ../src/config.py:2823
+#: ../src/config.py:2839
 msgid "Adding Administrator..."
 msgstr "Tilføj Administrator..."
 
-#: ../src/config.py:2824
+#: ../src/config.py:2840
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6507,7 +6678,7 @@ msgstr ""
 "<b>Hvem vil du gøre til administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2825
+#: ../src/config.py:2841
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6523,110 +6694,110 @@ 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:2926
+#: ../src/config.py:2943
 #, python-format
 msgid "Removing %s account"
 msgstr "Fjerne kontoen med navnet %s"
 
-#: ../src/config.py:2941
+#: ../src/config.py:2958
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Følelsesikoner er ikke aktiveret"
 
-#: ../src/config.py:2942
+#: ../src/config.py:2959
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2955 ../src/gui_interface.py:1132
-#: ../src/gui_interface.py:1243
+#: ../src/config.py:2972 ../src/gui_interface.py:311
+#: ../src/gui_interface.py:1048
 msgid "Password Required"
 msgstr "Adgangskode er Påkrævet"
 
-#: ../src/config.py:2956 ../src/gui_interface.py:1223
+#: ../src/config.py:2973 ../src/gui_interface.py:1028
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv din adgangskode for kontoen %s"
 
-#: ../src/config.py:2957 ../src/gui_interface.py:1243
+#: ../src/config.py:2974 ../src/gui_interface.py:1048
 msgid "Save password"
 msgstr "Gem adgangskode"
 
-#: ../src/config.py:2967
+#: ../src/config.py:2984
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kontoen \"%s\" er tilsluttet til serveren"
 
-#: ../src/config.py:2968
+#: ../src/config.py:2985
 msgid "If you remove it, the connection will be lost."
 msgstr "Hvis du fjerne den vil tilslutningen tabes."
 
-#: ../src/config.py:2982
+#: ../src/config.py:2999
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Tilslutning til proxy fejlede"
 
-#: ../src/config.py:2983
+#: ../src/config.py:3000
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Hvad vil du gøre?"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3001
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Fjern kun k_ontoen fra Gajim"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3002
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3078
+#: ../src/config.py:3095
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
 
-#: ../src/config.py:3079
+#: ../src/config.py:3096
 msgid "Enter and leave only"
 msgstr "GÃ¥ kun ind og ud"
 
-#: ../src/config.py:3080
+#: ../src/config.py:3097
 msgid "?print_status:None"
 msgstr "?print_status:Ingen"
 
-#: ../src/config.py:3150
+#: ../src/config.py:3167
 msgid "New Group Chat"
 msgstr "Ny Gruppe Samtale"
 
-#: ../src/config.py:3183
+#: ../src/config.py:3200
 msgid "This bookmark has invalid data"
 msgstr "Dette bogmærke er ugyldigt"
 
-#: ../src/config.py:3184
+#: ../src/config.py:3201
 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."
 
 #. invalid char
-#: ../src/config.py:3302 ../src/dialogs.py:1934
+#: ../src/config.py:3319 ../src/dialogs.py:1950
 msgid "Invalid nickname"
 msgstr "Ugyldigt kælenavn"
 
-#: ../src/config.py:3303 ../src/config.py:3317 ../src/config.py:3331
+#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
 msgid "Character not allowed"
 msgstr "Tegn ikke tilladt: %s"
 
-#: ../src/config.py:3316 ../src/config.py:3582
+#: ../src/config.py:3333 ../src/config.py:3599
 msgid "Invalid server"
 msgstr "Ugyldigt server"
 
-#: ../src/config.py:3330
+#: ../src/config.py:3347
 msgid "Invalid room"
 msgstr "Ugyldig rum"
 
-#: ../src/config.py:3498
+#: ../src/config.py:3515
 msgid "Account has been added successfully"
 msgstr "Kontoen er blevet tilføjet med succes"
 
-#: ../src/config.py:3499 ../src/config.py:3505
+#: ../src/config.py:3516 ../src/config.py:3522
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menu item under the Edit menu from the main "
@@ -6636,33 +6807,33 @@ msgstr ""
 "eller senere ved at vælge kontoens menupunkt under Rediger menuen fra "
 "hovedvinduet."
 
-#: ../src/config.py:3504
+#: ../src/config.py:3521
 msgid "Your new account has been created successfully"
 msgstr "Din nye konto er blevet oprettet med succes"
 
-#: ../src/config.py:3543
+#: ../src/config.py:3560
 msgid "Invalid username"
 msgstr "Ugyldigt brugernavn"
 
-#: ../src/config.py:3545
+#: ../src/config.py:3562
 msgid "You must provide a username to configure this account."
 msgstr "Du må give et brugernavn for at konfigurere denne konto."
 
-#: ../src/config.py:3583
+#: ../src/config.py:3600
 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:3639 ../src/gui_interface.py:1904
+#: ../src/config.py:3656 ../src/gui_interface.py:1693
 msgid "Certificate Already in File"
 msgstr "Certifikatet er allerede i filen"
 
-#: ../src/config.py:3640 ../src/gui_interface.py:1905
+#: ../src/config.py:3657 ../src/gui_interface.py:1694
 #, 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:3717
+#: ../src/config.py:3734
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6677,7 +6848,7 @@ msgstr ""
 "SSL Fejl: %(error)s\n"
 "Vil du stadig prøve at forbinde til denne server?"
 
-#: ../src/config.py:3723 ../src/gui_interface.py:1932
+#: ../src/config.py:3740 ../src/gui_interface.py:1721
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6688,63 +6859,72 @@ msgstr ""
 "Certifikatets SHA1 fingeraftryk:\n"
 "%s"
 
-#: ../src/config.py:3755 ../src/config.py:3789
+#: ../src/config.py:3772 ../src/config.py:3806
 msgid "An error occurred during account creation"
 msgstr "Under oprettelsen af kontoen opstod der en fejl"
 
-#: ../src/config.py:3854
+#: ../src/config.py:3871
 msgid "Account name is in use"
 msgstr "Kontonavnet er i brug"
 
-#: ../src/config.py:3855
+#: ../src/config.py:3872
 msgid "You already have an account using this name."
 msgstr "Du har allered en konto med dette navn."
 
-#: ../src/config.py:4009
+#: ../src/config.py:3991
+msgid "PEP node was not removed"
+msgstr "PEP knude blev ikke fjernet"
+
+#: ../src/config.py:3992
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr "PEP knude %(node)s blev ikke fjernet: %(message)s"
+
+#: ../src/config.py:4036
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:4017
+#: ../src/config.py:4044
 msgid "Event"
 msgstr "Hændelse"
 
-#: ../src/config.py:4052
+#: ../src/config.py:4079
 msgid "First Message Received"
 msgstr "Første Besked er Modtaget"
 
-#: ../src/config.py:4053
+#: ../src/config.py:4080
 msgid "Next Message Received Focused"
 msgstr "Næste Besked Modtages i Fokus"
 
-#: ../src/config.py:4055
+#: ../src/config.py:4082
 msgid "Next Message Received Unfocused"
 msgstr "Næste Besked Modtages uden Fokus"
 
-#: ../src/config.py:4056
+#: ../src/config.py:4083
 msgid "Contact Connected"
 msgstr "Kontakt er Tilsluttet"
 
-#: ../src/config.py:4057
+#: ../src/config.py:4084
 msgid "Contact Disconnected"
 msgstr "Kontakt er ikke Tilsluttet"
 
-#: ../src/config.py:4058
+#: ../src/config.py:4085
 msgid "Message Sent"
 msgstr "Besked er Sendt"
 
-#: ../src/config.py:4059
+#: ../src/config.py:4086
 msgid "Group Chat Message Highlight"
 msgstr "Gruppe Samtale Besked Fremhævning"
 
-#: ../src/config.py:4060
+#: ../src/config.py:4087
 msgid "Group Chat Message Received"
 msgstr "Gruppe Samtale Besked Modtaget"
 
-#: ../src/config.py:4061
+#: ../src/config.py:4088
 msgid "GMail Email Received"
 msgstr "GMail E-post Modtaget"
 
-#: ../src/conversation_textview.py:600
+#: ../src/conversation_textview.py:601
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6755,7 +6935,7 @@ msgstr ""
 "ikon forbliver på skærmen længe er det sandsynlig\n"
 "at beskeden gik tabt."
 
-#: ../src/conversation_textview.py:619
+#: ../src/conversation_textview.py:620
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6763,44 +6943,44 @@ 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:739
+#: ../src/conversation_textview.py:740
 msgid "_Quote"
 msgstr "_Citat"
 
-#: ../src/conversation_textview.py:746
+#: ../src/conversation_textview.py:747
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Handlinger for \"%s\""
 
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Read _Wikipedia Article"
 msgstr "Læs _Wikipedia Artikel"
 
-#: ../src/conversation_textview.py:763
+#: ../src/conversation_textview.py:765
 msgid "Look it up in _Dictionary"
 msgstr "Slå dette op i Or_dbogen"
 
-#: ../src/conversation_textview.py:780
+#: ../src/conversation_textview.py:782
 #, 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:793
+#: ../src/conversation_textview.py:795
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web søge URL'en mangler en \"%s\""
 
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 msgid "Web _Search for it"
 msgstr "Søg på nettet efter det"
 
-#: ../src/conversation_textview.py:802
+#: ../src/conversation_textview.py:804
 msgid "Open as _Link"
 msgstr "Ã…bn som et _Link"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1296
+#: ../src/conversation_textview.py:1298
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6808,184 +6988,189 @@ msgstr[0] "I går"
 msgstr[1] "I går"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1344 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Emne: %s\n"
 
-#: ../src/dataforms_widget.py:544
+#: ../src/dataforms_widget.py:545
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Ikke i stand til at indlæse tomgangs modulet"
 
-#: ../src/dataforms_widget.py:546
+#: ../src/dataforms_widget.py:547
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Usynlighed er ikke understøttet"
 
-#: ../src/dataforms_widget.py:601
+#: ../src/dataforms_widget.py:562
+msgid "This field is required"
+msgstr ""
+
+#: ../src/dataforms_widget.py:607
 msgid "Jabber ID already in list"
 msgstr "Jabber ID er allerede i listen"
 
-#: ../src/dataforms_widget.py:602
+#: ../src/dataforms_widget.py:608
 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:613
+#: ../src/dataforms_widget.py:619
 msgid "new@jabber.id"
 msgstr "ny@jabber.id"
 
-#: ../src/dataforms_widget.py:616 ../src/dataforms_widget.py:618
+#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "ny%d@jabber.id"
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontakt navn: <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:195
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/dialogs.py:201
+#: ../src/dialogs.py:202
 msgid "In the group"
 msgstr "I gruppen"
 
-#: ../src/dialogs.py:292
+#: ../src/dialogs.py:293
 msgid "KeyID"
 msgstr "Nøgle ID"
 
-#: ../src/dialogs.py:297
+#: ../src/dialogs.py:298
 msgid "Contact name"
 msgstr "Kontakt navn"
 
-#: ../src/dialogs.py:469
+#: ../src/dialogs.py:470
 msgid "Set Mood"
 msgstr "Sæt Humørstemning"
 
-#: ../src/dialogs.py:589
+#: ../src/dialogs.py:590
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Besked"
 
-#: ../src/dialogs.py:603
+#: ../src/dialogs.py:604
 msgid "Status Message"
 msgstr "Status Besked"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:794
 msgid "Overwrite Status Message?"
 msgstr "Overskriv Status Besked?"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:795
 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:802
+#: ../src/dialogs.py:803
 msgid "Save as Preset Status Message"
 msgstr "Gem som Forvalgt Status Besked"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:804
 msgid "Please type a name for this status message"
 msgstr "Skriv et navn for denne status besked"
 
-#: ../src/dialogs.py:831
+#: ../src/dialogs.py:832
 msgid "AIM Address:"
 msgstr "AIM Adresse:"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:833
 msgid "GG Number:"
 msgstr "GG Nummer:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:834
 msgid "ICQ Number:"
 msgstr "ICQ Nummer:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:835
 msgid "MSN Address:"
 msgstr "MSN Adresse:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:836
 msgid "Yahoo! Address:"
 msgstr "Yahoo! Adresse:"
 
-#: ../src/dialogs.py:872
+#: ../src/dialogs.py:873
 #, 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:875
+#: ../src/dialogs.py:876
 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:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
+#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
+#: ../src/dialogs.py:3464
 msgid "Invalid User ID"
 msgstr "Ugyldig Bruger ID"
 
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1052
 msgid "The user ID must not contain a resource."
 msgstr "Bruger ID'en må ikke indeholde en resource."
 
-#: ../src/dialogs.py:1051
+#: ../src/dialogs.py:1057
 msgid "You cannot add yourself to your roster."
 msgstr "Du kan ikke tilføje dig selv til kontaktvinduet."
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1071
 msgid "Contact already in roster"
 msgstr "Kontakten er allerede i kontaktvinduet"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1072
 msgid "This contact is already listed in your roster."
 msgstr "Denne kontakt er allered i dit kontaktvindue"
 
-#: ../src/dialogs.py:1112
+#: ../src/dialogs.py:1118
 msgid "User ID:"
 msgstr "Bruger ID:"
 
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1189
 msgid "A GTK+ jabber client"
 msgstr "En GTK+ jabber klient"
 
-#: ../src/dialogs.py:1176
+#: ../src/dialogs.py:1190
 msgid "GTK+ Version:"
 msgstr "GTK+ Version:"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1191
 msgid "PyGTK Version:"
 msgstr "PyGTK Version:"
 
-#: ../src/dialogs.py:1187
+#: ../src/dialogs.py:1201
 msgid "Current Developers:"
 msgstr "Nuværende Programudviklere:"
 
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1203
 msgid "Past Developers:"
 msgstr "Tidligere Programudviklerer:"
 
-#: ../src/dialogs.py:1195
+#: ../src/dialogs.py:1209
 msgid "THANKS:"
 msgstr "TAK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1215
 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:1213
+#: ../src/dialogs.py:1227
 msgid "translator-credits"
 msgstr "Niels Felsted Thorsen <felsted@fsfe.org>"
 
-#: ../src/dialogs.py:1396
+#: ../src/dialogs.py:1410
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6998,101 +7183,101 @@ msgstr ""
 "\n"
 "Egenskaben med at fremhæve stavefejl vil ikke blive brugt"
 
-#: ../src/dialogs.py:1935 ../src/dialogs.py:2322
+#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
 msgid "The nickname has not allowed characters."
 msgstr "Kælenavnet har ikke tilladte tegn."
 
-#: ../src/dialogs.py:2053
+#: ../src/dialogs.py:2069
 #, 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:2056
+#: ../src/dialogs.py:2072
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Forespørgsel om abonnering fra %s"
 
-#: ../src/dialogs.py:2131 ../src/gui_interface.py:2672
+#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Du er allerede i en gruppe samtale %s"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2153
 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:2178
+#: ../src/dialogs.py:2194
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Deltag i Gruppe Samtale med kontoen %s"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2325
 msgid "Invalid Account"
 msgstr "Ugyldig Konto"
 
-#: ../src/dialogs.py:2310
+#: ../src/dialogs.py:2326
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr ""
 "Du må vælge en konto som du vil bruge til at tilslutte gruppe samtalen med."
 
-#: ../src/dialogs.py:2321
+#: ../src/dialogs.py:2337
 msgid "Invalid Nickname"
 msgstr "Ugyldig Kælenavn"
 
-#: ../src/dialogs.py:2326 ../src/dialogs.py:2332
-#: ../src/groupchat_control.py:1832
+#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
+#: ../src/groupchat_control.py:1847
 msgid "Invalid group chat Jabber ID"
 msgstr "Ugyldig gruppe samtale Jabber ID"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2343
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "Gruppe samtale Jabber ID'en indeholder ikke tilladte tegn."
 
-#: ../src/dialogs.py:2333 ../src/groupchat_control.py:1833
+#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Gruppe samtale Jabber ID'en indeholder ikke tilladte tegn."
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2356
 msgid "This is not a group chat"
 msgstr "Dette er ikke en gruppe samtale"
 
-#: ../src/dialogs.py:2341
+#: ../src/dialogs.py:2357
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s er ikke navnet på en gruppe samtale."
 
-#: ../src/dialogs.py:2372
+#: ../src/dialogs.py:2388
 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:2386
+#: ../src/dialogs.py:2402
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2421
+#: ../src/dialogs.py:2437
 msgid "This account is not connected to the server"
 msgstr "Denne konto er ikke tilsluttet til serveren"
 
-#: ../src/dialogs.py:2422
+#: ../src/dialogs.py:2438
 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:2446
+#: ../src/dialogs.py:2462
 msgid "Synchronise"
 msgstr "Synkroniser"
 
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2523
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start en samtale med konto %s"
 
-#: ../src/dialogs.py:2509
+#: ../src/dialogs.py:2525
 msgid "Start Chat"
 msgstr "Start Samtale"
 
-#: ../src/dialogs.py:2510
+#: ../src/dialogs.py:2526
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7101,168 +7286,168 @@ msgstr ""
 "en besked til:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2536 ../src/dialogs.py:2917 ../src/dialogs.py:3129
+#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
 msgid "Connection not available"
 msgstr "Tilslutning er ikke tilgængelig"
 
-#: ../src/dialogs.py:2537 ../src/dialogs.py:2918 ../src/dialogs.py:3130
+#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
 #, 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:2546 ../src/dialogs.py:2549
+#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
 msgid "Invalid JID"
 msgstr "Ugyldig JID"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2565
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kan ikke fortolke \"%s\"."
 
-#: ../src/dialogs.py:2558
+#: ../src/dialogs.py:2574
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan kun ændre din adgangskode hvis du er tilsluttet."
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "Invalid password"
 msgstr "Ugyldig adgangskode"
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "You must enter a password."
 msgstr "Du må indtaste en adgangskode."
 
-#: ../src/dialogs.py:2581
+#: ../src/dialogs.py:2597
 msgid "Passwords do not match"
 msgstr "Adgangskoderne er ikke ens"
 
-#: ../src/dialogs.py:2582
+#: ../src/dialogs.py:2598
 msgid "The passwords typed in both fields must be identical."
 msgstr "Adgangskoderene i de to tekstindtastningsfelter må være identiske."
 
 #. default value
-#: ../src/dialogs.py:2619 ../src/notify.py:247 ../src/notify.py:473
+#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
 msgid "Contact Signed In"
 msgstr "Kontakt Loggede Ind"
 
-#: ../src/dialogs.py:2621 ../src/notify.py:255 ../src/notify.py:475
+#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
 msgid "Contact Signed Out"
 msgstr "Kontakt Loggede Ud"
 
 #. chat message
-#: ../src/dialogs.py:2623 ../src/notify.py:277 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
 msgid "New Message"
 msgstr "Ny Besked"
 
 #. single message
-#: ../src/dialogs.py:2623 ../src/notify.py:259 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
 msgid "New Single Message"
 msgstr "Ny Enkel Besked"
 
 #. private message
-#: ../src/dialogs.py:2624 ../src/notify.py:265 ../src/notify.py:478
+#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
 msgid "New Private Message"
 msgstr "Ny Privat Besked"
 
-#: ../src/dialogs.py:2624 ../src/gui_interface.py:1358 ../src/notify.py:487
+#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: ../src/dialogs.py:2626 ../src/gui_interface.py:1420 ../src/notify.py:480
+#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
 msgid "File Transfer Request"
 msgstr "Filoverførsel Forespørgsel"
 
-#: ../src/dialogs.py:2628 ../src/gui_interface.py:1320
-#: ../src/gui_interface.py:1389 ../src/notify.py:482
+#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
+#: ../src/gui_interface.py:1186 ../src/notify.py:482
 msgid "File Transfer Error"
 msgstr "Filoverførsel Fejl"
 
-#: ../src/dialogs.py:2630 ../src/gui_interface.py:1466
-#: ../src/gui_interface.py:1489 ../src/gui_interface.py:1506
+#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
+#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
 #: ../src/notify.py:484
 msgid "File Transfer Completed"
 msgstr "Filoverførsel er Fuldført"
 
-#: ../src/dialogs.py:2631 ../src/gui_interface.py:1469 ../src/notify.py:485
+#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
 msgid "File Transfer Stopped"
 msgstr "Filoverførsel Stoppede"
 
-#: ../src/dialogs.py:2633 ../src/gui_interface.py:1152 ../src/notify.py:489
+#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
 msgid "Groupchat Invitation"
 msgstr "Gruppesamtale Invitation"
 
-#: ../src/dialogs.py:2635 ../src/notify.py:239 ../src/notify.py:491
+#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
 msgid "Contact Changed Status"
 msgstr "Kontakt Ændrede Status"
 
-#: ../src/dialogs.py:2836
+#: ../src/dialogs.py:2852
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Enkel Besked med konto %s"
 
-#: ../src/dialogs.py:2838
+#: ../src/dialogs.py:2854
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Enkel Besked i konto %s"
 
-#: ../src/dialogs.py:2840
+#: ../src/dialogs.py:2856
 msgid "Single Message"
 msgstr "Enkel Besked"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2843
+#: ../src/dialogs.py:2859
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:2882
 #, python-format
 msgid "Received %s"
 msgstr "Modtaget %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2889
+#: ../src/dialogs.py:2905
 #, 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:2968
+#: ../src/dialogs.py:2984
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:2985
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:3028
+#: ../src/dialogs.py:3044
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsol for %s"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3046
 msgid "XML Console"
 msgstr "XML Konsol"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "add"
 msgstr "Trist"
 
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "modify"
 msgstr "Ændre"
 
-#: ../src/dialogs.py:3160
+#: ../src/dialogs.py:3176
 #, fuzzy
 msgid "remove"
 msgstr "_Fjern"
 
-#: ../src/dialogs.py:3188
+#: ../src/dialogs.py:3204
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7271,156 +7456,190 @@ msgstr ""
 "<b>%s</b> vil gerne at du <b>%s</b> nogle kontakter i dit kontaktvindue."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3204 ../src/dialogs.py:3250
+#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
 msgid "Add"
 msgstr "Tilføj"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3206 ../src/dialogs.py:3281
+#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
 msgid "Modify"
 msgstr "Ændre"
 
-#: ../src/dialogs.py:3212
+#: ../src/dialogs.py:3228
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3218
+#: ../src/dialogs.py:3234
 msgid "Groups"
 msgstr "Grupper"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3342
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s foreslog mig at tilføje dig til min kontaktliste."
 
-#: ../src/dialogs.py:3340
+#: ../src/dialogs.py:3356
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "Tilføj Kont_akt"
 
-#: ../src/dialogs.py:3377
+#: ../src/dialogs.py:3393
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Fjerner kontakt fra kontaktvinduet"
 
-#: ../src/dialogs.py:3430
+#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#, python-format
+msgid "Archiving Preferences for %s"
+msgstr ""
+
+#: ../src/dialogs.py:3473
+#, fuzzy
+msgid "Invalid expire value"
+msgstr "Ikke gyldigt server navn"
+
+#: ../src/dialogs.py:3474
+msgid "Expire must be a valid positive integer."
+msgstr ""
+
+#: ../src/dialogs.py:3521
+msgid "There is an error with the form"
+msgstr ""
+
+#: ../src/dialogs.py:3732
+#, fuzzy
+msgid "There is an error"
+msgstr "Tjeneste returnerede en fejl."
+
+#: ../src/dialogs.py:3796
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privatlivs Liste <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3434
+#: ../src/dialogs.py:3800
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privatlivs Liste for %s"
 
-#: ../src/dialogs.py:3490
+#: ../src/dialogs.py:3856
 #, 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:3495
+#: ../src/dialogs.py:3861
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Rækkefølge: %(order)s, handling: %(action)s"
 
-#: ../src/dialogs.py:3539
+#: ../src/dialogs.py:3905
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Rediger en regel</b>"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:4016
 msgid "<b>Add a rule</b>"
 msgstr "<b>Tilføj en regel</b>"
 
-#: ../src/dialogs.py:3750
+#: ../src/dialogs.py:4116
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privatlivs Liste for %s"
 
-#: ../src/dialogs.py:3752
+#: ../src/dialogs.py:4118
 msgid "Privacy Lists"
 msgstr "Privatlivs lister"
 
-#: ../src/dialogs.py:3822
+#: ../src/dialogs.py:4188
 msgid "Invalid List Name"
 msgstr "Ugyldig Listenavn"
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4189
 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:3855
+#: ../src/dialogs.py:4221
 msgid "You are invited to a groupchat"
 msgstr "Du er inviteret til en gruppesamtale."
 
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4224
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact har inviteret dig til at deltage i en diskussion"
 
-#: ../src/dialogs.py:3860
+#: ../src/dialogs.py:4226
 #, 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:3868
+#: ../src/dialogs.py:4234
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4236
 msgid "Do you want to accept the invitation?"
 msgstr "Vil du acceptere denne invitation?"
 
-#: ../src/dialogs.py:3932
+#: ../src/dialogs.py:4298
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:3942 ../src/dialogs.py:3985 ../src/dialogs.py:4041
+#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
+#: ../src/dialogs.py:4495
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/dialogs.py:3947
+#: ../src/dialogs.py:4313
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:3975
+#: ../src/dialogs.py:4341
 msgid "Choose Sound"
 msgstr "Vælg Lyd"
 
-#: ../src/dialogs.py:3990
+#: ../src/dialogs.py:4356
 msgid "Wav Sounds"
 msgstr "Wav Lyde"
 
-#: ../src/dialogs.py:4028
+#: ../src/dialogs.py:4394
 msgid "Choose Image"
 msgstr "Vælg Billede"
 
-#: ../src/dialogs.py:4046
+#: ../src/dialogs.py:4412
 msgid "Images"
 msgstr "Billeder"
 
-#: ../src/dialogs.py:4113
+#: ../src/dialogs.py:4482
+#, fuzzy
+msgid "Choose Archive"
+msgstr "Vælg Billede"
+
+#: ../src/dialogs.py:4500
+#, fuzzy
+msgid "Zip files"
+msgstr "Alle filer"
+
+#: ../src/dialogs.py:4525
 #, python-format
 msgid "When %s becomes:"
 msgstr "NÃ¥r %s bliver:"
 
-#: ../src/dialogs.py:4115
+#: ../src/dialogs.py:4527
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Tilføj Speciel Påmindelse for %s"
 
-#: ../src/dialogs.py:4190
+#: ../src/dialogs.py:4602
 msgid "Condition"
 msgstr "Betingelse"
 
-#: ../src/dialogs.py:4310
+#: ../src/dialogs.py:4722
 msgid "when I am "
 msgstr "når jeg er"
 
-#: ../src/dialogs.py:4786
+#: ../src/dialogs.py:5198
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7431,19 +7650,19 @@ msgstr ""
 "\n"
 "Denne sessions Korte Ægtheds Streng er: <b>%(sas)s</b>"
 
-#: ../src/dialogs.py:4789
+#: ../src/dialogs.py:5201
 msgid "You have already verified this contact's identity."
 msgstr "Du har allerede verificeret denne kontakts identitet."
 
-#: ../src/dialogs.py:4795 ../src/dialogs.py:4879
+#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
 msgid "Contact's identity verified"
 msgstr "Kontaktens identitet er verificeret"
 
-#: ../src/dialogs.py:4801
+#: ../src/dialogs.py:5213
 msgid "Verify again..."
 msgstr "Verificer igen..."
 
-#: ../src/dialogs.py:4806
+#: ../src/dialogs.py:5218
 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 "
@@ -7453,19 +7672,19 @@ msgstr ""
 "beskeder eller sende dig beskeder, må du verificere deres identitet ved at "
 "trykke på knappen under."
 
-#: ../src/dialogs.py:4809 ../src/dialogs.py:4860 ../src/dialogs.py:4873
+#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktens identitet er IKKE verificeret"
 
-#: ../src/dialogs.py:4814
+#: ../src/dialogs.py:5226
 msgid "Verify..."
 msgstr "Verificer..."
 
-#: ../src/dialogs.py:4825
+#: ../src/dialogs.py:5237
 msgid "Have you verified the contact's identity?"
 msgstr "Har du bekræftet den kontaktens identitet?"
 
-#: ../src/dialogs.py:4826
+#: ../src/dialogs.py:5238
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7480,23 +7699,23 @@ msgstr ""
 "\n"
 "Denne sessions Korte Ægtheds Streng: <b>%(sas)s</b>"
 
-#: ../src/dialogs.py:4827
+#: ../src/dialogs.py:5239
 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:4861
+#: ../src/dialogs.py:5273
 #, 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:4867
+#: ../src/dialogs.py:5279
 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:4874
+#: ../src/dialogs.py:5286
 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."
@@ -7505,7 +7724,7 @@ msgstr ""
 "nøgle</b>, så beskeder <b>kan ikke</b> krypteres. Brug din GPG klient til at "
 "ændre dette."
 
-#: ../src/dialogs.py:4880
+#: ../src/dialogs.py:5292
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7513,19 +7732,19 @@ msgstr ""
 "GPG Nøgle er tildet til denne kontakt, og du stoler på denne nøgle, så "
 "beskeder vil blive krypteret."
 
-#: ../src/dialogs.py:4945
+#: ../src/dialogs.py:5357
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4947
+#: ../src/dialogs.py:5359
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4949
+#: ../src/dialogs.py:5361
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4953
+#: ../src/dialogs.py:5365
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7541,24 +7760,24 @@ msgstr "Andre"
 msgid "Conference"
 msgstr "Konference"
 
-#: ../src/disco.py:512
+#: ../src/disco.py:513
 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:589
+#: ../src/disco.py:600
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Opdag Tjenester med kontoen %s"
 
-#: ../src/disco.py:591
+#: ../src/disco.py:602
 msgid "Service Discovery"
 msgstr "Opdag Tjenester"
 
-#: ../src/disco.py:741
+#: ../src/disco.py:758
 msgid "The service could not be found"
 msgstr "Tjenesten findes ikke"
 
-#: ../src/disco.py:742
+#: ../src/disco.py:759
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7566,94 +7785,94 @@ 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:746 ../src/disco.py:1082
+#: ../src/disco.py:763 ../src/disco.py:1100
 msgid "The service is not browsable"
 msgstr "Det er ikke mulig at gennemse denne tjeneste"
 
-#: ../src/disco.py:747
+#: ../src/disco.py:764
 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:786 ../src/disco.py:796
+#: ../src/disco.py:804 ../src/disco.py:814
 msgid "Invalid Server Name"
 msgstr "Ikke gyldigt server navn"
 
-#: ../src/disco.py:850
+#: ../src/disco.py:868
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Gennemse %(address)s med konto %(account)s"
 
-#: ../src/disco.py:894
+#: ../src/disco.py:912
 msgid "_Browse"
 msgstr "_Gennemse"
 
-#: ../src/disco.py:1083
+#: ../src/disco.py:1101
 msgid "This service does not contain any items to browse."
 msgstr "Denne tjeneste har ingen elementer som kan gennemses."
 
-#: ../src/disco.py:1323
+#: ../src/disco.py:1341
 msgid "_Execute Command"
 msgstr "_Kør Kommando"
 
-#: ../src/disco.py:1333 ../src/disco.py:1504
+#: ../src/disco.py:1351 ../src/disco.py:1522
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
-#: ../src/disco.py:1545
+#: ../src/disco.py:1563
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanner %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1736
+#: ../src/disco.py:1754
 msgid "Users"
 msgstr "Brugere"
 
 #. Description column
-#: ../src/disco.py:1744
+#: ../src/disco.py:1762
 msgid "Description"
 msgstr "Beskrivelse"
 
 #. Id column
-#: ../src/disco.py:1752
+#: ../src/disco.py:1770
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1817 ../src/gui_interface.py:3182
+#: ../src/disco.py:1835 ../src/gui_interface.py:2995
 msgid "Bookmark already set"
 msgstr "Bogmærke er allerede sat"
 
-#: ../src/disco.py:1818 ../src/gui_interface.py:3183
+#: ../src/disco.py:1836 ../src/gui_interface.py:2996
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Gruppe samtale \"%s\" er allerede i dine bogmærker."
 
-#: ../src/disco.py:1827 ../src/gui_interface.py:3197
+#: ../src/disco.py:1845 ../src/gui_interface.py:3010
 msgid "Bookmark has been added successfully"
 msgstr "Bogmærket er blevet tilføjet succesfuldt"
 
-#: ../src/disco.py:1828 ../src/gui_interface.py:3198
+#: ../src/disco.py:1846 ../src/gui_interface.py:3011
 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:2039
+#: ../src/disco.py:2057
 msgid "Subscribed"
 msgstr "Abonnerede"
 
-#: ../src/disco.py:2047
+#: ../src/disco.py:2065
 msgid "Node"
 msgstr "Knude"
 
-#: ../src/disco.py:2111
+#: ../src/disco.py:2129
 msgid "New post"
 msgstr "Ny post"
 
-#: ../src/disco.py:2117
+#: ../src/disco.py:2135
 msgid "_Subscribe"
 msgstr "_Abonner"
 
-#: ../src/disco.py:2123
+#: ../src/disco.py:2141
 msgid "_Unsubscribe"
 msgstr "_Frameld abonnement"
 
@@ -7824,17 +8043,19 @@ msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Omdan LaTeX udtryk mellem $$ $$."
 
 #: ../src/features_window.py:95
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
-"in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
 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:96
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
+"You have to set 'use_latex' to True in the Advanced Configuration Editor."
 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."
@@ -7991,12 +8212,12 @@ msgstr "Beskrivelse: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s vil gerne sende dig en fil:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Kan ikke overskrive den eksisterende fil \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -8004,22 +8225,22 @@ msgstr ""
 "En fil med dette navn eksisterer allerede og du har ikke rettigheder til at "
 "overskrive den."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 msgid "This file already exists"
 msgstr "Denne fil eksisterer allerede"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 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:369 ../src/gtkgui_helpers.py:914
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Kataloget \"%s\" er ikke skrivbart"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
 msgid "You do not have permission to create files in this directory."
 msgstr "Du har ikke rettigheder til at oprette filer i dette katalog."
 
@@ -8122,28 +8343,28 @@ msgstr ""
 "En anden instans af Gajim ser ud til at køre\n"
 "Kør alligevel?"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
 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:80
+#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
 msgid "command"
 msgstr "Kommando"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "Vis hjælp for kommando"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Viser eller gemmer kontaktvinduet"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Popper op et vindue ved næste hændelse"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8151,6 +8372,13 @@ msgstr ""
 "Udskriver en liste af alle kontakter i kontaktvinduet. Hver kontakt placeres "
 "på en separat linie"
 
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
+#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
+#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
+#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
 #: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
 #: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
 #: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
@@ -8162,41 +8390,33 @@ msgstr ""
 msgid "account"
 msgstr "Konto"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "viser kun kontakter for den givne konto"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Udskriver en liste af registrerede kontoer"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
 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:109
+#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106
 #, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"accoun't previous status"
+msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "en af: offline, online, chat, away, xa, dnd, invisible"
 
-#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
-msgid "message"
-msgstr "besked"
-
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "status besked"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8205,44 +8425,21 @@ msgstr ""
 "status for alle kontoer der har sat \"synkroniser med generel status\" "
 "indstillingen"
 
-#: ../src/gajim-remote.py:117
-msgid "Changes the priority of account or accounts"
-msgstr "Ændrer prioriteringen for kontoen eller kontoer"
-
-#: ../src/gajim-remote.py:119
-msgid "priority"
-msgstr "prioritet"
-
-#: ../src/gajim-remote.py:119
-msgid "priority you want to give to the account"
-msgstr "prioriteten du vil give til kontoen"
-
-#: ../src/gajim-remote.py:121
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-msgstr ""
-"ændre prioritet for en given konto. Hvis ikke specificeret, ændrer status "
-"for alle kontoer der har sat \"synkroniser med generel status\" indstillingen"
-
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
 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:129
+#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "Kontaktens JID som du vil samtale med"
 
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
 #: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 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:134
-msgid "message content. The account must be specified or \"\""
-msgstr "besked indhold. Kontoen må specificeres eller \"\""
-
-#: ../src/gajim-remote.py:139
+#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
 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 "
@@ -8252,29 +8449,34 @@ 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-plugin.py:127 ../src/gajim-remote-plugin.py:140
 #: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID på den kontakt som skal modtage beskeden"
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
+#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "besked indhold"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "pgp nøgle"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 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:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
+#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
 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:152
+#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
 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 "
@@ -8284,139 +8486,138 @@ 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:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "emne"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "emne på besked"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
 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:168
+#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "JID på den rum som skal modtage beskeden"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "FÃ¥ detaljeret information om kontakten"
 
+#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
+#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
 #: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
 #: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "Kontaktens JID"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "FÃ¥ detaljeret information om kontoen"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Navn på kontoen"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Send en fil til en kontakt"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "file"
 msgstr "fil"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Filsti"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "hvis specificeret vil filen blive sendt med denne konto"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Hvis alle indstillinger og deres værdier"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sætter værdien for 'nøglen' til 'værdi'."
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "nøgle=værdi"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 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:207
+#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Sletter et indstillingspunkt"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
 msgid "key"
 msgstr "nøgle"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "navn på den indstilling som skal slettes"
 
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
 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:218
+#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "Fjerner kontakt fra kontaktvinduet"
 
-#: ../src/gajim-remote.py:227
+#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "Tilføjer kontakt til kontaktvinduet"
 
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "jid"
-
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "Tilføjer ny kontakt til denne konto"
 
-#: ../src/gajim-remote.py:235
+#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
 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:242
+#: ../src/gajim-remote-plugin.py:226
+#, fuzzy
 msgid ""
-"Returns current status message (the global one unless account is specified)"
+"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:249
+#: ../src/gajim-remote-plugin.py:233 ../src/gajim-remote.py:249
 msgid "Returns number of unread messages"
 msgstr "Returnerer antal ikke læste beskeder"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr "Ã…bner 'Start Samtale' vinduet"
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "Starter en samtale med denne konto"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr "Sender tilpasset XML"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr "XML som skal sendes"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8424,90 +8625,44 @@ msgstr ""
 "Den konto hvor XML vil blive sendt; hvis ikke den er specificeret, vil XML "
 "blive sendt til alle kontoer"
 
-#: ../src/gajim-remote.py:268
-#, fuzzy
-msgid "Change the avatar"
-msgstr "Ændre status"
-
-#: ../src/gajim-remote.py:270
-#, fuzzy
-msgid "Picture to use"
-msgstr "Kælenavn som skal bruges"
-
-#: ../src/gajim-remote.py:271
-#, fuzzy
-msgid ""
-"Account in which the avatar will be set; if not specified, the avatar will "
-"be set for all accounts"
-msgstr ""
-"Den konto hvor XML vil blive sendt; hvis ikke den er specificeret, vil XML "
-"blive sendt til alle kontoer"
-
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
 msgid "Handle a xmpp:/ uri"
 msgstr "HÃ¥ndter en xmpp:/ uri"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:279
-msgid "URI to handle"
-msgstr "URI som skal håndteres"
-
-#: ../src/gajim-remote.py:280
-msgid "Account in which you want to handle it"
-msgstr "Den konto som du vil håndtere det med"
-
-#: ../src/gajim-remote.py:282
-msgid "Message content"
-msgstr "Besked indhold"
-
-#: ../src/gajim-remote.py:286
+#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
 msgid "Join a MUC room"
 msgstr "Deltag i et MUC rum"
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
 msgid "room"
 msgstr "rum"
 
-#: ../src/gajim-remote.py:288
-msgid "Room JID"
-msgstr "Rum JID"
-
-#: ../src/gajim-remote.py:289
+#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
 msgid "nick"
 msgstr "kælenavn"
 
-#: ../src/gajim-remote.py:289
-msgid "Nickname to use"
-msgstr "Kælenavn som skal bruges"
-
-#: ../src/gajim-remote.py:290
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
 msgid "password"
 msgstr "adgangskode"
 
-#: ../src/gajim-remote.py:290
-msgid "Password to enter the room"
-msgstr "Adgangskode for at slutte sig til rummet"
-
-#: ../src/gajim-remote.py:291
-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:296
+#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
 msgid "Check if Gajim is running"
 msgstr "Kontroller om Gajim kører"
 
+#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
 #: ../src/gajim-remote.py:300
 msgid "Shows or hides the ipython window"
 msgstr "Viser eller gemmer ipython vinduet"
 
-#: ../src/gajim-remote.py:327
+#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "Manglende argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:348
+#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8516,33 +8671,31 @@ msgstr ""
 "'%s' er ikke i dit kontaktvindue.\n"
 "Specificer venligst en konto for at sende beskeden."
 
-#: ../src/gajim-remote.py:351
+#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
 msgid "You have no active account"
 msgstr "Du har ingen aktiv konto"
 
-#: ../src/gajim-remote.py:404
+#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
 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:431
+#: ../src/gajim-remote-plugin.py:412
 #, python-format
 msgid ""
-"Usage: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
+"Usage: %s %s %s \n"
+"\t %s"
 msgstr ""
-"Brug: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
 
-#: ../src/gajim-remote.py:435
+#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
 msgid "Arguments:"
 msgstr "Argumenter:"
 
-#: ../src/gajim-remote.py:439
+#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
 #, python-format
 msgid "%s not found"
 msgstr "%s ikke fundet"
 
-#: ../src/gajim-remote.py:445
+#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8551,6 +8704,122 @@ msgstr ""
 "Brug: %s kommando [argumenter]\n"
 "Kommando er en af:\n"
 
+#: ../src/gajim-remote-plugin.py:496
+#, fuzzy, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"For mange argumenter. \n"
+"Skriv \"%(basename)s help %(command)s\" for mere information"
+
+#: ../src/gajim-remote-plugin.py:500
+#, fuzzy, python-format
+msgid ""
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Argument \"%(arg)s\" er ikke specificeret. \n"
+"Skriv \"%(basename)s help %(command)s\" for mere information"
+
+#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
+msgid "Wrong uri"
+msgstr "Forkert uri"
+
+#: ../src/gajim-remote.py:109
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
+msgstr "en af: offline, online, chat, away, xa, dnd, invisible"
+
+#: ../src/gajim-remote.py:117
+msgid "Changes the priority of account or accounts"
+msgstr "Ændrer prioriteringen for kontoen eller kontoer"
+
+#: ../src/gajim-remote.py:119
+msgid "priority"
+msgstr "prioritet"
+
+#: ../src/gajim-remote.py:119
+msgid "priority you want to give to the account"
+msgstr "prioriteten du vil give til kontoen"
+
+#: ../src/gajim-remote.py:121
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"ændre prioritet for en given konto. Hvis ikke specificeret, ændrer status "
+"for alle kontoer der har sat \"synkroniser med generel status\" indstillingen"
+
+#: ../src/gajim-remote.py:134
+msgid "message content. The account must be specified or \"\""
+msgstr "besked indhold. Kontoen må specificeres eller \"\""
+
+#: ../src/gajim-remote.py:242
+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:268
+#, fuzzy
+msgid "Change the avatar"
+msgstr "Ændre status"
+
+#: ../src/gajim-remote.py:270
+#, fuzzy
+msgid "Picture to use"
+msgstr "Kælenavn som skal bruges"
+
+#: ../src/gajim-remote.py:271
+#, fuzzy
+msgid ""
+"Account in which the avatar will be set; if not specified, the avatar will "
+"be set for all accounts"
+msgstr ""
+"Den konto hvor XML vil blive sendt; hvis ikke den er specificeret, vil XML "
+"blive sendt til alle kontoer"
+
+#: ../src/gajim-remote.py:279
+msgid "URI to handle"
+msgstr "URI som skal håndteres"
+
+#: ../src/gajim-remote.py:280
+msgid "Account in which you want to handle it"
+msgstr "Den konto som du vil håndtere det med"
+
+#: ../src/gajim-remote.py:282
+msgid "Message content"
+msgstr "Besked indhold"
+
+#: ../src/gajim-remote.py:288
+msgid "Room JID"
+msgstr "Rum JID"
+
+#: ../src/gajim-remote.py:289
+msgid "Nickname to use"
+msgstr "Kælenavn som skal bruges"
+
+#: ../src/gajim-remote.py:290
+msgid "Password to enter the room"
+msgstr "Adgangskode for at slutte sig til rummet"
+
+#: ../src/gajim-remote.py:291
+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:431
+#, python-format
+msgid ""
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
+msgstr ""
+"Brug: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
+
 #: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
@@ -8573,10 +8842,6 @@ msgstr ""
 msgid "No uri given"
 msgstr ""
 
-#: ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Forkert uri"
-
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Tema"
@@ -8602,182 +8867,180 @@ msgstr "Du kan ikke slette det nuværende tema"
 msgid "Please first choose another for your current theme."
 msgstr "Vælg venligst en anden for dit nuværende tema."
 
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:170
 msgid "Sending private message failed"
 msgstr "Sending af privat besked fejlede"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:171
+#: ../src/groupchat_control.py:172
 #, 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:450
+#: ../src/groupchat_control.py:455
 msgid "Insert Nickname"
 msgstr "Indsæt Kælenavn"
 
-#: ../src/groupchat_control.py:631
+#: ../src/groupchat_control.py:636
 msgid "Conversation with "
 msgstr "Samtale med "
 
-#: ../src/groupchat_control.py:633
+#: ../src/groupchat_control.py:638
 msgid "Continued conversation"
 msgstr "Fortsat samtale"
 
-#. Can be a message (see handle_event_gc_config_change in
-#. gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1272 ../src/gui_interface.py:1080
+#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
 msgid "Any occupant is allowed to see your full JID"
 msgstr "En hvilken som helst deltager har lov til at se din fulde JID"
 
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1286
 msgid "Room logging is enabled"
 msgstr "Rum logging er aktiveret"
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1288
 msgid "A new room has been created"
 msgstr "Et nyt rum er blevet oprettet"
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1291
 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:1287
+#: ../src/groupchat_control.py:1297
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s er blevet udvist: %(reason)s"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1300
 #, 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:1300
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s er blevet uønsket: %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1312
 #, 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:1314 ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nu kendt som %s"
 
-#: ../src/groupchat_control.py:1330 ../src/gui_interface.py:919
+#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s er nu kendt som %(new_nick)s"
 
-#: ../src/groupchat_control.py:1372 ../src/groupchat_control.py:1377
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1392
 #, 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:1374
+#: ../src/groupchat_control.py:1383
 msgid "affiliation changed"
 msgstr "tilknytning ændret"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1388
 msgid "room configuration changed to members-only"
 msgstr "Rum konfiguration er blevet ændret til 'kun for medlemmer'"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1394
 msgid "system shutdown"
 msgstr "computeren slukkes"
 
-#: ../src/groupchat_control.py:1470
+#: ../src/groupchat_control.py:1477
 #, 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:1474
+#: ../src/groupchat_control.py:1481
 #, 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:1489
+#: ../src/groupchat_control.py:1496
 #, 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:1493
+#: ../src/groupchat_control.py:1500
 #, 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:1522
+#: ../src/groupchat_control.py:1530
 #, python-format
 msgid "%s has left"
 msgstr "%s har forladt samtalen"
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1535
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s deltager nu i gruppe samtalen"
 
-#: ../src/groupchat_control.py:1529 ../src/gui_interface.py:946
+#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
 #: ../src/history_window.py:447 ../src/notify.py:234
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s er nu %(status)s"
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1774
 #, 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:1761
+#: ../src/groupchat_control.py:1776
 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:1765 ../src/gui_interface.py:1216
-#: ../src/gui_interface.py:1992 ../src/gui_interface.py:2029
-#: ../src/gui_interface.py:2064 ../src/message_window.py:224
-#: ../src/roster_window.py:2739 ../src/roster_window.py:3399
-#: ../src/roster_window.py:4123
+#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
+#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
+#: ../src/gui_interface.py:1853 ../src/message_window.py:224
+#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
+#: ../src/roster_window.py:4195
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "Ikke spørg mig ige_n"
 
-#: ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:1814
 msgid "Changing Subject"
 msgstr "Ændre emne"
 
-#: ../src/groupchat_control.py:1800
+#: ../src/groupchat_control.py:1815
 msgid "Please specify the new subject:"
 msgstr "Anfør et nyt emne:"
 
-#: ../src/groupchat_control.py:1807
+#: ../src/groupchat_control.py:1822
 msgid "Changing Nickname"
 msgstr "Ændre kælenavn"
 
-#: ../src/groupchat_control.py:1808
+#: ../src/groupchat_control.py:1823
 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:1839
+#: ../src/groupchat_control.py:1854
 #, python-format
 msgid "Destroying %s"
 msgstr "Fjern %s"
 
-#: ../src/groupchat_control.py:1840
+#: ../src/groupchat_control.py:1855
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8785,22 +9048,22 @@ msgstr ""
 "Du er ved at definitivt fjerne dette rum.\n"
 "Du kan anføre en grund herunder:"
 
-#: ../src/groupchat_control.py:1842
+#: ../src/groupchat_control.py:1857
 msgid "You may also enter an alternate venue:"
 msgstr "Du kan også indtaste et alternativt mødested:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2028
+#: ../src/groupchat_control.py:2046
 #, python-format
 msgid "Kicking %s"
 msgstr "Sparker %s"
 
-#: ../src/groupchat_control.py:2029 ../src/groupchat_control.py:2356
+#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
 msgid "You may specify a reason below:"
 msgstr "Du kan anføre en begrundelse under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2355
+#: ../src/groupchat_control.py:2373
 #, python-format
 msgid "Banning %s"
 msgstr "Udeluk %s"
@@ -8825,54 +9088,63 @@ msgid "Details"
 msgstr "Detaljer"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
+#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Fejl: kan ikke åbne %s for læsning"
 
-#: ../src/gtkgui_helpers.py:400
+#: ../src/gtkgui_helpers.py:404
 msgid "Error reading file:"
 msgstr "Fejl ved læsning af fil:"
 
-#: ../src/gtkgui_helpers.py:403
+#: ../src/gtkgui_helpers.py:407
 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:444
+#: ../src/gtkgui_helpers.py:448
 #, 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:818
+#: ../src/gtkgui_helpers.py:822
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim er ikke standard Jabber client"
 
-#: ../src/gtkgui_helpers.py:819
+#: ../src/gtkgui_helpers.py:823
 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:820
+#: ../src/gtkgui_helpers.py:824
 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:887
+#: ../src/gtkgui_helpers.py:891
 msgid "Extension not supported"
 msgstr "Udvidelse er ikke understøttet"
 
-#: ../src/gtkgui_helpers.py:888
+#: ../src/gtkgui_helpers.py:892
 #, 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:924
+#: ../src/gtkgui_helpers.py:928
 msgid "Save Image as..."
 msgstr "Gem Billede som..."
 
-#: ../src/gui_interface.py:140
+#. we are banned
+#. group chat does not exist
+#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
+#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
+#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
+#: ../src/gui_interface.py:348
+msgid "Unable to join group chat"
+msgstr "Ikke i stand til at deltage i gruppesamtale."
+
+#: ../src/gui_interface.py:138
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8883,58 +9155,93 @@ msgstr ""
 "anden indehaver.\n"
 "Specificer venligst et andet kælenavn under:"
 
-#: ../src/gui_interface.py:143
+#: ../src/gui_interface.py:141
 msgid "Always use this nickname when there is a conflict"
 msgstr "Altid brug dette kælenavn når der er en konflikt"
 
-#: ../src/gui_interface.py:159
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Accepterer du denne forespørsel?"
 
-#: ../src/gui_interface.py:161
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Accepterer du denne forespørgsel for konto %s?"
 
-#: ../src/gui_interface.py:164
+#: ../src/gui_interface.py:163
 #, 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/gui_interface.py:213 ../src/notify.py:493
+#: ../src/gui_interface.py:209 ../src/notify.py:493
 msgid "Connection Failed"
 msgstr "Tilslutning Fejlede"
 
-#: ../src/gui_interface.py:606 ../src/gui_interface.py:610
+#: ../src/gui_interface.py:312
+#, 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/gui_interface.py:324
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr "Maksimalt antal brugere for %s er nået"
+
+#: ../src/gui_interface.py:333
+#, python-format
+msgid "You are banned from group chat %s."
+msgstr "Du er bandlyst fra gruppesamtalen %s."
+
+#: ../src/gui_interface.py:338
+#, python-format
+msgid "Group chat %s does not exist."
+msgstr "Gruppesamtalen %s eksisterer ikke."
+
+#: ../src/gui_interface.py:341
+msgid "Group chat creation is restricted."
+msgstr "Gruppesamtale oprettelse er begrænset."
+
+#: ../src/gui_interface.py:344
+#, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Dit registrerede kælenavn skal bruges i gruppesamtalen %s."
+
+#: ../src/gui_interface.py:349
+#, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Du er ikke i medlemslisten for gruppesamtalen %s."
+
+#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Fejl %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:621 ../src/gui_interface.py:636
+#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "fejl opstod under sending %(message)s ( %(error)s )"
 
-#: ../src/gui_interface.py:663 ../src/notify.py:495
+#: ../src/gui_interface.py:540 ../src/notify.py:495
 msgid "Subscription request"
 msgstr "Abonnement forespørgsel"
 
-#: ../src/gui_interface.py:688
+#: ../src/gui_interface.py:565
 msgid "Authorization accepted"
 msgstr "Autorisering accepteret"
 
-#: ../src/gui_interface.py:689
+#: ../src/gui_interface.py:566
 #, 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/gui_interface.py:702
+#: ../src/gui_interface.py:579
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" har fjernet abonneringen på dig"
 
-#: ../src/gui_interface.py:703
+#: ../src/gui_interface.py:580
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8942,60 +9249,54 @@ msgstr ""
 "Du vil altid se ham eller hende som offline.\n"
 "Vil du fjerne ham eller hende fra din kontakt liste?"
 
-#: ../src/gui_interface.py:727 ../src/notify.py:497
+#: ../src/gui_interface.py:604 ../src/notify.py:497
 msgid "Unsubscribed"
 msgstr "Frameldt abonnement"
 
-#: ../src/gui_interface.py:754
+#: ../src/gui_interface.py:631
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan ikke blive etableret"
 
-#: ../src/gui_interface.py:1015
+#: ../src/gui_interface.py:859
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s har sat emnet til %(subject)s"
 
-#: ../src/gui_interface.py:1083
+#: ../src/gui_interface.py:926
 msgid "Room now shows unavailable member"
 msgstr "Rummet viser nu; ikke tilgængelige medlemmer"
 
-#: ../src/gui_interface.py:1085
+#: ../src/gui_interface.py:928
 msgid "room now does not show unavailable members"
 msgstr "Rummet viser nu ikke; ikke tilgængelige medlemmer"
 
-#: ../src/gui_interface.py:1087
+#: ../src/gui_interface.py:930
 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/gui_interface.py:1091
+#: ../src/gui_interface.py:934
 msgid "Room logging is now enabled"
 msgstr "Rum logging er nu aktiveret"
 
-#: ../src/gui_interface.py:1093
+#: ../src/gui_interface.py:936
 msgid "Room logging is now disabled"
 msgstr "Rum logging er nu deaktiveret"
 
-#: ../src/gui_interface.py:1095
+#: ../src/gui_interface.py:938
 msgid "Room is now non-anonymous"
 msgstr "Rummet er nu ikke-anonymt"
 
-#: ../src/gui_interface.py:1098
+#: ../src/gui_interface.py:941
 msgid "Room is now semi-anonymous"
 msgstr "Rummet er nu semi-anonymt"
 
-#: ../src/gui_interface.py:1101
+#: ../src/gui_interface.py:944
 msgid "Room is now fully-anonymous"
 msgstr "Rummet er nu helt anonymt"
 
-#: ../src/gui_interface.py:1133
-#, 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/gui_interface.py:1180
+#: ../src/gui_interface.py:985
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -9003,23 +9304,23 @@ 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/gui_interface.py:1182 ../src/gui_interface.py:1189
+#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du er for øjeblikket tilsluttet uden din OpenPGP nøgle."
 
-#: ../src/gui_interface.py:1184
+#: ../src/gui_interface.py:989
 msgid "Your passphrase is incorrect"
 msgstr "Dit pgp-løsen er ikke korrekt"
 
-#: ../src/gui_interface.py:1188
+#: ../src/gui_interface.py:993
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "OpenPGP-løsen er ikke korrekt"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid "GPG key not trusted"
 msgstr "GPG nøglen kan ikke stoles på"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
@@ -9027,7 +9328,7 @@ msgstr ""
 "GPG nøglen brugt til at kryptere den samtale er ikke til at stole på. Vil du "
 "virkelig kryptere den besked?"
 
-#: ../src/gui_interface.py:1226
+#: ../src/gui_interface.py:1031
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not                 correctly started "
@@ -9036,19 +9337,19 @@ msgstr ""
 "Gnomes Nøglering er installeret men ikke \t\t\t\tstartet korrekt "
 "(miljøvariabel er sandsynligvis ikke \t\t\t\t\\sat op rigtig)"
 
-#: ../src/gui_interface.py:1330
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Ny e-post på %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1332
+#: ../src/gui_interface.py:1133
 #, 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/gui_interface.py:1345
+#: ../src/gui_interface.py:1146
 #, python-format
 msgid ""
 "\n"
@@ -9063,42 +9364,42 @@ msgstr ""
 "Emne: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1418
+#: ../src/gui_interface.py:1215
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vil gerne sende dig en fil."
 
-#: ../src/gui_interface.py:1455 ../src/roster_window.py:1856
+#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
 msgid "Remote contact stopped transfer"
 msgstr "Den fjerne kontakt stoppede filoverførslen"
 
-#: ../src/gui_interface.py:1458 ../src/roster_window.py:1858
+#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
 msgid "Error opening file"
 msgstr "Fejl ved åbning af fil"
 
-#: ../src/gui_interface.py:1490
+#: ../src/gui_interface.py:1287
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Du har succesfuldt modtaget %(filename)s fra %(name)s"
 
 #. ft stopped
-#: ../src/gui_interface.py:1494
+#: ../src/gui_interface.py:1291
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Filoverførsel af %(filename)s fra %(name)s er stoppet."
 
-#: ../src/gui_interface.py:1507
+#: ../src/gui_interface.py:1304
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Du har succesfuldt sendt %(filename)s til %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1511
+#: ../src/gui_interface.py:1308
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Filoverførsel af %(filename)s til %(name)s er stoppet."
 
-#: ../src/gui_interface.py:1623
+#: ../src/gui_interface.py:1426
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -9107,36 +9408,36 @@ msgstr ""
 "Ikke i stand til at dekryptere beskeden fra %s\n"
 "Det er mulig den er blevet forfalsket."
 
-#: ../src/gui_interface.py:1630
+#: ../src/gui_interface.py:1433
 msgid "Unable to decrypt message"
 msgstr "Ikke i stand til at dekryptere beskeden"
 
-#: ../src/gui_interface.py:1702
+#: ../src/gui_interface.py:1505
 msgid "Username Conflict"
 msgstr "Brugernavns Konflikt"
 
-#: ../src/gui_interface.py:1703
+#: ../src/gui_interface.py:1506
 msgid "Please type a new username for your local account"
 msgstr "Skriv et nyt brugernavn for din lokale konto"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1519
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gui_interface.py:1729
+#: ../src/gui_interface.py:1532
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s .s)"
 
-#: ../src/gui_interface.py:1740
+#: ../src/gui_interface.py:1543
 msgid "Error."
 msgstr "Fejl."
 
-#: ../src/gui_interface.py:1768
+#: ../src/gui_interface.py:1556
 msgid "Resource Conflict"
 msgstr "Ressource Konflikt"
 
-#: ../src/gui_interface.py:1769
+#: ../src/gui_interface.py:1557
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -9145,21 +9446,21 @@ msgstr ""
 "venligst en ny"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1816
+#: ../src/gui_interface.py:1604
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s vil gerne sende dig en fil."
 
-#: ../src/gui_interface.py:1819
+#: ../src/gui_interface.py:1607
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Filoverførsel Forespørgsel"
 
-#: ../src/gui_interface.py:1927
+#: ../src/gui_interface.py:1716
 msgid "Error verifying SSL certificate"
 msgstr "Fejl under verificering af SSL certifikat"
 
-#: ../src/gui_interface.py:1928
+#: ../src/gui_interface.py:1717
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9170,15 +9471,15 @@ msgstr ""
 "server: %(error)s\n"
 "Vil du stadig prøve på at forbinde til denne server?"
 
-#: ../src/gui_interface.py:1936
+#: ../src/gui_interface.py:1725
 msgid "Ignore this error for this certificate."
 msgstr "Ignorer denne fejl for dette certifikat."
 
-#: ../src/gui_interface.py:1956
+#: ../src/gui_interface.py:1745
 msgid "SSL certificate error"
 msgstr "SSL certifikat fejl"
 
-#: ../src/gui_interface.py:1957
+#: ../src/gui_interface.py:1746
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9195,12 +9496,12 @@ msgstr ""
 "\n"
 "Vil du stadig forbinde og opdatere fingeraftrykket for certifikatet?"
 
-#: ../src/gui_interface.py:1987 ../src/gui_interface.py:2024
-#: ../src/gui_interface.py:2060
+#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
+#: ../src/gui_interface.py:1849
 msgid "Insecure connection"
 msgstr "Ikke sikker forbindelse"
 
-#: ../src/gui_interface.py:1988
+#: ../src/gui_interface.py:1777
 #, fuzzy
 msgid ""
 "You are about to connect to the server with an insecure connection. This "
@@ -9211,12 +9512,12 @@ msgstr ""
 "installere PyOpenSSL for at forhindre dette. Er du sikker på du vil gøre "
 "dette?"
 
-#: ../src/gui_interface.py:1991 ../src/gui_interface.py:2028
-#: ../src/gui_interface.py:2063
+#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
+#: ../src/gui_interface.py:1852
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ja, jeg vil virkelig gerne tilslutte mig uden sikkerhed"
 
-#: ../src/gui_interface.py:2025
+#: ../src/gui_interface.py:1814
 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?"
@@ -9225,7 +9526,7 @@ msgstr ""
 "installere PyOpenSSL for at forhindre dette. Er du sikker på du vil gøre "
 "dette?"
 
-#: ../src/gui_interface.py:2061
+#: ../src/gui_interface.py:1850
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9235,11 +9536,11 @@ msgstr ""
 "sikker på du vil gøre dette?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2624 ../src/gui_interface.py:2647
+#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
 msgid "Emoticons disabled"
 msgstr "Følelsesikoner er ikke aktiveret"
 
-#: ../src/gui_interface.py:2625
+#: ../src/gui_interface.py:2423
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -9247,7 +9548,7 @@ msgstr ""
 "Dit konfigurerede følelsesikon tema blev ikke fundet, så følelsesikoner er "
 "blevet deaktiveret."
 
-#: ../src/gui_interface.py:2648
+#: ../src/gui_interface.py:2446
 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 "
@@ -9257,40 +9558,40 @@ msgstr ""
 "opdatere formatet for filen emoticons.py. Se http://trac.gajim.org/wiki/"
 "Emoticons for flere detaljer."
 
-#: ../src/gui_interface.py:2679 ../src/roster_window.py:3560
+#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
 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/gui_interface.py:3058
+#: ../src/gui_interface.py:2871
 msgid "Could not save your settings and preferences"
 msgstr "Kunne ikke gemme din opsætning og indstillinger"
 
-#: ../src/gui_interface.py:3592
+#: ../src/gui_interface.py:3411
 msgid "Passphrase Required"
 msgstr "Adgangskode Påkrævet"
 
-#: ../src/gui_interface.py:3593
+#: ../src/gui_interface.py:3412
 #, 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/gui_interface.py:3607
+#: ../src/gui_interface.py:3426
 msgid "GPG key expired"
 msgstr "GPG nøgle er udløbet"
 
-#: ../src/gui_interface.py:3608
+#: ../src/gui_interface.py:3427
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Din GPG nøgle er udløbet, du vil blive tilsuttet til %s uden OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3617
+#: ../src/gui_interface.py:3436
 msgid "Wrong Passphrase"
 msgstr "Forkert Adgangskode"
 
-#: ../src/gui_interface.py:3618
+#: ../src/gui_interface.py:3437
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Indtast din GPG adgangskode igen eller annuller."
 
@@ -9328,6 +9629,11 @@ msgstr "Kælenavn"
 msgid "Message"
 msgstr "Besked"
 
+#. holds subject
+#: ../src/history_manager.py:188 ../src/history_manager.py:219
+msgid "Subject"
+msgstr "Emne"
+
 #: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -9423,19 +9729,19 @@ msgstr "Du er ved at lukke flere faneblade"
 msgid "Do you really want to close them all?"
 msgstr "Vil du virkelig lukke dem alle?"
 
-#: ../src/message_window.py:484
+#: ../src/message_window.py:485
 msgid "Chats"
 msgstr "Samtaler"
 
-#: ../src/message_window.py:486
+#: ../src/message_window.py:487
 msgid "Group Chats"
 msgstr "Gruppe Samtaler"
 
-#: ../src/message_window.py:488
+#: ../src/message_window.py:489
 msgid "Private Chats"
 msgstr "Private Samtaler"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:495
 msgid "Messages"
 msgstr "Beskeder"
 
@@ -9491,56 +9797,56 @@ msgstr "Ny Besked fra %(nickname)s"
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../src/profile_window.py:57
+#: ../src/profile_window.py:58
 msgid "Retrieving profile..."
 msgstr "Henter profil..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2935
+#: ../src/profile_window.py:111 ../src/roster_window.py:3001
 msgid "File is empty"
 msgstr "Filen er tom"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2938
+#: ../src/profile_window.py:114 ../src/roster_window.py:3004
 msgid "File does not exist"
 msgstr "Filen eksisterer ikke"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2940 ../src/roster_window.py:2951
+#: ../src/profile_window.py:128 ../src/profile_window.py:144
+#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
 msgid "Could not load image"
 msgstr "Kunne ikke laste billede"
 
-#: ../src/profile_window.py:214
+#: ../src/profile_window.py:215
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Kontakt Information"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:216
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Format: YYYY-MM-DD"
 
-#: ../src/profile_window.py:269
+#: ../src/profile_window.py:270
 msgid "Information received"
 msgstr "Information modtaget"
 
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:341
 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:353
+#: ../src/profile_window.py:354
 msgid "Sending profile..."
 msgstr "Sender profil..."
 
-#: ../src/profile_window.py:368
+#: ../src/profile_window.py:369
 msgid "Information NOT published"
 msgstr "Information er IKKE publiceret"
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:376
 msgid "vCard publication failed"
 msgstr "vCard publicering fejlede"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:377
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9548,53 +9854,53 @@ msgstr ""
 "Der var en fejl under publicering af din personlige information, prøv igen "
 "senere."
 
-#: ../src/roster_window.py:256 ../src/roster_window.py:1012
+#: ../src/roster_window.py:262 ../src/roster_window.py:1026
 msgid "Merged accounts"
 msgstr "Flettede kontoer"
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1942
 msgid "Authorization has been sent"
 msgstr "Godkendelse er blevet sendt"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1943
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nu vil %s vide din status."
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1966
 msgid "Subscription request has been sent"
 msgstr "Forespørgsel på abonnering er blevet sendt"
 
-#: ../src/roster_window.py:1944
+#: ../src/roster_window.py:1967
 #, 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:1958
+#: ../src/roster_window.py:1981
 msgid "Authorization has been removed"
 msgstr "Godkendelse er blevet fjernet"
 
-#: ../src/roster_window.py:1959
+#: ../src/roster_window.py:1982
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nu vil %s altid se dig som offline."
 
-#: ../src/roster_window.py:1986
+#: ../src/roster_window.py:2009
 msgid "GPG is not usable"
 msgstr "GPG er ikke brugbar"
 
-#: ../src/roster_window.py:1987
+#: ../src/roster_window.py:2010
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Du vil blive tilsluttet til %s uden OpenPGP."
 
-#: ../src/roster_window.py:2199 ../src/roster_window.py:3496
+#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
 msgid "You are participating in one or more group chats"
 msgstr "Du deltager i en eller flere gruppesamtaler"
 
-#: ../src/roster_window.py:2200 ../src/roster_window.py:3497
+#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9602,38 +9908,38 @@ 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:2226
+#: ../src/roster_window.py:2249
 msgid "desync'ed"
 msgstr "ikke synkroniseret"
 
-#: ../src/roster_window.py:2288
+#: ../src/roster_window.py:2311
 msgid "Really quit Gajim?"
 msgstr "Skal Gajim afsluttes?"
 
-#: ../src/roster_window.py:2289
+#: ../src/roster_window.py:2312
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Er du sikker på du vil afslutte Gajim?"
 
-#: ../src/roster_window.py:2290
+#: ../src/roster_window.py:2313
 msgid "Always close Gajim"
 msgstr "Altid afslut Gajim"
 
-#: ../src/roster_window.py:2373
+#: ../src/roster_window.py:2396
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Annuller filoverførsel"
 
-#: ../src/roster_window.py:2374
+#: ../src/roster_window.py:2397
 msgid ""
-"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2405 ../src/roster_window.py:2653
+#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
 msgid "You have unread messages"
 msgstr "Du har ulæste beskeder"
 
-#: ../src/roster_window.py:2406
+#: ../src/roster_window.py:2429
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9641,16 +9947,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:2654
+#: ../src/roster_window.py:2720
 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:2657
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" vil blive fjernet"
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2724
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9658,11 +9964,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:2661
+#: ../src/roster_window.py:2727
 msgid "Transports will be removed"
 msgstr "Transporter vil blive fjernet"
 
-#: ../src/roster_window.py:2666
+#: ../src/roster_window.py:2732
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9671,11 +9977,11 @@ msgstr ""
 "Du vil ikke længere være i stand til at sende og modtage beskeder fra "
 "kontakter som bruger disse transporter: %s"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2800
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Du er ved at blokere en kontakt. Er du sikker på du vil fortsætte?"
 
-#: ../src/roster_window.py:2736
+#: ../src/roster_window.py:2802
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -9684,56 +9990,56 @@ msgstr ""
 "dig."
 
 #. it's jid
-#: ../src/roster_window.py:2827
+#: ../src/roster_window.py:2893
 msgid "Rename Contact"
 msgstr "Omdøb Kontakt"
 
-#: ../src/roster_window.py:2828
+#: ../src/roster_window.py:2894
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Indtast et nyt kælenavn for kontakt %s"
 
-#: ../src/roster_window.py:2835
+#: ../src/roster_window.py:2901
 msgid "Rename Group"
 msgstr "Omdøb Gruppe"
 
-#: ../src/roster_window.py:2836
+#: ../src/roster_window.py:2902
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Indtast et nyt navn for gruppen %s"
 
-#: ../src/roster_window.py:2881
+#: ../src/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Fjern Gruppen"
 
-#: ../src/roster_window.py:2882
+#: ../src/roster_window.py:2948
 #, 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:2883
+#: ../src/roster_window.py:2949
 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:2922
+#: ../src/roster_window.py:2988
 msgid "Assign OpenPGP Key"
 msgstr "Tildel OpenPGP Nøgle"
 
-#: ../src/roster_window.py:2923
+#: ../src/roster_window.py:2989
 msgid "Select a key to apply to the contact"
 msgstr "Vælg den nøgle du vil anvende til kontakten"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3372
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt %s vil blive fjernet fra dit kontaktvindue"
 
-#: ../src/roster_window.py:3308
+#: ../src/roster_window.py:3374
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr "Du er ved at fjerne \"%(name)s\" (%(jid)s) fra dit kontaktvindue.\n"
 
-#: ../src/roster_window.py:3313
+#: ../src/roster_window.py:3379
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9742,11 +10048,11 @@ msgstr ""
 "vil altid se dig som offline."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3319
+#: ../src/roster_window.py:3385
 msgid "Do you want to continue?"
 msgstr "Vil du fortsætte?"
 
-#: ../src/roster_window.py:3323
+#: ../src/roster_window.py:3389
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9754,16 +10060,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:3326
+#: ../src/roster_window.py:3392
 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:3330
+#: ../src/roster_window.py:3396
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakter vil blive fjernet fra dit kontaktvindue"
 
-#: ../src/roster_window.py:3335
+#: ../src/roster_window.py:3401
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9773,14 +10079,14 @@ msgstr ""
 "fjerner du også godkendelsen, hvilket medfører at de altid vil se dig som "
 "offline."
 
-#: ../src/roster_window.py:3393
+#: ../src/roster_window.py:3459
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want  to continue?"
 msgstr ""
 "Du er ved at sende en personlig status. Er du sikker på du vil fortsætte?"
 
-#: ../src/roster_window.py:3395
+#: ../src/roster_window.py:3461
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -9789,20 +10095,20 @@ msgstr ""
 "Denne kontakt vil midlertidig se dig som %(status)s, men kun indtil du "
 "ændrer din status. Da vil han se din globale status."
 
-#: ../src/roster_window.py:3414
+#: ../src/roster_window.py:3480
 msgid "No account available"
 msgstr "Ingen konto tilgængelig"
 
-#: ../src/roster_window.py:3415
+#: ../src/roster_window.py:3481
 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:4023
+#: ../src/roster_window.py:4095
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakt lagring er ikke understøttet af din server"
 
-#: ../src/roster_window.py:4025
+#: ../src/roster_window.py:4097
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9811,12 +10117,12 @@ msgstr ""
 "information. Så denne information vil ikke blive gemt til næste gang du "
 "tilslutter dig."
 
-#: ../src/roster_window.py:4117
+#: ../src/roster_window.py:4189
 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:4119
+#: ../src/roster_window.py:4191
 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 "
@@ -9825,23 +10131,23 @@ 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:4234
+#: ../src/roster_window.py:4306
 msgid "Invalid file URI:"
 msgstr "Ugyldig Fil URI:"
 
-#: ../src/roster_window.py:4246
+#: ../src/roster_window.py:4318
 #, 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:4361
+#: ../src/roster_window.py:4433
 #, python-format
 msgid "Send %s to %s"
 msgstr "Send %s til %s"
 
-#: ../src/roster_window.py:4367
+#: ../src/roster_window.py:4439
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Lav %s og %s til metakontakter"
@@ -9851,143 +10157,143 @@ msgstr "Lav %s og %s til metakontakter"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4816 ../src/roster_window.py:4889
-#: ../src/roster_window.py:4898 ../src/statusicon.py:246
-#: ../src/statusicon.py:293 ../src/statusicon.py:299
+#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
+#: ../src/roster_window.py:4970 ../src/statusicon.py:263
+#: ../src/statusicon.py:310 ../src/statusicon.py:316
 #, python-format
 msgid "using account %s"
 msgstr "med konto %s"
 
 #. add
-#: ../src/roster_window.py:4905
+#: ../src/roster_window.py:4977
 #, python-format
 msgid "to %s account"
 msgstr "til %s konto"
 
 #. disco
-#: ../src/roster_window.py:4910
+#: ../src/roster_window.py:4982
 #, python-format
 msgid "using %s account"
 msgstr "bruger %s konto"
 
-#: ../src/roster_window.py:4948 ../src/statusicon.py:309
+#: ../src/roster_window.py:5020 ../src/statusicon.py:326
 msgid "_Manage Bookmarks..."
 msgstr "Håndter Bog_mærker..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4968
+#: ../src/roster_window.py:5040
 #, python-format
 msgid "of account %s"
 msgstr "fra konto %s"
 
-#: ../src/roster_window.py:5009
+#: ../src/roster_window.py:5081
 #, python-format
 msgid "for account %s"
 msgstr "for konto %s"
 
-#: ../src/roster_window.py:5069 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
 msgid "_Change Status Message"
 msgstr "_Ændre Status Besked"
 
-#: ../src/roster_window.py:5102
+#: ../src/roster_window.py:5174
 msgid "Publish Tune"
 msgstr "Publicer Melodi"
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5176
 #, fuzzy
 msgid "Publish Location"
 msgstr "Publicer Melodi"
 
-#: ../src/roster_window.py:5107
+#: ../src/roster_window.py:5179
 msgid "Configure Services..."
 msgstr "Tilpas Tjenester..."
 
-#: ../src/roster_window.py:5252
+#: ../src/roster_window.py:5324
 msgid "_Maximize All"
 msgstr "_Maksimer alt"
 
-#: ../src/roster_window.py:5262 ../src/roster_window.py:5436
+#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
 msgid "Send Group M_essage"
 msgstr "Send Gruppeb_esked"
 
-#: ../src/roster_window.py:5270
+#: ../src/roster_window.py:5342
 msgid "To all users"
 msgstr "Til alle brugere"
 
-#: ../src/roster_window.py:5274
+#: ../src/roster_window.py:5346
 msgid "To all online users"
 msgstr "Til alle brugere på net"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5456
+#: ../src/roster_window.py:5528
 msgid "_Manage Contacts"
 msgstr "_HÃ¥ndter Kontakter"
 
 #. Edit Groups
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5537
 msgid "Edit _Groups"
 msgstr "Ændre _Grupper"
 
 #. Send single message
-#: ../src/roster_window.py:5520
+#: ../src/roster_window.py:5592
 msgid "Send Single Message"
 msgstr "Send Enkel Besked"
 
 #. Execute Command
-#: ../src/roster_window.py:5567
+#: ../src/roster_window.py:5639
 msgid "Execute Command..."
 msgstr "Kør Kommando..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5577
+#: ../src/roster_window.py:5649
 msgid "_Manage Transport"
 msgstr "HÃ¥_ndter Transport"
 
 #. Modify Transport
-#: ../src/roster_window.py:5586
+#: ../src/roster_window.py:5658
 msgid "_Modify Transport"
 msgstr "_Modificer Transport"
 
 #. Rename
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5668
 msgid "_Rename"
 msgstr "_Omdøb"
 
-#: ../src/roster_window.py:5656
+#: ../src/roster_window.py:5728
 msgid "_Maximize"
 msgstr "_Maksimer"
 
-#: ../src/roster_window.py:5665
+#: ../src/roster_window.py:5737
 msgid "_Reconnect"
 msgstr "_Tilslut igen"
 
-#: ../src/roster_window.py:5672
+#: ../src/roster_window.py:5744
 msgid "_Disconnect"
 msgstr "Afbry_d tilslutningen"
 
 #. History manager
-#: ../src/roster_window.py:5754
+#: ../src/roster_window.py:5833
 msgid "History Manager"
 msgstr "Historik HÃ¥ndterer"
 
-#: ../src/roster_window.py:5765
+#: ../src/roster_window.py:5844
 msgid "_Join New Group Chat"
 msgstr "_Deltag i Ny Gruppe Samtale"
 
-#: ../src/roster_window.py:5938
+#: ../src/roster_window.py:6019
 msgid "Change Status Message..."
 msgstr "Ændre Status Besked..."
 
-#: ../src/search_window.py:94
+#: ../src/search_window.py:105
 msgid "Waiting for results"
 msgstr "Venter på resultater"
 
-#: ../src/search_window.py:132 ../src/search_window.py:210
+#: ../src/search_window.py:143 ../src/search_window.py:220
 msgid "Error in received dataform"
 msgstr "Fejl i modtaget dataform"
 
 #. No result
-#: ../src/search_window.py:166 ../src/search_window.py:202
+#: ../src/search_window.py:177 ../src/search_window.py:212
 msgid "No result"
 msgstr "Intet resultat"
 
@@ -10000,14 +10306,15 @@ msgstr "Disk SkriveFejl"
 msgid "Subject: %s"
 msgstr "Emne: %s"
 
-#: ../src/session.py:433 ../src/session.py:468
+#: ../src/session.py:447 ../src/session.py:491
 msgid "Confirm these session options"
 msgstr "Bekræft disse sessions indstillinger"
 
-#: ../src/session.py:435
+#: ../src/session.py:448
 #, fuzzy, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
+"The remote client wants '\n"
+"                            'to negotiate an session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -10019,7 +10326,7 @@ msgstr ""
 "\n"
 "\tKan disse indstillinger godkendes?"
 
-#: ../src/session.py:469
+#: ../src/session.py:492
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10034,16 +10341,16 @@ msgstr ""
 "\n"
 "Fortsæt med sessionen?"
 
-#: ../src/statusicon.py:210
+#: ../src/statusicon.py:227
 msgid "_Change Status Message..."
 msgstr "_Ændre Status Besked..."
 
-#: ../src/statusicon.py:322
+#: ../src/statusicon.py:339
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "i _kontaktvinduet"
 
-#: ../src/statusicon.py:333
+#: ../src/statusicon.py:350
 msgid "Hide this menu"
 msgstr "Skjul denne menu"
 
@@ -10182,32 +10489,32 @@ msgstr ""
 "Denne tjeneste kunne ikke svare med detaljeret information.\n"
 "Den er højst sandsynlig ikke fungerende"
 
-#: ../src/vcard.py:251
+#: ../src/vcard.py:265
 msgid "?Client:Unknown"
 msgstr "?Client:Ukendt"
 
-#: ../src/vcard.py:253
+#: ../src/vcard.py:267
 msgid "?OS:Unknown"
 msgstr "?OS:Ukendt"
 
-#: ../src/vcard.py:274
+#: ../src/vcard.py:288
 msgid "?Time:Unknown"
 msgstr "?Tid:Ukendt"
 
-#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
+#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
 #, python-format
 msgid "since %s"
 msgstr "siden %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:345
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:349
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Tilknytning:</b>"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:357
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10215,7 +10522,7 @@ msgstr ""
 "Denne kontakt er interesseret i din tilstedeværelses information, men du er "
 "ikke interesseret i hans/hendes tilstedeværelse"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:359
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10223,14 +10530,14 @@ msgstr ""
 "Du er interesseret i kontaktens tilstedeværelses information, men han/hun er "
 "ikke interesseret i din"
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:361
 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:349
+#: ../src/vcard.py:363
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10238,26 +10545,62 @@ msgstr ""
 "Du er ikke interesseret i kontaktens tilstedeværelse, og han/hun er ikke "
 "interesseret i din"
 
-#: ../src/vcard.py:356
+#: ../src/vcard.py:370
 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:358
+#: ../src/vcard.py:372
 msgid "There is no pending subscription request."
 msgstr "Der er ikke nogen ventende abbonerings forespørgsler."
 
-#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
+#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
 msgid " resource with priority "
 msgstr " ressource med prioritet "
 
-#~ msgid "_Available"
-#~ msgstr "Ti_lgængelig"
+#~ msgid "@"
+#~ msgstr "@"
+
+#~ msgid "_Disable showing event in systray"
+#~ msgstr "_Deaktivér visning af hændelse i systembakken"
+
+#~ msgid "_Show event in systray"
+#~ msgstr "_Vis hændelse i systembakken"
+
+#, fuzzy
+#~ msgid "Autodetect on every Gajim startup"
+#~ msgstr "T_ilslut når Gajim startes"
 
-#~ msgid "PEP node was not removed"
-#~ msgstr "PEP knude blev ikke fjernet"
+#~ msgid "Show systray:"
+#~ msgstr "Vis systembakken:"
 
-#~ msgid "PEP node %(node)s was not removed: %(message)s"
-#~ msgstr "PEP knude %(node)s blev ikke fjernet: %(message)s"
+#~ msgid "Nickname not allowed: %s"
+#~ msgstr "Kælenavn er ikke tilladt: %s"
+
+#~ msgid "Room has been destroyed"
+#~ msgstr "Rummet er blevet ødelagt"
+
+#~ msgid "You can join this room instead: %s"
+#~ msgstr "Du kan deltage i dette rum i stedet: %s"
+
+#~ msgid "I would like to add you to my roster."
+#~ msgstr "Jeg vil gerne tilføje dig til min kontaktliste."
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "vi abonnerer nu på %s"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "forespørsel om ophør på abonnement fra %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "nu abonnerer vi ikke længere på %s"
+
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "JID %s er ikke RFC føjelig. Den vil ikke blive tilføjet til dit "
+#~ "kontaktvindue. Brug kontaktvindue håndterings redskaber som http://jru."
+#~ "jabberstudio.org/ til at fjerne det."
 
 #~ msgid "Account Modification"
 #~ msgstr "Ændring af Konto"
@@ -10367,40 +10710,9 @@ msgstr " ressource med prioritet "
 #~ msgid "gtk-delete"
 #~ msgstr "gtk-slet"
 
-#~ msgid "Add this contact to roster (Ctrl+D)"
-#~ msgstr "Tilføj denne kontakt til kontaktvinduet (Ctrl+D)"
-
-#~ msgid "Bookmark this room (Ctrl+B)"
-#~ msgstr "Bogmærk dette rom (Ctrl+B)"
-
-#~ msgid "Browse the chat history (Ctrl+H)"
-#~ msgstr "Gennemse samtale historik (Ctrl+H)"
-
-#~ msgid "Change the room's subject (Alt+T)"
-#~ msgstr "Ændre emne for rummet (Alt+T)"
-
-#~ msgid "Change your nickname (Ctrl+N)"
-#~ msgstr "Ændre dit kælenavn (Ctrl+N)"
-
-#~ msgid "Invite contacts to the conversation (Ctrl+G)"
-#~ msgstr "Inviter kontakter til samtalen (Ctrl+G)"
-
 #~ msgid "Send a file (Ctrl+F)"
 #~ msgstr "Send en fil (Ctrl+F)"
 
-#~ msgid "Show a list of emoticons (Alt+M)"
-#~ msgstr "Hvis en liste over følelsesikoner (Alt+M)"
-
-#~ msgid "Show a list of formattings"
-#~ msgstr "Hvis en liste over følelsesikoner"
-
-#, fuzzy
-#~ msgid "Show a menu of advanced functions (Alt+D)"
-#~ msgstr "Vis en menu med avancerede funktioner (Alt+A)"
-
-#~ msgid "Show the contact's profile (Ctrl+I)"
-#~ msgstr "Vis kontaktens profil (Ctrl+I)"
-
 #~ msgid ""
 #~ "All chat states\n"
 #~ "Composing only\n"
@@ -10459,9 +10771,6 @@ msgstr " ressource med prioritet "
 #~ msgid "gtk-cancel"
 #~ msgstr "luk"
 
-#~ msgid "_Preferences"
-#~ msgstr "_Indstillinger"
-
 #~ msgid "_Quit"
 #~ msgstr "_Afslut"
 
diff --git a/po/de.po b/po/de.po
index dabfe30c069e0598e9ececae03d8f2334d9569b4..681aa72e6874d63ed6c1e6715fb54c2f593dab51 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,11 +7,15 @@
 # Sebastian Schäfer <sarek@uliweb.de>, 2007.
 # Nico Gulden <cilugnedon@gmx.de>, 2007, 2008, 2009.
 # Niklas Hambüchen <nh2@deditus.de>, 2009.
+#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.13\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 11:28+0200\n"
+"POT-Creation-Date: 2010-10-01 20:39+0200\n"
 "PO-Revision-Date: 2009-12-13 23:46+0100\n"
 "Last-Translator: Nico Gulden <cilugnedon@gmx.de>\n"
 "Language-Team: German <translators@gajim.org>\n"
@@ -30,7 +34,7 @@ msgstr "_Gruppenchat betreten …"
 msgid "_Add Contact..."
 msgstr "Kont_akt hinzufügen …"
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:17
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
 msgid "_Discover Services"
 msgstr "_Dienste durchsuchen"
 
@@ -50,7 +54,7 @@ msgstr "Google-Mail-Posteingang _öffnen"
 msgid "_Personal Events"
 msgstr "_Persönliche Ereignisse"
 
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:23
+#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
 msgid "_Start Chat..."
 msgstr "_Chat starten …"
 
@@ -82,10 +86,6 @@ msgid "<b>Please select a server</b>"
 msgstr "<b>Bitte einen Server wählen</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid "@"
-msgstr "@"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
@@ -93,64 +93,64 @@ msgstr ""
 "Dieses Zertifikat der Liste vertrauenswürdiger Zertifikate hinzufügen.\n"
 "SHA1-Fingerprint dieses Zertifikates:\n"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:10
 msgid "Anon_ymous authentication"
 msgstr "Anon_yme Authentifizierung"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Connect when I press Finish"
 msgstr "Verbinden, sobald ich auf Fertig klicke"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Assistent zum Einrichten eines neuen Kontos"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "I already have an account I want to _use"
 msgstr "Ich habe bereits ein Konto, das ich ben_utzen möchte"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I want to _register for a new account"
 msgstr "Ich möchte ein neues Konto _erstellen"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:16
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 #: ../data/gui/accounts_window.ui.h:28
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Falls aktiviert, wird Gajim das Passwort für dieses Konto speichern."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:17
+#: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Verwalten …"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:18
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
 #: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2263 ../src/config.py:2342
-#: ../src/config.py:2355 ../src/config.py:3596 ../src/config.py:3671
-#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513
-#: ../src/dialogs.py:526 ../src/roster_window.py:2890
-#: ../src/roster_window.py:2896 ../src/roster_window.py:2901
+#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
+#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
+#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
+#: ../src/dialogs.py:527 ../src/roster_window.py:2956
+#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
 msgid "None"
 msgstr "Kein Proxy"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:19
+#: ../data/gui/account_creation_wizard_window.ui.h:18
 msgid "Prox_y:"
 msgstr "Prox_y:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #: ../data/gui/accounts_window.ui.h:48
 msgid "Save pass_word"
 msgstr "Pass_wort speichern"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:21
+#: ../data/gui/account_creation_wizard_window.ui.h:20
 msgid "Set my profile when I connect"
 msgstr "Mein Profil setzen, wenn ich mich verbinde"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:22
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Use custom hostname/port"
 msgstr "Benutzerdefinierten Rechnernamen und Port verwenden"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:23
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -158,34 +158,34 @@ msgstr ""
 "Sie müssen ein Konto erstellen, bevor Sie sich zum Jabber-Netzwerk \n"
 "verbinden können."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-#: ../data/gui/roster_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:16
 msgid "_Advanced"
 msgstr "_Erweitert"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:25
 msgid "_Finish"
 msgstr "_Beenden"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:27
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Hostname:"
 msgstr "Rec_hnername:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #: ../data/gui/accounts_window.ui.h:62
 msgid "_Jabber ID:"
 msgstr "_Jabber-ID:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:28
 #: ../data/gui/accounts_window.ui.h:64
 msgid "_Password:"
 msgstr "_Passwort:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:29
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:31
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Server:"
 msgstr "_Server:"
 
@@ -294,17 +294,17 @@ msgstr "Vorname:"
 #. No configured account
 #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
 #: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592
-#: ../src/notify.py:608
+#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
+#: ../src/notify.py:616
 msgid "Gajim"
 msgstr "Gajim"
 
 #. FIXME: Ugly workaround.
 #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
 #. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:61
-#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121
-#: ../src/roster_window.py:2832 ../src/roster_window.py:5379
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
+#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
 msgid "General"
 msgstr "Allgemein"
 
@@ -367,7 +367,7 @@ msgstr "Informationen über Sie, die auf dem Server gespeichert sind"
 
 #: ../data/gui/accounts_window.ui.h:35
 #: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:830
+#: ../src/dialogs.py:831
 msgid "Jabber ID:"
 msgstr "Jabber-ID:"
 
@@ -381,7 +381,7 @@ msgid "Mer_ge accounts"
 msgstr "Konten _zusammenführen"
 
 #: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2356
+#: ../src/config.py:2358
 msgid "No key selected"
 msgstr "Kein Schlüssel ausgewählt"
 
@@ -409,7 +409,7 @@ msgstr ""
 "Falls aktiviert, ändert sich die Priorität automatisch gemäß dem Status."
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5329
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
 msgid "Re_name"
 msgstr "_Umbenennen"
 
@@ -635,39 +635,44 @@ msgid "Deletes Message of the Day"
 msgstr "Löscht die Nachricht des Tages (MOTD)."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
+#, fuzzy
+msgid "Edit Archi_ving Preferences"
+msgstr "_Einstellungen"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Edit _Privacy Lists..."
 msgstr "_Privatsphären-Listen bearbeiten …"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sends a message to users currently connected to this server"
 msgstr ""
 "Sendet eine Nachricht an alle momentan angemeldeten Benutzer des Servers."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Set MOTD..."
 msgstr "Nachricht des Tages (MOTD) setzen …"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Setzt die Nachricht des Tages (MOTD)."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Show _XML Console"
 msgstr "_XML-Konsole anzeigen"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "Update MOTD..."
 msgstr "Nachricht des Tages (MOTD) aktualisieren …"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "Aktualisiert die Nachricht des Tages (MOTD)."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:11
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:11
+#: ../data/gui/advanced_menuitem_menu.ui.h:12
 msgid "_Send Server Message..."
 msgstr "Servernachricht _senden …"
 
@@ -701,7 +706,7 @@ msgid "All statuses"
 msgstr "Alle Status"
 
 #: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:233
+#: ../src/common/commands.py:106 ../src/common/helpers.py:239
 #: ../src/tooltips.py:193
 msgid "Away"
 msgstr "Abwesend"
@@ -754,7 +759,7 @@ msgid "Have "
 msgstr "habe "
 
 #: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:249
 msgid "Invisible"
 msgstr "Unsichtbar"
 
@@ -763,7 +768,7 @@ msgid "Launch a command"
 msgstr "Einen Befehl ausführen"
 
 #: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:216 ../src/tooltips.py:197
+#: ../src/common/helpers.py:222 ../src/tooltips.py:197
 msgid "Not Available"
 msgstr "Nicht verfügbar"
 
@@ -808,12 +813,13 @@ msgid "_Disable existing sound for this event"
 msgstr "_Deaktivere existierenden Sound für dieses Ereignis"
 
 #: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in roster"
+#, fuzzy
+msgid "_Disable showing event in notification area"
 msgstr "_Deaktiviere die Ereignisanzeige in der Kontaktliste"
 
 #: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in systray"
-msgstr "_Deaktiviere die Ereignisanzeige im Systray"
+msgid "_Disable showing event in roster"
+msgstr "_Deaktiviere die Ereignisanzeige in der Kontaktliste"
 
 #: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
@@ -824,12 +830,13 @@ msgid "_Open chat window with user"
 msgstr "Ein _Chatfenster mit Benutzer öffnen"
 
 #: ../data/gui/advanced_notifications_window.ui.h:35
-msgid "_Show event in roster"
+#, fuzzy
+msgid "_Show event in notification area"
 msgstr "Zeige Ereignis in der Kontaktli_ste"
 
 #: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in systray"
-msgstr "Zeige Ereignisse im _Systray"
+msgid "_Show event in roster"
+msgstr "Zeige Ereignis in der Kontaktli_ste"
 
 #: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
@@ -857,6 +864,45 @@ msgstr "Gruppen"
 msgid "when I'm in"
 msgstr "wenn ich bin"
 
+#: ../data/gui/archiving_preferences_window.ui.h:1
+msgid "<i>Method Auto</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "<i>Method Local</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:3
+msgid "<i>Method Manual</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:4
+#, fuzzy
+msgid "Auto"
+msgstr "Automatisch verbinden"
+
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Concede"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "Forbid"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:7
+#, fuzzy
+msgid "No"
+msgstr "Kein Proxy"
+
+#: ../data/gui/archiving_preferences_window.ui.h:8
+#, fuzzy
+msgid "Prefer"
+msgstr "Einstellungen"
+
+#: ../data/gui/archiving_preferences_window.ui.h:9
+msgid "Yes"
+msgstr ""
+
 #: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Eintrag:"
@@ -884,8 +930,8 @@ msgstr "blockierte Kontakte"
 # TODO: Review by german translators
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5348
-#: ../src/roster_window.py:5476 ../src/roster_window.py:5609
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
+#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
 msgid "_Unblock"
 msgstr "_Entblocken"
 
@@ -973,7 +1019,7 @@ msgid "_Start Chat"
 msgstr "Chat _starten"
 
 #. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4184
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
 msgid "#"
 msgstr "Nr."
 
@@ -1021,13 +1067,49 @@ msgstr ""
 msgid "9"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:13
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Kontakt zur Kontaktliste hinzufügen (Strg+D)"
+
 #: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Chatverlauf anzeigen (Strg+H)"
+
+#: ../data/gui/chat_control.ui.h:15
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Weiteren Kontakt zur Unterhaltung einladen (Strg+G)"
+
+#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Emoticons (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
+msgid "Show a list of formattings"
+msgstr "Schriftformatierung (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Liste erweiterter Funktionen anzeigen (Alt+D)"
+
+#: ../data/gui/chat_control.ui.h:19
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr "Benutzerprofil anzeigen (Strg+I)"
+
+#: ../data/gui/chat_control.ui.h:20
+msgid "Toggle audio session"
+msgstr "Zwischen Audio-Sitzung umschalten"
+
+#: ../data/gui/chat_control.ui.h:21
+msgid "Toggle video session"
+msgstr "Zwischen Video-Sitzung umschalten"
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
 #: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Senden"
 
-#: ../data/gui/chat_control.ui.h:15 ../data/gui/groupchat_control.ui.h:3
+#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
 msgid "label"
 msgstr ""
 
@@ -1078,8 +1160,8 @@ msgstr "_Gruppen bearbeiten …"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5284
-#: ../src/roster_window.py:5444
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
+#: ../src/roster_window.py:5516
 msgid "In_vite to"
 msgstr "_Einladen zu"
 
@@ -1091,8 +1173,8 @@ msgstr "_Kontakte einladen"
 msgid "Remo_ve"
 msgstr "Ent_fernen"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5294
-#: ../src/roster_window.py:5533
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
+#: ../src/roster_window.py:5605
 msgid "Send Cus_tom Status"
 msgstr "Benu_tzerdefinierten Status senden"
 
@@ -1126,8 +1208,8 @@ msgid "_Allow him/her to see my status"
 msgstr "Erlaube dem Kont_akt, meinen Status zu sehen"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5482 ../src/roster_window.py:5612
+#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
+#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
 msgid "_Block"
 msgstr "_Blockieren"
 
@@ -1137,8 +1219,8 @@ msgstr "_Verbiete dem Kontakt, meinen Status zu sehen"
 
 #: ../data/gui/contact_context_menu.ui.h:20
 #: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:21
-#: ../src/roster_window.py:5683
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
+#: ../src/roster_window.py:5755
 msgid "_History"
 msgstr "_Verlauf"
 
@@ -1276,7 +1358,7 @@ msgstr "<b>Tabellenfarben des Chat-Status</b>"
 msgid "Account row"
 msgstr "Konto"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:925
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
 msgid "Bold"
 msgstr "Fett"
 
@@ -1314,7 +1396,7 @@ msgstr "Gruppe"
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:926
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
 msgid "Italic"
 msgstr "Kursiv"
 
@@ -1362,7 +1444,7 @@ msgstr "_Thema ändern …"
 msgid "Configure _Room..."
 msgstr "Chat_raum einrichten …"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1782
+#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
 msgid "_Bookmark"
 msgstr "Chatraum zu den Lesezeichen _hinzufügen"
 
@@ -1422,19 +1504,32 @@ msgstr "Private Nachricht _senden"
 msgid "_Voice"
 msgstr "_Stimme verleihen"
 
+# TODO: Synchronize with other strings concerning bookmarks
+#: ../data/gui/groupchat_control.ui.h:1
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Diesen Chatraum speichern (Strg+B)"
+
+#: ../data/gui/groupchat_control.ui.h:3
+msgid "Change the room's subject (Alt+T)"
+msgstr "Thema des Chatraums ändern (Alt+T)"
+
+#: ../data/gui/groupchat_control.ui.h:4
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Spitzname ändern (Strg+N)"
+
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Neue Nachricht"
 
-#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
-msgid "From"
-msgstr "Von"
+#: ../data/gui/groups_post_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:2
+msgid "From:"
+msgstr "Von:"
 
-#. holds subject
-#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
-#: ../src/history_manager.py:219
-msgid "Subject"
-msgstr "Thema"
+#: ../data/gui/groups_post_window.ui.h:3
+#: ../data/gui/single_message_window.ui.h:7
+msgid "Subject:"
+msgstr "Betreff:"
 
 #: ../data/gui/history_manager.ui.h:1
 msgid ""
@@ -1452,8 +1547,8 @@ msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Willkommen im Gajim-Verlaufsmanager</b></big>"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3208
-#: ../src/dialogs.py:3305
+#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
+#: ../src/dialogs.py:3321
 msgid "Delete"
 msgstr "Löschen"
 
@@ -1512,12 +1607,75 @@ msgstr "Suchen:"
 msgid "_Log conversation history"
 msgstr "Unterhaltungsver_lauf"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
+msgid "approve"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:2
+msgid "body"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:3
+msgid "concede"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:4
+msgid "expire"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:5
+msgid "false"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:6
+msgid "forbid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:7
+#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+msgid "jid"
+msgstr "Jabber-ID"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:8
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
+#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
+msgid "message"
+msgstr "Nachricht"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
+msgid "oppose"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
+#, fuzzy
+msgid "otr"
+msgstr "Heiß"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:11
+msgid "prefer"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:12
+msgid "require"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:13
+msgid "save"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:14
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
 msgid "Bro_wse Rooms"
 msgstr "_Durchsuche"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2180
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
 msgid "Join Group Chat"
 msgstr "Chatraum betreten"
 
@@ -1556,8 +1714,8 @@ msgstr "Server:"
 msgid "_Bookmark this room"
 msgstr "Diesen Chatraum merken (Strg+B)"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1341
-#: ../src/disco.py:1786
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../src/disco.py:1804
 msgid "_Join"
 msgstr "_Betreten"
 
@@ -1661,6 +1819,75 @@ msgstr "_Benutzername:"
 msgid "Passphrase"
 msgstr "Passphrase"
 
+#: ../data/gui/plugins_window.ui.h:1
+msgid "&lt;empty&gt;"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:2
+msgid "<empty>"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:3
+#, fuzzy
+msgid "Authors:"
+msgstr "Au_torisieren"
+
+#: ../data/gui/plugins_window.ui.h:4
+#, fuzzy
+msgid "Available"
+msgstr "_Angemeldet"
+
+#: ../data/gui/plugins_window.ui.h:5
+#, fuzzy
+msgid "Configure"
+msgstr "_Einstellen"
+
+#: ../data/gui/plugins_window.ui.h:6
+#, fuzzy
+msgid "Descrition:"
+msgstr "Beschreibung: "
+
+#: ../data/gui/plugins_window.ui.h:7
+#, fuzzy
+msgid "Homepage:"
+msgstr "<b>Homepage:</b>"
+
+#: ../data/gui/plugins_window.ui.h:8
+msgid "Install"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:9
+#, fuzzy
+msgid "Installed"
+msgstr "Steht still"
+
+#: ../data/gui/plugins_window.ui.h:10
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:11
+msgid "Plugins"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:12
+msgid "Uninstall"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:13
+#, fuzzy
+msgid "Version:"
+msgstr "GTK+-Version:"
+
+#: ../data/gui/plugins_window.ui.h:14
+msgid "button"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:15
+msgid "homepage url"
+msgstr ""
+
 #: ../data/gui/popup_notification_window.ui.h:1
 #, fuzzy
 msgid "Event Type"
@@ -1789,121 +2016,101 @@ msgid "Always"
 msgstr "Abwesend"
 
 #: ../data/gui/preferences_window.ui.h:31
-#, fuzzy
-msgid "Always use GNOME default applications"
-msgstr "Immer OS/X-Standardprogramme verwenden"
-
-#: ../data/gui/preferences_window.ui.h:32
-#, fuzzy
-msgid "Always use KDE default applications"
-msgstr "Immer OS/X-Standardprogramme verwenden"
-
-#: ../data/gui/preferences_window.ui.h:33
-#, fuzzy
-msgid "Always use Xfce default applications"
-msgstr "Immer OS/X-Standardprogramme verwenden"
-
-#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Erfrage Statusnachricht beim:"
 
-#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
 msgid "Audio / Video"
 msgstr "Audio / Video"
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:33
 msgid "Audio input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Audio output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:38
-#, fuzzy
-msgid "Autodetect on every Gajim startup"
-msgstr "Beim Pr_ogrammstart verbinden"
-
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:35
 msgid "Chat message:"
 msgstr "Chat-Nachricht:"
 
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:36
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Beim Starten überprüfen, ob Gajim der _Standard-Jabber-Client ist"
 
-#: ../data/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:37
 #, fuzzy
 msgid "Composing only"
 msgstr "Erstellen"
 
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:38
 msgid "Configure color and font of the interface"
 msgstr "Farben und Schriftarten für die Oberfläche konfigurieren"
 
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:39
 msgid "Contact's message:"
 msgstr "Nachricht des Kontakts:"
 
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:40
 msgid "Contact's nickname:"
 msgstr "Spitzname des Kontakts:"
 
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:41
 msgid "Custom"
 msgstr "Benutzerdefiniert"
 
-#: ../data/gui/preferences_window.ui.h:46
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Detached roster with chat grouped by account"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Detached roster with detached chats"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:45
 msgid "Detached roster with single chat"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
-#: ../src/config.py:671
+#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
+#: ../src/config.py:665
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:47
 msgid "Display _activity of contacts in roster"
 msgstr "_Aktivitäten von Kontakten in der Kontaktliste anzeigen"
 
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:48
 msgid "Display _extra email details"
 msgstr "Zusätzliche _E-Mail-Details anzeigen"
 
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:49
 #, fuzzy
 msgid "Display _location of contacts in roster"
 msgstr "_Stimmungen anzeigen"
 
-#: ../data/gui/preferences_window.ui.h:54
+#: ../data/gui/preferences_window.ui.h:50
 msgid "Display _tunes of contacts in roster"
 msgstr "Die gerade abgespielten Musik_titel anzeigen"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display a_vatars of contacts in roster"
 msgstr "A_vatare der Kontakte in der Kontaktliste anzeigen"
 
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display m_ood of contacts in roster"
 msgstr "_Stimmungen anzeigen"
 
-#: ../data/gui/preferences_window.ui.h:57
+#: ../data/gui/preferences_window.ui.h:53
 msgid "Display status _messages of contacts in roster"
 msgstr "Status_nachrichten anzeigen"
 
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:54
 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 "
@@ -1913,7 +2120,7 @@ msgstr ""
 "versenden. Hier können Sie festlegen, welche Chatstatus-Benachrichtigungen "
 "in Ihrem Chatfenster anzeigt werden sollen."
 
-#: ../data/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:55
 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 "
@@ -1923,7 +2130,7 @@ msgstr ""
 "versenden. Hier können Sie festlegen, welche Chatstatus-Benachrichtigungen "
 "Sie Ihrem Gegenüber senden möchten."
 
-#: ../data/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:56
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1931,11 +2138,11 @@ msgstr ""
 "Gajim informiert Sie über ein Popup-Fenster in der rechten unteren "
 "Bildschirmecke über Kontakte, die sich gerade abgemeldet haben."
 
-#: ../data/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:58
 msgid "Hide all buttons in chat windows"
 msgstr "Versteckt alle Schaltflächen im Chatfenster"
 
-#: ../data/gui/preferences_window.ui.h:63
+#: ../data/gui/preferences_window.ui.h:59
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1943,7 +2150,7 @@ msgstr ""
 "Falls aktiviert, erlaubt Gajim Ihrem Gegenüber, Ihr Betriebssystem "
 "festzustellen."
 
-#: ../data/gui/preferences_window.ui.h:64
+#: ../data/gui/preferences_window.ui.h:60
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1951,14 +2158,14 @@ msgstr ""
 "Falls aktiviert, fügt Gajim auch Informationen über den Absender neuer E-"
 "Mails hinzu."
 
-#: ../data/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:61
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Falls aktiviert, wird der Status in Abwesend geändert, wenn der Computer "
 "nicht genutzt wird."
 
-#: ../data/gui/preferences_window.ui.h:66
+#: ../data/gui/preferences_window.ui.h:62
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1966,7 +2173,7 @@ msgstr ""
 "Falls aktiviert, wird der Status in Nicht Verfügbar geändert, wenn der "
 "Computer längere Zeit nicht genutzt wird."
 
-#: ../data/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1974,7 +2181,7 @@ msgstr ""
 "Falls aktiviert, werden die Avatare der Kontakte in der Kontaktliste und in "
 "Chaträumen eingeblendet."
 
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1982,14 +2189,14 @@ msgstr ""
 "Falls aktiviert, wird unter dem Namen jeden Kontaktes in der Kontaktliste "
 "und in Chaträumen die Statusnachricht angezeigt."
 
-#: ../data/gui/preferences_window.ui.h:69
+#: ../data/gui/preferences_window.ui.h:65
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "Falls aktiviert, wird die Aktivität der Kontakte in der Kontaktliste "
 "angezeigt."
 
-#: ../data/gui/preferences_window.ui.h:70
+#: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the location of contacts in the roster window"
@@ -1997,21 +2204,21 @@ msgstr ""
 "Falls aktiviert, wird die Stimmung der Kontakte in der Kontaktliste "
 "angezeigt."
 
-#: ../data/gui/preferences_window.ui.h:71
+#: ../data/gui/preferences_window.ui.h:67
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
 "Falls aktiviert, wird die Stimmung der Kontakte in der Kontaktliste "
 "angezeigt."
 
-#: ../data/gui/preferences_window.ui.h:72
+#: ../data/gui/preferences_window.ui.h:68
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Falls aktiviert, wird der gerade abgespielte Musiktitel der Kontakte in der "
 "Kontaktliste angezeigt."
 
-#: ../data/gui/preferences_window.ui.h:73
+#: ../data/gui/preferences_window.ui.h:69
 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 "
@@ -2022,7 +2229,7 @@ msgstr ""
 "Rechtsklick), wird die Standardsprache für diesen Kontakt oder Chatraum "
 "verwendet."
 
-#: ../data/gui/preferences_window.ui.h:74
+#: ../data/gui/preferences_window.ui.h:70
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -2032,7 +2239,7 @@ msgstr ""
 "Kontakten ignoriert. Vorsicht: Sie können nur noch Nachrichten von Kontakten "
 "empfangen, die in Ihrer Kontaktliste sind."
 
-#: ../data/gui/preferences_window.ui.h:75
+#: ../data/gui/preferences_window.ui.h:71
 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 "
@@ -2042,7 +2249,7 @@ msgstr ""
 "Bitte bedenken Sie, dass bei der Benutzung von ESession-Verschlüsselung der "
 "Chatpartner zustimmen muss; ansonsten wird nichts aufgezeichnet."
 
-#: ../data/gui/preferences_window.ui.h:76
+#: ../data/gui/preferences_window.ui.h:72
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -2050,7 +2257,7 @@ msgstr ""
 "Falls aktiviert, wird eine Benachrichtigung angezeigt, wenn eine neue E-Mail "
 "über Google-Mail empfangen wurde."
 
-#: ../data/gui/preferences_window.ui.h:77
+#: ../data/gui/preferences_window.ui.h:73
 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, "
@@ -2060,7 +2267,7 @@ msgstr ""
 "Beispiel wird für einen MSN-Kontakt das jeweilige MSN-Symbol für den Status "
 "\"Anwesend\", \"Abwesend\", \"Beschäftigt\", etc. angezeigt.)"
 
-#: ../data/gui/preferences_window.ui.h:78
+#: ../data/gui/preferences_window.ui.h:74
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -2068,7 +2275,7 @@ msgstr ""
 "Falls aktiviert, werden Sie nicht nach einer Statusnachricht gefragt. Die "
 "Standardnachricht wird benutzt."
 
-#: ../data/gui/preferences_window.ui.h:79
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2076,45 +2283,45 @@ msgstr ""
 "Falls aktiviert, werden ASCII-Smilies wie \":)\" mit äquivalenten "
 "graphischen Emoticons ersetzt."
 
-#: ../data/gui/preferences_window.ui.h:80
+#: ../data/gui/preferences_window.ui.h:76
 msgid "Log _encrypted chat session"
 msgstr "V_erschlüsselte Sitzungen aufzeichnen"
 
-#: ../data/gui/preferences_window.ui.h:81
+#: ../data/gui/preferences_window.ui.h:77
 msgid "Ma_ke message windows compact"
 msgstr "Nachrichtenfenster _kompakt anzeigen"
 
-#: ../data/gui/preferences_window.ui.h:82
+#: ../data/gui/preferences_window.ui.h:78
 msgid "Ma_nage..."
 msgstr "Verwalte_n …"
 
-#: ../data/gui/preferences_window.ui.h:83
+#: ../data/gui/preferences_window.ui.h:79
 #, fuzzy
 msgid "Never"
 msgstr "Server"
 
-#: ../data/gui/preferences_window.ui.h:84
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: ../data/gui/preferences_window.ui.h:85
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Notify me about contacts that sign _in"
 msgstr "Benachr_ichtigen, wenn sich ein Kontakt anmeldet"
 
-#: ../data/gui/preferences_window.ui.h:86
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Notify me about contacts that sign _out"
 msgstr "Benachrichtigen, wenn sich ein K_ontakt abmeldet"
 
-#: ../data/gui/preferences_window.ui.h:87
+#: ../data/gui/preferences_window.ui.h:83
 #, fuzzy
 msgid "Notify me about it"
 msgstr "Benachrichtigen, wenn sich ein K_ontakt abmeldet"
 
-#: ../data/gui/preferences_window.ui.h:88
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notify on new _GMail email"
 msgstr "Bei neuen E-Mails bei _Google-Mail benachrichtigen"
 
-#: ../data/gui/preferences_window.ui.h:89
+#: ../data/gui/preferences_window.ui.h:85
 #, fuzzy
 msgid "Only when pending events"
 msgstr ""
@@ -2122,57 +2329,55 @@ msgstr ""
 "Nur bei neuen Ereignissen\n"
 "Immer"
 
-#: ../data/gui/preferences_window.ui.h:90
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Personal Events"
 msgstr "Persönliche Ereignisse"
 
-#: ../data/gui/preferences_window.ui.h:91
+#: ../data/gui/preferences_window.ui.h:87
 msgid "Play _sounds"
 msgstr "Klänge ab_spielen"
 
-#: ../data/gui/preferences_window.ui.h:92
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Pop it up"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:93
+#: ../data/gui/preferences_window.ui.h:89
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../data/gui/preferences_window.ui.h:94
+#: ../data/gui/preferences_window.ui.h:90
 msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:96
+#: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
 msgid "STUN server:"
 msgstr "Server:"
 
-#: ../data/gui/preferences_window.ui.h:97
+#: ../data/gui/preferences_window.ui.h:93
+msgid "Show notification area icon:"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
 msgid "Show only in roster"
 msgstr "Zeige Ereignis in der Kontaktli_ste"
 
-# FIXME: Check English. This should be called something like "Show systray icon"
-# because the systray itself is always visible.
-#: ../data/gui/preferences_window.ui.h:98
-msgid "Show systray:"
-msgstr "Symbol in der Systemleiste anzeigen:"
-
-#: ../data/gui/preferences_window.ui.h:99
+#: ../data/gui/preferences_window.ui.h:95
 msgid "Sign _in"
 msgstr "_anmelden"
 
-#: ../data/gui/preferences_window.ui.h:100
+#: ../data/gui/preferences_window.ui.h:96
 msgid "Sign _out"
 msgstr "a_bmelden"
 
-#: ../data/gui/preferences_window.ui.h:101
+#: ../data/gui/preferences_window.ui.h:97
 msgid "Single window for everything"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:102
+#: ../data/gui/preferences_window.ui.h:98
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2181,27 +2386,27 @@ msgstr ""
 "Schriftarten usw.). Falls aktiviert, wird Gajim nur den reinen "
 "Nachrichtentext anzeigen."
 
-#: ../data/gui/preferences_window.ui.h:103
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sort contacts by status"
 msgstr "Kontakte nach Status sortieren"
 
-#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
 msgid "Status"
 msgstr "Status"
 
-#: ../data/gui/preferences_window.ui.h:105
+#: ../data/gui/preferences_window.ui.h:101
 msgid "Status _iconset:"
 msgstr "Status-S_ymbole:"
 
-#: ../data/gui/preferences_window.ui.h:106
+#: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Stil"
 
-#: ../data/gui/preferences_window.ui.h:107
+#: ../data/gui/preferences_window.ui.h:103
 msgid "T_heme:"
 msgstr "D_esign:"
 
-#: ../data/gui/preferences_window.ui.h:108
+#: ../data/gui/preferences_window.ui.h:104
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2214,7 +2419,7 @@ msgstr ""
 "eingesetzt werden. $T kann für die Zeit eingesetzt werden, seit der der "
 "Status auf Abwesend gestellt ist."
 
-#: ../data/gui/preferences_window.ui.h:111
+#: ../data/gui/preferences_window.ui.h:107
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2227,120 +2432,125 @@ msgstr ""
 "Statusnachricht eingesetzt werden. $T kann für die Zeit eingesetzt werden, "
 "seit der der Status auf Nicht Verfügbar gestellt ist."
 
-#: ../data/gui/preferences_window.ui.h:114
+#: ../data/gui/preferences_window.ui.h:110
 msgid "Use _transports icons"
 msgstr "_Transport-Symbole verwenden"
 
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:111
+#, fuzzy
+msgid "Use default applications"
+msgstr "Immer OS/X-Standardprogramme verwenden"
+
+#: ../data/gui/preferences_window.ui.h:112
 msgid "Use system _default"
 msgstr "Benutze System-_Voreinstellung"
 
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:113
 msgid "Video framerate"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:117
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Video input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:118
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Video output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:119
+#: ../data/gui/preferences_window.ui.h:116
 msgid "Video size"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:120
+#: ../data/gui/preferences_window.ui.h:117
 msgid "When new event is received:"
 msgstr "Wenn eine neue Nachricht empfangen wird:"
 
-#: ../data/gui/preferences_window.ui.h:121
+#: ../data/gui/preferences_window.ui.h:118
 msgid "Your message:"
 msgstr "Deine Nachricht:"
 
-#: ../data/gui/preferences_window.ui.h:122
+#: ../data/gui/preferences_window.ui.h:119
 msgid "Your nickname:"
 msgstr "Dein Spitzname:"
 
-#: ../data/gui/preferences_window.ui.h:123
+#: ../data/gui/preferences_window.ui.h:120
 msgid "_Away after:"
 msgstr "Automatisch _abwesend nach:"
 
-#: ../data/gui/preferences_window.ui.h:124
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../data/gui/preferences_window.ui.h:125
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Display chat state notifications:"
 msgstr "Benachrichtigungen über _den Chatstatus anzeigen:"
 
-#: ../data/gui/preferences_window.ui.h:126
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Emoticons:"
 msgstr "_Emoticons:"
 
-#: ../data/gui/preferences_window.ui.h:127
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_File manager:"
 msgstr "_Dateimanager:"
 
-#: ../data/gui/preferences_window.ui.h:128
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_Highlight misspelled words"
 msgstr "Falsch geschriebene Wörter _hervorheben"
 
-#: ../data/gui/preferences_window.ui.h:129
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Ignore events from contacts not in the roster"
 msgstr ""
 "Ereignisse von Kontakten, die nicht in der Kontaktliste sind, _ignorieren"
 
-#: ../data/gui/preferences_window.ui.h:130
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore rich content in incoming messages"
 msgstr "Formatierten Inhalt in ankommenden Nachrichten _ignorieren"
 
-#: ../data/gui/preferences_window.ui.h:131
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Log status changes of contacts"
 msgstr "_Logge die Statusveränderungen von Kontakten"
 
-#: ../data/gui/preferences_window.ui.h:132
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Mail client:"
 msgstr "E-_Mail-Programm:"
 
-#: ../data/gui/preferences_window.ui.h:133
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Not available after:"
 msgstr "Automatisch _nicht verfügbar nach:"
 
-#: ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Open..."
 msgstr "Ö_ffnen …"
 
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Reset to Default Colors"
 msgstr "Auf Standardfarben zu_rücksetzen"
 
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Send chat state notifications:"
 msgstr "Benachrichtigungen über den Chatstatus _senden:"
 
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Status message:"
 msgstr "_Statusnachricht:"
 
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_URL highlight:"
 msgstr "_URL hervorheben:"
 
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_Window behavior:"
 msgstr "_Fensterverhalten:"
 
-#: ../data/gui/preferences_window.ui.h:140
+#: ../data/gui/preferences_window.ui.h:137
 msgid "in _group chats"
 msgstr "in Chat_räumen"
 
-#: ../data/gui/preferences_window.ui.h:141
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _roster"
 msgstr "in der _Kontaktliste"
 
-#: ../data/gui/preferences_window.ui.h:142
+#: ../data/gui/preferences_window.ui.h:139
 msgid "minutes"
 msgstr "Minuten"
 
@@ -2392,7 +2602,7 @@ msgstr "der Jabber-ID:"
 msgid "Order:"
 msgstr "Reihenfolge:"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3436
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
 msgid "Privacy List"
 msgstr "Privatsphären-Liste"
 
@@ -2603,8 +2813,8 @@ msgstr "Konto entfernen (in Gajim und auf dem _Server)"
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5492 ../src/roster_window.py:5622
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
+#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
 msgid "_Remove"
 msgstr "_Entfernen"
 
@@ -2652,56 +2862,60 @@ msgid "Help online"
 msgstr "Online-Hilfe"
 
 #: ../data/gui/roster_window.ui.h:8
+msgid "P_lugins"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:9
 msgid "Profile, A_vatar"
 msgstr "Profil und A_vatar"
 
-#: ../data/gui/roster_window.ui.h:9
+#: ../data/gui/roster_window.ui.h:10
 msgid "Show Only _Active Contacts"
 msgstr "Nur _aktive Kontakte anzeigen"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
 msgid "Show Trans_ports"
 msgstr "Trans_porte anzeigen"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
 msgid "Show _Offline Contacts"
 msgstr "Abgemeldete K_ontakte anzeigen"
 
-#: ../data/gui/roster_window.ui.h:12 ../src/statusicon.py:326
+#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
 msgid "Show _Roster"
 msgstr "_Kontaktliste anzeigen"
 
-#: ../data/gui/roster_window.ui.h:13
+#: ../data/gui/roster_window.ui.h:14
 msgid "_Accounts"
 msgstr "_Konten"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
 #: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Aktionen"
 
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
 msgid "_Contents"
 msgstr "In_halte"
 
-#: ../data/gui/roster_window.ui.h:18 ../src/disco.py:1502
+#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
 msgid "_Edit"
 msgstr "Änd_ern"
 
-#: ../data/gui/roster_window.ui.h:19
+#: ../data/gui/roster_window.ui.h:20
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../data/gui/roster_window.ui.h:22
+#: ../data/gui/roster_window.ui.h:23
 msgid "_Send Single Message..."
 msgstr "Einzelne _Nachricht senden …"
 
-#: ../data/gui/roster_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:25
 msgid "_View"
 msgstr "A_nsicht"
 
@@ -2718,11 +2932,11 @@ msgid "_Add contact"
 msgstr "_Kontakt hinzufügen"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5634
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
 msgid "_Information"
 msgstr "_Informationen"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1353
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
 msgid "_Search"
 msgstr "_Suche"
 
@@ -2742,10 +2956,6 @@ msgstr "Registrieren auf"
 msgid "_Cancel"
 msgstr "Abbre_chen"
 
-#: ../data/gui/single_message_window.ui.h:2
-msgid "From:"
-msgstr "Von:"
-
 #: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Nachricht beantworten"
@@ -2762,10 +2972,6 @@ msgstr "Nachricht senden"
 msgid "Send message and close window"
 msgstr "Nachricht senden und Fenster schließen"
 
-#: ../data/gui/single_message_window.ui.h:7
-msgid "Subject:"
-msgstr "Betreff:"
-
 #: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "An:"
@@ -2975,26 +3181,36 @@ msgstr "Gajim Instant Messenger"
 msgid "Jabber IM Client"
 msgstr "Jabber IM-Client"
 
-#: ../src/adhoc_commands.py:314
+#: ../src/adhoc_commands.py:323
 msgid "Cancel confirmation"
 msgstr "Bestätigung abbrechen"
 
-#: ../src/adhoc_commands.py:315
+#: ../src/adhoc_commands.py:324
 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:351 ../src/adhoc_commands.py:374
+#: ../src/adhoc_commands.py:370
+#, fuzzy
+msgid "Invalid Form"
+msgstr "Ungültiger Raum"
+
+#: ../src/adhoc_commands.py:371
+#, fuzzy
+msgid "The form is not filled correctly."
+msgstr "Die Jabber-ID enthält ungültige Zeichen."
+
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
 msgid "Service sent malformed data"
 msgstr "Der Dienst sendete unzureichende Daten."
 
-#: ../src/adhoc_commands.py:360
+#: ../src/adhoc_commands.py:399
 msgid "Service changed the session identifier."
 msgstr "Der Dienst änderte die Sitzungskennung."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:471
+#: ../src/adhoc_commands.py:513
 msgid "Service returned an error."
 msgstr "Der Dienst gab einen Fehler zurück."
 
@@ -3019,7 +3235,7 @@ msgstr "Ganzzahl"
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:945
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
 msgid "Color"
 msgstr "Farbe"
 
@@ -3056,140 +3272,140 @@ msgstr[1] "Sie haben neue Einträge erhalten (und %d werden nicht angezeigt):"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "English"
 msgstr "Englisch"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Belarusian"
 msgstr "Weißrussisch"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Bulgarian"
 msgstr "Bulgarisch"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Breton"
 msgstr "Bretonisch"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Czech"
 msgstr "Tschechisch"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "German"
 msgstr "Deutsch"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Greek"
 msgstr "Griechisch"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "British"
 msgstr "Britisch"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Basque"
 msgstr "Baskisch"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "French"
 msgstr "Französisch"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Croatian"
 msgstr "Kroatisch"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Italian"
 msgstr "Italienisch"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian (b)"
 msgstr "Norwegisch (Bokmål)"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Dutch"
 msgstr "Niederländisch"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian"
 msgstr "Norwegisch"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Polish"
 msgstr "Polnisch"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Portuguese"
 msgstr "Portugiesisch"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Brazilian Portuguese"
 msgstr "Brasilianisch"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Russian"
 msgstr "Russsich"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Serbian"
 msgstr "Serbisch"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Slovak"
 msgstr "Slovakisch"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Swedish"
 msgstr "Schwedisch"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Chinese (Ch)"
 msgstr "Chinesisch"
 
-#: ../src/chat_control.py:479
+#: ../src/chat_control.py:496
 msgid "Spelling language"
 msgstr "Sprache für die Rechtschreibprüfung"
 
 #. we are not connected
-#: ../src/chat_control.py:511 ../src/chat_control.py:720
+#: ../src/chat_control.py:528 ../src/chat_control.py:737
 msgid "A connection is not available"
 msgstr "Keine Verbindung verfügbar"
 
-#: ../src/chat_control.py:512 ../src/chat_control.py:721
+#: ../src/chat_control.py:529 ../src/chat_control.py:738
 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:927
+#: ../src/chat_control.py:944
 msgid "Underline"
 msgstr "Unterstrichen"
 
-#: ../src/chat_control.py:928
+#: ../src/chat_control.py:945
 msgid "Strike"
 msgstr "Durchgestrichen"
 
-#: ../src/chat_control.py:951
+#: ../src/chat_control.py:968
 msgid "Font"
 msgstr "Schriftart"
 
-#: ../src/chat_control.py:960
+#: ../src/chat_control.py:977
 msgid "Clear formating"
 msgstr "Formatierung löschen"
 
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1055
 msgid "Really send file?"
 msgstr "Datei wirklich senden?"
 
-#: ../src/chat_control.py:1039
+#: ../src/chat_control.py:1056
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
@@ -3197,49 +3413,49 @@ msgstr ""
 "kennen."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/chat_control.py:1503 ../src/chat_control.py:1987
+#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
 msgid "GPG encryption enabled"
 msgstr "GPG-Verschlüsselung aktiviert"
 
 #. Add to roster
-#: ../src/chat_control.py:1528 ../src/common/contacts.py:158
+#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
 #: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:245 ../src/dialogs.py:1064 ../src/dialogs.py:2078
-#: ../src/dialogs.py:2107 ../src/gui_interface.py:674
+#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
+#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
 #: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1610 ../src/roster_window.py:1612
-#: ../src/roster_window.py:1942 ../src/roster_window.py:3289
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
+#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
+#: ../src/roster_window.py:3382
 msgid "Not in Roster"
 msgstr "Nicht in der Kontaktliste"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1575
 msgid "This contact does not support file transfer."
 msgstr "Der Kontakt unterstützt keine Dateiübertragung."
 
-#: ../src/chat_control.py:1561
+#: ../src/chat_control.py:1578
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 "Sie müssen die JID des Kontakts kennen, um ihm oder ihr eine Datei zu senden."
 
-#: ../src/chat_control.py:1656
+#: ../src/chat_control.py:1677
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s Status: %(state)s, Grund: %(reason)s"
 
-#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:1869
 #, 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:1967 ../src/dialogs.py:4866
+#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
 msgid "No GPG key assigned"
 msgstr "Kein GPG-Schlüssel zugewiesen"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/chat_control.py:1968
+#: ../src/chat_control.py:1991
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3248,50 +3464,50 @@ msgstr ""
 "GPG verschlüsselt werden."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/chat_control.py:1977
+#: ../src/chat_control.py:2000
 msgid "GPG encryption disabled"
 msgstr "GPG-Verschlüsselung deaktiviert"
 
-#: ../src/chat_control.py:2003
+#: ../src/chat_control.py:2026
 msgid "Session WILL be logged"
 msgstr "Sitzung WIRD aufgezeichnet"
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:2028
 msgid "Session WILL NOT be logged"
 msgstr "Sitzung WIRD NICHT aufgezeichnet"
 
 #. encryption %s active
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is"
 msgstr "ist"
 
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is NOT"
 msgstr "ist NICHT"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will"
 msgstr "wird"
 
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will NOT"
 msgstr "wird NICHT"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2051
 msgid "and authenticated"
 msgstr "und authentifiziert"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2032
+#: ../src/chat_control.py:2055
 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:2039
+#: ../src/chat_control.py:2062
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3300,23 +3516,32 @@ msgstr ""
 "%(type)s Verschlüsselung %(status)s aktiv %(authenticated)s.\n"
 "Ihre Chatsitzung %(logged)s mitgeschrieben."
 
-#: ../src/chat_control.py:2182
+#: ../src/chat_control.py:2205
 msgid "Session negotiation cancelled"
 msgstr "Sitzungsaushandlung abgebrochen"
 
-#: ../src/chat_control.py:2191
+#: ../src/chat_control.py:2215
+msgid "This session WILL be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2217
+#, fuzzy
+msgid "This session WILL NOT be archived on server"
+msgstr "Sitzung WIRD NICHT aufgezeichnet"
+
+#: ../src/chat_control.py:2226
 msgid "This session is encrypted"
 msgstr "Diese Sitzung ist verschlüsselt"
 
-#: ../src/chat_control.py:2194
+#: ../src/chat_control.py:2229
 msgid " and WILL be logged"
 msgstr " und wird AUFGEZEICHNET"
 
-#: ../src/chat_control.py:2196
+#: ../src/chat_control.py:2231
 msgid " and WILL NOT be logged"
 msgstr " und wird NICHT AUFGEZEICHNET"
 
-#: ../src/chat_control.py:2201
+#: ../src/chat_control.py:2236
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3324,25 +3549,25 @@ msgstr ""
 "Die Identität des Gesprächspartners wurde nicht überprüft. Mehr "
 "Informationen durch Klicken auf das Schild-Symbol."
 
-#: ../src/chat_control.py:2203
+#: ../src/chat_control.py:2238
 msgid "E2E encryption disabled"
 msgstr "E2E-Verschlüsselung deaktiviert"
 
-#: ../src/chat_control.py:2241 ../src/chat_control.py:2254
+#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
 msgid "The following message was NOT encrypted"
 msgstr "Die folgende Nachricht wurde UNVERSCHLÜSSELT übertragen"
 
-#: ../src/chat_control.py:2247
+#: ../src/chat_control.py:2288
 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:2519
+#: ../src/chat_control.py:2566
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Sie haben eine neue Nachricht von \"%s\" erhalten"
 
-#: ../src/chat_control.py:2520
+#: ../src/chat_control.py:2567
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3350,15 +3575,13 @@ msgstr ""
 "Wenn Sie das Fenster schließen und der Verlauf abgeschaltet ist, geht die "
 "Nachricht verloren."
 
-#: ../src/chat_control.py:2663 ../src/common/connection_handlers.py:1635
-#: ../src/common/connection_handlers.py:1758
-#: ../src/common/connection_handlers.py:1960
-#: ../src/common/connection_handlers.py:2110 ../src/common/connection.py:452
+#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
 #: ../src/gajim.py:159 ../src/session.py:138
 msgid "Database Error"
 msgstr "Datenbankfehler"
 
-#: ../src/chat_control.py:2664
+#: ../src/chat_control.py:2714
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3367,7 +3590,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:2906
+#: ../src/chat_control.py:2962
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s ist jetzt %(status)s"
@@ -3381,28 +3604,28 @@ msgstr "Erstelle Log-Datenbank"
 msgid "creating cache database"
 msgstr "Erstelle Log-Datenbank"
 
-#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
-#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
-#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
-#: ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
 #, 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:275 ../src/common/check_paths.py:282
-#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
-#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
-#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:333
+#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
+#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
+#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
 msgid "Gajim will now exit"
 msgstr "Gajim wird nun beendet"
 
-#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
+#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
 #, 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:342
+#: ../src/common/check_paths.py:351
 #, python-format
 msgid "creating %s directory"
 msgstr "Erstelle Verzeichnis %s"
@@ -3466,9 +3689,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:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:801
-#: ../src/roster_window.py:1614 ../src/roster_window.py:1616
-#: ../src/roster_window.py:5251
+#: ../src/common/helpers.py:57 ../src/roster_window.py:815
+#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
+#: ../src/roster_window.py:5323
 msgid "Groupchats"
 msgstr "Gruppenchat"
 
@@ -3534,7 +3757,9 @@ msgstr ""
 
 # FIXME: Check English
 #: ../src/common/config.py:88
-msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+#, fuzzy
+msgid ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 "Legt fest, wann das Systemleisten-Symbol angezeigt wird. Mögliche Werte: "
 "'never', 'on_event', 'always'."
@@ -3587,9 +3812,9 @@ msgstr ""
 "eingeklappt sind."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:501
-#: ../src/common/optparser.py:290 ../src/common/optparser.py:486
-#: ../src/common/optparser.py:520 ../src/gui_interface.py:3370
+#: ../src/common/config.py:106 ../src/common/config.py:505
+#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
+#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
 msgid "default"
 msgstr "Standard"
 
@@ -3822,7 +4047,8 @@ 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:197
-msgid "Notify of events in the system trayicon."
+#, fuzzy
+msgid "Notify of events in the notification area."
 msgstr "Neue Ereignisse per Trayicon anzeigen"
 
 #: ../src/common/config.py:203
@@ -3862,9 +4088,10 @@ msgstr ""
 "hervorgehoben werden sollen."
 
 #: ../src/common/config.py:221
+#, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
+"setting is taken into account only if notification icon is used."
 msgstr ""
 "Falls aktiviert, wird Gajim beendet, wenn der X-Button des Fenstermanagers "
 "geklickt wird. Diese Option funktioniert nur, wenn das Trayicon verwendet "
@@ -4149,9 +4376,10 @@ msgstr ""
 "Zeilen werden gelöscht."
 
 #: ../src/common/config.py:270
+#, fuzzy
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
-"systray icon."
+"notification icon."
 msgstr ""
 "Falls aktiviert, werden Benachrichtigungsfenster vom Benachrichtigungsdienst "
 "an das Systray-Icon angehängt."
@@ -4362,11 +4590,15 @@ msgstr ""
 msgid "Message that is sent to contacts you want to add"
 msgstr "Bitte geben Sie die Daten des neuen Kontakts ein"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:374
+msgid "Last time we syncronized with logs from server."
+msgstr ""
+
+#: ../src/common/config.py:436
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Ist OpenPGP für diesen Kontakt aktiviert?"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4374,102 +4606,109 @@ msgstr ""
 "Soll automatisch eine ESession-Verschlüsselung mit diesem Kontakt gestartet "
 "werden?"
 
-#: ../src/common/config.py:437 ../src/common/config.py:440
+#: ../src/common/config.py:438 ../src/common/config.py:441
 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:446
+#: ../src/common/config.py:447
 msgid "all or space separated status"
 msgstr "alle oder durch Leerzeichen getrennte Status"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:448
 msgid "'yes', 'no', or 'both'"
 msgstr "'ja', 'nein' oder 'beide'"
 
-#: ../src/common/config.py:448 ../src/common/config.py:450
-#: ../src/common/config.py:451 ../src/common/config.py:454
-#: ../src/common/config.py:455
+#: ../src/common/config.py:449 ../src/common/config.py:451
+#: ../src/common/config.py:452 ../src/common/config.py:455
+#: ../src/common/config.py:456
 msgid "'yes', 'no' or ''"
 msgstr "'ja, 'nein' oder ''"
 
-#: ../src/common/config.py:461 ../src/common/pep.py:157
+#: ../src/common/config.py:460
+msgid ""
+"State whether plugins should be activated on exit (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
+msgstr ""
+
+#: ../src/common/config.py:465 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Schlafen"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back soon"
 msgstr "Bin gleich wieder da"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back in some minutes."
 msgstr "Bin in ein paar Minuten zurück."
 
-#: ../src/common/config.py:463 ../src/common/pep.py:127
+#: ../src/common/config.py:467 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Essen"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:467
 msgid "I'm eating, so leave me a message."
 msgstr "Ich esse gerade, bitte hinterlasse eine Nachricht."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "I'm watching a movie."
 msgstr "Ich sehe mir einen Film an."
 
-#: ../src/common/config.py:465 ../src/common/pep.py:186
+#: ../src/common/config.py:469 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Arbeiten"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:469
 msgid "I'm working."
 msgstr "Ich arbeite."
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "I'm on the phone."
 msgstr "Ich telefoniere."
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "Out"
 msgstr "Draußen"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "I'm out enjoying life."
 msgstr "Ich bin draußen und genieße das Leben."
 
-#: ../src/common/config.py:478
+#: ../src/common/config.py:482
 msgid "I'm available."
 msgstr "Ich bin angemeldet."
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:483
 msgid "I'm free for chat."
 msgstr "Ich bin frei zum Chatten."
 
-#: ../src/common/config.py:480 ../src/config.py:1600
+#: ../src/common/config.py:484 ../src/config.py:1600
 msgid "Be right back."
 msgstr "Bin gleich zurück."
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:485
 msgid "I'm not available."
 msgstr "Ich bin nicht verfügbar."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:486
 msgid "Do not disturb."
 msgstr "Bitte nicht stören."
 
-#: ../src/common/config.py:483 ../src/common/config.py:484
+#: ../src/common/config.py:487 ../src/common/config.py:488
 msgid "Bye!"
 msgstr "Auf Wiedersehen!"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:498
 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."
@@ -4477,58 +4716,58 @@ 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:495
+#: ../src/common/config.py:499
 msgid "Sound to play when any MUC message arrives."
 msgstr "Ton, der bei einer neuen Chatraum-Nachricht abgespielt werden soll"
 
-#: ../src/common/config.py:504 ../src/common/optparser.py:304
+#: ../src/common/config.py:508 ../src/common/optparser.py:308
 msgid "green"
 msgstr "grün"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:290
+#: ../src/common/config.py:512 ../src/common/optparser.py:294
 msgid "grocery"
 msgstr "Lebensmittel"
 
-#: ../src/common/config.py:512
+#: ../src/common/config.py:516
 msgid "human"
 msgstr "Menschlich"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:520
 msgid "marine"
 msgstr "Marine"
 
-#: ../src/common/connection_handlers.py:84
+#: ../src/common/connection_handlers.py:94
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Konnte Idle-Modul nicht laden"
 
-#: ../src/common/connection_handlers.py:117
+#: ../src/common/connection_handlers.py:127
 #, 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:124
+#: ../src/common/connection_handlers.py:134
 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:125
+#: ../src/common/connection_handlers.py:135
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registrierung mit Agent %s war erfolgreich"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 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:133
+#: ../src/common/connection_handlers.py:143
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -4536,40 +4775,36 @@ msgstr ""
 "Registrierung mit Agent %(agent)s ist mit Fehler %(error)s fehlgeschlagen: "
 "%(error_msg)s"
 
-#: ../src/common/connection_handlers.py:445
-#: ../src/common/connection_handlers.py:1633
-#: ../src/common/connection_handlers.py:1756
-#: ../src/common/connection_handlers.py:1957
-#: ../src/common/connection_handlers.py:2108 ../src/common/connection.py:449
+#: ../src/common/connection_handlers.py:466
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
 #: ../src/gajim.py:341
 msgid "Disk Write Error"
 msgstr "Fehler beim Schreiben auf Festplatte"
 
-#: ../src/common/connection_handlers.py:678 ../src/common/connection.py:1472
+#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
 msgid "Invisibility not supported"
 msgstr "Unsichtbarkeit wird nicht unterstützt"
 
-#: ../src/common/connection_handlers.py:679 ../src/common/connection.py:1473
+#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Das Konto %s unterstützt keine Unsichtbarkeit."
 
-#: ../src/common/connection_handlers.py:1446 ../src/common/connection.py:253
-#: ../src/config.py:2091 ../src/config.py:2100 ../src/config.py:2168
-#: ../src/config.py:3560 ../src/dataforms_widget.py:597 ../src/dialogs.py:2931
+#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
+#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
+#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
 msgid "Invalid Jabber ID"
 msgstr "Ungültige Jabber-ID"
 
-#: ../src/common/connection_handlers.py:1447
+#: ../src/common/connection_handlers.py:1405
 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:1636
-#: ../src/common/connection_handlers.py:1759
-#: ../src/common/connection_handlers.py:1961
-#: ../src/common/connection_handlers.py:2111 ../src/common/connection.py:453
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
 #: ../src/gajim.py:160 ../src/session.py:139
 #, python-format
 msgid ""
@@ -4580,91 +4815,6 @@ msgstr ""
 "reparieren (http://trac.gajim.org/wiki/DatabaseBackup (Englisch)) oder zu "
 "löschen (dabei gehen alle Verläufe verloren)."
 
-#: ../src/common/connection_handlers.py:1805
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Spitzname nicht erlaubt: %s"
-
-#: ../src/common/connection_handlers.py:1902
-#: ../src/common/connection_handlers.py:1911
-#: ../src/common/connection_handlers.py:1918
-#: ../src/common/connection_handlers.py:1922
-#: ../src/common/connection_handlers.py:1926
-#: ../src/common/connection_handlers.py:1931 ../src/gui_interface.py:139
-msgid "Unable to join group chat"
-msgstr "Fehler beim Betreten des Chatraums"
-
-#: ../src/common/connection_handlers.py:1903
-#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr "Die maximale Anzahl an Benutzern für %s wurde erreicht"
-
-#: ../src/common/connection_handlers.py:1912
-#, python-format
-msgid "You are banned from group chat %s."
-msgstr "Sie wurden aus dem Chatraum %s verbannt."
-
-#: ../src/common/connection_handlers.py:1919
-#, python-format
-msgid "Group chat %s does not exist."
-msgstr "Der Chatraum %s existiert nicht."
-
-#: ../src/common/connection_handlers.py:1923
-msgid "Group chat creation is restricted."
-msgstr "Die Chatraumerstellung ist eingeschränkt."
-
-#: ../src/common/connection_handlers.py:1927
-#, 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:1932
-#, 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:1976
-msgid "Room has been destroyed"
-msgstr "Der Chatraum wurde gelöscht"
-
-#: ../src/common/connection_handlers.py:1984
-#, python-format
-msgid "You can join this room instead: %s"
-msgstr "Sie können stattdessen diesen Chatraum betreten: %s"
-
-#: ../src/common/connection_handlers.py:2020
-msgid "I would like to add you to my roster."
-msgstr "Ich würde Sie gerne als Kontakt zu meiner Kontaktliste hinzufügen."
-
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2041
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "Sie haben jetzt %s abonniert"
-
-#: ../src/common/connection_handlers.py:2043
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "Anfrage zur Beendigung des Abonnements von %s"
-
-#: ../src/common/connection_handlers.py:2045
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "%s hat das Abonnement beendet"
-
-#: ../src/common/connection_handlers.py:2240
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"Die Jabber-ID %s ist nicht RFC-konform und wird nicht zu Ihrer Kontaktliste "
-"hinzugefügt. Verwenden Sie ein Kontaktlisten-Managment-Tool wie <http://jru."
-"jabberstudio.org/>, um sie zu entfernen."
-
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr "Das Zertifikat des Ausstellers ist nicht verfügbar."
@@ -4796,19 +4946,19 @@ msgstr ""
 msgid "Application verification failure"
 msgstr "Fehler beim Überprüfen der Anwendung"
 
-#: ../src/common/connection.py:254 ../src/dialogs.py:2932
+#: ../src/common/connection.py:256 ../src/dialogs.py:2948
 #, 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:276
+#: ../src/common/connection.py:278
 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:279
+#: ../src/common/connection.py:281
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr ""
@@ -4817,11 +4967,11 @@ msgstr ""
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:331
+#: ../src/common/connection.py:333
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Diese Nachricht ist *verschlüsselt* (Siehe: JEP:`27`)]"
 
-#: ../src/common/connection.py:439
+#: ../src/common/connection.py:441
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4830,83 +4980,83 @@ msgstr ""
 "Thema: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:807
+#: ../src/common/connection.py:809
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Verbindung mit Konto \"%s\" abgebrochen"
 
-#: ../src/common/connection.py:808
+#: ../src/common/connection.py:810
 msgid "Reconnect manually."
 msgstr "Manuelle Neuverbindung."
 
-#: ../src/common/connection.py:820
+#: ../src/common/connection.py:822
 #, 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:854
+#: ../src/common/connection.py:856
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Der Server %s hat ein anderes Registrierungsformular angeboten"
 
-#: ../src/common/connection.py:867
+#: ../src/common/connection.py:869
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Unbekannter SSL-Fehler: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:882
+#: ../src/common/connection.py:884
 msgid "Invalid answer"
 msgstr "Ungültige Antwort"
 
-#: ../src/common/connection.py:883
+#: ../src/common/connection.py:885
 #, 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:1165 ../src/common/connection.py:1294
-#: ../src/common/connection.py:1784
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
+#: ../src/common/connection.py:1792
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Die Verbindung mit %s konnte nicht hergestellt werden."
 
-#: ../src/common/connection.py:1166 ../src/gui_interface.py:755
+#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
 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:1171
+#: ../src/common/connection.py:1173
 #, python-format
 msgid "Server replied: %s"
 msgstr "Server antwortete: %s"
 
-#: ../src/common/connection.py:1184
+#: ../src/common/connection.py:1186
 msgid "Connection to proxy failed"
 msgstr "Verbindung mit Proxy fehlgeschlagen"
 
-#: ../src/common/connection.py:1215 ../src/common/connection.py:1274
+#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Die Verbindung zum Konto %s konnte nicht hergestellt werden."
 
-#: ../src/common/connection.py:1216 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
 #, 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:1241
+#: ../src/common/connection.py:1243
 #, 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:1244
+#: ../src/common/connection.py:1246
 #, python-format
 msgid ""
 "\n"
@@ -4915,7 +5065,7 @@ msgstr ""
 "\n"
 "SSL-Fehler: <b>%s</b>"
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1248
 #, python-format
 msgid ""
 "\n"
@@ -4924,24 +5074,24 @@ msgstr ""
 "\n"
 "Unbekannter SSL-Fehler: %d"
 
-#: ../src/common/connection.py:1295
+#: ../src/common/connection.py:1297
 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:1324
+#: ../src/common/connection.py:1329
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Authentifizierung mit \"%s\" fehlgeschlagen"
 
-#: ../src/common/connection.py:1326
+#: ../src/common/connection.py:1331
 msgid "Please check your login and password for correctness."
 msgstr "Bitte überprüfen Sie Benutzernamen und Passwort."
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1400
 msgid "Error while removing privacy list"
 msgstr "Fehler beim Entfernen der Privatsphären-Liste"
 
-#: ../src/common/connection.py:1396
+#: ../src/common/connection.py:1401
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4951,39 +5101,39 @@ msgstr ""
 "in einer Ihrer Verbindungen aktiv. Deaktivieren Sie diese und versuchen Sie "
 "es erneut."
 
-#: ../src/common/connection.py:1650
+#: ../src/common/connection.py:1658
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Kontakt gesendet: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1653
+#: ../src/common/connection.py:1661
 msgid "Sent contacts:"
 msgstr "Gesendete Kontakte:"
 
-#: ../src/common/connection.py:1799 ../src/common/connection.py:1822
+#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
 msgid "Not fetched because of invisible status"
 msgstr "Nicht abgeholt, da der Status auf Unsichtbar gesetzt ist"
 
-#: ../src/common/connection.py:2254
+#: ../src/common/connection.py:2262
 msgid "Unregister failed"
 msgstr "De-Registrierung fehlgeschlagen"
 
-#: ../src/common/connection.py:2255
+#: ../src/common/connection.py:2263
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr "De-Registrierung mit Server %(server)s fehlgeschlagen: %(error)s"
 
 #: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:674
+#: ../src/gui_interface.py:551
 msgid "Observers"
 msgstr "Beobachter"
 
 #: ../src/common/contacts.py:139 ../src/common/contacts.py:366
 #: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1499 ../src/gui_interface.py:424
-#: ../src/roster_window.py:840 ../src/roster_window.py:1525
-#: ../src/roster_window.py:1606 ../src/roster_window.py:1608
-#: ../src/roster_window.py:1769
+#: ../src/disco.py:1517 ../src/roster_window.py:854
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
+#: ../src/roster_window.py:2466
 msgid "Transports"
 msgstr "Transporte"
 
@@ -5211,203 +5361,219 @@ msgstr "Ende der Woche"
 msgid "Weekend!"
 msgstr "Wochenende!"
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:148
+msgid "Username must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:153
 msgid "Invalid character in username."
 msgstr "Ungültiges Zeichen im Benutzernamen"
 
-#: ../src/common/helpers.py:156
-msgid "Server address required."
-msgstr "Server-Adresse benötigt."
+#: ../src/common/helpers.py:159
+msgid "Server must be between 1 and 1023 chars"
+msgstr ""
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 msgid "Invalid character in hostname."
 msgstr "Ungültiges Zeichen im Rechnernamen."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:166
+msgid "Server address required."
+msgstr "Server-Adresse benötigt."
+
+#: ../src/common/helpers.py:170
+msgid "Resource must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:175
 msgid "Invalid character in resource."
 msgstr "Ungültiges Zeichen in der Ressource."
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:215
 msgid "_Busy"
 msgstr "_Beschäftigt"
 
-#: ../src/common/helpers.py:211 ../src/tooltips.py:195
+#: ../src/common/helpers.py:217 ../src/tooltips.py:195
 msgid "Busy"
 msgstr "Beschäftigt"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:220
 msgid "_Not Available"
 msgstr "_Nicht verfügbar"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:225
 msgid "_Free for Chat"
 msgstr "_Frei zum Chatten"
 
-#: ../src/common/helpers.py:221 ../src/tooltips.py:191
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Free for Chat"
 msgstr "Frei zum Chatten"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:230
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?Transferstatus:Pausiert"
 
-#: ../src/common/helpers.py:226 ../src/tooltips.py:189
+#: ../src/common/helpers.py:232 ../src/tooltips.py:189
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?Transferstatus:Pausiert"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:234
 msgid "Connecting"
 msgstr "Verbindung wird hergestellt"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:237
 msgid "A_way"
 msgstr "Ab_wesend"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:242
 msgid "_Offline"
 msgstr "A_bgemeldet"
 
-#: ../src/common/helpers.py:238 ../src/tooltips.py:199
+#: ../src/common/helpers.py:244 ../src/tooltips.py:199
 msgid "Offline"
 msgstr "Abgemeldet"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:247
 msgid "_Invisible"
 msgstr "_Unsichtbar"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:253
 msgid "?contact has status:Unknown"
 msgstr "?Kontakt hat Status: Unbekannt"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:255
 msgid "?contact has status:Has errors"
 msgstr "?Kontakt hat Status: Hat einen Fehler"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:260
 msgid "?Subscription we already have:None"
 msgstr "?Abonnement schon vorhanden:Keines"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:262
 msgid "To"
 msgstr "An"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
+msgid "From"
+msgstr "Von"
+
+#: ../src/common/helpers.py:266
 msgid "Both"
 msgstr "Beide"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:274
 msgid "?Ask (for Subscription):None"
 msgstr "?Frage nach Abonnement: Keine"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:276
 msgid "Subscribe"
 msgstr "Abonnieren"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:285
 msgid "?Group Chat Contact Role:None"
 msgstr "?Gruppenchat Kontaktrolle: Keine"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:288
 msgid "Moderators"
 msgstr "Moderatoren"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:290
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:293
 msgid "Participants"
 msgstr "Teilnehmer"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:295
 msgid "Participant"
 msgstr "Teilnehmer"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:298
 msgid "Visitors"
 msgstr "Besucher"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:300
 msgid "Visitor"
 msgstr "Besucher"
 
-#: ../src/common/helpers.py:300 ../src/tooltips.py:210
+#: ../src/common/helpers.py:306 ../src/tooltips.py:210
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Gruppenchat Kontaktverbindung:Keine"
 
-#: ../src/common/helpers.py:302 ../src/tooltips.py:216
+#: ../src/common/helpers.py:308 ../src/tooltips.py:216
 msgid "Owner"
 msgstr "Besitzer"
 
-#: ../src/common/helpers.py:304 ../src/tooltips.py:214
+#: ../src/common/helpers.py:310 ../src/tooltips.py:214
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:212
+#: ../src/common/helpers.py:312 ../src/tooltips.py:212
 msgid "Member"
 msgstr "Mitglied"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:351
 msgid "is paying attention to the conversation"
 msgstr "beobachtet diese Unterhaltung"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:353
 msgid "is doing something else"
 msgstr "tut etwas anderes"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:355
 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:352
+#: ../src/common/helpers.py:358
 msgid "paused composing a message"
 msgstr "macht gerade eine Schreibpause"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:360
 msgid "has closed the chat window or tab"
 msgstr "hat das Chatfenster oder den Tab geschlossen"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:619
+#: ../src/common/helpers.py:625
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:622
+#: ../src/common/helpers.py:628
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:626
+#: ../src/common/helpers.py:632
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:629
+#: ../src/common/helpers.py:635
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:633
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:636
+#: ../src/common/helpers.py:642
 #, python-format
 msgid "%s KB"
 msgstr "%s kB"
 
 #. B means bytes
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:645
 #, python-format
 msgid "%s B"
 msgstr "%s B"
@@ -5450,12 +5616,12 @@ msgstr "Gajim - %s"
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:111
+#: ../src/common/jingle_rtp.py:107
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Chatraum-Einstellungen"
 
-#: ../src/common/jingle_rtp.py:112
+#: ../src/common/jingle_rtp.py:108
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5467,30 +5633,30 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:209
+#: ../src/common/jingle_rtp.py:205
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:210
+#: ../src/common/jingle_rtp.py:206
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Fehlermeldung: %s"
 
-#: ../src/common/jingle_rtp.py:336
+#: ../src/common/jingle_rtp.py:335
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:339
+#: ../src/common/jingle_rtp.py:338
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:382
+#: ../src/common/jingle_rtp.py:381
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:390
+#: ../src/common/jingle_rtp.py:389
 msgid "video output"
 msgstr ""
 
@@ -5568,11 +5734,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "Fehler: %s kann nicht zum Lesen geöffnet werden"
 
-#: ../src/common/optparser.py:299 ../src/common/optparser.py:300
+#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:379
+#: ../src/common/optparser.py:383
 msgid "migrating logs database to indices"
 msgstr "migriere Logdatenbank zu Indizes"
 
@@ -6243,7 +6409,7 @@ msgid ""
 msgstr "Möglicherweise läuft Gajim bereits. Dateiübertragung wird abgebrochen."
 
 #. we're not english
-#: ../src/common/stanza_session.py:303
+#: ../src/common/stanza_session.py:423
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6251,11 +6417,11 @@ msgstr ""
 "[Dies ist ein Teil einer verschlüsselten Unterhaltung. Wenn Sie diese "
 "Nachricht sehen, ist etwas schief gegangen.]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:178
+#: ../src/common/zeroconf/connection_zeroconf.py:181
 msgid "Avahi error"
 msgstr "Avahi-Fehler"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:179
+#: ../src/common/zeroconf/connection_zeroconf.py:182
 #, python-format
 msgid ""
 "%s\n"
@@ -6264,44 +6430,44 @@ msgstr ""
 "%s\n"
 "Lokaler Nachrichtenversand funktioniert eventuell nicht richtig."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:190
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Bitte überprüfen Sie, ob Avahi bzw. Bonjour installiert ist."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:199
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Could not start local service"
 msgstr "Lokaler Dienst konnte nicht gestartet werden"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Die Verbindung mit Port %d ist fehlgeschlagen."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-#: ../src/common/zeroconf/connection_zeroconf.py:283
-#: ../src/common/zeroconf/connection_zeroconf.py:294
-#: ../src/common/zeroconf/connection_zeroconf.py:308
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:286
+#: ../src/common/zeroconf/connection_zeroconf.py:297
+#: ../src/common/zeroconf/connection_zeroconf.py:311
 msgid "Please check if avahi-daemon is running."
 msgstr "Bitte überprüfen Sie, ob avahi-daemon läuft."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:282
-#: ../src/common/zeroconf/connection_zeroconf.py:293
-#: ../src/common/zeroconf/connection_zeroconf.py:307
+#: ../src/common/zeroconf/connection_zeroconf.py:285
+#: ../src/common/zeroconf/connection_zeroconf.py:296
+#: ../src/common/zeroconf/connection_zeroconf.py:310
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Der Status des Kontos \"%s\" konnte nicht geändert werden."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:325
+#: ../src/common/zeroconf/connection_zeroconf.py:328
 msgid "Your message could not be sent."
 msgstr "Die Nachricht konnte nicht gesendet werden."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:335
+#: ../src/common/zeroconf/connection_zeroconf.py:338
 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:360
+#: ../src/common/zeroconf/connection_zeroconf.py:363
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6322,16 +6488,16 @@ msgstr "Standard-Nachricht"
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3078
+#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:739 ../src/dialogs.py:1395
+#: ../src/config.py:733 ../src/dialogs.py:1409
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Kein Wörterburch für die Sprache %s verfügbar"
 
-#: ../src/config.py:740
+#: ../src/config.py:734
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6349,9 +6515,9 @@ msgid "status message text"
 msgstr "Statusnachricht"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2383 ../src/dialogs.py:2449
-#: ../src/dialogs.py:3215 ../src/disco.py:866 ../src/disco.py:1726
-#: ../src/disco.py:2030 ../src/history_window.py:90
+#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
+#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
+#: ../src/disco.py:2048 ../src/history_window.py:90
 msgid "Name"
 msgstr "Name"
 
@@ -6387,7 +6553,7 @@ msgstr "Sie haben mit dem Konto %s einen Chat geöffnet."
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Alle Chatfenster werden geschlossen. Fortfahren?"
 
-#: ../src/config.py:1976 ../src/config.py:2509 ../src/config.py:2545
+#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
 msgid "You are currently connected to the server"
 msgstr "Sie sind mit dem Server verbunden."
 
@@ -6426,140 +6592,140 @@ msgstr "Der Kontoname darf nicht leer sein."
 msgid "Account name cannot contain spaces."
 msgstr "Der Kontoname darf keine Leerzeichen enthalten."
 
-#: ../src/config.py:2072
+#: ../src/config.py:2074
 msgid "Rename Account"
 msgstr "Konto umbenennen"
 
-#: ../src/config.py:2073
+#: ../src/config.py:2075
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Geben Sie einen neuen Namen für das Konto %s ein"
 
-#: ../src/config.py:2101
+#: ../src/config.py:2103
 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:2318 ../src/config.py:3606
+#: ../src/config.py:2320 ../src/config.py:3623
 msgid "Invalid entry"
 msgstr "Ungültiger Eintrag"
 
-#: ../src/config.py:2319 ../src/config.py:3607
+#: ../src/config.py:2321 ../src/config.py:3624
 msgid "Custom port must be a port number."
 msgstr "Der Proxy-Port muss eine gültige Portnummer sein."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2342
 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:2341
+#: ../src/config.py:2343
 msgid "There is no OpenPGP secret key available."
 msgstr "Kein GPG-Schlüssel verfügbar."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/config.py:2375
+#: ../src/config.py:2377
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP-Schlüssel-Auswahl"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/config.py:2376
+#: ../src/config.py:2378
 msgid "Choose your OpenPGP key"
 msgstr "Wählen Sie Ihren OpenPGP-Schlüssel"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2385
 msgid "No such account available"
 msgstr "Das angegebene Konto ist nicht verfügbar"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2386
 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:2391 ../src/dialogs.py:2136 ../src/dialogs.py:2371
-#: ../src/dialogs.py:2557 ../src/disco.py:511 ../src/profile_window.py:339
+#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
+#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
 msgid "You are not connected to the server"
 msgstr "Sie sind nicht mit dem Server verbunden."
 
-#: ../src/config.py:2392
+#: ../src/config.py:2394
 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:2396
+#: ../src/config.py:2398
 msgid "Your server doesn't support Vcard"
 msgstr "Ihr Server unterstützt keine vCard."
 
-#: ../src/config.py:2397
+#: ../src/config.py:2399
 msgid "Your server can't save your personal information."
 msgstr "Ihr Server kann keine persönlichen Informationen speichern."
 
-#: ../src/config.py:2510 ../src/config.py:2546
+#: ../src/config.py:2512 ../src/config.py:2548
 msgid "To disable the account, you must be disconnected."
 msgstr "Zum Deaktivieren des Kontos, müssen Sie offline sein."
 
-#: ../src/config.py:2515
+#: ../src/config.py:2517
 msgid "Account Local already exists."
 msgstr "Ein Konto mit dem Namen 'Local' ist bereits vorhanden."
 
-#: ../src/config.py:2516
+#: ../src/config.py:2518
 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:2673
+#: ../src/config.py:2675
 #, python-format
 msgid "Edit %s"
 msgstr "%s bearbeiten"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2677
 #, python-format
 msgid "Register to %s"
 msgstr "Auf %s registrieren"
 
 #. list at the beginning
-#: ../src/config.py:2711
+#: ../src/config.py:2713
 msgid "Ban List"
 msgstr "Sperrliste"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2714
 msgid "Member List"
 msgstr "Mitgliederliste"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2714
 msgid "Owner List"
 msgstr "Besitzerliste"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2715
 msgid "Administrator List"
 msgstr "Administratorliste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2763 ../src/disco.py:873 ../src/history_manager.py:201
+#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
 msgid "JID"
 msgstr "Jabber-ID"
 
-#: ../src/config.py:2773
+#: ../src/config.py:2789
 msgid "Reason"
 msgstr "Grund"
 
-#: ../src/config.py:2780
+#: ../src/config.py:2796
 msgid "Nick"
 msgstr "Spitzname"
 
-#: ../src/config.py:2786
+#: ../src/config.py:2802
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2813
+#: ../src/config.py:2829
 msgid "Banning..."
 msgstr "Verbannen …"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2815
+#: ../src/config.py:2831
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6567,11 +6733,11 @@ msgstr ""
 "<b>Wen möchten Sie verbannen?</b>\n"
 "\n"
 
-#: ../src/config.py:2817
+#: ../src/config.py:2833
 msgid "Adding Member..."
 msgstr "Mitglied hinzufügen …"
 
-#: ../src/config.py:2818
+#: ../src/config.py:2834
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6579,11 +6745,11 @@ msgstr ""
 "<b>Wen möchten Sie zum Mitglied machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2836
 msgid "Adding Owner..."
 msgstr "Besitzer hinzufügen …"
 
-#: ../src/config.py:2821
+#: ../src/config.py:2837
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6591,11 +6757,11 @@ msgstr ""
 "<b>Wen möchten Sie zum Besitzer machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2823
+#: ../src/config.py:2839
 msgid "Adding Administrator..."
 msgstr "Administrator hinzufügen …"
 
-#: ../src/config.py:2824
+#: ../src/config.py:2840
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6603,7 +6769,7 @@ msgstr ""
 "<b>Wen möchten Sie zum Administrator machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2825
+#: ../src/config.py:2841
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6620,111 +6786,111 @@ msgstr ""
 "benutzer@domain, jede domain/Ressource oder jede Adresse, die eine Subdomain "
 "enthält)."
 
-#: ../src/config.py:2926
+#: ../src/config.py:2943
 #, python-format
 msgid "Removing %s account"
 msgstr "Entferne Konto %s"
 
-#: ../src/config.py:2941
+#: ../src/config.py:2958
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Emoticons deaktiviert"
 
-#: ../src/config.py:2942
+#: ../src/config.py:2959
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2955 ../src/gui_interface.py:1132
-#: ../src/gui_interface.py:1243
+#: ../src/config.py:2972 ../src/gui_interface.py:311
+#: ../src/gui_interface.py:1048
 msgid "Password Required"
 msgstr "Passwort benötigt"
 
-#: ../src/config.py:2956 ../src/gui_interface.py:1223
+#: ../src/config.py:2973 ../src/gui_interface.py:1028
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Bitte geben Sie Ihr Passwort für %s ein"
 
-#: ../src/config.py:2957 ../src/gui_interface.py:1243
+#: ../src/config.py:2974 ../src/gui_interface.py:1048
 msgid "Save password"
 msgstr "Passwort speichern"
 
-#: ../src/config.py:2967
+#: ../src/config.py:2984
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Das Konto \"%s\" ist mit dem Server verbunden"
 
-#: ../src/config.py:2968
+#: ../src/config.py:2985
 msgid "If you remove it, the connection will be lost."
 msgstr "Wenn Sie es entfernen, wird die Verbindung beendet."
 
-#: ../src/config.py:2982
+#: ../src/config.py:2999
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Verbindung mit Proxy fehlgeschlagen"
 
-#: ../src/config.py:2983
+#: ../src/config.py:3000
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Was möchten Sie tun?"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3001
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Kont_o entfernen (nur in Gajim)"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3002
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3078
+#: ../src/config.py:3095
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
 
-#: ../src/config.py:3079
+#: ../src/config.py:3096
 msgid "Enter and leave only"
 msgstr "Nur betreten und verlassen"
 
-#: ../src/config.py:3080
+#: ../src/config.py:3097
 msgid "?print_status:None"
 msgstr "?print_status:Nichts"
 
-#: ../src/config.py:3150
+#: ../src/config.py:3167
 msgid "New Group Chat"
 msgstr "Neuer Gruppenchat"
 
 # TODO: make decisision about how to handle original string referring to a bookmarked groupchat.
-#: ../src/config.py:3183
+#: ../src/config.py:3200
 msgid "This bookmark has invalid data"
 msgstr "Dieser gespeicherte Chatraum beinhaltet ungültige Daten"
 
-#: ../src/config.py:3184
+#: ../src/config.py:3201
 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."
 
 #. invalid char
-#: ../src/config.py:3302 ../src/dialogs.py:1934
+#: ../src/config.py:3319 ../src/dialogs.py:1950
 msgid "Invalid nickname"
 msgstr "Ungültiger Benutzername"
 
-#: ../src/config.py:3303 ../src/config.py:3317 ../src/config.py:3331
+#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
 msgid "Character not allowed"
 msgstr "Zeichen nicht erlaubt"
 
-#: ../src/config.py:3316 ../src/config.py:3582
+#: ../src/config.py:3333 ../src/config.py:3599
 msgid "Invalid server"
 msgstr "Ungültiger Server"
 
-#: ../src/config.py:3330
+#: ../src/config.py:3347
 msgid "Invalid room"
 msgstr "Ungültiger Raum"
 
-#: ../src/config.py:3498
+#: ../src/config.py:3515
 msgid "Account has been added successfully"
 msgstr "Konto wurde erfolgreich hinzugefügt"
 
-#: ../src/config.py:3499 ../src/config.py:3505
+#: ../src/config.py:3516 ../src/config.py:3522
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menu item under the Edit menu from the main "
@@ -6734,35 +6900,35 @@ msgstr ""
 "Button drücken, oder später den Eintrag Konto im Ändern Menü in der "
 "Kontaktliste auswählen."
 
-#: ../src/config.py:3504
+#: ../src/config.py:3521
 msgid "Your new account has been created successfully"
 msgstr "Ihr neues Konto wurde erfolgreich erstellt"
 
-#: ../src/config.py:3543
+#: ../src/config.py:3560
 msgid "Invalid username"
 msgstr "Ungültiger Benutzername"
 
-#: ../src/config.py:3545
+#: ../src/config.py:3562
 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:3583
+#: ../src/config.py:3600
 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:3639 ../src/gui_interface.py:1904
+#: ../src/config.py:3656 ../src/gui_interface.py:1693
 msgid "Certificate Already in File"
 msgstr "Zertifikat bereits in der Datei"
 
-#: ../src/config.py:3640 ../src/gui_interface.py:1905
+#: ../src/config.py:3657 ../src/gui_interface.py:1694
 #, 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:3717
+#: ../src/config.py:3734
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6777,7 +6943,7 @@ msgstr ""
 "SSL-Fehler: %(error)s\n"
 "Möchten Sie sich dennoch zum Server verbinden?"
 
-#: ../src/config.py:3723 ../src/gui_interface.py:1932
+#: ../src/config.py:3740 ../src/gui_interface.py:1721
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6788,63 +6954,72 @@ msgstr ""
 "SHA1-Fingerprint dieses Zertifikates:\n"
 "%s"
 
-#: ../src/config.py:3755 ../src/config.py:3789
+#: ../src/config.py:3772 ../src/config.py:3806
 msgid "An error occurred during account creation"
 msgstr "Während der Konto-Erstellung ist ein Fehler aufgetreten"
 
-#: ../src/config.py:3854
+#: ../src/config.py:3871
 msgid "Account name is in use"
 msgstr "Der Kontoname ist bereits vergeben"
 
-#: ../src/config.py:3855
+#: ../src/config.py:3872
 msgid "You already have an account using this name."
 msgstr "Sie haben bereits ein Konto mit diesem Namen."
 
-#: ../src/config.py:4009
+#: ../src/config.py:3991
+msgid "PEP node was not removed"
+msgstr "PEP-Knoten wurde nicht entfernt"
+
+#: ../src/config.py:3992
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr "Der PEP-Knoten %(node)s wurde nicht entfernt: %(message)s"
+
+#: ../src/config.py:4036
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:4017
+#: ../src/config.py:4044
 msgid "Event"
 msgstr "Ereignis"
 
-#: ../src/config.py:4052
+#: ../src/config.py:4079
 msgid "First Message Received"
 msgstr "Erste empfangene Nachricht"
 
-#: ../src/config.py:4053
+#: ../src/config.py:4080
 msgid "Next Message Received Focused"
 msgstr "Nächste empfangene Nachricht ausgewählt"
 
-#: ../src/config.py:4055
+#: ../src/config.py:4082
 msgid "Next Message Received Unfocused"
 msgstr "Nächste empfangene Nachricht nicht ausgewählt"
 
-#: ../src/config.py:4056
+#: ../src/config.py:4083
 msgid "Contact Connected"
 msgstr "Kontakt verbunden"
 
-#: ../src/config.py:4057
+#: ../src/config.py:4084
 msgid "Contact Disconnected"
 msgstr "Kontakt nicht verbunden"
 
-#: ../src/config.py:4058
+#: ../src/config.py:4085
 msgid "Message Sent"
 msgstr "Nachricht gesendet"
 
-#: ../src/config.py:4059
+#: ../src/config.py:4086
 msgid "Group Chat Message Highlight"
 msgstr "Hervorhebung von Chatraum-Nachrichten"
 
-#: ../src/config.py:4060
+#: ../src/config.py:4087
 msgid "Group Chat Message Received"
 msgstr "Chatraum-Nachricht empfangen"
 
-#: ../src/config.py:4061
+#: ../src/config.py:4088
 msgid "GMail Email Received"
 msgstr "E-Mail über Google-Mail empfangen"
 
-#: ../src/conversation_textview.py:600
+#: ../src/conversation_textview.py:601
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6854,7 +7029,7 @@ msgstr ""
 "am anderen Ende eingetroffen ist. Falls es längere\n"
 "Zeit bleibt, ging die Nachricht höchstwahrscheinlich verloren."
 
-#: ../src/conversation_textview.py:619
+#: ../src/conversation_textview.py:620
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6862,44 +7037,44 @@ msgstr ""
 "Der Text unterhalb dieser Linie zeigt, was seit Ihrem letzten Besuch in "
 "diesem Chatraum gesagt wurde."
 
-#: ../src/conversation_textview.py:739
+#: ../src/conversation_textview.py:740
 msgid "_Quote"
 msgstr "_Zitieren"
 
-#: ../src/conversation_textview.py:746
+#: ../src/conversation_textview.py:747
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Aktionen für \"%s\""
 
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Read _Wikipedia Article"
 msgstr "_Wikipedia-Artikel lesen"
 
-#: ../src/conversation_textview.py:763
+#: ../src/conversation_textview.py:765
 msgid "Look it up in _Dictionary"
 msgstr "Im Wörterbuch _suchen"
 
-#: ../src/conversation_textview.py:780
+#: ../src/conversation_textview.py:782
 #, 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:793
+#: ../src/conversation_textview.py:795
 #, 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:796
+#: ../src/conversation_textview.py:798
 msgid "Web _Search for it"
 msgstr "Im _Internet hiernach suchen"
 
-#: ../src/conversation_textview.py:802
+#: ../src/conversation_textview.py:804
 msgid "Open as _Link"
 msgstr "Als _Link öffnen"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1296
+#: ../src/conversation_textview.py:1298
 #, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6907,186 +7082,191 @@ msgstr[0] "Gestern"
 msgstr[1] "vor %i Tagen"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1344 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Thema: %s\n"
 
-#: ../src/dataforms_widget.py:544
+#: ../src/dataforms_widget.py:545
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Konnte Idle-Modul nicht laden"
 
-#: ../src/dataforms_widget.py:546
+#: ../src/dataforms_widget.py:547
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Unsichtbarkeit wird nicht unterstützt"
 
-#: ../src/dataforms_widget.py:601
+#: ../src/dataforms_widget.py:562
+msgid "This field is required"
+msgstr ""
+
+#: ../src/dataforms_widget.py:607
 msgid "Jabber ID already in list"
 msgstr "Die Jabber-ID steht bereits in der Liste"
 
-#: ../src/dataforms_widget.py:602
+#: ../src/dataforms_widget.py:608
 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:613
+#: ../src/dataforms_widget.py:619
 msgid "new@jabber.id"
 msgstr "neu@jabber.id"
 
-#: ../src/dataforms_widget.py:616 ../src/dataforms_widget.py:618
+#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "neu%d@jabber.id"
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktname: <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber-ID: <i>%s</i>"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:195
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/dialogs.py:201
+#: ../src/dialogs.py:202
 msgid "In the group"
 msgstr "In der Gruppe"
 
-#: ../src/dialogs.py:292
+#: ../src/dialogs.py:293
 msgid "KeyID"
 msgstr "Schlüssel-ID"
 
-#: ../src/dialogs.py:297
+#: ../src/dialogs.py:298
 msgid "Contact name"
 msgstr "Name des Kontakts"
 
-#: ../src/dialogs.py:469
+#: ../src/dialogs.py:470
 msgid "Set Mood"
 msgstr "Stimmung setzen"
 
-#: ../src/dialogs.py:589
+#: ../src/dialogs.py:590
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Statusnachricht"
 
-#: ../src/dialogs.py:603
+#: ../src/dialogs.py:604
 msgid "Status Message"
 msgstr "Statusnachricht"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:794
 msgid "Overwrite Status Message?"
 msgstr "Statusnachricht überschreiben"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:795
 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:802
+#: ../src/dialogs.py:803
 msgid "Save as Preset Status Message"
 msgstr "Als Vorlage für Statusnachrichten speichern"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:804
 msgid "Please type a name for this status message"
 msgstr "Bitte geben Sie einen Namen für diese Statusnachricht ein:"
 
-#: ../src/dialogs.py:831
+#: ../src/dialogs.py:832
 msgid "AIM Address:"
 msgstr "AIM-Adresse"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:833
 msgid "GG Number:"
 msgstr "GG-Nummer"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:834
 msgid "ICQ Number:"
 msgstr "ICQ-Nummer"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:835
 msgid "MSN Address:"
 msgstr "MSN-Adresse"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:836
 msgid "Yahoo! Address:"
 msgstr "Yahoo-Adresse"
 
-#: ../src/dialogs.py:872
+#: ../src/dialogs.py:873
 #, 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:875
+#: ../src/dialogs.py:876
 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:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
+#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
+#: ../src/dialogs.py:3464
 msgid "Invalid User ID"
 msgstr "Ungültige Benutzer-ID"
 
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1052
 msgid "The user ID must not contain a resource."
 msgstr "Die Benutzer-ID darf keine Ressource enthalten."
 
-#: ../src/dialogs.py:1051
+#: ../src/dialogs.py:1057
 msgid "You cannot add yourself to your roster."
 msgstr "Sie können sich nicht selbst zu Ihrer Kontaktliste hinzuzufügen."
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1071
 msgid "Contact already in roster"
 msgstr "Kontakt bereits in der Kontaktliste"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1072
 msgid "This contact is already listed in your roster."
 msgstr "Der angegebene Kontakt befindet sich bereits in Ihrer Kontaktliste."
 
-#: ../src/dialogs.py:1112
+#: ../src/dialogs.py:1118
 msgid "User ID:"
 msgstr "_Benutzer-ID:"
 
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1189
 msgid "A GTK+ jabber client"
 msgstr "Ein Jabber-Client in GTK+"
 
-#: ../src/dialogs.py:1176
+#: ../src/dialogs.py:1190
 msgid "GTK+ Version:"
 msgstr "GTK+-Version:"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1191
 msgid "PyGTK Version:"
 msgstr "PyGTK-Version"
 
-#: ../src/dialogs.py:1187
+#: ../src/dialogs.py:1201
 msgid "Current Developers:"
 msgstr "Derzeitige Entwickler:"
 
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1203
 msgid "Past Developers:"
 msgstr "Frühere Entwickler:"
 
-#: ../src/dialogs.py:1195
+#: ../src/dialogs.py:1209
 msgid "THANKS:"
 msgstr "DANKE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1215
 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:1213
+#: ../src/dialogs.py:1227
 msgid "translator-credits"
 msgstr ""
 "Fridtjof Busse\n"
@@ -7096,7 +7276,7 @@ msgstr ""
 "Nico Gulden (cilugnedon AT gmx.de)\n"
 "Niklas Hambüchen (nh2 AT deditus.de)"
 
-#: ../src/dialogs.py:1396
+#: ../src/dialogs.py:1410
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7109,101 +7289,101 @@ msgstr ""
 "\n"
 "Falsch geschriebene Wörter können nicht hervorgehoben werden."
 
-#: ../src/dialogs.py:1935 ../src/dialogs.py:2322
+#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
 msgid "The nickname has not allowed characters."
 msgstr "Die Jabber-ID enthält ungültige Zeichen."
 
-#: ../src/dialogs.py:2053
+#: ../src/dialogs.py:2069
 #, 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:2056
+#: ../src/dialogs.py:2072
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnement-Anfrage von %s"
 
-#: ../src/dialogs.py:2131 ../src/gui_interface.py:2672
+#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Sie sind bereits im Chatraum %s"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2153
 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:2178
+#: ../src/dialogs.py:2194
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Chatraum betreten mit dem Konto %s"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2325
 msgid "Invalid Account"
 msgstr "Ungültiges Konto"
 
-#: ../src/dialogs.py:2310
+#: ../src/dialogs.py:2326
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr ""
 "Sie müssen ein Konto auswählen, mit dem Sie den Gruppenchat betreten möchten."
 
-#: ../src/dialogs.py:2321
+#: ../src/dialogs.py:2337
 msgid "Invalid Nickname"
 msgstr "Ungültiger Benutzername"
 
-#: ../src/dialogs.py:2326 ../src/dialogs.py:2332
-#: ../src/groupchat_control.py:1832
+#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
+#: ../src/groupchat_control.py:1847
 msgid "Invalid group chat Jabber ID"
 msgstr "Ungültige Jabber-ID für den Chatraum"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2343
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "Bitte gib die Gruppenchat Jabber ID als raum@server ein."
 
-#: ../src/dialogs.py:2333 ../src/groupchat_control.py:1833
+#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Die Jabber-ID des Chatraums enthält ungültige Zeichen."
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2356
 msgid "This is not a group chat"
 msgstr "Dies ist kein Chatraum"
 
-#: ../src/dialogs.py:2341
+#: ../src/dialogs.py:2357
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s ist nicht der Name eines Chatraums."
 
-#: ../src/dialogs.py:2372
+#: ../src/dialogs.py:2388
 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:2386
+#: ../src/dialogs.py:2402
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2421
+#: ../src/dialogs.py:2437
 msgid "This account is not connected to the server"
 msgstr "Das Konto \"%s\" ist nicht mit dem Server verbunden"
 
-#: ../src/dialogs.py:2422
+#: ../src/dialogs.py:2438
 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:2446
+#: ../src/dialogs.py:2462
 msgid "Synchronise"
 msgstr "Synchronisieren"
 
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2523
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Starte Chat mit Konto %s"
 
-#: ../src/dialogs.py:2509
+#: ../src/dialogs.py:2525
 msgid "Start Chat"
 msgstr "Chat starten"
 
-#: ../src/dialogs.py:2510
+#: ../src/dialogs.py:2526
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7212,165 +7392,165 @@ msgstr ""
 "an den Sie eine Chat-Nachricht schicken wollen:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2536 ../src/dialogs.py:2917 ../src/dialogs.py:3129
+#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
 msgid "Connection not available"
 msgstr "Verbindung nicht verfügbar"
 
-#: ../src/dialogs.py:2537 ../src/dialogs.py:2918 ../src/dialogs.py:3130
+#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vergewissern Sie sich, dass Sie mit \"%s\" verbunden sind."
 
-#: ../src/dialogs.py:2546 ../src/dialogs.py:2549
+#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
 msgid "Invalid JID"
 msgstr "Ungültige Jabber-ID"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2565
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kann \"%s\" nicht parsen."
 
-#: ../src/dialogs.py:2558
+#: ../src/dialogs.py:2574
 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:2577
+#: ../src/dialogs.py:2593
 msgid "Invalid password"
 msgstr "Ungültiges Passwort"
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "You must enter a password."
 msgstr "Sie müssen ein Passwort eingeben."
 
-#: ../src/dialogs.py:2581
+#: ../src/dialogs.py:2597
 msgid "Passwords do not match"
 msgstr "Die Passwörter stimmen nicht überein"
 
-#: ../src/dialogs.py:2582
+#: ../src/dialogs.py:2598
 msgid "The passwords typed in both fields must be identical."
 msgstr "Die Passwörter in beiden Feldern müssen identisch sein."
 
 #. default value
-#: ../src/dialogs.py:2619 ../src/notify.py:247 ../src/notify.py:473
+#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
 msgid "Contact Signed In"
 msgstr "Kontakt hat sich angemeldet"
 
-#: ../src/dialogs.py:2621 ../src/notify.py:255 ../src/notify.py:475
+#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
 msgid "Contact Signed Out"
 msgstr "Kontakt hat sich abgemeldet"
 
 #. chat message
-#: ../src/dialogs.py:2623 ../src/notify.py:277 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
 msgid "New Message"
 msgstr "Neue Nachricht"
 
 #. single message
-#: ../src/dialogs.py:2623 ../src/notify.py:259 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
 msgid "New Single Message"
 msgstr "Neue einzelne Nachricht"
 
 #. private message
-#: ../src/dialogs.py:2624 ../src/notify.py:265 ../src/notify.py:478
+#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
 msgid "New Private Message"
 msgstr "Neue private Nachricht"
 
-#: ../src/dialogs.py:2624 ../src/gui_interface.py:1358 ../src/notify.py:487
+#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
 msgid "New E-mail"
 msgstr "Neue E-Mail"
 
-#: ../src/dialogs.py:2626 ../src/gui_interface.py:1420 ../src/notify.py:480
+#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
 msgid "File Transfer Request"
 msgstr "Anfrage zur Dateiübertragung"
 
-#: ../src/dialogs.py:2628 ../src/gui_interface.py:1320
-#: ../src/gui_interface.py:1389 ../src/notify.py:482
+#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
+#: ../src/gui_interface.py:1186 ../src/notify.py:482
 msgid "File Transfer Error"
 msgstr "Dateiübertragungsfehler"
 
-#: ../src/dialogs.py:2630 ../src/gui_interface.py:1466
-#: ../src/gui_interface.py:1489 ../src/gui_interface.py:1506
+#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
+#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
 #: ../src/notify.py:484
 msgid "File Transfer Completed"
 msgstr "Dateiübertragung beendet"
 
-#: ../src/dialogs.py:2631 ../src/gui_interface.py:1469 ../src/notify.py:485
+#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
 msgid "File Transfer Stopped"
 msgstr "Dateiübertragung gestoppt"
 
-#: ../src/dialogs.py:2633 ../src/gui_interface.py:1152 ../src/notify.py:489
+#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
 msgid "Groupchat Invitation"
 msgstr "Gruppenchat-Einladung"
 
-#: ../src/dialogs.py:2635 ../src/notify.py:239 ../src/notify.py:491
+#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
 msgid "Contact Changed Status"
 msgstr "Kontakt hat Status verändert"
 
-#: ../src/dialogs.py:2836
+#: ../src/dialogs.py:2852
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Einzelne Nachricht über das Konto %s"
 
-#: ../src/dialogs.py:2838
+#: ../src/dialogs.py:2854
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Einzelne Nachricht über das Konto %s"
 
-#: ../src/dialogs.py:2840
+#: ../src/dialogs.py:2856
 msgid "Single Message"
 msgstr "Einzelne Nachricht"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2843
+#: ../src/dialogs.py:2859
 #, python-format
 msgid "Send %s"
 msgstr "Sende %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:2882
 #, python-format
 msgid "Received %s"
 msgstr "%s empfangen"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2889
+#: ../src/dialogs.py:2905
 #, 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:2968
+#: ../src/dialogs.py:2984
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:2985
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s schrieb:\n"
 
-#: ../src/dialogs.py:3028
+#: ../src/dialogs.py:3044
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML-Konsole für %s"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3046
 msgid "XML Console"
 msgstr "XML-Konsole"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 msgid "add"
 msgstr "hinzufügen"
 
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 msgid "modify"
 msgstr "Verändern"
 
-#: ../src/dialogs.py:3160
+#: ../src/dialogs.py:3176
 msgid "remove"
 msgstr "Entfernen"
 
-#: ../src/dialogs.py:3188
+#: ../src/dialogs.py:3204
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7380,158 +7560,192 @@ msgstr ""
 "%(action)s</b>."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3204 ../src/dialogs.py:3250
+#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
 msgid "Add"
 msgstr "Hinzufügen"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3206 ../src/dialogs.py:3281
+#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
 msgid "Modify"
 msgstr "Verändern"
 
-#: ../src/dialogs.py:3212
+#: ../src/dialogs.py:3228
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3218
+#: ../src/dialogs.py:3234
 msgid "Groups"
 msgstr "Gruppen"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3342
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr ""
 "%s hat mir vorgeschlagen Sie als Kontakt zu meiner Kontaktliste hinzuzufügen."
 
-#: ../src/dialogs.py:3340
+#: ../src/dialogs.py:3356
 #, python-format
 msgid "Added  %s contacts"
 msgstr "%s Kontakte hinzugefügt"
 
-#: ../src/dialogs.py:3377
+#: ../src/dialogs.py:3393
 #, python-format
 msgid "Removed  %s contacts"
 msgstr "%s Kontakte entfernt"
 
-#: ../src/dialogs.py:3430
+#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#, python-format
+msgid "Archiving Preferences for %s"
+msgstr ""
+
+#: ../src/dialogs.py:3473
+#, fuzzy
+msgid "Invalid expire value"
+msgstr "Ungültiger Servername"
+
+#: ../src/dialogs.py:3474
+msgid "Expire must be a valid positive integer."
+msgstr ""
+
+#: ../src/dialogs.py:3521
+msgid "There is an error with the form"
+msgstr ""
+
+#: ../src/dialogs.py:3732
+#, fuzzy
+msgid "There is an error"
+msgstr "Der Dienst gab einen Fehler zurück."
+
+#: ../src/dialogs.py:3796
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privatsphären-Liste <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3434
+#: ../src/dialogs.py:3800
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privatsphären-Liste für %s"
 
-#: ../src/dialogs.py:3490
+#: ../src/dialogs.py:3856
 #, 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:3495
+#: ../src/dialogs.py:3861
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Sortierung: %(order)s, Aktion: %(action)s"
 
-#: ../src/dialogs.py:3539
+#: ../src/dialogs.py:3905
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Eine Regel bearbeiten</b>"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:4016
 msgid "<b>Add a rule</b>"
 msgstr "<b>Eine Regel hinzufügen</b>"
 
-#: ../src/dialogs.py:3750
+#: ../src/dialogs.py:4116
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privatsphären-Liste für %s"
 
-#: ../src/dialogs.py:3752
+#: ../src/dialogs.py:4118
 msgid "Privacy Lists"
 msgstr "Privatsphären-Listen"
 
-#: ../src/dialogs.py:3822
+#: ../src/dialogs.py:4188
 msgid "Invalid List Name"
 msgstr "Ungültiger Listenname"
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4189
 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:3855
+#: ../src/dialogs.py:4221
 msgid "You are invited to a groupchat"
 msgstr "Sie wurden in einen Chatraum eingeladen"
 
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4224
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact hat Sie in den Chatraum %(room_Jabber-ID)s eingeladen"
 
-#: ../src/dialogs.py:3860
+#: ../src/dialogs.py:4226
 #, 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:3868
+#: ../src/dialogs.py:4234
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4236
 msgid "Do you want to accept the invitation?"
 msgstr "Möchten Sie die Einladung annehmen?"
 
-#: ../src/dialogs.py:3932
+#: ../src/dialogs.py:4298
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:3942 ../src/dialogs.py:3985 ../src/dialogs.py:4041
+#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
+#: ../src/dialogs.py:4495
 msgid "All files"
 msgstr "Alle Dateien"
 
-#: ../src/dialogs.py:3947
+#: ../src/dialogs.py:4313
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:3975
+#: ../src/dialogs.py:4341
 msgid "Choose Sound"
 msgstr "Sound wählen"
 
-#: ../src/dialogs.py:3990
+#: ../src/dialogs.py:4356
 msgid "Wav Sounds"
 msgstr "Wav-Dateien"
 
-#: ../src/dialogs.py:4028
+#: ../src/dialogs.py:4394
 msgid "Choose Image"
 msgstr "Bild auswählen"
 
-#: ../src/dialogs.py:4046
+#: ../src/dialogs.py:4412
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:4113
+#: ../src/dialogs.py:4482
+#, fuzzy
+msgid "Choose Archive"
+msgstr "Bild auswählen"
+
+#: ../src/dialogs.py:4500
+#, fuzzy
+msgid "Zip files"
+msgstr "Alle Dateien"
+
+#: ../src/dialogs.py:4525
 #, python-format
 msgid "When %s becomes:"
 msgstr "Wenn %s wird:"
 
-#: ../src/dialogs.py:4115
+#: ../src/dialogs.py:4527
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Füge speziellen Hinweis für %s hinzu"
 
-#: ../src/dialogs.py:4190
+#: ../src/dialogs.py:4602
 msgid "Condition"
 msgstr "Bedingung"
 
-#: ../src/dialogs.py:4310
+#: ../src/dialogs.py:4722
 msgid "when I am "
 msgstr "wenn Ich bin "
 
-#: ../src/dialogs.py:4786
+#: ../src/dialogs.py:5198
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7543,19 +7757,19 @@ msgstr ""
 "Der kurze Authentifizierungs-Schlüssel für diese Unterhaltung ist: <b>"
 "%(sas)s</b>"
 
-#: ../src/dialogs.py:4789
+#: ../src/dialogs.py:5201
 msgid "You have already verified this contact's identity."
 msgstr "Sie haben die Identität dieses Kontaktes bereits überprüft."
 
-#: ../src/dialogs.py:4795 ../src/dialogs.py:4879
+#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
 msgid "Contact's identity verified"
 msgstr "Kontaktidentität wurde überprüft"
 
-#: ../src/dialogs.py:4801
+#: ../src/dialogs.py:5213
 msgid "Verify again..."
 msgstr "Erneut überprüfen …"
 
-#: ../src/dialogs.py:4806
+#: ../src/dialogs.py:5218
 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 "
@@ -7565,19 +7779,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:4809 ../src/dialogs.py:4860 ../src/dialogs.py:4873
+#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktidentität nicht überprüft"
 
-#: ../src/dialogs.py:4814
+#: ../src/dialogs.py:5226
 msgid "Verify..."
 msgstr "Überprüfen …"
 
-#: ../src/dialogs.py:4825
+#: ../src/dialogs.py:5237
 msgid "Have you verified the contact's identity?"
 msgstr "Haben Sie die Identität des Kontaktes überprüft?"
 
-#: ../src/dialogs.py:4826
+#: ../src/dialogs.py:5238
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7593,13 +7807,13 @@ msgstr ""
 "Der kurze Authentifizierungs-Schlüssel dieser Unterhaltung ist: <b>%(sas)s</"
 "b>"
 
-#: ../src/dialogs.py:4827
+#: ../src/dialogs.py:5239
 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:4861
+#: ../src/dialogs.py:5273
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
@@ -7607,14 +7821,14 @@ msgstr ""
 "Schlüssel überein."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/dialogs.py:4867
+#: ../src/dialogs.py:5279
 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:4874
+#: ../src/dialogs.py:5286
 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."
@@ -7625,7 +7839,7 @@ msgstr ""
 "einzustufen."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/dialogs.py:4880
+#: ../src/dialogs.py:5292
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7633,19 +7847,19 @@ msgstr ""
 "Ein vertrauenswürdiger GPG-Schlüssel ist dem Kontakt zugewiesen. Die "
 "Nachrichten werden verschlüsselt."
 
-#: ../src/dialogs.py:4945
+#: ../src/dialogs.py:5357
 msgid "an audio and video"
 msgstr "eine Audio und Video"
 
-#: ../src/dialogs.py:4947
+#: ../src/dialogs.py:5359
 msgid "an audio"
 msgstr "eine Audio"
 
-#: ../src/dialogs.py:4949
+#: ../src/dialogs.py:5361
 msgid "a video"
 msgstr "eine Video"
 
-#: ../src/dialogs.py:4953
+#: ../src/dialogs.py:5365
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7663,24 +7877,24 @@ msgstr "Andere"
 msgid "Conference"
 msgstr "Konferenz"
 
-#: ../src/disco.py:512
+#: ../src/disco.py:513
 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:589
+#: ../src/disco.py:600
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Dienste des Kontos %s durchsuchen"
 
-#: ../src/disco.py:591
+#: ../src/disco.py:602
 msgid "Service Discovery"
 msgstr "Dienste durchsuchen"
 
-#: ../src/disco.py:741
+#: ../src/disco.py:758
 msgid "The service could not be found"
 msgstr "Der Dienst konnte nicht gefunden werden"
 
-#: ../src/disco.py:742
+#: ../src/disco.py:759
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7689,96 +7903,96 @@ msgstr ""
 "Dienst antwortet nicht. Überprüfen Sie die Adresse und versuchen Sie es "
 "erneut."
 
-#: ../src/disco.py:746 ../src/disco.py:1082
+#: ../src/disco.py:763 ../src/disco.py:1100
 msgid "The service is not browsable"
 msgstr "Der Dienst ist nicht durchsuchbar"
 
-#: ../src/disco.py:747
+#: ../src/disco.py:764
 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:786 ../src/disco.py:796
+#: ../src/disco.py:804 ../src/disco.py:814
 msgid "Invalid Server Name"
 msgstr "Ungültiger Servername"
 
-#: ../src/disco.py:850
+#: ../src/disco.py:868
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Durchsuche %(address)s über das Konto %(account)s"
 
-#: ../src/disco.py:894
+#: ../src/disco.py:912
 msgid "_Browse"
 msgstr "_Durchsuche"
 
-#: ../src/disco.py:1083
+#: ../src/disco.py:1101
 msgid "This service does not contain any items to browse."
 msgstr "Dieser Dienst enthält keine keine durchsuchbaren Objekte."
 
-#: ../src/disco.py:1323
+#: ../src/disco.py:1341
 msgid "_Execute Command"
 msgstr "_Befehl ausführen"
 
-#: ../src/disco.py:1333 ../src/disco.py:1504
+#: ../src/disco.py:1351 ../src/disco.py:1522
 msgid "Re_gister"
 msgstr "Re_gistrieren"
 
-#: ../src/disco.py:1545
+#: ../src/disco.py:1563
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Durchsuche %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1736
+#: ../src/disco.py:1754
 msgid "Users"
 msgstr "Benutzer"
 
 #. Description column
-#: ../src/disco.py:1744
+#: ../src/disco.py:1762
 msgid "Description"
 msgstr "Beschreibung"
 
 #. Id column
-#: ../src/disco.py:1752
+#: ../src/disco.py:1770
 msgid "Id"
 msgstr "ID"
 
-#: ../src/disco.py:1817 ../src/gui_interface.py:3182
+#: ../src/disco.py:1835 ../src/gui_interface.py:2995
 msgid "Bookmark already set"
 msgstr "Chatraum ist bereits gespeichert"
 
-#: ../src/disco.py:1818 ../src/gui_interface.py:3183
+#: ../src/disco.py:1836 ../src/gui_interface.py:2996
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Der Chatraum \"%s\" wurde bereits gespeichert."
 
-#: ../src/disco.py:1827 ../src/gui_interface.py:3197
+#: ../src/disco.py:1845 ../src/gui_interface.py:3010
 msgid "Bookmark has been added successfully"
 msgstr "Chatraum wurde erfolgreich gespeichert"
 
-#: ../src/disco.py:1828 ../src/gui_interface.py:3198
+#: ../src/disco.py:1846 ../src/gui_interface.py:3011
 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:2039
+#: ../src/disco.py:2057
 msgid "Subscribed"
 msgstr "Abonniert"
 
-#: ../src/disco.py:2047
+#: ../src/disco.py:2065
 msgid "Node"
 msgstr "Node"
 
-#: ../src/disco.py:2111
+#: ../src/disco.py:2129
 msgid "New post"
 msgstr "Neue Nachricht"
 
-#: ../src/disco.py:2117
+#: ../src/disco.py:2135
 msgid "_Subscribe"
 msgstr "_Abonnieren"
 
-#: ../src/disco.py:2123
+#: ../src/disco.py:2141
 msgid "_Unsubscribe"
 msgstr "_Abbestellen"
 
@@ -7961,17 +8175,19 @@ msgstr ""
 "LaTeX interpretiert."
 
 #: ../src/features_window.py:95
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
-"in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
 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
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
+"You have to set 'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 "Erfordert texlive-latex-base und dvipng (befindlich in MikTeX). Sie müssen "
 "'use_latex' im Erweiterten Konfigurationseditor auf 'true' setzen."
@@ -8127,12 +8343,12 @@ msgstr "Beschreibung: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s möchte Ihnen eine Datei senden:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Kann existierende Datei \"%s\" nicht überschreiben"
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -8140,22 +8356,22 @@ msgstr ""
 "Eine Datei mit diesem Namen existiert bereits und Sie haben nicht die "
 "erforderlichen Rechte, um sie zu überschreiben."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 msgid "This file already exists"
 msgstr "Diese Datei existiert bereits"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 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:369 ../src/gtkgui_helpers.py:914
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Verzeichnis \"%s\" ist nicht schreibbar"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 "Ihre Benutzerrechte erlauben es Ihnen nicht, in diesem Verzeichnis Dateien "
@@ -8260,34 +8476,41 @@ msgstr ""
 "Gajim schein bereits zu laufen.\n"
 "Soll eine weitere Instanz gestartet werden?"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
 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:80
+#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
 msgid "command"
 msgstr "Befehl"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "zeige Hilfe für Befehl"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Ein- oder Ausblenden des Hauptfensters"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Zeige Popup-Fenster mit dem nächsten ungelesenen Ereignis"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
 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-plugin.py:93 ../src/gajim-remote-plugin.py:108
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
+#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
+#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
+#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
 #: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
 #: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
 #: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
@@ -8299,41 +8522,33 @@ msgstr ""
 msgid "account"
 msgstr "Konto"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "zeige nur Kontakte für das gegebene Konto"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Gibt eine Liste registrierter Konten aus"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
 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:109
+#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
 msgid "status"
 msgstr "Status"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106
 #, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"accoun't previous status"
+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:110 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
-msgid "message"
-msgstr "Nachricht"
-
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "Statusnachricht"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8342,46 +8557,22 @@ msgstr ""
 "aller Konten für die die Option \"Kontostatus mit globalem Status "
 "synchronisieren\" aktiviert ist"
 
-#: ../src/gajim-remote.py:117
-msgid "Changes the priority of account or accounts"
-msgstr "Ändert die Priorität eines oder mehrerer Konten"
-
-#: ../src/gajim-remote.py:119
-msgid "priority"
-msgstr "Priorität"
-
-#: ../src/gajim-remote.py:119
-msgid "priority you want to give to the account"
-msgstr "Priorität, die Sie dem Konto geben möchten"
-
-#: ../src/gajim-remote.py:121
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-msgstr ""
-"Priorität für das Konto ändern. Falls nicht angegeben, ändere den Status "
-"aller Konten für die die Option \"Kontostatus mit globalem Status "
-"synchronisieren\" aktiviert ist"
-
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
 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:129
+#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
 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-plugin.py:118 ../src/gajim-remote-plugin.py:205
 #: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 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:134
-msgid "message content. The account must be specified or \"\""
-msgstr "Nachrichteninhalt. Das Konto muss angegeben werden oder \"\""
-
-#: ../src/gajim-remote.py:139
+#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
 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 "
@@ -8391,30 +8582,35 @@ msgstr ""
 "Schlüssel und Konto sind optional. Falls nur das Konto ohne einen OpenGPG-"
 "Schlüssel gesetzt werden soll, setzen Sie 'OpenGPG-Schlüssel' einfach auf ''."
 
+#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
 #: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "Jabber-ID des Kontakts, der die Nachricht empfangen soll"
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
+#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "Nachrichteninhalt"
 
 # TODO: GPG/PGP unification in original strings needed
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "PGP-Schlüssel"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "falls angegeben, wird die Nachricht damit verschlüsselt"
 
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
+#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "falls angegeben, wird die Nachricht über dieses Konto gesendet"
 
-#: ../src/gajim-remote.py:152
+#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
 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 "
@@ -8424,139 +8620,138 @@ msgstr ""
 "Schlüssel und Konto sind optional. Falls nur das Konto ohne einen OpenGPG-"
 "Schlüssel gesetzt werden soll, setzen Sie 'OpenGPG-Schlüssel' einfach auf ''."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "Betreff"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "Nachrichten-Betreff"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Sendet eine neue Nachricht an einen Chatraum, den Sie betreten haben."
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "Jabber-ID des Chatraums, der die Nachricht empfangen soll"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Zeige detaillierte Informationen über einen Kontakt"
 
+#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
+#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
 #: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
 #: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "Jabber-ID des Kontakts"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Zeige detaillierte Informationen über ein Konto"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Name des Kontos"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Sendet dem Kontakt eine Datei"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "file"
 msgstr "Datei"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Dateipfad"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "Wenn angegeben, wird die Nachricht über dieses Konto gesendet"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Zeigt alle Einstellungen und ihre Werte"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Setzt den Wert von 'Schlüssel' auf 'Wert'."
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "Schlüssel=Wert"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'Schlüssel' ist der Name der Einstellung, 'Wert' ist der der einzustellende "
 "Wert"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Löscht eine Einstellung"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
 msgid "key"
 msgstr "Schlüssel"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "Name der zu löschenden Einstellung"
 
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Schreibt die aktuellen Gajim-Einstellungen in die Konfigurationsdatei"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "Entfernt den Kontakt aus der Kontaktliste"
 
-#: ../src/gajim-remote.py:227
+#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "Fügt den Kontakt der Kontaktliste hinzu"
 
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "Jabber-ID"
-
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "Fügt einen neuen Kontakt zu diesem Konto hinzu"
 
-#: ../src/gajim-remote.py:235
+#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Gibt den derzeitigen Status zurück (den globalen Status, es sei denn, es "
 "wird ein Konto angegeben)"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote-plugin.py:226
+#, fuzzy
 msgid ""
-"Returns current status message (the global one unless account is specified)"
+"Returns current status message(the global one unless account is specified)"
 msgstr ""
 "Gibt die derzeitige Statusnachricht zurück (die globale, es sei denn, es "
 "wird ein Konto angegeben)"
 
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote-plugin.py:233 ../src/gajim-remote.py:249
 msgid "Returns number of unread messages"
 msgstr "Gibt die Anzahl der ungelesenen Nachrichten zurück"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr "Öffnet den Dialog zum Beginnen eines Chats"
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "Startet einen Chat über dieses Konto"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr "Benutzerdefinierten XML-Code senden"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr "Zu sendender XML-Code"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8564,90 +8759,44 @@ msgstr ""
 "Konto, an welches der XML-Code gesendet wird; falls nicht angegeben, wird "
 "der XML-Code an alle Konten gesendet"
 
-#: ../src/gajim-remote.py:268
-#, fuzzy
-msgid "Change the avatar"
-msgstr "Status ändern"
-
-#: ../src/gajim-remote.py:270
-#, fuzzy
-msgid "Picture to use"
-msgstr "Spitzname, der benutzt werden soll"
-
-#: ../src/gajim-remote.py:271
-#, fuzzy
-msgid ""
-"Account in which the avatar will be set; if not specified, the avatar will "
-"be set for all accounts"
-msgstr ""
-"Konto, an welches der XML-Code gesendet wird; falls nicht angegeben, wird "
-"der XML-Code an alle Konten gesendet"
-
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
 msgid "Handle a xmpp:/ uri"
 msgstr "Verarbeite einen xmpp:/-URI"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
 msgid "uri"
 msgstr "URI"
 
-#: ../src/gajim-remote.py:279
-msgid "URI to handle"
-msgstr "Zu verarbeitender URI"
-
-#: ../src/gajim-remote.py:280
-msgid "Account in which you want to handle it"
-msgstr "Konto, mit dem er verarbeitet werden soll"
-
-#: ../src/gajim-remote.py:282
-msgid "Message content"
-msgstr "Nachrichteninhalt"
-
-#: ../src/gajim-remote.py:286
+#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
 msgid "Join a MUC room"
 msgstr "Neuen Chatraum betreten"
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
 msgid "room"
 msgstr "Chatraum"
 
-#: ../src/gajim-remote.py:288
-msgid "Room JID"
-msgstr "Jabber-ID des Chatraums"
-
-#: ../src/gajim-remote.py:289
+#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
 msgid "nick"
 msgstr "Spitzname"
 
-#: ../src/gajim-remote.py:289
-msgid "Nickname to use"
-msgstr "Spitzname, der benutzt werden soll"
-
-#: ../src/gajim-remote.py:290
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
 msgid "password"
 msgstr "Passwort"
 
-#: ../src/gajim-remote.py:290
-msgid "Password to enter the room"
-msgstr "Das Passwort, um den Chatraum zu betreten"
-
-#: ../src/gajim-remote.py:291
-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:296
+#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
 msgid "Check if Gajim is running"
 msgstr "Bitte überprüfen Sie, ob Gajim läuft"
 
+#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
 #: ../src/gajim-remote.py:300
 msgid "Shows or hides the ipython window"
 msgstr "Ein- oder Ausblenden des Hauptfensters"
 
-#: ../src/gajim-remote.py:327
+#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "Fehlendes Argument \"contact_Jabber-ID\""
 
-#: ../src/gajim-remote.py:348
+#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8656,35 +8805,33 @@ msgstr ""
 "'%s' ist nicht in Ihrer Kontaktliste.\n"
 "Bitte geben Sie ein Konto zum Senden der Nachricht an."
 
-#: ../src/gajim-remote.py:351
+#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
 msgid "You have no active account"
 msgstr "Kein aktives Konto"
 
-#: ../src/gajim-remote.py:404
+#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
 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:431
+#: ../src/gajim-remote-plugin.py:412
 #, python-format
 msgid ""
-"Usage: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
+"Usage: %s %s %s \n"
+"\t %s"
 msgstr ""
-"Verwendung: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
 
-#: ../src/gajim-remote.py:435
+#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
 msgid "Arguments:"
 msgstr "Parameter:"
 
-#: ../src/gajim-remote.py:439
+#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
 #, python-format
 msgid "%s not found"
 msgstr "%s nicht gefunden"
 
-#: ../src/gajim-remote.py:445
+#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8693,6 +8840,125 @@ msgstr ""
 "Verwendung: %s Befehl [Argumente]\n"
 "Der Befehl ist einer von:\n"
 
+#: ../src/gajim-remote-plugin.py:496
+#, fuzzy, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Zu viele Argumente.\n"
+"Geben Sie \"%(basename)s help %(command)s\" ein, um weitere Informationen zu "
+"erhalten"
+
+#: ../src/gajim-remote-plugin.py:500
+#, fuzzy, python-format
+msgid ""
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Argument \"%(arg)s\" wurde nicht definiert. \n"
+"Geben Sie \"%(basename)s help %(command)s\" ein, um weitere Informationen zu "
+"erhalten"
+
+#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
+msgid "Wrong uri"
+msgstr "Falscher URI"
+
+#: ../src/gajim-remote.py:109
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
+msgstr "Mögliche Werte: offline, online, chat, away, xa, dnd, invisible "
+
+#: ../src/gajim-remote.py:117
+msgid "Changes the priority of account or accounts"
+msgstr "Ändert die Priorität eines oder mehrerer Konten"
+
+#: ../src/gajim-remote.py:119
+msgid "priority"
+msgstr "Priorität"
+
+#: ../src/gajim-remote.py:119
+msgid "priority you want to give to the account"
+msgstr "Priorität, die Sie dem Konto geben möchten"
+
+#: ../src/gajim-remote.py:121
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"Priorität für das Konto ändern. Falls nicht angegeben, ändere den Status "
+"aller Konten für die die Option \"Kontostatus mit globalem Status "
+"synchronisieren\" aktiviert ist"
+
+#: ../src/gajim-remote.py:134
+msgid "message content. The account must be specified or \"\""
+msgstr "Nachrichteninhalt. Das Konto muss angegeben werden oder \"\""
+
+#: ../src/gajim-remote.py:242
+msgid ""
+"Returns current status message (the global one unless account is specified)"
+msgstr ""
+"Gibt die derzeitige Statusnachricht zurück (die globale, es sei denn, es "
+"wird ein Konto angegeben)"
+
+#: ../src/gajim-remote.py:268
+#, fuzzy
+msgid "Change the avatar"
+msgstr "Status ändern"
+
+#: ../src/gajim-remote.py:270
+#, fuzzy
+msgid "Picture to use"
+msgstr "Spitzname, der benutzt werden soll"
+
+#: ../src/gajim-remote.py:271
+#, fuzzy
+msgid ""
+"Account in which the avatar will be set; if not specified, the avatar will "
+"be set for all accounts"
+msgstr ""
+"Konto, an welches der XML-Code gesendet wird; falls nicht angegeben, wird "
+"der XML-Code an alle Konten gesendet"
+
+#: ../src/gajim-remote.py:279
+msgid "URI to handle"
+msgstr "Zu verarbeitender URI"
+
+#: ../src/gajim-remote.py:280
+msgid "Account in which you want to handle it"
+msgstr "Konto, mit dem er verarbeitet werden soll"
+
+#: ../src/gajim-remote.py:282
+msgid "Message content"
+msgstr "Nachrichteninhalt"
+
+#: ../src/gajim-remote.py:288
+msgid "Room JID"
+msgstr "Jabber-ID des Chatraums"
+
+#: ../src/gajim-remote.py:289
+msgid "Nickname to use"
+msgstr "Spitzname, der benutzt werden soll"
+
+#: ../src/gajim-remote.py:290
+msgid "Password to enter the room"
+msgstr "Das Passwort, um den Chatraum zu betreten"
+
+#: ../src/gajim-remote.py:291
+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:431
+#, python-format
+msgid ""
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
+msgstr ""
+"Verwendung: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
+
 #: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
@@ -8717,10 +8983,6 @@ msgstr ""
 msgid "No uri given"
 msgstr ""
 
-#: ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Falscher URI"
-
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Design"
@@ -8747,185 +9009,183 @@ msgid "Please first choose another for your current theme."
 msgstr ""
 "Bitte wählen Sie zuerst einen anderen Namen für Ihr derzeitiges Design."
 
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:170
 msgid "Sending private message failed"
 msgstr "Senden privater Nachricht fehlgeschlagen"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:171
+#: ../src/groupchat_control.py:172
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Entweder sind Sie nicht mehr im Chatraum \"%(room)s\" oder \"%(nick)s\" hat "
 "den Chatraum verlassen."
 
-#: ../src/groupchat_control.py:450
+#: ../src/groupchat_control.py:455
 msgid "Insert Nickname"
 msgstr "Spitzname einfügen"
 
-#: ../src/groupchat_control.py:631
+#: ../src/groupchat_control.py:636
 msgid "Conversation with "
 msgstr "Unterhaltung mit "
 
-#: ../src/groupchat_control.py:633
+#: ../src/groupchat_control.py:638
 msgid "Continued conversation"
 msgstr "Unterhaltung fortsetzen"
 
-#. Can be a message (see handle_event_gc_config_change in
-#. gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1272 ../src/gui_interface.py:1080
+#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Jeder Teilnehmer darf Ihre vollständige Jabber-ID sehen"
 
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1286
 msgid "Room logging is enabled"
 msgstr "Chatraum-Aufzeichnung ist aktiviert"
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1288
 msgid "A new room has been created"
 msgstr "Ein neuer Chatraum wurde erstellt"
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1291
 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:1287
+#: ../src/groupchat_control.py:1297
 #, 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:1291
+#: ../src/groupchat_control.py:1300
 #, 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:1300
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s wurde gebannt. Grund: %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1312
 #, 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:1314 ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
 #, python-format
 msgid "You are now known as %s"
 msgstr "Sie heißen nun %s"
 
-#: ../src/groupchat_control.py:1330 ../src/gui_interface.py:919
+#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s heißt jetzt %(new_nick)s"
 
-#: ../src/groupchat_control.py:1372 ../src/groupchat_control.py:1377
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1392
 #, 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:1374
+#: ../src/groupchat_control.py:1383
 msgid "affiliation changed"
 msgstr "Zugehörigkeit geändert:"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1388
 msgid "room configuration changed to members-only"
 msgstr ""
 "Chatraum-Konfiguration wurde auf \"ausschließlich Mitgleider\" geändert"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1394
 msgid "system shutdown"
 msgstr "Computer wird heruntergefahren"
 
-#: ../src/groupchat_control.py:1470
+#: ../src/groupchat_control.py:1477
 #, 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:1474
+#: ../src/groupchat_control.py:1481
 #, 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:1489
+#: ../src/groupchat_control.py:1496
 #, 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:1493
+#: ../src/groupchat_control.py:1500
 #, 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:1522
+#: ../src/groupchat_control.py:1530
 #, python-format
 msgid "%s has left"
 msgstr "%s ist gegangen"
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1535
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s hat den Chatraum betreten"
 
-#: ../src/groupchat_control.py:1529 ../src/gui_interface.py:946
+#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
 #: ../src/history_window.py:447 ../src/notify.py:234
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s ist jetzt %(status)s"
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1774
 #, 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:1761
+#: ../src/groupchat_control.py:1776
 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:1765 ../src/gui_interface.py:1216
-#: ../src/gui_interface.py:1992 ../src/gui_interface.py:2029
-#: ../src/gui_interface.py:2064 ../src/message_window.py:224
-#: ../src/roster_window.py:2739 ../src/roster_window.py:3399
-#: ../src/roster_window.py:4123
+#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
+#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
+#: ../src/gui_interface.py:1853 ../src/message_window.py:224
+#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
+#: ../src/roster_window.py:4195
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Nicht noch einmal fragen"
 
-#: ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:1814
 msgid "Changing Subject"
 msgstr "Thema ändern"
 
-#: ../src/groupchat_control.py:1800
+#: ../src/groupchat_control.py:1815
 msgid "Please specify the new subject:"
 msgstr "Bitte wählen Sie ein neues Thema"
 
-#: ../src/groupchat_control.py:1807
+#: ../src/groupchat_control.py:1822
 msgid "Changing Nickname"
 msgstr "Spitzname ändern"
 
-#: ../src/groupchat_control.py:1808
+#: ../src/groupchat_control.py:1823
 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:1839
+#: ../src/groupchat_control.py:1854
 #, python-format
 msgid "Destroying %s"
 msgstr "Lösche %s"
 
-#: ../src/groupchat_control.py:1840
+#: ../src/groupchat_control.py:1855
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8933,22 +9193,22 @@ msgstr ""
 "Der Chatraum wird endgültig gelöscht.\n"
 "Sie können hier einen Grund angeben:"
 
-#: ../src/groupchat_control.py:1842
+#: ../src/groupchat_control.py:1857
 msgid "You may also enter an alternate venue:"
 msgstr "Sie können auch einen alternativen Chatraum eintragen:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2028
+#: ../src/groupchat_control.py:2046
 #, python-format
 msgid "Kicking %s"
 msgstr "%s rauswerfen"
 
-#: ../src/groupchat_control.py:2029 ../src/groupchat_control.py:2356
+#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
 msgid "You may specify a reason below:"
 msgstr "Sie können eine Begründung angeben:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2355
+#: ../src/groupchat_control.py:2373
 #, python-format
 msgid "Banning %s"
 msgstr "%s verbannen"
@@ -8974,22 +9234,22 @@ msgid "Details"
 msgstr "Details"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
+#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Fehler: Kann %s kann nicht zum Lesen öffnen"
 
-#: ../src/gtkgui_helpers.py:400
+#: ../src/gtkgui_helpers.py:404
 msgid "Error reading file:"
 msgstr "Fehler beim Lesen der Datei:"
 
-#: ../src/gtkgui_helpers.py:403
+#: ../src/gtkgui_helpers.py:407
 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:444
+#: ../src/gtkgui_helpers.py:448
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
@@ -8997,35 +9257,44 @@ msgstr ""
 "funktionieren"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:818
+#: ../src/gtkgui_helpers.py:822
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim ist nicht Ihr Standard-Jabber-Client"
 
-#: ../src/gtkgui_helpers.py:819
+#: ../src/gtkgui_helpers.py:823
 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:820
+#: ../src/gtkgui_helpers.py:824
 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:887
+#: ../src/gtkgui_helpers.py:891
 msgid "Extension not supported"
 msgstr "Erweiterung wird nicht unterstützt."
 
-#: ../src/gtkgui_helpers.py:888
+#: ../src/gtkgui_helpers.py:892
 #, 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:924
+#: ../src/gtkgui_helpers.py:928
 msgid "Save Image as..."
 msgstr "Bild speichern unter …"
 
-#: ../src/gui_interface.py:140
+#. we are banned
+#. group chat does not exist
+#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
+#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
+#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
+#: ../src/gui_interface.py:348
+msgid "Unable to join group chat"
+msgstr "Fehler beim Betreten des Chatraums"
+
+#: ../src/gui_interface.py:138
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9036,58 +9305,93 @@ msgstr ""
 "von einem anderen Benutzer registriert.\n"
 "Bitte geben Sie einen anderen Benutzernamen an:"
 
-#: ../src/gui_interface.py:143
+#: ../src/gui_interface.py:141
 msgid "Always use this nickname when there is a conflict"
 msgstr "Benutze bei einem Konflikt immer diesen Spitznamen"
 
-#: ../src/gui_interface.py:159
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Akzeptieren Sie diese Anfrage?"
 
-#: ../src/gui_interface.py:161
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Akzeptieren Sie diese Anfrage vom Konto %s?"
 
-#: ../src/gui_interface.py:164
+#: ../src/gui_interface.py:163
 #, 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/gui_interface.py:213 ../src/notify.py:493
+#: ../src/gui_interface.py:209 ../src/notify.py:493
 msgid "Connection Failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: ../src/gui_interface.py:606 ../src/gui_interface.py:610
+#: ../src/gui_interface.py:312
+#, 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."
+
+#: ../src/gui_interface.py:324
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr "Die maximale Anzahl an Benutzern für %s wurde erreicht"
+
+#: ../src/gui_interface.py:333
+#, python-format
+msgid "You are banned from group chat %s."
+msgstr "Sie wurden aus dem Chatraum %s verbannt."
+
+#: ../src/gui_interface.py:338
+#, python-format
+msgid "Group chat %s does not exist."
+msgstr "Der Chatraum %s existiert nicht."
+
+#: ../src/gui_interface.py:341
+msgid "Group chat creation is restricted."
+msgstr "Die Chatraumerstellung ist eingeschränkt."
+
+#: ../src/gui_interface.py:344
+#, 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/gui_interface.py:349
+#, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Sie stehen nicht in der Mitgliedliste des Chatraums %s."
+
+#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Fehler %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:621 ../src/gui_interface.py:636
+#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "Fehler beim Senden von %(message)s ( %(error)s )"
 
-#: ../src/gui_interface.py:663 ../src/notify.py:495
+#: ../src/gui_interface.py:540 ../src/notify.py:495
 msgid "Subscription request"
 msgstr "Abonnementanfrage"
 
-#: ../src/gui_interface.py:688
+#: ../src/gui_interface.py:565
 msgid "Authorization accepted"
 msgstr "Autorisierung akzeptiert"
 
-#: ../src/gui_interface.py:689
+#: ../src/gui_interface.py:566
 #, 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/gui_interface.py:702
+#: ../src/gui_interface.py:579
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Der Kontakt \"%s\" hat das Abonnement zurückgezogen"
 
-#: ../src/gui_interface.py:703
+#: ../src/gui_interface.py:580
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -9095,62 +9399,57 @@ msgstr ""
 "Er wird Ihnen von nun an als offline angezeigt.\n"
 "Möchten Sie ihn von Ihrer Kontaktliste entfernen?"
 
-#: ../src/gui_interface.py:727 ../src/notify.py:497
+#: ../src/gui_interface.py:604 ../src/notify.py:497
 msgid "Unsubscribed"
 msgstr "Abbestellt"
 
-#: ../src/gui_interface.py:754
+#: ../src/gui_interface.py:631
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Die Verbindung mit \"%s\" konnte nicht hergestellt werden"
 
-#: ../src/gui_interface.py:1015
+#: ../src/gui_interface.py:859
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s hat das Thema in %(subject)s geändert"
 
-#: ../src/gui_interface.py:1083
+#: ../src/gui_interface.py:926
 msgid "Room now shows unavailable member"
 msgstr "Der Chatraum zeigt nun abwesende Teilnehmer an"
 
-#: ../src/gui_interface.py:1085
+#: ../src/gui_interface.py:928
 msgid "room now does not show unavailable members"
 msgstr "Der Chatraum zeigt nun abwesende Teilnehmer nicht mehr an"
 
-#: ../src/gui_interface.py:1087
+#: ../src/gui_interface.py:930
 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/gui_interface.py:1091
+#: ../src/gui_interface.py:934
 msgid "Room logging is now enabled"
 msgstr "Die Chatraum-Aufzeichnung ist jetzt aktiviert"
 
-#: ../src/gui_interface.py:1093
+#: ../src/gui_interface.py:936
 msgid "Room logging is now disabled"
 msgstr "Die Chatraum-Aufzeichnung ist jetzt deaktiviert"
 
-#: ../src/gui_interface.py:1095
+#: ../src/gui_interface.py:938
 msgid "Room is now non-anonymous"
 msgstr "Der Chatraum ist jetzt nicht mehr anonym"
 
-#: ../src/gui_interface.py:1098
+#: ../src/gui_interface.py:941
 msgid "Room is now semi-anonymous"
 msgstr "Der Chatraum ist jetzt semi-anonym"
 
-#: ../src/gui_interface.py:1101
+#: ../src/gui_interface.py:944
 msgid "Room is now fully-anonymous"
 msgstr "Der Chatraum ist jetzt komplett anonym"
 
-#: ../src/gui_interface.py:1133
-#, 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/gui_interface.py:1180
+#: ../src/gui_interface.py:985
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -9159,25 +9458,25 @@ msgstr ""
 "jedoch kein GPG-Agent oder er gab eine falsche Passphrase zurück.\n"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gui_interface.py:1182 ../src/gui_interface.py:1189
+#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Sie wurden ohne Ihren GPG-Schlüssel verbunden"
 
-#: ../src/gui_interface.py:1184
+#: ../src/gui_interface.py:989
 msgid "Your passphrase is incorrect"
 msgstr "Ihre Passphrase ist falsch"
 
-#: ../src/gui_interface.py:1188
+#: ../src/gui_interface.py:993
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "OpenGPG Passphrase ist falsch"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid "GPG key not trusted"
 msgstr "GPG-Schlüssel ist nicht vertrauenswürdig"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
@@ -9185,7 +9484,7 @@ msgstr ""
 "Der GPG-Schlüssel zum Verschlüsseln dieses Chats ist nicht vertrauenswürdig. "
 "Möchten Sie diese Nachricht wirklich verschlüsseln?"
 
-#: ../src/gui_interface.py:1226
+#: ../src/gui_interface.py:1031
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not                 correctly started "
@@ -9195,19 +9494,19 @@ msgstr ""
 "gestartet (die Umgebungsvariablen sind möglicherweise nicht \t\t\t\t\t\t"
 "\tkorrekt gesetzt gesetzt)"
 
-#: ../src/gui_interface.py:1330
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Neue E-Mail über %(gmail_mail_address)s empfangen"
 
-#: ../src/gui_interface.py:1332
+#: ../src/gui_interface.py:1133
 #, 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/gui_interface.py:1345
+#: ../src/gui_interface.py:1146
 #, python-format
 msgid ""
 "\n"
@@ -9222,43 +9521,43 @@ msgstr ""
 "Betreff: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1418
+#: ../src/gui_interface.py:1215
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s möchte Ihnen eine Datei senden."
 
-#: ../src/gui_interface.py:1455 ../src/roster_window.py:1856
+#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
 msgid "Remote contact stopped transfer"
 msgstr "Entfernter Kontakt unterbrach die Dateiübertragung"
 
-#: ../src/gui_interface.py:1458 ../src/roster_window.py:1858
+#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
 msgid "Error opening file"
 msgstr "Fehler beim Öffnen der Datei:"
 
-#: ../src/gui_interface.py:1490
+#: ../src/gui_interface.py:1287
 #, 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/gui_interface.py:1494
+#: ../src/gui_interface.py:1291
 #, 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/gui_interface.py:1507
+#: ../src/gui_interface.py:1304
 #, 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/gui_interface.py:1511
+#: ../src/gui_interface.py:1308
 #, 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/gui_interface.py:1623
+#: ../src/gui_interface.py:1426
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -9267,36 +9566,36 @@ msgstr ""
 "Die Nachricht von %s konnte nicht entschlüsselt werden.\n"
 "Eventuell wurde sie verändert."
 
-#: ../src/gui_interface.py:1630
+#: ../src/gui_interface.py:1433
 msgid "Unable to decrypt message"
 msgstr "Die Nachricht konnte nicht entschlüsselt werden"
 
-#: ../src/gui_interface.py:1702
+#: ../src/gui_interface.py:1505
 msgid "Username Conflict"
 msgstr "Benutzernamenkonflikt"
 
-#: ../src/gui_interface.py:1703
+#: ../src/gui_interface.py:1506
 msgid "Please type a new username for your local account"
 msgstr "Bitte geben Sie einen neuen Benutzernamen für Ihr lokales Konto ein"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1519
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gui_interface.py:1729
+#: ../src/gui_interface.py:1532
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gui_interface.py:1740
+#: ../src/gui_interface.py:1543
 msgid "Error."
 msgstr "Fehler:"
 
-#: ../src/gui_interface.py:1768
+#: ../src/gui_interface.py:1556
 msgid "Resource Conflict"
 msgstr "Ressourcenkonflikt"
 
-#: ../src/gui_interface.py:1769
+#: ../src/gui_interface.py:1557
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -9305,20 +9604,20 @@ msgstr ""
 "geben Sie eine neue Ressource ein"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1816
+#: ../src/gui_interface.py:1604
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s möchte einen Sprachchat beginnen."
 
-#: ../src/gui_interface.py:1819
+#: ../src/gui_interface.py:1607
 msgid "Voice Chat Request"
 msgstr "Anfrage für Sprachchat"
 
-#: ../src/gui_interface.py:1927
+#: ../src/gui_interface.py:1716
 msgid "Error verifying SSL certificate"
 msgstr "Fehler bei der Überprüfung des SSL-Zertifikats"
 
-#: ../src/gui_interface.py:1928
+#: ../src/gui_interface.py:1717
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9329,17 +9628,17 @@ msgstr ""
 "Servers auf: %(error)s\n"
 "Möchten Sie sich dennoch zum Server verbinden?"
 
-#: ../src/gui_interface.py:1936
+#: ../src/gui_interface.py:1725
 msgid "Ignore this error for this certificate."
 msgstr "Ignoriere den Fehler für dieses Zertifikat."
 
-#: ../src/gui_interface.py:1956
+#: ../src/gui_interface.py:1745
 msgid "SSL certificate error"
 msgstr "SSL-Zertifikat-Fehler"
 
 # FIXME: Check English. Should be:
 # your connection has been hacked.
-#: ../src/gui_interface.py:1957
+#: ../src/gui_interface.py:1746
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9357,12 +9656,12 @@ msgstr ""
 "Möchten Sie sich dennoch verbinden und den Fingerabdruck des Zertifikats "
 "aktualisieren?"
 
-#: ../src/gui_interface.py:1987 ../src/gui_interface.py:2024
-#: ../src/gui_interface.py:2060
+#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
+#: ../src/gui_interface.py:1849
 msgid "Insecure connection"
 msgstr "Unsichere Verbindung"
 
-#: ../src/gui_interface.py:1988
+#: ../src/gui_interface.py:1777
 #, fuzzy
 msgid ""
 "You are about to connect to the server with an insecure connection. This "
@@ -9373,12 +9672,12 @@ msgstr ""
 "Sie sicher, dass Sie dies tun möchten? (Es ist ratsam, PyOpenSSL zu "
 "installieren, um dieses Problem zu beheben.)"
 
-#: ../src/gui_interface.py:1991 ../src/gui_interface.py:2028
-#: ../src/gui_interface.py:2063
+#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
+#: ../src/gui_interface.py:1852
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ja, ich möchte dies trotz Sicherheitsbedenken tun"
 
-#: ../src/gui_interface.py:2025
+#: ../src/gui_interface.py:1814
 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?"
@@ -9387,7 +9686,7 @@ msgstr ""
 "Sie sicher, dass Sie dies tun möchten? (Es ist ratsam, PyOpenSSL zu "
 "installieren, um dieses Problem zu beheben.)"
 
-#: ../src/gui_interface.py:2061
+#: ../src/gui_interface.py:1850
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9397,11 +9696,11 @@ msgstr ""
 "senden. Sind Sie sicher, dass Sie dies tun möchten?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2624 ../src/gui_interface.py:2647
+#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
 msgid "Emoticons disabled"
 msgstr "Emoticons deaktiviert"
 
-#: ../src/gui_interface.py:2625
+#: ../src/gui_interface.py:2423
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -9409,7 +9708,7 @@ msgstr ""
 "Das konfigurierte Emoticon-Set wurde nicht gefunden. Emoticons sind "
 "deaktiviert."
 
-#: ../src/gui_interface.py:2648
+#: ../src/gui_interface.py:2446
 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 "
@@ -9419,22 +9718,22 @@ msgstr ""
 "eventuell das Format der Datei emoticons.py aktualisieren. Besuchen Sie "
 "http://trac.gajim.org/wiki/Emoticons (Englisch) für mehr Informationen."
 
-#: ../src/gui_interface.py:2679 ../src/roster_window.py:3560
+#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
 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/gui_interface.py:3058
+#: ../src/gui_interface.py:2871
 msgid "Could not save your settings and preferences"
 msgstr "Konnte Einstellungen nicht speichern"
 
-#: ../src/gui_interface.py:3592
+#: ../src/gui_interface.py:3411
 msgid "Passphrase Required"
 msgstr "Passphrase benötigt"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gui_interface.py:3593
+#: ../src/gui_interface.py:3412
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
@@ -9442,13 +9741,13 @@ msgstr ""
 "%(account)s)."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gui_interface.py:3607
+#: ../src/gui_interface.py:3426
 msgid "GPG key expired"
 msgstr "GPG-Schlüssel abgelaufen"
 
 # TODO: GPG/PGP unification in original strings needed
 # FIXME: should be "has expired"
-#: ../src/gui_interface.py:3608
+#: ../src/gui_interface.py:3427
 #, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr ""
@@ -9456,12 +9755,12 @@ msgstr ""
 "mit %s verbunden."
 
 #. ask again
-#: ../src/gui_interface.py:3617
+#: ../src/gui_interface.py:3436
 msgid "Wrong Passphrase"
 msgstr "Falsche Passphrase"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gui_interface.py:3618
+#: ../src/gui_interface.py:3437
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 "Bitte geben Sie Ihre GPG-Passphrase erneut ein oder klicken Sie auf "
@@ -9501,6 +9800,11 @@ msgstr "Spitzname"
 msgid "Message"
 msgstr "Nachricht"
 
+#. holds subject
+#: ../src/history_manager.py:188 ../src/history_manager.py:219
+msgid "Subject"
+msgstr "Thema"
+
 #: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -9597,19 +9901,19 @@ msgstr "Sie sind dabei verschiedene Tabs zu schließen"
 msgid "Do you really want to close them all?"
 msgstr "Möchten Sie wirklich alle schließen?"
 
-#: ../src/message_window.py:484
+#: ../src/message_window.py:485
 msgid "Chats"
 msgstr "Chats"
 
-#: ../src/message_window.py:486
+#: ../src/message_window.py:487
 msgid "Group Chats"
 msgstr "Chatraum"
 
-#: ../src/message_window.py:488
+#: ../src/message_window.py:489
 msgid "Private Chats"
 msgstr "Private Chats"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:495
 msgid "Messages"
 msgstr "Nachrichten"
 
@@ -9665,58 +9969,58 @@ msgstr "Neue Nachricht von %(nickname)s"
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: ../src/profile_window.py:57
+#: ../src/profile_window.py:58
 msgid "Retrieving profile..."
 msgstr "Empfange Profil …"
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2935
+#: ../src/profile_window.py:111 ../src/roster_window.py:3001
 msgid "File is empty"
 msgstr "Datei ist leer"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2938
+#: ../src/profile_window.py:114 ../src/roster_window.py:3004
 msgid "File does not exist"
 msgstr "Datei existiert nicht"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2940 ../src/roster_window.py:2951
+#: ../src/profile_window.py:128 ../src/profile_window.py:144
+#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
 msgid "Could not load image"
 msgstr "Konnte Bild nicht laden"
 
-#: ../src/profile_window.py:214
+#: ../src/profile_window.py:215
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Kontaktinformationen"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:216
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Format: JJJJ-MM-TT"
 
-#: ../src/profile_window.py:269
+#: ../src/profile_window.py:270
 msgid "Information received"
 msgstr "Informationen empfangen"
 
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:341
 msgid "Without a connection you can not publish your contact information."
 msgstr ""
 "Sie müssen angemeldet sein, um Kontaktinformationen veröffentlichen zu "
 "können."
 
-#: ../src/profile_window.py:353
+#: ../src/profile_window.py:354
 msgid "Sending profile..."
 msgstr "Sende Profil …"
 
-#: ../src/profile_window.py:368
+#: ../src/profile_window.py:369
 msgid "Information NOT published"
 msgstr "Informationen NICHT veröffentlicht"
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:376
 msgid "vCard publication failed"
 msgstr "Veröffentlichung der vCard fehlgeschlagen"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:377
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9724,54 +10028,54 @@ msgstr ""
 "Bei der Veröffentlichung Ihrer persönlichen Informationen ist ein Fehler "
 "aufgetreten. Versuchen Sie es später erneut."
 
-#: ../src/roster_window.py:256 ../src/roster_window.py:1012
+#: ../src/roster_window.py:262 ../src/roster_window.py:1026
 msgid "Merged accounts"
 msgstr "Alle Konten"
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1942
 msgid "Authorization has been sent"
 msgstr "Autorisierung wurde erneut gesendet"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1943
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "\"%s\" kennt jetzt Ihren Status."
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1966
 msgid "Subscription request has been sent"
 msgstr "Abonnement-Anforderung wurde gesendet"
 
-#: ../src/roster_window.py:1944
+#: ../src/roster_window.py:1967
 #, 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:1958
+#: ../src/roster_window.py:1981
 msgid "Authorization has been removed"
 msgstr "Autorisierung wurde entfernt"
 
-#: ../src/roster_window.py:1959
+#: ../src/roster_window.py:1982
 #, 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:1986
+#: ../src/roster_window.py:2009
 msgid "GPG is not usable"
 msgstr "GPG ist nicht benutzbar"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/roster_window.py:1987
+#: ../src/roster_window.py:2010
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Sie werden ohne OpenPGP-Verschlüsselung mit %s verbunden."
 
-#: ../src/roster_window.py:2199 ../src/roster_window.py:3496
+#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
 msgid "You are participating in one or more group chats"
 msgstr "Sie nehmen an einem oder mehreren Gruppenchats teil"
 
-#: ../src/roster_window.py:2200 ../src/roster_window.py:3497
+#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9779,38 +10083,38 @@ 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:2226
+#: ../src/roster_window.py:2249
 msgid "desync'ed"
 msgstr "Nicht synchronisiert"
 
-#: ../src/roster_window.py:2288
+#: ../src/roster_window.py:2311
 msgid "Really quit Gajim?"
 msgstr "Gajim wirklich beenden?"
 
-#: ../src/roster_window.py:2289
+#: ../src/roster_window.py:2312
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Möchten Sie Gajim wirklich verlassen?"
 
-#: ../src/roster_window.py:2290
+#: ../src/roster_window.py:2313
 msgid "Always close Gajim"
 msgstr "Gajim immer schließen"
 
-#: ../src/roster_window.py:2373
+#: ../src/roster_window.py:2396
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Dateiübertragung abbrechen"
 
-#: ../src/roster_window.py:2374
+#: ../src/roster_window.py:2397
 msgid ""
-"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2405 ../src/roster_window.py:2653
+#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
 msgid "You have unread messages"
 msgstr "Sie haben ungelesene Nachrichten"
 
-#: ../src/roster_window.py:2406
+#: ../src/roster_window.py:2429
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9818,16 +10122,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:2654
+#: ../src/roster_window.py:2720
 msgid "You must read them before removing this transport."
 msgstr "Sie müssen sie lesen, bevor das Konto entfernt wird."
 
-#: ../src/roster_window.py:2657
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Der Transport \"%s\" wird entfernt"
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2724
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9835,11 +10139,11 @@ msgstr ""
 "Sie können nun keine Nachrichten mehr mit Kontakten über diesen Transport "
 "austauschen."
 
-#: ../src/roster_window.py:2661
+#: ../src/roster_window.py:2727
 msgid "Transports will be removed"
 msgstr "Transporte werden entfernt"
 
-#: ../src/roster_window.py:2666
+#: ../src/roster_window.py:2732
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9848,12 +10152,12 @@ msgstr ""
 "Sie können nun keine Nachrichten mehr mit Kontakten über diese Transporte "
 "austauschen: %s"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2800
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "Sie sind dabei, einen Kontakt zu blockieren. Wollen Sie wirklich fortfahren?"
 
-#: ../src/roster_window.py:2736
+#: ../src/roster_window.py:2802
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -9862,57 +10166,57 @@ msgstr ""
 "Nachrichten empfangen, die er Ihnen sendet."
 
 #. it's jid
-#: ../src/roster_window.py:2827
+#: ../src/roster_window.py:2893
 msgid "Rename Contact"
 msgstr "Kontakt umbenennen"
 
-#: ../src/roster_window.py:2828
+#: ../src/roster_window.py:2894
 #, 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:2835
+#: ../src/roster_window.py:2901
 msgid "Rename Group"
 msgstr "Gruppe umbenennen"
 
-#: ../src/roster_window.py:2836
+#: ../src/roster_window.py:2902
 #, 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:2881
+#: ../src/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Gruppe entfernen"
 
-#: ../src/roster_window.py:2882
+#: ../src/roster_window.py:2948
 #, 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:2883
+#: ../src/roster_window.py:2949
 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:2922
+#: ../src/roster_window.py:2988
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP-Schlüssel zuweisen"
 
-#: ../src/roster_window.py:2923
+#: ../src/roster_window.py:2989
 msgid "Select a key to apply to the contact"
 msgstr "Weisen Sie dem Kontakt einen Schüssel zu"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3372
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" wird von Ihrer Kontaktliste entfernt"
 
-#: ../src/roster_window.py:3308
+#: ../src/roster_window.py:3374
 #, 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:3313
+#: ../src/roster_window.py:3379
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9922,11 +10226,11 @@ msgstr ""
 "offline sehen wird."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3319
+#: ../src/roster_window.py:3385
 msgid "Do you want to continue?"
 msgstr "Möchten Sie fortsetzen?"
 
-#: ../src/roster_window.py:3323
+#: ../src/roster_window.py:3389
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9935,17 +10239,17 @@ msgstr ""
 "Berechtigung, Ihren Status zu sehen, wodurch der Kontakt Sie nur noch als "
 "offline sehen wird."
 
-#: ../src/roster_window.py:3326
+#: ../src/roster_window.py:3392
 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:3330
+#: ../src/roster_window.py:3396
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakte werden von Ihrer Kontaktliste entfernt"
 
-#: ../src/roster_window.py:3335
+#: ../src/roster_window.py:3401
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9955,7 +10259,7 @@ 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:3393
+#: ../src/roster_window.py:3459
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want  to continue?"
@@ -9963,7 +10267,7 @@ msgstr ""
 "Sie sind dabei, einen speziellen Status zu senden. Wollen Sie wirklich "
 "fortfahren?"
 
-#: ../src/roster_window.py:3395
+#: ../src/roster_window.py:3461
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -9972,22 +10276,22 @@ msgstr ""
 "Der Kontakt wird Sie vorläufig als %(status)s sehen, aber nur bis Sie Ihren "
 "Status ändern. Dann wird er Ihren globalen Status sehen."
 
-#: ../src/roster_window.py:3414
+#: ../src/roster_window.py:3480
 msgid "No account available"
 msgstr "Kein Konto vorhanden"
 
-#: ../src/roster_window.py:3415
+#: ../src/roster_window.py:3481
 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:4023
+#: ../src/roster_window.py:4095
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 "Das Speichern von Metakontakten wird von Ihrem Server nicht unterstützt"
 
-#: ../src/roster_window.py:4025
+#: ../src/roster_window.py:4097
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9996,14 +10300,14 @@ msgstr ""
 "Daher werden diese Informationen bei der nächsten Neuverbindung nicht "
 "gespeichert."
 
-#: ../src/roster_window.py:4117
+#: ../src/roster_window.py:4189
 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:4119
+#: ../src/roster_window.py:4191
 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 "
@@ -10013,23 +10317,23 @@ msgstr ""
 "gruppieren. Sie werden normalerweise verwendet, wenn eine Person mehrere "
 "Jabber- oder Transport-Konten hat."
 
-#: ../src/roster_window.py:4234
+#: ../src/roster_window.py:4306
 msgid "Invalid file URI:"
 msgstr "Ungültiger Datei-URI:"
 
-#: ../src/roster_window.py:4246
+#: ../src/roster_window.py:4318
 #, 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:4361
+#: ../src/roster_window.py:4433
 #, python-format
 msgid "Send %s to %s"
 msgstr "Sende %s an %s"
 
-#: ../src/roster_window.py:4367
+#: ../src/roster_window.py:4439
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "%s und %s zu Metakontakt zusammenführen"
@@ -10039,143 +10343,143 @@ msgstr "%s und %s zu Metakontakt zusammenführen"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4816 ../src/roster_window.py:4889
-#: ../src/roster_window.py:4898 ../src/statusicon.py:246
-#: ../src/statusicon.py:293 ../src/statusicon.py:299
+#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
+#: ../src/roster_window.py:4970 ../src/statusicon.py:263
+#: ../src/statusicon.py:310 ../src/statusicon.py:316
 #, python-format
 msgid "using account %s"
 msgstr "über das Konto %s"
 
 #. add
-#: ../src/roster_window.py:4905
+#: ../src/roster_window.py:4977
 #, python-format
 msgid "to %s account"
 msgstr "an das Konto %s"
 
 #. disco
-#: ../src/roster_window.py:4910
+#: ../src/roster_window.py:4982
 #, python-format
 msgid "using %s account"
 msgstr "über das Konto %s"
 
-#: ../src/roster_window.py:4948 ../src/statusicon.py:309
+#: ../src/roster_window.py:5020 ../src/statusicon.py:326
 msgid "_Manage Bookmarks..."
 msgstr "_Gespeicherte Chaträume …"
 
 #. profile, avatar
-#: ../src/roster_window.py:4968
+#: ../src/roster_window.py:5040
 #, python-format
 msgid "of account %s"
 msgstr "des Kontos %s"
 
-#: ../src/roster_window.py:5009
+#: ../src/roster_window.py:5081
 #, python-format
 msgid "for account %s"
 msgstr "für das Konto %s"
 
-#: ../src/roster_window.py:5069 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
 msgid "_Change Status Message"
 msgstr "Ändere _Statusnachricht"
 
-#: ../src/roster_window.py:5102
+#: ../src/roster_window.py:5174
 msgid "Publish Tune"
 msgstr "Musiktitel veröffentlichen"
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5176
 #, fuzzy
 msgid "Publish Location"
 msgstr "Musiktitel veröffentlichen"
 
-#: ../src/roster_window.py:5107
+#: ../src/roster_window.py:5179
 msgid "Configure Services..."
 msgstr "Dienste konfigurieren …"
 
-#: ../src/roster_window.py:5252
+#: ../src/roster_window.py:5324
 msgid "_Maximize All"
 msgstr "Alle _maximieren"
 
-#: ../src/roster_window.py:5262 ../src/roster_window.py:5436
+#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
 msgid "Send Group M_essage"
 msgstr "Nachricht an die Gruppe _senden"
 
-#: ../src/roster_window.py:5270
+#: ../src/roster_window.py:5342
 msgid "To all users"
 msgstr "An alle Benutzer"
 
-#: ../src/roster_window.py:5274
+#: ../src/roster_window.py:5346
 msgid "To all online users"
 msgstr "An alle angemeldeten Benutzer"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5456
+#: ../src/roster_window.py:5528
 msgid "_Manage Contacts"
 msgstr "Kontakte verwalten"
 
 #. Edit Groups
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5537
 msgid "Edit _Groups"
 msgstr "_Gruppen bearbeiten"
 
 #. Send single message
-#: ../src/roster_window.py:5520
+#: ../src/roster_window.py:5592
 msgid "Send Single Message"
 msgstr "Sende _einzelne Nachricht"
 
 #. Execute Command
-#: ../src/roster_window.py:5567
+#: ../src/roster_window.py:5639
 msgid "Execute Command..."
 msgstr "Befehl ausführen …"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5577
+#: ../src/roster_window.py:5649
 msgid "_Manage Transport"
 msgstr "_Transport verwalten"
 
 #. Modify Transport
-#: ../src/roster_window.py:5586
+#: ../src/roster_window.py:5658
 msgid "_Modify Transport"
 msgstr "_Ändern"
 
 #. Rename
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5668
 msgid "_Rename"
 msgstr "_Umbenennen"
 
-#: ../src/roster_window.py:5656
+#: ../src/roster_window.py:5728
 msgid "_Maximize"
 msgstr "_Maximieren"
 
-#: ../src/roster_window.py:5665
+#: ../src/roster_window.py:5737
 msgid "_Reconnect"
 msgstr "Wieder ve_rbinden"
 
-#: ../src/roster_window.py:5672
+#: ../src/roster_window.py:5744
 msgid "_Disconnect"
 msgstr "_Verbindung trennen"
 
 #. History manager
-#: ../src/roster_window.py:5754
+#: ../src/roster_window.py:5833
 msgid "History Manager"
 msgstr "_Verlaufsmanager"
 
-#: ../src/roster_window.py:5765
+#: ../src/roster_window.py:5844
 msgid "_Join New Group Chat"
 msgstr "_Chatraum betreten …"
 
-#: ../src/roster_window.py:5938
+#: ../src/roster_window.py:6019
 msgid "Change Status Message..."
 msgstr "Ändere Statusnachricht …"
 
-#: ../src/search_window.py:94
+#: ../src/search_window.py:105
 msgid "Waiting for results"
 msgstr "Warte auf Ergebnisse"
 
-#: ../src/search_window.py:132 ../src/search_window.py:210
+#: ../src/search_window.py:143 ../src/search_window.py:220
 msgid "Error in received dataform"
 msgstr "Fehler im empfangenen Datenformular"
 
 #. No result
-#: ../src/search_window.py:166 ../src/search_window.py:202
+#: ../src/search_window.py:177 ../src/search_window.py:212
 msgid "No result"
 msgstr "Kein Ergebnis"
 
@@ -10188,14 +10492,15 @@ msgstr "Fehler beim Schreiben auf Festplatte"
 msgid "Subject: %s"
 msgstr "Thema: %s"
 
-#: ../src/session.py:433 ../src/session.py:468
+#: ../src/session.py:447 ../src/session.py:491
 msgid "Confirm these session options"
 msgstr "Bestätigen Sie diese Sitzungsoptionen"
 
-#: ../src/session.py:435
+#: ../src/session.py:448
 #, fuzzy, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
+"The remote client wants '\n"
+"                            'to negotiate an session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -10207,7 +10512,7 @@ msgstr ""
 "\n"
 "\t\tSind diese Einstellungen akzeptabel?"
 
-#: ../src/session.py:469
+#: ../src/session.py:492
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10222,16 +10527,16 @@ msgstr ""
 "\n"
 "Mit der Sitzung fortfahren?"
 
-#: ../src/statusicon.py:210
+#: ../src/statusicon.py:227
 msgid "_Change Status Message..."
 msgstr "Ändere _Statusnachricht …"
 
-#: ../src/statusicon.py:322
+#: ../src/statusicon.py:339
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "in der _Kontaktliste"
 
-#: ../src/statusicon.py:333
+#: ../src/statusicon.py:350
 msgid "Hide this menu"
 msgstr "Dieses Menü ausblenden"
 
@@ -10370,32 +10675,32 @@ msgstr ""
 "Dieser Dienst konnte nicht mit detaillierten Informationen antworten\n"
 "Er ist wahrscheinlich veraltet oder defekt"
 
-#: ../src/vcard.py:251
+#: ../src/vcard.py:265
 msgid "?Client:Unknown"
 msgstr "Unbekannt"
 
-#: ../src/vcard.py:253
+#: ../src/vcard.py:267
 msgid "?OS:Unknown"
 msgstr "?OS:Unbekannt"
 
-#: ../src/vcard.py:274
+#: ../src/vcard.py:288
 msgid "?Time:Unknown"
 msgstr "?Time:Unbekannt"
 
-#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
+#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
 #, python-format
 msgid "since %s"
 msgstr "seit %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:345
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:349
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Mitgliedschaft:</b>"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:357
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10403,7 +10708,7 @@ msgstr ""
 "Dieser Kontakt ist an Ihrem Status interessiert, aber Sie sind nicht an "
 "seinem interessiert"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:359
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10411,12 +10716,12 @@ msgstr ""
 "Sie sind am Status des Kontakts interessiert, aber er ist nicht an Ihrem "
 "interessiert"
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:361
 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:349
+#: ../src/vcard.py:363
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10424,27 +10729,73 @@ msgstr ""
 "Sie sind nicht am Status des Kontakts interessiert, und er ist nicht Ihrem "
 "interessiert"
 
-#: ../src/vcard.py:356
+#: ../src/vcard.py:370
 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:358
+#: ../src/vcard.py:372
 msgid "There is no pending subscription request."
 msgstr "Es gibt keine offenen Abonnementanfragen."
 
-#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
+#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
 msgid " resource with priority "
 msgstr " Resource mit Priorität "
 
-#~ msgid "_Available"
-#~ msgstr "_Angemeldet"
+#~ msgid "@"
+#~ msgstr "@"
+
+#~ msgid "_Disable showing event in systray"
+#~ msgstr "_Deaktiviere die Ereignisanzeige im Systray"
+
+#~ msgid "_Show event in systray"
+#~ msgstr "Zeige Ereignisse im _Systray"
+
+#, fuzzy
+#~ msgid "Always use GNOME default applications"
+#~ msgstr "Immer OS/X-Standardprogramme verwenden"
+
+#, fuzzy
+#~ msgid "Always use Xfce default applications"
+#~ msgstr "Immer OS/X-Standardprogramme verwenden"
+
+#, fuzzy
+#~ msgid "Autodetect on every Gajim startup"
+#~ msgstr "Beim Pr_ogrammstart verbinden"
+
+# FIXME: Check English. This should be called something like "Show systray icon"
+# because the systray itself is always visible.
+#~ msgid "Show systray:"
+#~ msgstr "Symbol in der Systemleiste anzeigen:"
 
-#~ msgid "PEP node was not removed"
-#~ msgstr "PEP-Knoten wurde nicht entfernt"
+#~ msgid "Nickname not allowed: %s"
+#~ msgstr "Spitzname nicht erlaubt: %s"
 
-#~ msgid "PEP node %(node)s was not removed: %(message)s"
-#~ msgstr "Der PEP-Knoten %(node)s wurde nicht entfernt: %(message)s"
+#~ msgid "Room has been destroyed"
+#~ msgstr "Der Chatraum wurde gelöscht"
+
+#~ msgid "You can join this room instead: %s"
+#~ msgstr "Sie können stattdessen diesen Chatraum betreten: %s"
+
+#~ msgid "I would like to add you to my roster."
+#~ msgstr "Ich würde Sie gerne als Kontakt zu meiner Kontaktliste hinzufügen."
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "Sie haben jetzt %s abonniert"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "Anfrage zur Beendigung des Abonnements von %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "%s hat das Abonnement beendet"
+
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "Die Jabber-ID %s ist nicht RFC-konform und wird nicht zu Ihrer "
+#~ "Kontaktliste hinzugefügt. Verwenden Sie ein Kontaktlisten-Managment-Tool "
+#~ "wie <http://jru.jabberstudio.org/>, um sie zu entfernen."
 
 #~ msgid "Account Modification"
 #~ msgstr "Kontoänderung"
@@ -10554,46 +10905,9 @@ msgstr " Resource mit Priorität "
 #~ msgid "gtk-delete"
 #~ msgstr "gtk-delete"
 
-#~ msgid "Add this contact to roster (Ctrl+D)"
-#~ msgstr "Kontakt zur Kontaktliste hinzufügen (Strg+D)"
-
-# TODO: Synchronize with other strings concerning bookmarks
-#~ msgid "Bookmark this room (Ctrl+B)"
-#~ msgstr "Diesen Chatraum speichern (Strg+B)"
-
-#~ msgid "Browse the chat history (Ctrl+H)"
-#~ msgstr "Chatverlauf anzeigen (Strg+H)"
-
-#~ msgid "Change the room's subject (Alt+T)"
-#~ msgstr "Thema des Chatraums ändern (Alt+T)"
-
-#~ msgid "Change your nickname (Ctrl+N)"
-#~ msgstr "Spitzname ändern (Strg+N)"
-
-#~ msgid "Invite contacts to the conversation (Ctrl+G)"
-#~ msgstr "Weiteren Kontakt zur Unterhaltung einladen (Strg+G)"
-
 #~ msgid "Send a file (Ctrl+F)"
 #~ msgstr "Datei senden (Strg+F)"
 
-#~ msgid "Show a list of emoticons (Alt+M)"
-#~ msgstr "Emoticons (Alt+M)"
-
-#~ msgid "Show a list of formattings"
-#~ msgstr "Schriftformatierung (Alt+M)"
-
-#~ msgid "Show a menu of advanced functions (Alt+D)"
-#~ msgstr "Liste erweiterter Funktionen anzeigen (Alt+D)"
-
-#~ msgid "Show the contact's profile (Ctrl+I)"
-#~ msgstr "Benutzerprofil anzeigen (Strg+I)"
-
-#~ msgid "Toggle audio session"
-#~ msgstr "Zwischen Audio-Sitzung umschalten"
-
-#~ msgid "Toggle video session"
-#~ msgstr "Zwischen Video-Sitzung umschalten"
-
 #~ msgid ""
 #~ "All chat states\n"
 #~ "Composing only\n"
@@ -10653,9 +10967,6 @@ msgstr " Resource mit Priorität "
 #~ msgid "gtk-cancel"
 #~ msgstr "gtk-cancel"
 
-#~ msgid "_Preferences"
-#~ msgstr "_Einstellungen"
-
 #~ msgid "_Quit"
 #~ msgstr "_Beenden"
 
diff --git a/po/el.po b/po/el.po
index ecbf8e3f8d004106b08c501d6298fd92d3685ed4..caeb7d096e50087a26904e1d157ff90061cbdd7d 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,11 +7,15 @@
 # Filippos Papadopoulos <filip@cs.uoi.gr>, 2005.
 # Stathis Kamperis <ekamperi@auth.gr>, 2005
 #
+#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 11:28+0200\n"
+"POT-Creation-Date: 2010-10-01 20:39+0200\n"
 "PO-Revision-Date: 2009-08-19 23:46+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg@hellug.gr>\n"
 "Language-Team:  <>\n"
@@ -33,7 +37,7 @@ msgstr "Συμμετοχή σε _Ομαδική Συζήτηση..."
 msgid "_Add Contact..."
 msgstr "_Προσθήκη επαφής..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:17
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
 msgid "_Discover Services"
 msgstr "Εύρεση _υπηρεσιών"
 
@@ -56,7 +60,7 @@ msgstr "Άνοιγμα υπάρχοντος μενού"
 msgid "_Personal Events"
 msgstr "Προσωπικές πληροφορίες"
 
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:23
+#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
 #, fuzzy
 msgid "_Start Chat..."
 msgstr "_Έναρξη συζήτησης"
@@ -91,76 +95,72 @@ msgid "<b>Please select a server</b>"
 msgstr ""
 
 #: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid "@"
-msgstr ""
-
-#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
 msgstr ""
 
-#: ../data/gui/account_creation_wizard_window.ui.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:10
 #, fuzzy
 msgid "Anon_ymous authentication"
 msgstr "Χρήση πιστοποίησης"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Connect when I press Finish"
 msgstr "Σύνδεση όταν επιλέξω Τέλος"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Οδηγός δημιουργίας λογαριασμού"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 #, fuzzy
 msgid "I already have an account I want to _use"
 msgstr "Έχω ήδη ένα λογαριασμό που θέλω να χρησιμοποιήσω"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I want to _register for a new account"
 msgstr "_Επιλέξτε εάν επιθυμείτε να καταχωρήσετε νέο jabber λογαριασμό"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:16
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 #: ../data/gui/accounts_window.ui.h:28
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Αν επιλεγεί, το Gajim θα θυμάται τον κωδικό για αυτόν το λογαριασμό"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:17
+#: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Διαχείριση..."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:18
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
 #: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2263 ../src/config.py:2342
-#: ../src/config.py:2355 ../src/config.py:3596 ../src/config.py:3671
-#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513
-#: ../src/dialogs.py:526 ../src/roster_window.py:2890
-#: ../src/roster_window.py:2896 ../src/roster_window.py:2901
+#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
+#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
+#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
+#: ../src/dialogs.py:527 ../src/roster_window.py:2956
+#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
 msgid "None"
 msgstr "Κανένα"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:19
+#: ../data/gui/account_creation_wizard_window.ui.h:18
 #, fuzzy
 msgid "Prox_y:"
 msgstr "Μεσολαβητής:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #: ../data/gui/accounts_window.ui.h:48
 msgid "Save pass_word"
 msgstr "_Αποθήκευση κωδικού"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:21
+#: ../data/gui/account_creation_wizard_window.ui.h:20
 msgid "Set my profile when I connect"
 msgstr "Καθορισμός του προφίλ μου κατά τη σύνδεση"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:22
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Use custom hostname/port"
 msgstr "Χρήση προσαρμοσμένου διακομιστή/θύρας"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:23
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -168,35 +168,35 @@ msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό προτού μπορέσετε\n"
 "να συνδεθείτε στο Jabber."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-#: ../data/gui/roster_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:16
 msgid "_Advanced"
 msgstr "Για προ_χωρημένους"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:25
 msgid "_Finish"
 msgstr "_Τέλος"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:27
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 #, fuzzy
 msgid "_Hostname:"
 msgstr "Εξυπηρετητής:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #: ../data/gui/accounts_window.ui.h:62
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:28
 #: ../data/gui/accounts_window.ui.h:64
 msgid "_Password:"
 msgstr "_Κωδικός πρόσβασης:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:29
 msgid "_Port:"
 msgstr "_Θύρα:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:31
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Server:"
 msgstr "_Εξυπηρετητής:"
 
@@ -308,17 +308,17 @@ msgstr "Όνομα:"
 #. No configured account
 #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
 #: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592
-#: ../src/notify.py:608
+#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
+#: ../src/notify.py:616
 msgid "Gajim"
 msgstr "Gajim"
 
 #. FIXME: Ugly workaround.
 #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
 #. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:61
-#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121
-#: ../src/roster_window.py:2832 ../src/roster_window.py:5379
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
+#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
 msgid "General"
 msgstr "Γενικά"
 
@@ -376,7 +376,7 @@ msgstr "Οι πληροφορίες για εσάς, όπως αποθηκεύο
 
 #: ../data/gui/accounts_window.ui.h:35
 #: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:830
+#: ../src/dialogs.py:831
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -390,7 +390,7 @@ msgid "Mer_ge accounts"
 msgstr "Συ_γχώνευση λογαριασμών"
 
 #: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2356
+#: ../src/config.py:2358
 msgid "No key selected"
 msgstr "Δεν έχει επιλεχτεί κλειδί"
 
@@ -418,7 +418,7 @@ msgid "Priority will change automatically according to your status."
 msgstr ""
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5329
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
 msgid "Re_name"
 msgstr "_Μετονομασία"
 
@@ -659,42 +659,47 @@ msgstr "Διαγράφει το Μήνυμα της ημέρας (MOTD)"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
 #, fuzzy
+msgid "Edit Archi_ving Preferences"
+msgstr "_Προτιμήσεις"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#, fuzzy
 msgid "Edit _Privacy Lists..."
 msgstr "Προσωπικές συζητήσεις"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 #, fuzzy
 msgid "Sends a message to users currently connected to this server"
 msgstr ""
 "Στέλνει ένα μήνυμα στους χρήστες που είναι συνδεδεμένοι σε αυτό το διακομιστή"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 #, fuzzy
 msgid "Set MOTD..."
 msgstr "Ορισμός MOTD"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Ορίζει το Μήνυμα της ημέρας (MOTD)"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Show _XML Console"
 msgstr "Κονσόλα _XML"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "Ενημέρωση MOTD"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "Ενημερώνει το Μήνυμα της ημέρας (MOTD)"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:11
 msgid "_Administrator"
 msgstr "_Διαχειριστής"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:11
+#: ../data/gui/advanced_menuitem_menu.ui.h:12
 #, fuzzy
 msgid "_Send Server Message..."
 msgstr "_Αποστολή μηνύματος διακομιστή"
@@ -729,7 +734,7 @@ msgid "All statuses"
 msgstr "Όλες οι καταστάσεις"
 
 #: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:233
+#: ../src/common/commands.py:106 ../src/common/helpers.py:239
 #: ../src/tooltips.py:193
 msgid "Away"
 msgstr "Απομακρυσμένος"
@@ -782,7 +787,7 @@ msgid "Have "
 msgstr "Έχει"
 
 #: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:249
 msgid "Invisible"
 msgstr "Αφανής"
 
@@ -791,7 +796,7 @@ msgid "Launch a command"
 msgstr "Εκτέλεση εντολής"
 
 #: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:216 ../src/tooltips.py:197
+#: ../src/common/helpers.py:222 ../src/tooltips.py:197
 msgid "Not Available"
 msgstr "Μη διαθέσιμος"
 
@@ -839,11 +844,11 @@ msgid "_Disable existing sound for this event"
 msgstr "Το αρχείο ήχου για το παρόν γεγονός δεν υπάρχει."
 
 #: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in roster"
+msgid "_Disable showing event in notification area"
 msgstr ""
 
 #: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in systray"
+msgid "_Disable showing event in roster"
 msgstr ""
 
 #: ../data/gui/advanced_notifications_window.ui.h:33
@@ -857,12 +862,12 @@ msgstr "Χρήση ενός παραθύρου κουβέντας με _καρτ
 
 #: ../data/gui/advanced_notifications_window.ui.h:35
 #, fuzzy
-msgid "_Show event in roster"
+msgid "_Show event in notification area"
 msgstr "_Προβολή τίτλου στο κουμπί"
 
 #: ../data/gui/advanced_notifications_window.ui.h:36
 #, fuzzy
-msgid "_Show event in systray"
+msgid "_Show event in roster"
 msgstr "_Προβολή τίτλου στο κουμπί"
 
 #: ../data/gui/advanced_notifications_window.ui.h:37
@@ -891,6 +896,45 @@ msgstr "Ομάδα"
 msgid "when I'm in"
 msgstr "όταν είμαι στο"
 
+#: ../data/gui/archiving_preferences_window.ui.h:1
+msgid "<i>Method Auto</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "<i>Method Local</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:3
+msgid "<i>Method Manual</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:4
+#, fuzzy
+msgid "Auto"
+msgstr "Αυτόματη είσοδος"
+
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Concede"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "Forbid"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:7
+#, fuzzy
+msgid "No"
+msgstr "Κανένα"
+
+#: ../data/gui/archiving_preferences_window.ui.h:8
+#, fuzzy
+msgid "Prefer"
+msgstr "Προτιμήσεις"
+
+#: ../data/gui/archiving_preferences_window.ui.h:9
+msgid "Yes"
+msgstr ""
+
 #: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Εγγραφή:"
@@ -921,8 +965,8 @@ msgstr "Επαφές"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5348
-#: ../src/roster_window.py:5476 ../src/roster_window.py:5609
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
+#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
 msgid "_Unblock"
 msgstr ""
 
@@ -1016,7 +1060,7 @@ msgid "_Start Chat"
 msgstr "_Έναρξη συζήτησης"
 
 #. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4184
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
 msgid "#"
 msgstr "#"
 
@@ -1064,13 +1108,55 @@ msgstr ""
 msgid "9"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:13
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Προσθέτει μια επαφή στη λίστα επαφών"
+
 #: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
+msgid "Browse the chat history (Ctrl+H)"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:15
+#, fuzzy
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "έχει την προσοχή του στην κουβέντα"
+
+#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+#, fuzzy
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Κάντε κλικ για να εισάγετε φατσούλα (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
+#, fuzzy
+msgid "Show a list of formattings"
+msgstr "Κάντε κλικ για να εισάγετε φατσούλα (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Κάντε κλικ για να εισάγετε φατσούλα (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:19
+#, fuzzy
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr "Προσθέτει μια επαφή στη λίστα επαφών"
+
+#: ../data/gui/chat_control.ui.h:20
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:21
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
 #: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Αποστολή"
 
-#: ../data/gui/chat_control.ui.h:15 ../data/gui/groupchat_control.ui.h:3
+#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
 msgid "label"
 msgstr ""
 
@@ -1125,8 +1211,8 @@ msgstr "Επεξεργασία _ομάδων"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5284
-#: ../src/roster_window.py:5444
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
+#: ../src/roster_window.py:5516
 #, fuzzy
 msgid "In_vite to"
 msgstr "Αδυναμία φόρτωσης"
@@ -1141,8 +1227,8 @@ msgstr "Επαφές"
 msgid "Remo_ve"
 msgstr "_Αφαίρεση"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5294
-#: ../src/roster_window.py:5533
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
+#: ../src/roster_window.py:5605
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Προσαρμοσμένο μέγεθος _γραμματοσειράς:"
@@ -1179,8 +1265,8 @@ msgid "_Allow him/her to see my status"
 msgstr "Επέτρεψε τον/την να βλέπει την κατάστασή μου"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5482 ../src/roster_window.py:5612
+#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
+#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
 msgid "_Block"
 msgstr ""
 
@@ -1191,8 +1277,8 @@ msgstr "Απαγόρευσε τον/την να βλέπει την κατάστ
 
 #: ../data/gui/contact_context_menu.ui.h:20
 #: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:21
-#: ../src/roster_window.py:5683
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
+#: ../src/roster_window.py:5755
 msgid "_History"
 msgstr "_Ιστορικό"
 
@@ -1335,7 +1421,7 @@ msgstr "<b>Χρώματα κατάστασης κουβέντας</b>"
 msgid "Account row"
 msgstr "Λογαριασμός"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:925
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
 msgid "Bold"
 msgstr "Έντονα"
 
@@ -1374,7 +1460,7 @@ msgstr "Ομάδα"
 msgid "Inactive"
 msgstr "Ανενεργό"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:926
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
 msgid "Italic"
 msgstr "Πλάγια"
 
@@ -1425,7 +1511,7 @@ msgstr "Αλλαγή _θέματος"
 msgid "Configure _Room..."
 msgstr "Ρύθμιση _δωματίου"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1782
+#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
 #, fuzzy
 msgid "_Bookmark"
 msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
@@ -1489,20 +1575,34 @@ msgstr "_Αποστολή προσωπικού μηνύματος"
 msgid "_Voice"
 msgstr "_Φωνή"
 
+#: ../data/gui/groupchat_control.ui.h:1
+#, fuzzy
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
+
+#: ../data/gui/groupchat_control.ui.h:3
+msgid "Change the room's subject (Alt+T)"
+msgstr ""
+
+#: ../data/gui/groupchat_control.ui.h:4
+#, fuzzy
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Αλλαγή _ψευδώνυμου"
+
 #: ../data/gui/groups_post_window.ui.h:1
 #, fuzzy
 msgid "Create new post"
 msgstr "Δημιουργία νέου προφίλ"
 
-#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
-msgid "From"
-msgstr "Από"
+#: ../data/gui/groups_post_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:2
+msgid "From:"
+msgstr "Από:"
 
-#. holds subject
-#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
-#: ../src/history_manager.py:219
-msgid "Subject"
-msgstr "Θέμα"
+#: ../data/gui/groups_post_window.ui.h:3
+#: ../data/gui/single_message_window.ui.h:7
+msgid "Subject:"
+msgstr "Θέμα:"
 
 #: ../data/gui/history_manager.ui.h:1
 #, fuzzy
@@ -1527,8 +1627,8 @@ msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Διαχειριστής βάσης δεδομένων ιστορικού Gajim"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3208
-#: ../src/dialogs.py:3305
+#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
+#: ../src/dialogs.py:3321
 msgid "Delete"
 msgstr "Διαγραφή"
 
@@ -1582,12 +1682,75 @@ msgstr "Αναζήτηση"
 msgid "_Log conversation history"
 msgstr "_Καταγραφή ιστορικού συζητήσεων"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
+msgid "approve"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:2
+msgid "body"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:3
+msgid "concede"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:4
+msgid "expire"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:5
+msgid "false"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:6
+msgid "forbid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:7
+#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+msgid "jid"
+msgstr "jid"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:8
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
+#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
+msgid "message"
+msgstr "μήνυμα"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
+msgid "oppose"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
+#, fuzzy
+msgid "otr"
+msgstr "Ε_ξυπηρετητής:"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:11
+msgid "prefer"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:12
+msgid "require"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:13
+msgid "save"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:14
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
 msgid "Bro_wse Rooms"
 msgstr "_Περιήγηση"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2180
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
 msgid "Join Group Chat"
 msgstr "Συμμετοχή σε ομαδική κουβέντα"
 
@@ -1625,8 +1788,8 @@ msgstr "Εξυπηρετητής:"
 msgid "_Bookmark this room"
 msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1341
-#: ../src/disco.py:1786
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../src/disco.py:1804
 msgid "_Join"
 msgstr "_Συμμετοχή"
 
@@ -1737,6 +1900,75 @@ msgstr "Όν_ομα χρήστη:"
 msgid "Passphrase"
 msgstr "Φράση πρόσβασης"
 
+#: ../data/gui/plugins_window.ui.h:1
+msgid "&lt;empty&gt;"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:2
+msgid "<empty>"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:3
+#, fuzzy
+msgid "Authors:"
+msgstr "Αμερική/Πορτ-Ο-Πρενς"
+
+#: ../data/gui/plugins_window.ui.h:4
+#, fuzzy
+msgid "Available"
+msgstr "Μη διαθέσιμος"
+
+#: ../data/gui/plugins_window.ui.h:5
+#, fuzzy
+msgid "Configure"
+msgstr "_Συνέχεια"
+
+#: ../data/gui/plugins_window.ui.h:6
+#, fuzzy
+msgid "Descrition:"
+msgstr "Περιγραφή: %s"
+
+#: ../data/gui/plugins_window.ui.h:7
+msgid "Homepage:"
+msgstr "Προσωπ. σελίδα:"
+
+#: ../data/gui/plugins_window.ui.h:8
+msgid "Install"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:9
+#, fuzzy
+msgid "Installed"
+msgstr "Πάγωσε"
+
+#: ../data/gui/plugins_window.ui.h:10
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:11
+msgid "Plugins"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:12
+msgid "Uninstall"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:13
+#, fuzzy
+msgid "Version:"
+msgstr "Έκδοση GTK+:"
+
+#: ../data/gui/plugins_window.ui.h:14
+msgid "button"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:15
+#, fuzzy
+msgid "homepage url"
+msgstr "Προσωπ. σελίδα:"
+
 #: ../data/gui/popup_notification_window.ui.h:1
 #, fuzzy
 msgid "Event Type"
@@ -1874,126 +2106,109 @@ msgid "Always"
 msgstr "Απομακρυσμένος"
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Always use GNOME default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:32
-msgid "Always use KDE default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:33
-msgid "Always use Xfce default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Ερώτηση μηνύματος κατάστασης όταν γίνομαι:"
 
-#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
 msgid "Audio / Video"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:33
 msgid "Audio input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Audio output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:38
-#, fuzzy
-msgid "Autodetect on every Gajim startup"
-msgstr "Σύνδεση κατά την ε_κκίνηση του Gajim"
-
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:35
 #, fuzzy
 msgid "Chat message:"
 msgstr "Μήνυμα κατά_στασης:"
 
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:36
 #, fuzzy
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Gajim - ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
 
-#: ../data/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:37
 #, fuzzy
 msgid "Composing only"
 msgstr "Σύνθεση"
 
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:38
 msgid "Configure color and font of the interface"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Μήνυμα κατά_στασης:"
 
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Όνομα επαφής"
 
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:41
 #, fuzzy
 msgid "Custom"
 msgstr "<b>Προσαρμοσμένες ρυθμίσεις</b>"
 
-#: ../data/gui/preferences_window.ui.h:46
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Detached roster with chat grouped by account"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Detached roster with detached chats"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:45
 msgid "Detached roster with single chat"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
-#: ../src/config.py:671
+#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
+#: ../src/config.py:665
 msgid "Disabled"
 msgstr "Απενεργοποιημένο"
 
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:47
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
 
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:48
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:49
 #, fuzzy
 msgid "Display _location of contacts in roster"
 msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
 
-#: ../data/gui/preferences_window.ui.h:54
+#: ../data/gui/preferences_window.ui.h:50
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display a_vatars of contacts in roster"
 msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
 
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:52
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
 
-#: ../data/gui/preferences_window.ui.h:57
+#: ../data/gui/preferences_window.ui.h:53
 msgid "Display status _messages of contacts in roster"
 msgstr "Εμφάνιση των _μηνυμάτων κατάστασης στη λίστα επαφών"
 
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:54
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -2004,7 +2219,7 @@ msgstr ""
 "μια συζήτηση που έχετε με μια επαφή. Εδώ μπορείτε να ορίσετε τι πληροφορίες "
 "θέλετε να στέλνετε στους άλλους."
 
-#: ../data/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:55
 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 "
@@ -2014,7 +2229,7 @@ msgstr ""
 "μια συζήτηση που έχετε με μια επαφή. Εδώ μπορείτε να ορίσετε τι πληροφορίες "
 "θέλετε να στέλνετε στους άλλους."
 
-#: ../data/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:56
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2022,12 +2237,12 @@ msgstr ""
 "Το Gajim θα σας ειδοποιήσει μέσω ενός αναδυόμενου παραθύρου στο κάτω δεξιά "
 "μέρος της οθόνης για τις επαφές που μόλις αποσυνδέθηκαν στο Jabber"
 
-#: ../data/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:58
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "Αποκρύπτει τα κουμπιά σε παράθυρο ομαδικής κουβέντας"
 
-#: ../data/gui/preferences_window.ui.h:63
+#: ../data/gui/preferences_window.ui.h:59
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
@@ -2036,26 +2251,26 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα σας συνδέει αυτόματα σε αυτό το δωμάτιο κατά την "
 "εκκίνηση"
 
-#: ../data/gui/preferences_window.ui.h:64
+#: ../data/gui/preferences_window.ui.h:60
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:61
 #, fuzzy
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Αν επιλεγεί, το Gajim θα έχει δικό του εικονίδιο στην περιοχή γνωστοποίησης"
 
-#: ../data/gui/preferences_window.ui.h:66
+#: ../data/gui/preferences_window.ui.h:62
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -2063,7 +2278,7 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
 "και στις ομαδικές κουβέντες"
 
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -2071,7 +2286,7 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα εμφανίζει τα μηνύματα κατάστασης των επαφών σας "
 "κάτω από τα ονόματα τους στη λίστα επαφών και στις ομαδικές κουβέντες"
 
-#: ../data/gui/preferences_window.ui.h:69
+#: ../data/gui/preferences_window.ui.h:65
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -2079,7 +2294,7 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
 "και στις ομαδικές κουβέντες"
 
-#: ../data/gui/preferences_window.ui.h:70
+#: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the location of contacts in the roster window"
@@ -2087,7 +2302,7 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
 "και στις ομαδικές κουβέντες"
 
-#: ../data/gui/preferences_window.ui.h:71
+#: ../data/gui/preferences_window.ui.h:67
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -2095,7 +2310,7 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
 "και στις ομαδικές κουβέντες"
 
-#: ../data/gui/preferences_window.ui.h:72
+#: ../data/gui/preferences_window.ui.h:68
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -2103,14 +2318,14 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
 "και στις ομαδικές κουβέντες"
 
-#: ../data/gui/preferences_window.ui.h:73
+#: ../data/gui/preferences_window.ui.h:69
 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/gui/preferences_window.ui.h:74
+#: ../data/gui/preferences_window.ui.h:70
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -2121,20 +2336,20 @@ msgstr ""
 "ή άλλα ενοχλητικά μηνύματα. Χρησιμοποιήστε το με προσοχή, γιατί μπλοκάρει "
 "όλα τα μηνύματα από κάθε επαφή που δεν έχετε στη λίστα επαφών σας"
 
-#: ../data/gui/preferences_window.ui.h:75
+#: ../data/gui/preferences_window.ui.h:71
 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/gui/preferences_window.ui.h:76
+#: ../data/gui/preferences_window.ui.h:72
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:77
+#: ../data/gui/preferences_window.ui.h:73
 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, "
@@ -2144,13 +2359,13 @@ msgstr ""
 "πρωτόκολλο της επαφής. (πχ. Μια επαφή από το MSN θα έχει το αντίστοιχο msn "
 "εικονίδιο για τις καταστάσεις διαθέσιμος, απομακρυσμένος κλπ..)"
 
-#: ../data/gui/preferences_window.ui.h:78
+#: ../data/gui/preferences_window.ui.h:74
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:79
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2158,133 +2373,133 @@ msgstr ""
 "Αν δεν απενεργοποιηθεί, το Gajim θα μετατρέπει όλα ascii σύμβολα όπως το "
 "':)' με τις αντίστοιχες γραφικές φατσούλες"
 
-#: ../data/gui/preferences_window.ui.h:80
+#: ../data/gui/preferences_window.ui.h:76
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:81
+#: ../data/gui/preferences_window.ui.h:77
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "Παρά_θυρο ενός μηνύματος:"
 
-#: ../data/gui/preferences_window.ui.h:82
+#: ../data/gui/preferences_window.ui.h:78
 msgid "Ma_nage..."
 msgstr "Δια_χείριση..."
 
-#: ../data/gui/preferences_window.ui.h:83
+#: ../data/gui/preferences_window.ui.h:79
 #, fuzzy
 msgid "Never"
 msgstr "_Ποτέ"
 
-#: ../data/gui/preferences_window.ui.h:84
+#: ../data/gui/preferences_window.ui.h:80
 #, fuzzy
 msgid "Notifications"
 msgstr "Τροποποίηση λογαριασμού"
 
-#: ../data/gui/preferences_window.ui.h:85
+#: ../data/gui/preferences_window.ui.h:81
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Ειδοποίηση όταν μια επαφή:"
 
-#: ../data/gui/preferences_window.ui.h:86
+#: ../data/gui/preferences_window.ui.h:82
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Ειδοποίηση όταν μια επαφή:"
 
-#: ../data/gui/preferences_window.ui.h:87
+#: ../data/gui/preferences_window.ui.h:83
 #, fuzzy
 msgid "Notify me about it"
 msgstr "_Ειδοποίησε με για αυτό"
 
-#: ../data/gui/preferences_window.ui.h:88
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notify on new _GMail email"
 msgstr "Ειδοποίηση σε νέο μήνυμα στο _Gmail"
 
-#: ../data/gui/preferences_window.ui.h:89
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Only when pending events"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:90
+#: ../data/gui/preferences_window.ui.h:86
 #, fuzzy
 msgid "Personal Events"
 msgstr "Προσωπικές πληροφορίες"
 
-#: ../data/gui/preferences_window.ui.h:91
+#: ../data/gui/preferences_window.ui.h:87
 msgid "Play _sounds"
 msgstr "Αναπαραγωγή _ήχων"
 
-#: ../data/gui/preferences_window.ui.h:92
+#: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
 msgid "Pop it up"
 msgstr "_Εμφάνισε το"
 
-#: ../data/gui/preferences_window.ui.h:93
+#: ../data/gui/preferences_window.ui.h:89
 msgid "Preferences"
 msgstr "Προτιμήσεις"
 
-#: ../data/gui/preferences_window.ui.h:94
+#: ../data/gui/preferences_window.ui.h:90
 msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:96
+#: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
 msgid "STUN server:"
 msgstr "Εξυπηρετητής:"
 
-#: ../data/gui/preferences_window.ui.h:97
+#: ../data/gui/preferences_window.ui.h:93
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Εμφά_νιση το μόνο στο κύριο παράθυρο"
+msgid "Show notification area icon:"
+msgstr "_Εικονίδιο στην περιοχή γνωστοποίησης"
 
-#: ../data/gui/preferences_window.ui.h:98
+#: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
-msgid "Show systray:"
-msgstr "_Προβολή τίτλου στο κουμπί"
+msgid "Show only in roster"
+msgstr "Εμφά_νιση το μόνο στο κύριο παράθυρο"
 
-#: ../data/gui/preferences_window.ui.h:99
+#: ../data/gui/preferences_window.ui.h:95
 msgid "Sign _in"
 msgstr "Σύν_δεση"
 
-#: ../data/gui/preferences_window.ui.h:100
+#: ../data/gui/preferences_window.ui.h:96
 msgid "Sign _out"
 msgstr "Αποσ_ύνδεση"
 
-#: ../data/gui/preferences_window.ui.h:101
+#: ../data/gui/preferences_window.ui.h:97
 msgid "Single window for everything"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:102
+#: ../data/gui/preferences_window.ui.h:98
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:103
+#: ../data/gui/preferences_window.ui.h:99
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "Τα_ξινόμηση επαφών βάσει κατάστασης"
 
-#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
 msgid "Status"
 msgstr "Κατάσταση"
 
-#: ../data/gui/preferences_window.ui.h:105
+#: ../data/gui/preferences_window.ui.h:101
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "Εξορισμού _σετ εικονιδίων κατάστασης:"
 
-#: ../data/gui/preferences_window.ui.h:106
+#: ../data/gui/preferences_window.ui.h:102
 #, fuzzy
 msgid "Style"
 msgstr "Πάγωσε"
 
-#: ../data/gui/preferences_window.ui.h:107
+#: ../data/gui/preferences_window.ui.h:103
 msgid "T_heme:"
 msgstr "_Θέμα:"
 
-#: ../data/gui/preferences_window.ui.h:108
+#: ../data/gui/preferences_window.ui.h:104
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2292,7 +2507,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:111
+#: ../data/gui/preferences_window.ui.h:107
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2300,132 +2515,136 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:114
+#: ../data/gui/preferences_window.ui.h:110
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Χρήση σετ _εικονιδίων κατάστασης:"
 
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:111
+msgid "Use default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:112
 #, fuzzy
 msgid "Use system _default"
 msgstr "Χρήση _προκαθορισμένου χρώματος"
 
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:113
 msgid "Video framerate"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:117
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Video input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:118
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Video output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:119
+#: ../data/gui/preferences_window.ui.h:116
 msgid "Video size"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:120
+#: ../data/gui/preferences_window.ui.h:117
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Όταν λαμβάνεται ένα νέο γεγονός"
 
-#: ../data/gui/preferences_window.ui.h:121
+#: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
 msgid "Your message:"
 msgstr "Μήνυμα σφάλματος: %s"
 
-#: ../data/gui/preferences_window.ui.h:122
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your nickname:"
 msgstr "Π_ριν το ψευδώνυμο:"
 
-#: ../data/gui/preferences_window.ui.h:123
+#: ../data/gui/preferences_window.ui.h:120
 #, fuzzy
 msgid "_Away after:"
 msgstr "Αυτόματα _απομακρυσμένος μετά:"
 
-#: ../data/gui/preferences_window.ui.h:124
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Περιηγητής:"
 
-#: ../data/gui/preferences_window.ui.h:125
+#: ../data/gui/preferences_window.ui.h:122
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "Ειδοπ_οιήσεις για κατάσταση κουβέντας:"
 
-#: ../data/gui/preferences_window.ui.h:126
+#: ../data/gui/preferences_window.ui.h:123
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Φατσούλες:"
 
-#: ../data/gui/preferences_window.ui.h:127
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_File manager:"
 msgstr "_Διαχειριστής αρχείων:"
 
-#: ../data/gui/preferences_window.ui.h:128
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_Highlight misspelled words"
 msgstr "_Υπογράμμιση λέξεων με τυπογραφικά λάθη"
 
-#: ../data/gui/preferences_window.ui.h:129
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Ignore events from contacts not in the roster"
 msgstr "Να _αγνοούνται γεγονότα από επαφές που δεν είναι στη λίστα επαφών"
 
-#: ../data/gui/preferences_window.ui.h:130
+#: ../data/gui/preferences_window.ui.h:127
 #, fuzzy
 msgid "_Ignore rich content in incoming messages"
 msgstr "%d μη αναγνωσμένο μεμονωμένο μήνυμα"
 
-#: ../data/gui/preferences_window.ui.h:131
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Log status changes of contacts"
 msgstr "Καταγραφή α_λλαγών κατάστασης των επαφών"
 
-#: ../data/gui/preferences_window.ui.h:132
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Mail client:"
 msgstr "_Εφαρμογή αλληλογραφίας:"
 
-#: ../data/gui/preferences_window.ui.h:133
+#: ../data/gui/preferences_window.ui.h:130
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Αυτόματα _μη διαθέσιμος μετά:"
 
-#: ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Open..."
 msgstr "_Άνοιγμα..."
 
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Reset to Default Colors"
 msgstr "Επανα_φορά προεπιλεγμένων χρωμάτων"
 
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:133
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "Ειδοπ_οιήσεις για κατάσταση κουβέντας:"
 
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Status message:"
 msgstr "Μήνυμα κατά_στασης:"
 
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:140
+#: ../data/gui/preferences_window.ui.h:137
 #, fuzzy
 msgid "in _group chats"
 msgstr "Συμμετοχή σε _ομαδική συζήτηση"
 
-#: ../data/gui/preferences_window.ui.h:141
+#: ../data/gui/preferences_window.ui.h:138
 #, fuzzy
 msgid "in _roster"
 msgstr "Εκτέλεση στο Τερματικό"
 
-#: ../data/gui/preferences_window.ui.h:142
+#: ../data/gui/preferences_window.ui.h:139
 msgid "minutes"
 msgstr "λεπτά"
 
@@ -2483,7 +2702,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Σειρά:"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3436
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
 msgid "Privacy List"
 msgstr ""
 
@@ -2722,8 +2941,8 @@ msgstr "Αφαίρεση λογαριασμού από το Gajim και από
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5492 ../src/roster_window.py:5622
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
+#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
 msgid "_Remove"
 msgstr "_Αφαίρεση"
 
@@ -2769,61 +2988,65 @@ msgid "Help online"
 msgstr "Online βοήθεια"
 
 #: ../data/gui/roster_window.ui.h:8
+msgid "P_lugins"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:9
 #, fuzzy
 msgid "Profile, A_vatar"
 msgstr "Όνομα προφίλ:"
 
-#: ../data/gui/roster_window.ui.h:9
+#: ../data/gui/roster_window.ui.h:10
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "Εμφάνιση _αποσυνδεδεμένων χρηστών"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
 #, fuzzy
 msgid "Show Trans_ports"
 msgstr "Προβολή ιδιοτήτων εκτυπωτή"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
 msgid "Show _Offline Contacts"
 msgstr "Εμφάνιση _αποσυνδεδεμένων χρηστών"
 
-#: ../data/gui/roster_window.ui.h:12 ../src/statusicon.py:326
+#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
 msgid "Show _Roster"
 msgstr "Εμφάνιση _λίστας επαφών"
 
-#: ../data/gui/roster_window.ui.h:13
+#: ../data/gui/roster_window.ui.h:14
 #, 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/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
 #: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Ενέργειες"
 
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
 msgid "_Contents"
 msgstr "_Περιεχόμενα"
 
-#: ../data/gui/roster_window.ui.h:18 ../src/disco.py:1502
+#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
 msgid "_Edit"
 msgstr "Ε_πεξεργασία"
 
-#: ../data/gui/roster_window.ui.h:19
+#: ../data/gui/roster_window.ui.h:20
 msgid "_FAQ"
 msgstr "_Συχνές ερωτήσεις"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Help"
 msgstr "_Βοήθεια"
 
-#: ../data/gui/roster_window.ui.h:22
+#: ../data/gui/roster_window.ui.h:23
 #, fuzzy
 msgid "_Send Single Message..."
 msgstr "Αποστολή μονού _μηνύματος"
 
-#: ../data/gui/roster_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:25
 msgid "_View"
 msgstr "_Προβολή"
 
@@ -2842,12 +3065,12 @@ msgid "_Add contact"
 msgstr "Προσθήκη _επαφής"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5634
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
 #, fuzzy
 msgid "_Information"
 msgstr "Πληροφορίες επαφής"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1353
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
 msgid "_Search"
 msgstr "_Αναζήτηση"
 
@@ -2867,10 +3090,6 @@ msgstr "Εγγραφή σε"
 msgid "_Cancel"
 msgstr "_Άκυρο"
 
-#: ../data/gui/single_message_window.ui.h:2
-msgid "From:"
-msgstr "Από:"
-
 #: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Απάντηση σε αυτό το μήνυμα"
@@ -2887,10 +3106,6 @@ msgstr "Αποστολή μηνύματος"
 msgid "Send message and close window"
 msgstr "Αποστολή μηνύματος και κλείσιμο παραθύρου"
 
-#: ../data/gui/single_message_window.ui.h:7
-msgid "Subject:"
-msgstr "Θέμα:"
-
 #: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Προς:"
@@ -3115,26 +3330,37 @@ msgstr "Gajim Instant Messenger"
 msgid "Jabber IM Client"
 msgstr "Ένα πρόγραμμα για το Jabber"
 
-#: ../src/adhoc_commands.py:314
+#: ../src/adhoc_commands.py:323
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Πληροφορίες επαφής"
 
-#: ../src/adhoc_commands.py:315
+#: ../src/adhoc_commands.py:324
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:351 ../src/adhoc_commands.py:374
+#: ../src/adhoc_commands.py:370
+#, fuzzy
+msgid "Invalid Form"
+msgstr "Μη έγκυρη εγγραφή"
+
+#: ../src/adhoc_commands.py:371
+#, fuzzy
+msgid "The form is not filled correctly."
+msgstr ""
+"Το όνομα του δωματίου ή του διακομιστή περιέχει μη επιτρεπόμενους χαρακτήρες."
+
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:360
+#: ../src/adhoc_commands.py:399
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:471
+#: ../src/adhoc_commands.py:513
 msgid "Service returned an error."
 msgstr ""
 
@@ -3159,7 +3385,7 @@ msgstr "Ακέραιος"
 msgid "Text"
 msgstr "Κείμενο"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:945
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
 msgid "Color"
 msgstr "Χρώμα"
 
@@ -3196,235 +3422,235 @@ msgstr[1] "Προσθήκη νέας εγγραφής στο μενού"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "English"
 msgstr "Αγγλικά"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Belarusian"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Bulgarian"
 msgstr "Βουλγαρικά"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Breton"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Czech"
 msgstr "Τσέχικα"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "German"
 msgstr "Γερμανικά"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Greek"
 msgstr "Εληνικά"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "British"
 msgstr "Βρετανικά"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Esperanto"
 msgstr "Εσπεράντο"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Spanish"
 msgstr "Ισπανικά"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Basque"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "French"
 msgstr "Γαλλικά"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Croatian"
 msgstr "Κροατικά"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Italian"
 msgstr "Ιταλικά"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian (b)"
 msgstr "Νορβηγικά (b)"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Dutch"
 msgstr "Ολλανδικά"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian"
 msgstr "Νορβηγικά"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Polish"
 msgstr "Πολωνέζικα"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Portuguese"
 msgstr "Πορτογαλικά"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Brazilian Portuguese"
 msgstr "Πορτογαλικά Βραζιλίας"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Russian"
 msgstr "Ρώσικα"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Serbian"
 msgstr "Γερμανικά"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Slovak"
 msgstr "Σλοβάκικα"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Swedish"
 msgstr "Σουηδικά"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Chinese (Ch)"
 msgstr "Κινέζικα (Ch)"
 
-#: ../src/chat_control.py:479
+#: ../src/chat_control.py:496
 msgid "Spelling language"
 msgstr ""
 
 #. we are not connected
-#: ../src/chat_control.py:511 ../src/chat_control.py:720
+#: ../src/chat_control.py:528 ../src/chat_control.py:737
 msgid "A connection is not available"
 msgstr "Δεν υπάρχει διαθέσιμη σύνδεση"
 
-#: ../src/chat_control.py:512 ../src/chat_control.py:721
+#: ../src/chat_control.py:529 ../src/chat_control.py:738
 msgid "Your message can not be sent until you are connected."
 msgstr "Δε μπορεί να σταλεί το μήνυμα σας εκτός αν είστε συνδεδεμένος."
 
-#: ../src/chat_control.py:927
+#: ../src/chat_control.py:944
 #, fuzzy
 msgid "Underline"
 msgstr "Υπογράμμιση"
 
-#: ../src/chat_control.py:928
+#: ../src/chat_control.py:945
 #, fuzzy
 msgid "Strike"
 msgstr "Ψευδώνυμο"
 
-#: ../src/chat_control.py:951
+#: ../src/chat_control.py:968
 #, fuzzy
 msgid "Font"
 msgstr "_Γραμματοσειρά:"
 
-#: ../src/chat_control.py:960
+#: ../src/chat_control.py:977
 #, fuzzy
 msgid "Clear formating"
 msgstr "Πληροφορίες επαφής"
 
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1055
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:1039
+#: ../src/chat_control.py:1056
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1503 ../src/chat_control.py:1987
+#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Ενεργοποιήθηκε η κρυπτογράφηση"
 
 #. Add to roster
-#: ../src/chat_control.py:1528 ../src/common/contacts.py:158
+#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
 #: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:245 ../src/dialogs.py:1064 ../src/dialogs.py:2078
-#: ../src/dialogs.py:2107 ../src/gui_interface.py:674
+#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
+#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
 #: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1610 ../src/roster_window.py:1612
-#: ../src/roster_window.py:1942 ../src/roster_window.py:3289
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
+#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
+#: ../src/roster_window.py:3382
 msgid "Not in Roster"
 msgstr "εκτός λίστας επαφών"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1575
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Λίστα ενεργών, ολοκληρωμένων και σταματημένων μεταφορών αρχείων"
 
-#: ../src/chat_control.py:1561
+#: ../src/chat_control.py:1578
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1656
+#: ../src/chat_control.py:1677
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:1869
 #, 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:1967 ../src/dialogs.py:4866
+#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1968
+#: ../src/chat_control.py:1991
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1977
+#: ../src/chat_control.py:2000
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
 
-#: ../src/chat_control.py:2003
+#: ../src/chat_control.py:2026
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:2028
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2051
 #, fuzzy
 msgid "and authenticated"
 msgstr "Χρήση πιστοποίησης"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2032
+#: ../src/chat_control.py:2055
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Χρήση πιστοποίησης"
@@ -3432,58 +3658,66 @@ 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:2039
+#: ../src/chat_control.py:2062
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2182
+#: ../src/chat_control.py:2205
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2191
+#: ../src/chat_control.py:2215
+msgid "This session WILL be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2217
+msgid "This session WILL NOT be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2226
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 
-#: ../src/chat_control.py:2194
+#: ../src/chat_control.py:2229
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2196
+#: ../src/chat_control.py:2231
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2201
+#: ../src/chat_control.py:2236
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2203
+#: ../src/chat_control.py:2238
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
 
-#: ../src/chat_control.py:2241 ../src/chat_control.py:2254
+#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 
-#: ../src/chat_control.py:2247
+#: ../src/chat_control.py:2288
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2519
+#: ../src/chat_control.py:2566
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Mόλις λάβατε ένα μήνυμα από \"%s\""
 
-#: ../src/chat_control.py:2520
+#: ../src/chat_control.py:2567
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3491,22 +3725,20 @@ msgstr ""
 "Εάν κλείσετε αυτήν την καρτέλα και έχετε απενεργοποιημένο το ιστορικό, το "
 "μήνυμα θα χαθεί."
 
-#: ../src/chat_control.py:2663 ../src/common/connection_handlers.py:1635
-#: ../src/common/connection_handlers.py:1758
-#: ../src/common/connection_handlers.py:1960
-#: ../src/common/connection_handlers.py:2110 ../src/common/connection.py:452
+#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
 #: ../src/gajim.py:159 ../src/session.py:138
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2664
+#: ../src/chat_control.py:2714
 #, 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:2906
+#: ../src/chat_control.py:2962
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "Ο %(nick)s είναι τώρα %(status)s"
@@ -3520,28 +3752,28 @@ msgstr "δημιουργία βάσης δεδομένων ιστορικού"
 msgid "creating cache database"
 msgstr "δημιουργία βάσης δεδομένων ιστορικού"
 
-#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
-#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
-#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
-#: ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "Το %s είναι αρχείο αλλά πρέπει να είναι φάκελος"
 
-#: ../src/common/check_paths.py:275 ../src/common/check_paths.py:282
-#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
-#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
-#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:333
+#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
+#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
+#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
 msgid "Gajim will now exit"
 msgstr "Το Gajim τώρα θα κλείσει"
 
-#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
+#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "Το %s είναι κατάλογος αλλά θα έπρεπε να είναι αρχείο"
 
-#: ../src/common/check_paths.py:342
+#: ../src/common/check_paths.py:351
 #, python-format
 msgid "creating %s directory"
 msgstr "δημιουργία φακέλου %s"
@@ -3607,9 +3839,9 @@ msgstr ""
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:801
-#: ../src/roster_window.py:1614 ../src/roster_window.py:1616
-#: ../src/roster_window.py:5251
+#: ../src/common/helpers.py:57 ../src/roster_window.py:815
+#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
+#: ../src/roster_window.py:5323
 #, fuzzy
 msgid "Groupchats"
 msgstr "Ομαδικές συζητήσεις"
@@ -3677,7 +3909,8 @@ msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
 #: ../src/common/config.py:88
-msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgid ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
 #: ../src/common/config.py:93
@@ -3734,9 +3967,9 @@ msgstr ""
 "συμπτυχθεί"
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:501
-#: ../src/common/optparser.py:290 ../src/common/optparser.py:486
-#: ../src/common/optparser.py:520 ../src/gui_interface.py:3370
+#: ../src/common/config.py:106 ../src/common/config.py:505
+#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
+#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
 #, fuzzy
 msgid "default"
 msgstr "Προεπιλογή"
@@ -3934,7 +4167,7 @@ msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Το IEC standard υπαγορεύει ότι ΚιΒ = 1024 bytes, KB = 1000 bytes."
 
 #: ../src/common/config.py:197
-msgid "Notify of events in the system trayicon."
+msgid "Notify of events in the notification area."
 msgstr ""
 
 #: ../src/common/config.py:203
@@ -3971,9 +4204,10 @@ msgstr ""
 "Μία λίστα με λέξεις χωρισμένες με ερωτηματικά, οι οποίες θα επισημαίνονται."
 
 #: ../src/common/config.py:221
+#, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
+"setting is taken into account only if notification icon is used."
 msgstr ""
 "Αν είναι αληθές, το Gajim κλείνει όταν πατιέται το κουμπί Χ του διαχειριστή "
 "παραθύρων. Αυτή η ρύθμιση έχει νόημα μόνο εφόσον γίνεται χρήση εικονιδίου "
@@ -4224,7 +4458,7 @@ msgstr ""
 #: ../src/common/config.py:270
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
-"systray icon."
+"notification icon."
 msgstr ""
 
 #: ../src/common/config.py:271
@@ -4394,112 +4628,123 @@ msgstr ""
 msgid "Message that is sent to contacts you want to add"
 msgstr "Παρακαλώ συμπληρώστε τα στοιχεία της επαφής που θέλετε να προσθέσετε"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:374
+msgid "Last time we syncronized with logs from server."
+msgstr ""
+
+#: ../src/common/config.py:436
 #, fuzzy
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Το OpenPGP δεν είναι διαθέσιμο σε αυτόν τον Η/Υ"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:437 ../src/common/config.py:440
+#: ../src/common/config.py:438 ../src/common/config.py:441
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:447
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:448
 msgid "'yes', 'no', or 'both'"
 msgstr "'ναι', 'όχι', ή 'και τα δύο'"
 
-#: ../src/common/config.py:448 ../src/common/config.py:450
-#: ../src/common/config.py:451 ../src/common/config.py:454
-#: ../src/common/config.py:455
+#: ../src/common/config.py:449 ../src/common/config.py:451
+#: ../src/common/config.py:452 ../src/common/config.py:455
+#: ../src/common/config.py:456
 msgid "'yes', 'no' or ''"
 msgstr "'ναι', 'όχι' ή ''"
 
-#: ../src/common/config.py:461 ../src/common/pep.py:157
+#: ../src/common/config.py:460
+msgid ""
+"State whether plugins should be activated on exit (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
+msgstr ""
+
+#: ../src/common/config.py:465 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Κοιμάμαι"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back soon"
 msgstr "Πίσω σύντομα"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back in some minutes."
 msgstr "Πίσω σε λίγα λεπτά."
 
-#: ../src/common/config.py:463 ../src/common/pep.py:127
+#: ../src/common/config.py:467 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Τρώω"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:467
 msgid "I'm eating, so leave me a message."
 msgstr "Τώρα τρώω, οπότε αφήστε μήνυμα."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "Movie"
 msgstr "Ταινία"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "I'm watching a movie."
 msgstr "Βλέπω μια ταινία."
 
-#: ../src/common/config.py:465 ../src/common/pep.py:186
+#: ../src/common/config.py:469 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Δουλειά"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:469
 msgid "I'm working."
 msgstr "Δουλεύω."
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "Phone"
 msgstr "Τηλέφωνο"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "I'm on the phone."
 msgstr "Είμαι στο τηλέφωνο."
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "Out"
 msgstr "Έξω"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "I'm out enjoying life."
 msgstr "Είμαι έξω απολαμβάνοντας την πραγματική ζωή."
 
-#: ../src/common/config.py:478
+#: ../src/common/config.py:482
 msgid "I'm available."
 msgstr "Είμαι διαθέσιμος."
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:483
 msgid "I'm free for chat."
 msgstr "Είμαι ελεύθερος για κουβέντα."
 
-#: ../src/common/config.py:480 ../src/config.py:1600
+#: ../src/common/config.py:484 ../src/config.py:1600
 msgid "Be right back."
 msgstr "Επιστρέφω αμέσως."
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:485
 msgid "I'm not available."
 msgstr "Δεν είμαι διαθέσιμος."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:486
 msgid "Do not disturb."
 msgstr "Μην ενοχλείτε."
 
-#: ../src/common/config.py:483 ../src/common/config.py:484
+#: ../src/common/config.py:487 ../src/common/config.py:488
 msgid "Bye!"
 msgstr "Γεια χαρά!"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:498
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -4508,183 +4753,94 @@ msgstr ""
 "Ο ήχος που θα παιχθεί όταν ληφθεί ένα μήνυμα MUC που περιέχει κάποια λέξη "
 "από αυτές που έχουν οριστεί στο muc_highlight_words, ή στο ψευδώνυμό σας."
 
-#: ../src/common/config.py:495
+#: ../src/common/config.py:499
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: ../src/common/config.py:504 ../src/common/optparser.py:304
+#: ../src/common/config.py:508 ../src/common/optparser.py:308
 msgid "green"
 msgstr "πράσινο"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:290
+#: ../src/common/config.py:512 ../src/common/optparser.py:294
 msgid "grocery"
 msgstr "μανάβικο"
 
-#: ../src/common/config.py:512
+#: ../src/common/config.py:516
 msgid "human"
 msgstr "ζεστό"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:520
 msgid "marine"
 msgstr "θαλασσί"
 
-#: ../src/common/connection_handlers.py:84
+#: ../src/common/connection_handlers.py:94
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:117
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr ""
-"Πληροφορίες σχετικές με την καταχώριση δεν έφτασαν εγκαίρως για την μεταφορά "
-"%s"
-
-#: ../src/common/connection_handlers.py:124
-#, fuzzy
-msgid "Registration succeeded"
-msgstr "Η δημοσιοποίηση της vCard έγινε επιτυχώς"
-
-#: ../src/common/connection_handlers.py:125
-#, python-format
-msgid "Registration with agent %s succeeded"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:133
-#, fuzzy
-msgid "Registration failed"
-msgstr "Η δημοσιοποίηση της vCard απέτυχε"
-
-#: ../src/common/connection_handlers.py:133
-#, python-format
-msgid ""
-"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:445
-#: ../src/common/connection_handlers.py:1633
-#: ../src/common/connection_handlers.py:1756
-#: ../src/common/connection_handlers.py:1957
-#: ../src/common/connection_handlers.py:2108 ../src/common/connection.py:449
-#: ../src/gajim.py:341
-msgid "Disk Write Error"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:678 ../src/common/connection.py:1472
-#, fuzzy
-msgid "Invisibility not supported"
-msgstr "Η επέκταση δεν υποστηρίζεται"
-
-#: ../src/common/connection_handlers.py:679 ../src/common/connection.py:1473
-#, python-format
-msgid "Account %s doesn't support invisibility."
-msgstr ""
-
-#: ../src/common/connection_handlers.py:1446 ../src/common/connection.py:253
-#: ../src/config.py:2091 ../src/config.py:2100 ../src/config.py:2168
-#: ../src/config.py:3560 ../src/dataforms_widget.py:597 ../src/dialogs.py:2931
-msgid "Invalid Jabber ID"
-msgstr "Μη έγκυρο Jabber ID"
-
-#: ../src/common/connection_handlers.py:1447
-msgid "A message from a non-valid JID arrived, it has been ignored."
-msgstr ""
-
-#: ../src/common/connection_handlers.py:1636
-#: ../src/common/connection_handlers.py:1759
-#: ../src/common/connection_handlers.py:1961
-#: ../src/common/connection_handlers.py:2111 ../src/common/connection.py:453
-#: ../src/gajim.py:160 ../src/session.py:139
-#, 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:1805
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Δεν επιτρέπεται το ψευδώνυμο: %s"
-
-#: ../src/common/connection_handlers.py:1902
-#: ../src/common/connection_handlers.py:1911
-#: ../src/common/connection_handlers.py:1918
-#: ../src/common/connection_handlers.py:1922
-#: ../src/common/connection_handlers.py:1926
-#: ../src/common/connection_handlers.py:1931 ../src/gui_interface.py:139
-msgid "Unable to join group chat"
-msgstr "Δεν ήταν δυνατή η σύνδεση στην ομαδική συζήτηση"
-
-#: ../src/common/connection_handlers.py:1903
-#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:1912
-#, fuzzy, python-format
-msgid "You are banned from group chat %s."
-msgstr "Σας έχει απαγορευτεί η είσοδος σε αυτή την ομαδική συζήτηση."
-
-#: ../src/common/connection_handlers.py:1919
-#, fuzzy, python-format
-msgid "Group chat %s does not exist."
-msgstr "Δεν υπάρχει τέτοια συζήτηση."
-
-#: ../src/common/connection_handlers.py:1923
-msgid "Group chat creation is restricted."
-msgstr "Δεν επιτρέπεται η δημιουργία ομαδικών συζητήσεων."
+#: ../src/common/connection_handlers.py:127
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr ""
+"Πληροφορίες σχετικές με την καταχώριση δεν έφτασαν εγκαίρως για την μεταφορά "
+"%s"
 
-#: ../src/common/connection_handlers.py:1927
-#, fuzzy, python-format
-msgid "Your registered nickname must be used in group chat %s."
-msgstr "Πρέπει να χρησιμοποιηθεί το καταχωρημένο σας ψευδώνυμο."
+#: ../src/common/connection_handlers.py:134
+#, fuzzy
+msgid "Registration succeeded"
+msgstr "Η δημοσιοποίηση της vCard έγινε επιτυχώς"
 
-#: ../src/common/connection_handlers.py:1932
-#, fuzzy, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Δεν είστε στη λίστα μελών."
+#: ../src/common/connection_handlers.py:135
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr ""
 
-#. Room has been destroyed. see
-#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:1976
+#: ../src/common/connection_handlers.py:143
 #, fuzzy
-msgid "Room has been destroyed"
-msgstr "Η εξουσιοδότηση έχει αφαιρεθεί"
+msgid "Registration failed"
+msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 
-#: ../src/common/connection_handlers.py:1984
+#: ../src/common/connection_handlers.py:143
 #, python-format
-msgid "You can join this room instead: %s"
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2020
-msgid "I would like to add you to my roster."
-msgstr "Επιθυμώ να σε προσθέσω στη λίστα επαφών μου."
+#: ../src/common/connection_handlers.py:466
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
+#: ../src/gajim.py:341
+msgid "Disk Write Error"
+msgstr ""
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2041
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "Ο %s μόλις σας εξουσιοδότησε"
+#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
+#, fuzzy
+msgid "Invisibility not supported"
+msgstr "Η επέκταση δεν υποστηρίζεται"
 
-#: ../src/common/connection_handlers.py:2043
+#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
 #, python-format
-msgid "unsubscribe request from %s"
-msgstr "αίτηση αφαίρεσης εξουσιοδότησης από %s"
+msgid "Account %s doesn't support invisibility."
+msgstr ""
 
-#: ../src/common/connection_handlers.py:2045
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "πραγματοποιήθηκε αφαίρεση εξουσιοδότησης από %s"
+#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
+#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
+#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
+msgid "Invalid Jabber ID"
+msgstr "Μη έγκυρο Jabber ID"
+
+#: ../src/common/connection_handlers.py:1405
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr ""
 
-#: ../src/common/connection_handlers.py:2240
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
+#: ../src/gajim.py:160 ../src/session.py:139
 #, python-format
 msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
+"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 ""
-"Το Jid %s δεν είναι σύμμορφο προς το RFC. Δεν θα προστεθεί στη λίστα επαφών "
-"σας. Χρησιμοποιήστε κάποιο εργαλείο διαχείρισης όπως το http://jru."
-"jabberstudio.org για να το αφαιρέσετε"
 
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
@@ -4815,28 +4971,28 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:254 ../src/dialogs.py:2932
+#: ../src/common/connection.py:256 ../src/dialogs.py:2948
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Δεν είναι δυνατό να στείλετε άδεια αρχεία"
 
-#: ../src/common/connection.py:276
+#: ../src/common/connection.py:278
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:281
 #, 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:331
+#: ../src/common/connection.py:333
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Aυτό το μήνυμα είναι *κρυπτογραφημένο* (Δείτε:JEP:`27`)]"
 
-#: ../src/common/connection.py:439
+#: ../src/common/connection.py:441
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4845,150 +5001,150 @@ msgstr ""
 "Θέμα: %s\n"
 "%s"
 
-#: ../src/common/connection.py:807
+#: ../src/common/connection.py:809
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Η σύνδεση με τον λογαριασμό \"%s\" χάθηκε"
 
-#: ../src/common/connection.py:808
+#: ../src/common/connection.py:810
 msgid "Reconnect manually."
 msgstr "Επανασύνδεση χειροκίνητα."
 
-#: ../src/common/connection.py:820
+#: ../src/common/connection.py:822
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Η μεταφορά %s αποκρίθηκε εσφαλμένα στην αίτηση εγγραφής."
 
-#: ../src/common/connection.py:854
+#: ../src/common/connection.py:856
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:867
+#: ../src/common/connection.py:869
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Άγνωστη έκδοση του D-Bus: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:882
+#: ../src/common/connection.py:884
 msgid "Invalid answer"
 msgstr "Μη έγκυρη απόκριση"
 
-#: ../src/common/connection.py:883
+#: ../src/common/connection.py:885
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Η μεταφορά %s αποκρίθηκε εσφαλμένα στην αίτηση εγγραφής."
 
-#: ../src/common/connection.py:1165 ../src/common/connection.py:1294
-#: ../src/common/connection.py:1784
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
+#: ../src/common/connection.py:1792
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη"
 
-#: ../src/common/connection.py:1166 ../src/gui_interface.py:755
+#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
 msgid "Check your connection or try again later."
 msgstr "Ελέγξτε τη σύνδεση σας ή δοκιμάστε αργότερα."
 
-#: ../src/common/connection.py:1171
+#: ../src/common/connection.py:1173
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Αποθηκεύτηκε στο: %s"
 
-#: ../src/common/connection.py:1184
+#: ../src/common/connection.py:1186
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: ../src/common/connection.py:1215 ../src/common/connection.py:1274
+#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη"
 
-#: ../src/common/connection.py:1216 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Η σύνδεση με τον λογαριασμό \"%s\" χάθηκε"
 
-#: ../src/common/connection.py:1241
+#: ../src/common/connection.py:1243
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1244
+#: ../src/common/connection.py:1246
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1248
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Άγνωστη έκδοση του D-Bus: %s"
 
-#: ../src/common/connection.py:1295
+#: ../src/common/connection.py:1297
 msgid "Check your connection or try again later"
 msgstr "Ελέγξτε τη σύνδεση σας ή δοκιμάστε αργότερα"
 
-#: ../src/common/connection.py:1324
+#: ../src/common/connection.py:1329
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Η πιστοποίηση ταυτότητας με \"%s\" απέτυχε"
 
-#: ../src/common/connection.py:1326
+#: ../src/common/connection.py:1331
 msgid "Please check your login and password for correctness."
 msgstr "Παρακαλώ ελέγξτε το όνομα χρήστη και το συνθηματικό σας."
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1400
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "Δημιουργήθηκε σφάλμα κατά την αφαίρεση της εργασίας !"
 
-#: ../src/common/connection.py:1396
+#: ../src/common/connection.py:1401
 #, 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:1650
+#: ../src/common/connection.py:1658
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1653
+#: ../src/common/connection.py:1661
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Επαφές"
 
-#: ../src/common/connection.py:1799 ../src/common/connection.py:1822
+#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
 msgid "Not fetched because of invisible status"
 msgstr ""
 
-#: ../src/common/connection.py:2254
+#: ../src/common/connection.py:2262
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 
-#: ../src/common/connection.py:2255
+#: ../src/common/connection.py:2263
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
 #: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:674
+#: ../src/gui_interface.py:551
 msgid "Observers"
 msgstr "Παρατηρητές"
 
 #: ../src/common/contacts.py:139 ../src/common/contacts.py:366
 #: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1499 ../src/gui_interface.py:424
-#: ../src/roster_window.py:840 ../src/roster_window.py:1525
-#: ../src/roster_window.py:1606 ../src/roster_window.py:1608
-#: ../src/roster_window.py:1769
+#: ../src/disco.py:1517 ../src/roster_window.py:854
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
+#: ../src/roster_window.py:2466
 msgid "Transports"
 msgstr "Μεταφορές"
 
@@ -5219,204 +5375,220 @@ msgstr "Τέλος εβδομάδας"
 msgid "Weekend!"
 msgstr "Σαββατοκύριακο!"
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:148
+msgid "Username must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:153
 msgid "Invalid character in username."
 msgstr "Μη έγκυρος χαρακτήρας στο όνομα του χρήστη."
 
-#: ../src/common/helpers.py:156
-msgid "Server address required."
-msgstr "Απαιτείται η διεύθυνση του διακομιστή."
+#: ../src/common/helpers.py:159
+msgid "Server must be between 1 and 1023 chars"
+msgstr ""
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 msgid "Invalid character in hostname."
 msgstr "Μη έγκυρος χαρακτήρας στο όνομα του διακομιστή."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:166
+msgid "Server address required."
+msgstr "Απαιτείται η διεύθυνση του διακομιστή."
+
+#: ../src/common/helpers.py:170
+msgid "Resource must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:175
 msgid "Invalid character in resource."
 msgstr "Μη έγκυρος χαρακτήρας στον πόρο."
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:215
 msgid "_Busy"
 msgstr "Απα_σχολημένος"
 
-#: ../src/common/helpers.py:211 ../src/tooltips.py:195
+#: ../src/common/helpers.py:217 ../src/tooltips.py:195
 msgid "Busy"
 msgstr "Απασχολημένος"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:220
 msgid "_Not Available"
 msgstr "_Μη διαθέσιμος"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:225
 msgid "_Free for Chat"
 msgstr "Διαθέσιμος για _κουβέντα"
 
-#: ../src/common/helpers.py:221 ../src/tooltips.py:191
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Free for Chat"
 msgstr "Διαθέσιμος για κουβέντα"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:230
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "_Διαθέσιμος"
 
-#: ../src/common/helpers.py:226 ../src/tooltips.py:189
+#: ../src/common/helpers.py:232 ../src/tooltips.py:189
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Εκτύπωση όλων των σελίδων"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:234
 msgid "Connecting"
 msgstr "Συνδέεται"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:237
 msgid "A_way"
 msgstr "Α_πομακρυσμένος"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:242
 msgid "_Offline"
 msgstr "Απ_οσυνδεδεμένος"
 
-#: ../src/common/helpers.py:238 ../src/tooltips.py:199
+#: ../src/common/helpers.py:244 ../src/tooltips.py:199
 msgid "Offline"
 msgstr "Αποσυνδεδεμένος"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:247
 msgid "_Invisible"
 msgstr "Αόρατ_ος"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:253
 msgid "?contact has status:Unknown"
 msgstr "?κατάσταση επαφής: Άγνωστη"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:255
 msgid "?contact has status:Has errors"
 msgstr "?κατάσταση επαφής: Υπάρχουν σφάλματα"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:260
 msgid "?Subscription we already have:None"
 msgstr "Καμία"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:262
 msgid "To"
 msgstr "Προς"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
+msgid "From"
+msgstr "Από"
+
+#: ../src/common/helpers.py:266
 msgid "Both"
 msgstr "Και τα δυο"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:274
 msgid "?Ask (for Subscription):None"
 msgstr "Τίποτα"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:276
 msgid "Subscribe"
 msgstr "Εγγραφή"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:285
 msgid "?Group Chat Contact Role:None"
 msgstr "Κανένας"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:288
 msgid "Moderators"
 msgstr "Διαχειριστές"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:290
 msgid "Moderator"
 msgstr "Διαχειριστής"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:293
 msgid "Participants"
 msgstr "Συμμετέχοντες"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:295
 msgid "Participant"
 msgstr "Συμμετέχων"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:298
 msgid "Visitors"
 msgstr "Επισκέπτες"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:300
 msgid "Visitor"
 msgstr "Επισκέπτης"
 
-#: ../src/common/helpers.py:300 ../src/tooltips.py:210
+#: ../src/common/helpers.py:306 ../src/tooltips.py:210
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Κανένας"
 
-#: ../src/common/helpers.py:302 ../src/tooltips.py:216
+#: ../src/common/helpers.py:308 ../src/tooltips.py:216
 msgid "Owner"
 msgstr "Ιδιοκτήτης"
 
-#: ../src/common/helpers.py:304 ../src/tooltips.py:214
+#: ../src/common/helpers.py:310 ../src/tooltips.py:214
 msgid "Administrator"
 msgstr "Διαχειριστής"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:212
+#: ../src/common/helpers.py:312 ../src/tooltips.py:212
 msgid "Member"
 msgstr "Μέλος"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:351
 msgid "is paying attention to the conversation"
 msgstr "έχει την προσοχή του στην κουβέντα"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:353
 msgid "is doing something else"
 msgstr "κάνει κάτι άλλο"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:355
 msgid "is composing a message..."
 msgstr "γράφει ένα μήνυμα..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:352
+#: ../src/common/helpers.py:358
 msgid "paused composing a message"
 msgstr "σταμάτησε για λίγο να γράφει ένα μήνυμα"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:360
 msgid "has closed the chat window or tab"
 msgstr "έκλεισε το παράθυρο ή την καρτέλα"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:619
+#: ../src/common/helpers.py:625
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:622
+#: ../src/common/helpers.py:628
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:626
+#: ../src/common/helpers.py:632
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:629
+#: ../src/common/helpers.py:635
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:633
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:636
+#: ../src/common/helpers.py:642
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:645
 #, python-format
 msgid "%s B"
 msgstr "%s B"
@@ -5459,12 +5631,12 @@ msgstr "Gajim - %s"
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:111
+#: ../src/common/jingle_rtp.py:107
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Ρυθμίσεις δωματίου"
 
-#: ../src/common/jingle_rtp.py:112
+#: ../src/common/jingle_rtp.py:108
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5476,30 +5648,30 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:209
+#: ../src/common/jingle_rtp.py:205
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:210
+#: ../src/common/jingle_rtp.py:206
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Μήνυμα σφάλματος: %s"
 
-#: ../src/common/jingle_rtp.py:336
+#: ../src/common/jingle_rtp.py:335
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:339
+#: ../src/common/jingle_rtp.py:338
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:382
+#: ../src/common/jingle_rtp.py:381
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:390
+#: ../src/common/jingle_rtp.py:389
 msgid "video output"
 msgstr ""
 
@@ -5576,11 +5748,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "Το αρχείο %s δε μπορεί να ανοιχθεί για ανάγνωση"
 
-#: ../src/common/optparser.py:299 ../src/common/optparser.py:300
+#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
 msgid "cyan"
 msgstr "κυανό"
 
-#: ../src/common/optparser.py:379
+#: ../src/common/optparser.py:383
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "δημιουργία βάσης δεδομένων ιστορικού"
@@ -6328,62 +6500,62 @@ msgid ""
 msgstr ""
 
 #. we're not english
-#: ../src/common/stanza_session.py:303
+#: ../src/common/stanza_session.py:423
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:178
+#: ../src/common/zeroconf/connection_zeroconf.py:181
 msgid "Avahi error"
 msgstr "Σφάλμα avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:179
+#: ../src/common/zeroconf/connection_zeroconf.py:182
 #, python-format
 msgid ""
 "%s\n"
 "Link-local messaging might not work properly."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:190
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:199
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Could not start local service"
 msgstr "Δεν ήταν δυνατή η εκκίνηση της τοπικής υπηρεσίας"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 #, fuzzy, python-format
 msgid "Unable to bind to port %d."
 msgstr "Δεν ήταν δυνατό το άνοιγμα της οθόνης \"%s\"."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-#: ../src/common/zeroconf/connection_zeroconf.py:283
-#: ../src/common/zeroconf/connection_zeroconf.py:294
-#: ../src/common/zeroconf/connection_zeroconf.py:308
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:286
+#: ../src/common/zeroconf/connection_zeroconf.py:297
+#: ../src/common/zeroconf/connection_zeroconf.py:311
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:282
-#: ../src/common/zeroconf/connection_zeroconf.py:293
-#: ../src/common/zeroconf/connection_zeroconf.py:307
+#: ../src/common/zeroconf/connection_zeroconf.py:285
+#: ../src/common/zeroconf/connection_zeroconf.py:296
+#: ../src/common/zeroconf/connection_zeroconf.py:310
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:325
+#: ../src/common/zeroconf/connection_zeroconf.py:328
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "Δε μπορεί να σταλεί το μήνυμα σας εκτός αν είστε συνδεδεμένος."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:335
+#: ../src/common/zeroconf/connection_zeroconf.py:338
 msgid "Contact is offline. Your message could not be sent."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:363
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6404,16 +6576,16 @@ msgstr "Προεπιλεγμένα μηνύματα κατάστασης"
 msgid "Enabled"
 msgstr "Ενεργοποίηση"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3078
+#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
 msgid "Default"
 msgstr "Προεπιλογή"
 
-#: ../src/config.py:739 ../src/dialogs.py:1395
+#: ../src/config.py:733 ../src/dialogs.py:1409
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Δεν υπάρχει διαθέσιμο λεξικό για τη γλώσσα %s"
 
-#: ../src/config.py:740
+#: ../src/config.py:734
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6429,9 +6601,9 @@ msgid "status message text"
 msgstr "κείμενο μηνύματος κατάστασης"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2383 ../src/dialogs.py:2449
-#: ../src/dialogs.py:3215 ../src/disco.py:866 ../src/disco.py:1726
-#: ../src/disco.py:2030 ../src/history_window.py:90
+#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
+#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
+#: ../src/disco.py:2048 ../src/history_window.py:90
 msgid "Name"
 msgstr "Όνομα"
 
@@ -6469,7 +6641,7 @@ msgstr "Δεν έχετε κανέναν ενεργό λογαριασμό"
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1976 ../src/config.py:2509 ../src/config.py:2545
+#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
 msgid "You are currently connected to the server"
 msgstr "Αυτή τη στιγμή είστε συνδεδεμένος στο διακομιστή"
 
@@ -6507,142 +6679,142 @@ msgstr "Το όνομα λογαριασμού δε μπορεί να είναι
 msgid "Account name cannot contain spaces."
 msgstr "Το όνομα λογαριασμού δε μπορεί να έχει κενά."
 
-#: ../src/config.py:2072
+#: ../src/config.py:2074
 #, fuzzy
 msgid "Rename Account"
 msgstr "Διαχείριση λογαριασμών"
 
-#: ../src/config.py:2073
+#: ../src/config.py:2075
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Επιλέξτε ένα όνομα για τη νέα συνεδρία:"
 
-#: ../src/config.py:2101
+#: ../src/config.py:2103
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr ""
 "Ένα Jabber ID πρέπει να είναι στην μορφή \"όνομα_χρήστη@όνομα_διακομιστή\"."
 
-#: ../src/config.py:2318 ../src/config.py:3606
+#: ../src/config.py:2320 ../src/config.py:3623
 msgid "Invalid entry"
 msgstr "Μη έγκυρη εγγραφή"
 
-#: ../src/config.py:2319 ../src/config.py:3607
+#: ../src/config.py:2321 ../src/config.py:3624
 msgid "Custom port must be a port number."
 msgstr "Ο προσαρμοσμένος αριθμός θύρας του μεσολαβητή πρέπει να είναι αριθμός."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2342
 msgid "Failed to get secret keys"
 msgstr "Σφάλμα κατά τη λήψη μυστικών κλειδιών"
 
-#: ../src/config.py:2341
+#: ../src/config.py:2343
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Σφάλμα κατά τη λήψη των μυστικών κλειδιών OpenPGP σας."
 
-#: ../src/config.py:2375
+#: ../src/config.py:2377
 msgid "OpenPGP Key Selection"
 msgstr "Επιλογή κλειδιού OpenPGP"
 
-#: ../src/config.py:2376
+#: ../src/config.py:2378
 msgid "Choose your OpenPGP key"
 msgstr "Επιλέξτε το κλειδί OpenPGP σας"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2385
 msgid "No such account available"
 msgstr "Τέτοιος λογαριασμός δεν είναι διαθέσιμος"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2386
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Πρέπει πρώτα να δημιουργήσετε το λογαριασμό σας προτού ξεκινήσετε να "
 "τροποποιείτε τις προσωπικές σας πληροφορίες."
 
-#: ../src/config.py:2391 ../src/dialogs.py:2136 ../src/dialogs.py:2371
-#: ../src/dialogs.py:2557 ../src/disco.py:511 ../src/profile_window.py:339
+#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
+#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
 msgid "You are not connected to the server"
 msgstr "Δεν είστε συνδεδεμένος στο διακομιστή"
 
-#: ../src/config.py:2392
+#: ../src/config.py:2394
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Πρέπει να είστε συνδεδεμένος για να τροποποιήσετε τις προσωπικές σας "
 "πληροφορίες."
 
-#: ../src/config.py:2396
+#: ../src/config.py:2398
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:2397
+#: ../src/config.py:2399
 #, fuzzy
 msgid "Your server can't save your personal information."
 msgstr ""
 "Πρέπει πρώτα να δημιουργήσετε το λογαριασμό σας προτού ξεκινήσετε να "
 "τροποποιείτε τις προσωπικές σας πληροφορίες."
 
-#: ../src/config.py:2510 ../src/config.py:2546
+#: ../src/config.py:2512 ../src/config.py:2548
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Για να αλλάξετε το όνομα λογαριασμού, πρέπει να αποσυνδεθείτε."
 
-#: ../src/config.py:2515
+#: ../src/config.py:2517
 msgid "Account Local already exists."
 msgstr "Υπάρχει ήδη τοπικό προφίλ με αυτό το όνομα"
 
-#: ../src/config.py:2516
+#: ../src/config.py:2518
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2673
+#: ../src/config.py:2675
 #, python-format
 msgid "Edit %s"
 msgstr "Επεξεργασία %s"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2677
 #, python-format
 msgid "Register to %s"
 msgstr "Εγγραφή στο %s"
 
 #. list at the beginning
-#: ../src/config.py:2711
+#: ../src/config.py:2713
 msgid "Ban List"
 msgstr "Λίστα Ban"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2714
 msgid "Member List"
 msgstr "Λίστα μελών"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2714
 msgid "Owner List"
 msgstr "Λίστα ιδιοκτητών"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2715
 msgid "Administrator List"
 msgstr "Λίστα διαχειριστών"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2763 ../src/disco.py:873 ../src/history_manager.py:201
+#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2773
+#: ../src/config.py:2789
 msgid "Reason"
 msgstr "Αιτία"
 
-#: ../src/config.py:2780
+#: ../src/config.py:2796
 msgid "Nick"
 msgstr "Ψευδώνυμο"
 
-#: ../src/config.py:2786
+#: ../src/config.py:2802
 msgid "Role"
 msgstr "Ρόλος"
 
-#: ../src/config.py:2813
+#: ../src/config.py:2829
 msgid "Banning..."
 msgstr "Απαγορεύεται η πρόσβαση..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2815
+#: ../src/config.py:2831
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6650,11 +6822,11 @@ msgstr ""
 "<b>Ποιόν θέλετε να αποβάλλετε;</b>\n"
 "\n"
 
-#: ../src/config.py:2817
+#: ../src/config.py:2833
 msgid "Adding Member..."
 msgstr "Προσθήκη μέλους..."
 
-#: ../src/config.py:2818
+#: ../src/config.py:2834
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6662,11 +6834,11 @@ msgstr ""
 "<b>Ποιόν θέλετε να κάνετε μέλος;</b>\n"
 "\n"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2836
 msgid "Adding Owner..."
 msgstr "Προσθήκη ιδιοκτήτη..."
 
-#: ../src/config.py:2821
+#: ../src/config.py:2837
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -6675,11 +6847,11 @@ msgstr ""
 "<b>Ποιόν θέλετε να κάνετε ιδιοκτήτη;</b>\n"
 "\n"
 
-#: ../src/config.py:2823
+#: ../src/config.py:2839
 msgid "Adding Administrator..."
 msgstr "Προσθήκη διαχειριστή..."
 
-#: ../src/config.py:2824
+#: ../src/config.py:2840
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6687,7 +6859,7 @@ msgstr ""
 "<b>Ποιόν θέλετε να κάνετε διαχειριστή;</b>\n"
 "\n"
 
-#: ../src/config.py:2825
+#: ../src/config.py:2841
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6704,86 +6876,86 @@ msgstr ""
 "4. τομέας (ταιριάζει ο τομέας, και κάθε χρήστης@τομέας,\n"
 "τομέας/πόρος, ή διεύθυνση που περιέχει υποτομέα."
 
-#: ../src/config.py:2926
+#: ../src/config.py:2943
 #, python-format
 msgid "Removing %s account"
 msgstr "Aφαίρεση του λογαριασμού %s"
 
-#: ../src/config.py:2941
+#: ../src/config.py:2958
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
 
-#: ../src/config.py:2942
+#: ../src/config.py:2959
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2955 ../src/gui_interface.py:1132
-#: ../src/gui_interface.py:1243
+#: ../src/config.py:2972 ../src/gui_interface.py:311
+#: ../src/gui_interface.py:1048
 msgid "Password Required"
 msgstr "Απαιτείται κωδικός"
 
-#: ../src/config.py:2956 ../src/gui_interface.py:1223
+#: ../src/config.py:2973 ../src/gui_interface.py:1028
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Πληκτρολογήστε τον κωδικό σας για το λογαριασμό %s"
 
-#: ../src/config.py:2957 ../src/gui_interface.py:1243
+#: ../src/config.py:2974 ../src/gui_interface.py:1048
 msgid "Save password"
 msgstr "Αποθήκευση κωδικού"
 
-#: ../src/config.py:2967
+#: ../src/config.py:2984
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Ο λογαριασμός \"%s\" είναι συνδεδεμένος με το διακομιστή"
 
-#: ../src/config.py:2968
+#: ../src/config.py:2985
 msgid "If you remove it, the connection will be lost."
 msgstr "Αν αφαιρεθεί, η σύνδεση θα χαθεί."
 
-#: ../src/config.py:2982
+#: ../src/config.py:2999
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: ../src/config.py:2983
+#: ../src/config.py:3000
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Τι θέλετε να κάνετε;"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3001
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Αφαίρεση λογαριασμού μόν_ο από το Gajim"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3002
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3078
+#: ../src/config.py:3095
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Εκτύπωση όλων των σελίδων"
 
-#: ../src/config.py:3079
+#: ../src/config.py:3096
 msgid "Enter and leave only"
 msgstr "Είσοδος και έξοδος μόνο"
 
-#: ../src/config.py:3080
+#: ../src/config.py:3097
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Εκτύπωση όλων των σελίδων"
 
-#: ../src/config.py:3150
+#: ../src/config.py:3167
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Αρχηγός ομάδας παραθύρων"
 
-#: ../src/config.py:3183
+#: ../src/config.py:3200
 msgid "This bookmark has invalid data"
 msgstr "Αυτός ο σελιδοδείκτης έχει μη έγκυρα δεδομένα"
 
-#: ../src/config.py:3184
+#: ../src/config.py:3201
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6791,31 +6963,31 @@ msgstr ""
 "αφαιρέστε το σελιδοδείκτη."
 
 #. invalid char
-#: ../src/config.py:3302 ../src/dialogs.py:1934
+#: ../src/config.py:3319 ../src/dialogs.py:1950
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/config.py:3303 ../src/config.py:3317 ../src/config.py:3331
+#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Δεν επιτρέπεται το ψευδώνυμο: %s"
 
-#: ../src/config.py:3316 ../src/config.py:3582
+#: ../src/config.py:3333 ../src/config.py:3599
 #, fuzzy
 msgid "Invalid server"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/config.py:3330
+#: ../src/config.py:3347
 #, fuzzy
 msgid "Invalid room"
 msgstr "Μη έγκυρη εγγραφή"
 
-#: ../src/config.py:3498
+#: ../src/config.py:3515
 msgid "Account has been added successfully"
 msgstr "Ο λογαριασμός προστέθηκε με επιτυχία"
 
-#: ../src/config.py:3499 ../src/config.py:3505
+#: ../src/config.py:3516 ../src/config.py:3522
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6826,36 +6998,36 @@ msgstr ""
 "επιλέγοντας το κουμπί για Προχωρημένους, ή αργότερα εάν επιλέξετε "
 "Λογαριασμοί από το μενού Επεξεργασία στο κυρίως παράθυρο."
 
-#: ../src/config.py:3504
+#: ../src/config.py:3521
 msgid "Your new account has been created successfully"
 msgstr "Ο νέος σας λογαριασμός δημιουργήθηκε με επιτυχία"
 
-#: ../src/config.py:3543
+#: ../src/config.py:3560
 msgid "Invalid username"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/config.py:3545
+#: ../src/config.py:3562
 msgid "You must provide a username to configure this account."
 msgstr ""
 "Πρέπει να δώσετε ένα όνομα χρήστη για την παραμετροποίηση του συγκεκριμένου "
 "λογαριασμού."
 
-#: ../src/config.py:3583
+#: ../src/config.py:3600
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Παρακαλώ καθορίστε το νέο ψευδώνυμο που θέλετε να χρησιμοποιείτε:"
 
-#: ../src/config.py:3639 ../src/gui_interface.py:1904
+#: ../src/config.py:3656 ../src/gui_interface.py:1693
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Επαφή ήδη στη λίστα επαφών"
 
-#: ../src/config.py:3640 ../src/gui_interface.py:1905
+#: ../src/config.py:3657 ../src/gui_interface.py:1694
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3717
+#: ../src/config.py:3734
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6865,7 +7037,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3723 ../src/gui_interface.py:1932
+#: ../src/config.py:3740 ../src/gui_interface.py:1721
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6873,74 +7045,83 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3755 ../src/config.py:3789
+#: ../src/config.py:3772 ../src/config.py:3806
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Σφάλμα κατά τη διάρκεια δημιουργίας λογαριασμού"
 
-#: ../src/config.py:3854
+#: ../src/config.py:3871
 msgid "Account name is in use"
 msgstr "Το όνομα λογαριασμού είναι ήδη σε χρήση"
 
-#: ../src/config.py:3855
+#: ../src/config.py:3872
 msgid "You already have an account using this name."
 msgstr "Έχετε ήδη ένα λογαριασμό με αυτό το όνομα."
 
-#: ../src/config.py:4009
+#: ../src/config.py:3991
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/config.py:3992
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#: ../src/config.py:4036
 msgid "Active"
 msgstr "Ενεργό"
 
-#: ../src/config.py:4017
+#: ../src/config.py:4044
 msgid "Event"
 msgstr "Γεγονός"
 
-#: ../src/config.py:4052
+#: ../src/config.py:4079
 msgid "First Message Received"
 msgstr "Λήφθηκε το πρώτο μήνυμα"
 
-#: ../src/config.py:4053
+#: ../src/config.py:4080
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Επόμενο μήνυμα ελήφθη"
 
-#: ../src/config.py:4055
+#: ../src/config.py:4082
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Επόμενο μήνυμα ελήφθη"
 
-#: ../src/config.py:4056
+#: ../src/config.py:4083
 msgid "Contact Connected"
 msgstr "Σύνδεση επαφής"
 
-#: ../src/config.py:4057
+#: ../src/config.py:4084
 msgid "Contact Disconnected"
 msgstr "Αποσύνδεση επαφής"
 
-#: ../src/config.py:4058
+#: ../src/config.py:4085
 msgid "Message Sent"
 msgstr "Το μήνυμα στάλθηκε"
 
-#: ../src/config.py:4059
+#: ../src/config.py:4086
 msgid "Group Chat Message Highlight"
 msgstr "Επισήμανση "
 
-#: ../src/config.py:4060
+#: ../src/config.py:4087
 msgid "Group Chat Message Received"
 msgstr "Λήφθηκε μήνυμα ομαδικής συζήτησης"
 
-#: ../src/config.py:4061
+#: ../src/config.py:4088
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Αντιγραφή διεύθυνσης email"
 
-#: ../src/conversation_textview.py:600
+#: ../src/conversation_textview.py:601
 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:619
+#: ../src/conversation_textview.py:620
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6949,46 +7130,46 @@ msgstr ""
 "Το κείμενο κάτω από αυτή τη γραμμή είναι ότι έχει λεχθεί από την τελευταία "
 "φορά που κοιτάξατε αυτή την ομαδική συζήτηση"
 
-#: ../src/conversation_textview.py:739
+#: ../src/conversation_textview.py:740
 #, fuzzy
 msgid "_Quote"
 msgstr "_Έξοδος"
 
-#: ../src/conversation_textview.py:746
+#: ../src/conversation_textview.py:747
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Α_ναζήτηση για:"
 
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Read _Wikipedia Article"
 msgstr "Ανάγνωση άρθρου της _Wikipedia"
 
-#: ../src/conversation_textview.py:763
+#: ../src/conversation_textview.py:765
 msgid "Look it up in _Dictionary"
 msgstr "Εύρεση στο _Λεξικό"
 
-#: ../src/conversation_textview.py:780
+#: ../src/conversation_textview.py:782
 #, 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:793
+#: ../src/conversation_textview.py:795
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Λείπει ένα \"%s\" από το URL της Δικτυακής αναζήτησης"
 
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 msgid "Web _Search for it"
 msgstr "Δικτυακή ανα_ζήτηση γι' αυτό"
 
-#: ../src/conversation_textview.py:802
+#: ../src/conversation_textview.py:804
 #, fuzzy
 msgid "Open as _Link"
 msgstr "Το άνοιγμα του συνδέσμου απέτυχε"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1296
+#: ../src/conversation_textview.py:1298
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6996,86 +7177,90 @@ msgstr[0] "Χθες"
 msgstr[1] "Χθες"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1344 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Θέμα: %s\n"
 
-#: ../src/dataforms_widget.py:544
+#: ../src/dataforms_widget.py:545
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Σε κάθε _μήνυμα"
 
-#: ../src/dataforms_widget.py:546
+#: ../src/dataforms_widget.py:547
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Η επέκταση δεν υποστηρίζεται"
 
-#: ../src/dataforms_widget.py:601
+#: ../src/dataforms_widget.py:562
+msgid "This field is required"
+msgstr ""
+
+#: ../src/dataforms_widget.py:607
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Ένα πρόγραμμα για το Jabber"
 
-#: ../src/dataforms_widget.py:602
+#: ../src/dataforms_widget.py:608
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:613
+#: ../src/dataforms_widget.py:619
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:616 ../src/dataforms_widget.py:618
+#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:82
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Όνομα εικονιδίου"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:84
 #, fuzzy, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "ID συστήματος:"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:195
 msgid "Group"
 msgstr "Ομάδα"
 
-#: ../src/dialogs.py:201
+#: ../src/dialogs.py:202
 msgid "In the group"
 msgstr "Στην ομάδα"
 
-#: ../src/dialogs.py:292
+#: ../src/dialogs.py:293
 msgid "KeyID"
 msgstr "Ταυτότητα κλειδιού"
 
-#: ../src/dialogs.py:297
+#: ../src/dialogs.py:298
 msgid "Contact name"
 msgstr "Όνομα επαφής"
 
-#: ../src/dialogs.py:469
+#: ../src/dialogs.py:470
 #, fuzzy
 msgid "Set Mood"
 msgstr "Ορισμός MOTD"
 
-#: ../src/dialogs.py:589
+#: ../src/dialogs.py:590
 #, python-format
 msgid "%s Status Message"
 msgstr "Μήνυμα για κατάσταση %s"
 
-#: ../src/dialogs.py:603
+#: ../src/dialogs.py:604
 msgid "Status Message"
 msgstr "Μήνυμα κατάστασης"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:794
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Μήνυμα κατάστασης"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:795
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
@@ -7083,108 +7268,109 @@ msgstr ""
 "Αυτό το όνομα χρησιμοποιείται ήδη από κάποιον άλλον από τους λογαριασμούς "
 "σας. Παρακαλώ, επιλέξτε άλλο όνομα."
 
-#: ../src/dialogs.py:802
+#: ../src/dialogs.py:803
 msgid "Save as Preset Status Message"
 msgstr "Αποθήκευση ως προκαθορισμένο μήνυμα κατάστασης"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:804
 msgid "Please type a name for this status message"
 msgstr "Εισάγετε ένα όνομα για αυτό το μήνυμα κατάστασης"
 
-#: ../src/dialogs.py:831
+#: ../src/dialogs.py:832
 #, fuzzy
 msgid "AIM Address:"
 msgstr "Αντιγραφή διεύθυνσης email"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:833
 #, fuzzy
 msgid "GG Number:"
 msgstr "Αριθμός χώρων εργασίας:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:834
 #, fuzzy
 msgid "ICQ Number:"
 msgstr "Αριθμός χώρων εργασίας:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:835
 #, fuzzy
 msgid "MSN Address:"
 msgstr "Αντιγραφή διεύθυνσης email"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:836
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Αντιγραφή διεύθυνσης email"
 
-#: ../src/dialogs.py:872
+#: ../src/dialogs.py:873
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Παρακαλώ συμπληρώστε τα στοιχεία της επαφής που θέλετε να προσθέσετε στο "
 "λογαριασμό %s"
 
-#: ../src/dialogs.py:875
+#: ../src/dialogs.py:876
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Παρακαλώ συμπληρώστε τα στοιχεία της επαφής που θέλετε να προσθέσετε"
 
-#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
+#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
+#: ../src/dialogs.py:3464
 msgid "Invalid User ID"
 msgstr "Μη έγκυρη ταυτότητα χρήστη"
 
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1052
 msgid "The user ID must not contain a resource."
 msgstr "Το αναγνωριστικό χρήστη δεν πρέπει να περιέχει έναν πόρο."
 
-#: ../src/dialogs.py:1051
+#: ../src/dialogs.py:1057
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Επιθυμώ να σε προσθέσω στη λίστα επαφών μου."
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1071
 msgid "Contact already in roster"
 msgstr "Επαφή ήδη στη λίστα επαφών"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1072
 msgid "This contact is already listed in your roster."
 msgstr "Αυτή η επαφή υπάρχει ήδη στη λίστα επαφών σας."
 
-#: ../src/dialogs.py:1112
+#: ../src/dialogs.py:1118
 #, fuzzy
 msgid "User ID:"
 msgstr "Το αναγνωριστικό χρήστη δεν ταιριάζει"
 
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1189
 msgid "A GTK+ jabber client"
 msgstr "Ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
 
-#: ../src/dialogs.py:1176
+#: ../src/dialogs.py:1190
 msgid "GTK+ Version:"
 msgstr "Έκδοση GTK+:"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1191
 msgid "PyGTK Version:"
 msgstr "Έκδοση PyGTK:"
 
-#: ../src/dialogs.py:1187
+#: ../src/dialogs.py:1201
 msgid "Current Developers:"
 msgstr "Δημιουργοί:"
 
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1203
 msgid "Past Developers:"
 msgstr "Προηγούμενοι δημιουργοί:"
 
-#: ../src/dialogs.py:1195
+#: ../src/dialogs.py:1209
 msgid "THANKS:"
 msgstr "ΕΥΧΑΡΙΣΤΙΕΣ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1215
 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:1213
+#: ../src/dialogs.py:1227
 msgid "translator-credits"
 msgstr ""
 "Νίκος Κουρεμένος <kourem@gmail.com>\n"
@@ -7192,7 +7378,7 @@ msgstr ""
 "Σταύρος Γιαννούρης <stavrosg@hellug.gr>\n"
 "Στάθης Καμπέρης <ekamperi@auth.gr>"
 
-#: ../src/dialogs.py:1396
+#: ../src/dialogs.py:1410
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7201,44 +7387,44 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1935 ../src/dialogs.py:2322
+#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr ""
 "Το όνομα του δωματίου ή του διακομιστή περιέχει μη επιτρεπόμενους χαρακτήρες."
 
-#: ../src/dialogs.py:2053
+#: ../src/dialogs.py:2069
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Αίτηση εγγραφής για το λογαριασμό %s από %s"
 
-#: ../src/dialogs.py:2056
+#: ../src/dialogs.py:2072
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Αίτηση εγγραφής από %s"
 
-#: ../src/dialogs.py:2131 ../src/gui_interface.py:2672
+#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
 #, fuzzy, python-format
 msgid "You are already in group chat %s"
 msgstr "Βρίσκεστε ήδη στο δωμάτιο %s"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2153
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εκτός αν είστε "
 "συνδεδεμένος."
 
-#: ../src/dialogs.py:2178
+#: ../src/dialogs.py:2194
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Συμμετοχή σε Ομαδική συζήτηση με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2325
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Μη έγκυρο όνομα λογαριασμού"
 
-#: ../src/dialogs.py:2310
+#: ../src/dialogs.py:2326
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
@@ -7246,74 +7432,74 @@ msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: ../src/dialogs.py:2321
+#: ../src/dialogs.py:2337
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/dialogs.py:2326 ../src/dialogs.py:2332
-#: ../src/groupchat_control.py:1832
+#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
+#: ../src/groupchat_control.py:1847
 #, fuzzy
 msgid "Invalid group chat Jabber ID"
 msgstr "Μη έγκυρο Jabber ID"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2343
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr ""
 "Το όνομα του δωματίου ή του διακομιστή περιέχει μη επιτρεπόμενους χαρακτήρες."
 
-#: ../src/dialogs.py:2333 ../src/groupchat_control.py:1833
+#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
 #, fuzzy
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr ""
 "Το όνομα του δωματίου ή του διακομιστή περιέχει μη επιτρεπόμενους χαρακτήρες."
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2356
 #, fuzzy
 msgid "This is not a group chat"
 msgstr "Αυτή η μορφή συμπίεσης δεν υποστηρίζεται:"
 
-#: ../src/dialogs.py:2341
+#: ../src/dialogs.py:2357
 #, fuzzy, python-format
 msgid "%s is not the name of a group chat."
 msgstr "Ερώτηση πριν το κλείσιμο καρτέλας/ παραθύρου ομαδικής κουβέντας."
 
-#: ../src/dialogs.py:2372
+#: ../src/dialogs.py:2388
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Πρέπει να είστε συνδεδεμένος για να αλλάξετε τον κωδικό σας."
 
-#: ../src/dialogs.py:2386
+#: ../src/dialogs.py:2402
 msgid "Server"
 msgstr "Εξυπηρετητής"
 
-#: ../src/dialogs.py:2421
+#: ../src/dialogs.py:2437
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Ο λογαριασμός \"%s\" είναι συνδεδεμένος με το διακομιστή"
 
-#: ../src/dialogs.py:2422
+#: ../src/dialogs.py:2438
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εκτός αν είστε "
 "συνδεδεμένος."
 
-#: ../src/dialogs.py:2446
+#: ../src/dialogs.py:2462
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2523
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Έναρξη κουβέντας με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:2509
+#: ../src/dialogs.py:2525
 msgid "Start Chat"
 msgstr "Έναρξη κουβέντας"
 
-#: ../src/dialogs.py:2510
+#: ../src/dialogs.py:2526
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -7323,168 +7509,168 @@ msgstr ""
 "την οποία θέλετε να στείλετε ένα μήνυμα συζήτησης:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2536 ../src/dialogs.py:2917 ../src/dialogs.py:3129
+#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
 msgid "Connection not available"
 msgstr "Σύνδεση μη διαθέσιμη"
 
-#: ../src/dialogs.py:2537 ../src/dialogs.py:2918 ../src/dialogs.py:3130
+#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Παρακαλώ βεβαιωθείτε ότι είστε συνδεδεμένοι με το \"%s\"."
 
-#: ../src/dialogs.py:2546 ../src/dialogs.py:2549
+#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
 msgid "Invalid JID"
 msgstr "Μη έγκυρο JID"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2565
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Δεν ήταν δυνατή η ανάγνωση του \"%s\"."
 
-#: ../src/dialogs.py:2558
+#: ../src/dialogs.py:2574
 msgid "Without a connection, you can not change your password."
 msgstr "Πρέπει να είστε συνδεδεμένος για να αλλάξετε τον κωδικό σας."
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "Invalid password"
 msgstr "Μη έγκυρος κωδικός"
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "You must enter a password."
 msgstr "Πρέπει να πληκτρολογήσετε ένα κωδικό."
 
-#: ../src/dialogs.py:2581
+#: ../src/dialogs.py:2597
 msgid "Passwords do not match"
 msgstr "Οι κωδικοί δεν ταιριάζουν"
 
-#: ../src/dialogs.py:2582
+#: ../src/dialogs.py:2598
 msgid "The passwords typed in both fields must be identical."
 msgstr "Οι κωδικοί των δυο πεδίων πρέπει να είναι ίδιοι."
 
 #. default value
-#: ../src/dialogs.py:2619 ../src/notify.py:247 ../src/notify.py:473
+#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
 msgid "Contact Signed In"
 msgstr "Σύνδεση επαφής"
 
-#: ../src/dialogs.py:2621 ../src/notify.py:255 ../src/notify.py:475
+#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
 msgid "Contact Signed Out"
 msgstr "Αποσύνδεση επαφής"
 
 #. chat message
-#: ../src/dialogs.py:2623 ../src/notify.py:277 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
 msgid "New Message"
 msgstr "Νέο μήνυμα"
 
 #. single message
-#: ../src/dialogs.py:2623 ../src/notify.py:259 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
 msgid "New Single Message"
 msgstr "Νέο μονό μήνυμα"
 
 #. private message
-#: ../src/dialogs.py:2624 ../src/notify.py:265 ../src/notify.py:478
+#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
 msgid "New Private Message"
 msgstr "Νέο προσωπικό μήνυμα"
 
-#: ../src/dialogs.py:2624 ../src/gui_interface.py:1358 ../src/notify.py:487
+#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
 msgid "New E-mail"
 msgstr "Νέο E-Mail"
 
-#: ../src/dialogs.py:2626 ../src/gui_interface.py:1420 ../src/notify.py:480
+#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
 msgid "File Transfer Request"
 msgstr "Αίτηση μεταφοράς αρχείου"
 
-#: ../src/dialogs.py:2628 ../src/gui_interface.py:1320
-#: ../src/gui_interface.py:1389 ../src/notify.py:482
+#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
+#: ../src/gui_interface.py:1186 ../src/notify.py:482
 msgid "File Transfer Error"
 msgstr "Σφάλμα μεταφοράς αρχείου"
 
-#: ../src/dialogs.py:2630 ../src/gui_interface.py:1466
-#: ../src/gui_interface.py:1489 ../src/gui_interface.py:1506
+#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
+#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
 #: ../src/notify.py:484
 msgid "File Transfer Completed"
 msgstr "Η μεταφορά αρχείου ολοκληρώθηκε"
 
-#: ../src/dialogs.py:2631 ../src/gui_interface.py:1469 ../src/notify.py:485
+#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
 msgid "File Transfer Stopped"
 msgstr "Η μεταφορά αρχείου διακόπηκε"
 
-#: ../src/dialogs.py:2633 ../src/gui_interface.py:1152 ../src/notify.py:489
+#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
 msgid "Groupchat Invitation"
 msgstr "Πρόσκληση ομαδικής κουβέντας"
 
-#: ../src/dialogs.py:2635 ../src/notify.py:239 ../src/notify.py:491
+#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
 msgid "Contact Changed Status"
 msgstr "Η επαφή άλλαξε κατάσταση"
 
-#: ../src/dialogs.py:2836
+#: ../src/dialogs.py:2852
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Μονό μήνυμα με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:2838
+#: ../src/dialogs.py:2854
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Μονό μήνυμα με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:2840
+#: ../src/dialogs.py:2856
 msgid "Single Message"
 msgstr "Μονό μήνυμα"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2843
+#: ../src/dialogs.py:2859
 #, python-format
 msgid "Send %s"
 msgstr "Αποστολή %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:2882
 #, python-format
 msgid "Received %s"
 msgstr "Έγινε λήψη του %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2889
+#: ../src/dialogs.py:2905
 #, 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:2968
+#: ../src/dialogs.py:2984
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:2985
 #, python-format
 msgid "%s wrote:\n"
 msgstr "Ο/Η %s έγραψε:\n"
 
-#: ../src/dialogs.py:3028
+#: ../src/dialogs.py:3044
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Κονσόλα για %s"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3046
 msgid "XML Console"
 msgstr "XML Κονσόλα"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "add"
 msgstr "Πάγωσε"
 
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "modify"
 msgstr "_Τροποποίηση"
 
-#: ../src/dialogs.py:3160
+#: ../src/dialogs.py:3176
 #, fuzzy
 msgid "remove"
 msgstr "_Αφαίρεση"
 
-#: ../src/dialogs.py:3188
+#: ../src/dialogs.py:3204
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7492,162 +7678,195 @@ msgid ""
 msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3204 ../src/dialogs.py:3250
+#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
 msgid "Add"
 msgstr "Προσθήκη"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3206 ../src/dialogs.py:3281
+#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
 #, fuzzy
 msgid "Modify"
 msgstr "_Τροποποίηση"
 
-#: ../src/dialogs.py:3212
+#: ../src/dialogs.py:3228
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:3218
+#: ../src/dialogs.py:3234
 #, fuzzy
 msgid "Groups"
 msgstr "Ομάδα"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3342
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Επιθυμώ να σε προσθέσω στη λίστα επαφών μου."
 
-#: ../src/dialogs.py:3340
+#: ../src/dialogs.py:3356
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "Προσθήκη _επαφής"
 
-#: ../src/dialogs.py:3377
+#: ../src/dialogs.py:3393
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: ../src/dialogs.py:3430
+#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#, python-format
+msgid "Archiving Preferences for %s"
+msgstr ""
+
+#: ../src/dialogs.py:3473
+#, fuzzy
+msgid "Invalid expire value"
+msgstr "Μη έγκυρο όνομα χρήστη"
+
+#: ../src/dialogs.py:3474
+msgid "Expire must be a valid positive integer."
+msgstr ""
+
+#: ../src/dialogs.py:3521
+msgid "There is an error with the form"
+msgstr ""
+
+#: ../src/dialogs.py:3732
+msgid "There is an error"
+msgstr ""
+
+#: ../src/dialogs.py:3796
 #, fuzzy, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "backdrops.list"
 
-#: ../src/dialogs.py:3434
+#: ../src/dialogs.py:3800
 #, fuzzy, python-format
 msgid "Privacy List for %s"
 msgstr "Σύνταξη συντόμευσης για :"
 
-#: ../src/dialogs.py:3490
+#: ../src/dialogs.py:3856
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3861
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Εικονίδια δράσεων"
 
-#: ../src/dialogs.py:3539
+#: ../src/dialogs.py:3905
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Επεξεργασία κανόνα</b>"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:4016
 msgid "<b>Add a rule</b>"
 msgstr "<b>Προσθήκη κανόνα</b>"
 
-#: ../src/dialogs.py:3750
+#: ../src/dialogs.py:4116
 #, fuzzy, python-format
 msgid "Privacy Lists for %s"
 msgstr "Σύνταξη συντόμευσης για :"
 
-#: ../src/dialogs.py:3752
+#: ../src/dialogs.py:4118
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Προσωπικές συζητήσεις"
 
-#: ../src/dialogs.py:3822
+#: ../src/dialogs.py:4188
 #, fuzzy
 msgid "Invalid List Name"
 msgstr "Μη έγκυρο όνομα αρχείου"
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4189
 #, fuzzy
 msgid "You must enter a name to create a privacy list."
 msgstr "Πρέπει να δώσετε έναν κωδικό για το νέο λογαριασμό."
 
-#: ../src/dialogs.py:3855
+#: ../src/dialogs.py:4221
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Ο/Η %s μπήκε στο δωμάτιο"
 
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4224
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "Ο/Η %(contact_jid)s σας προσκάλεσε στο %(room_jid)s"
 
-#: ../src/dialogs.py:3860
+#: ../src/dialogs.py:4226
 #, fuzzy, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "Ο/Η %(contact_jid)s σας προσκάλεσε στο %(room_jid)s"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4234
 #, python-format
 msgid "Comment: %s"
 msgstr "Σχόλιο: %s"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4236
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3932
+#: ../src/dialogs.py:4298
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:3942 ../src/dialogs.py:3985 ../src/dialogs.py:4041
+#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
+#: ../src/dialogs.py:4495
 msgid "All files"
 msgstr "Όλα τα αρχεία"
 
-#: ../src/dialogs.py:3947
+#: ../src/dialogs.py:4313
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:3975
+#: ../src/dialogs.py:4341
 msgid "Choose Sound"
 msgstr "Επιλογή ήχου"
 
-#: ../src/dialogs.py:3990
+#: ../src/dialogs.py:4356
 msgid "Wav Sounds"
 msgstr "Αρχεία ήχου Wav"
 
-#: ../src/dialogs.py:4028
+#: ../src/dialogs.py:4394
 msgid "Choose Image"
 msgstr "Επιλογή εικόνας"
 
-#: ../src/dialogs.py:4046
+#: ../src/dialogs.py:4412
 msgid "Images"
 msgstr "Εικόνες"
 
-#: ../src/dialogs.py:4113
+#: ../src/dialogs.py:4482
+#, fuzzy
+msgid "Choose Archive"
+msgstr "Επιλογή εικόνας"
+
+#: ../src/dialogs.py:4500
+#, fuzzy
+msgid "Zip files"
+msgstr "Όλα τα αρχεία"
+
+#: ../src/dialogs.py:4525
 #, python-format
 msgid "When %s becomes:"
 msgstr "Όταν το %s γίνεται:"
 
-#: ../src/dialogs.py:4115
+#: ../src/dialogs.py:4527
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Προσθήκη ειδικής ειδοποίησης για το %s"
 
-#: ../src/dialogs.py:4190
+#: ../src/dialogs.py:4602
 msgid "Condition"
 msgstr "Κατάσταση"
 
-#: ../src/dialogs.py:4310
+#: ../src/dialogs.py:4722
 msgid "when I am "
 msgstr "όταν είμαι"
 
-#: ../src/dialogs.py:4786
+#: ../src/dialogs.py:5198
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7655,38 +7874,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4789
+#: ../src/dialogs.py:5201
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4795 ../src/dialogs.py:4879
+#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4801
+#: ../src/dialogs.py:5213
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4806
+#: ../src/dialogs.py:5218
 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:4809 ../src/dialogs.py:4860 ../src/dialogs.py:4873
+#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4814
+#: ../src/dialogs.py:5226
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4825
+#: ../src/dialogs.py:5237
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4826
+#: ../src/dialogs.py:5238
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7696,44 +7915,44 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4827
+#: ../src/dialogs.py:5239
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4861
+#: ../src/dialogs.py:5273
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4867
+#: ../src/dialogs.py:5279
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4874
+#: ../src/dialogs.py:5286
 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:4880
+#: ../src/dialogs.py:5292
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:4945
+#: ../src/dialogs.py:5357
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4947
+#: ../src/dialogs.py:5359
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4949
+#: ../src/dialogs.py:5361
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4953
+#: ../src/dialogs.py:5365
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7749,24 +7968,24 @@ msgstr "Άλλα"
 msgid "Conference"
 msgstr "Ομαδικές συζητήσεις"
 
-#: ../src/disco.py:512
+#: ../src/disco.py:513
 msgid "Without a connection, you can not browse available services"
 msgstr "Πρέπει να συνδεθείτε για να περιηγηθείτε στις υπηρεσίες"
 
-#: ../src/disco.py:589
+#: ../src/disco.py:600
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Ανακάλυψη υπηρεσιών χρησιμοποιώντας το λογαριασμό %s"
 
-#: ../src/disco.py:591
+#: ../src/disco.py:602
 msgid "Service Discovery"
 msgstr "Ανακάλυψη υπηρεσιών"
 
-#: ../src/disco.py:741
+#: ../src/disco.py:758
 msgid "The service could not be found"
 msgstr "Η υπηρεσία δεν ήταν δυνατό να βρεθεί"
 
-#: ../src/disco.py:742
+#: ../src/disco.py:759
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7774,99 +7993,99 @@ msgstr ""
 "Δεν υπάρχει υπηρεσία στη διεύθυνση που εισάγατε, ή δεν ανταποκρίνεται. "
 "Ελέγξτε τη διεύθυνση και προσπαθήστε ξανά."
 
-#: ../src/disco.py:746 ../src/disco.py:1082
+#: ../src/disco.py:763 ../src/disco.py:1100
 msgid "The service is not browsable"
 msgstr "Η υπηρεσία δεν είναι περιηγήσιμη"
 
-#: ../src/disco.py:747
+#: ../src/disco.py:764
 msgid "This type of service does not contain any items to browse."
 msgstr "Αυτού του είδους η υπηρεσία δεν περιέχει άλλα αντικείμενα."
 
-#: ../src/disco.py:786 ../src/disco.py:796
+#: ../src/disco.py:804 ../src/disco.py:814
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/disco.py:850
+#: ../src/disco.py:868
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Περιήγηση %s χρησιμοποιώντας το λογαριασμό %s"
 
-#: ../src/disco.py:894
+#: ../src/disco.py:912
 msgid "_Browse"
 msgstr "_Περιήγηση"
 
-#: ../src/disco.py:1083
+#: ../src/disco.py:1101
 msgid "This service does not contain any items to browse."
 msgstr "Αυτή η υπηρεσία δεν περιέχει άλλα αντικείμενα."
 
-#: ../src/disco.py:1323
+#: ../src/disco.py:1341
 #, fuzzy
 msgid "_Execute Command"
 msgstr "_Εκτέλεση εντολής..."
 
-#: ../src/disco.py:1333 ../src/disco.py:1504
+#: ../src/disco.py:1351 ../src/disco.py:1522
 msgid "Re_gister"
 msgstr "_Εγγραφή"
 
-#: ../src/disco.py:1545
+#: ../src/disco.py:1563
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Σάρωση %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1736
+#: ../src/disco.py:1754
 msgid "Users"
 msgstr "Χρήστες"
 
 #. Description column
-#: ../src/disco.py:1744
+#: ../src/disco.py:1762
 msgid "Description"
 msgstr "Περιγραφή"
 
 #. Id column
-#: ../src/disco.py:1752
+#: ../src/disco.py:1770
 #, fuzzy
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1817 ../src/gui_interface.py:3182
+#: ../src/disco.py:1835 ../src/gui_interface.py:2995
 msgid "Bookmark already set"
 msgstr "Ο σελιδοδείκτης έχει οριστεί ήδη"
 
-#: ../src/disco.py:1818 ../src/gui_interface.py:3183
+#: ../src/disco.py:1836 ../src/gui_interface.py:2996
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Το δωμάτιο \"%s\" υπάρχει ήδη στους σελιδοδείκτες σας."
 
-#: ../src/disco.py:1827 ../src/gui_interface.py:3197
+#: ../src/disco.py:1845 ../src/gui_interface.py:3010
 msgid "Bookmark has been added successfully"
 msgstr "Ο σελιδοδείκτης προστέθηκε με επιτυχία"
 
-#: ../src/disco.py:1828 ../src/gui_interface.py:3198
+#: ../src/disco.py:1846 ../src/gui_interface.py:3011
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Μπορείτε να διαχειριστείτε τους σελιδοδείκτες από το μενού Ενέργειας στο "
 "κεντρικό παράθυρο."
 
-#: ../src/disco.py:2039
+#: ../src/disco.py:2057
 msgid "Subscribed"
 msgstr "Εγγεγραμμένος"
 
-#: ../src/disco.py:2047
+#: ../src/disco.py:2065
 msgid "Node"
 msgstr "Κόμβος"
 
-#: ../src/disco.py:2111
+#: ../src/disco.py:2129
 #, fuzzy
 msgid "New post"
 msgstr "_Νέα λίστα..."
 
-#: ../src/disco.py:2117
+#: ../src/disco.py:2135
 msgid "_Subscribe"
 msgstr "_Εγγραφή"
 
-#: ../src/disco.py:2123
+#: ../src/disco.py:2141
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "_Εγγραφή"
@@ -8043,14 +8262,14 @@ msgstr ""
 
 #: ../src/features_window.py:95
 msgid ""
-"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
-"in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 
 #: ../src/features_window.py:96
 msgid ""
-"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
+"You have to set 'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 
 #: ../src/features_window.py:97
@@ -8209,12 +8428,12 @@ msgstr "Περιγραφή: %s"
 msgid "%s wants to send you a file:"
 msgstr "O %s επιθυμεί να σας στείλει ένα αρχείο:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Δεν είναι δυνατή η αντικατάσταση του υπάρχοντος αρχείου \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -8222,22 +8441,22 @@ msgstr ""
 "Ένα αρχείο με αυτό το όνομα υπάρχει ήδη και δε μπορείτε να το "
 "αντικαταστήσετε."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 msgid "This file already exists"
 msgstr "Αυτό το αρχείο υπάρχει ήδη"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 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:369 ../src/gtkgui_helpers.py:914
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Δεν είναι δυνατή η εγγραφή στον κατάλογο \"%s\""
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
 msgid "You do not have permission to create files in this directory."
 msgstr "Δε μπορείτε να δημιουργήσετε αρχεία σε αυτό τον κατάλογο."
 
@@ -8338,30 +8557,30 @@ msgstr ""
 "Φαίνεται πως εκτελείται ήδη μια διεργασία του Gajim.\n"
 "Σίγουρα να εκτελεστεί;"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
 #, fuzzy
 msgid "Shows a help on specific command"
 msgstr "εμφανίζει βοήθεια για μια συγκεκριμένη εντολή"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:80
+#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
 msgid "command"
 msgstr "εντολή"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "εμφάνιση βοήθειας στην εντολή"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Εμφανίζει ή αποκρύπτει το παράθυρο λίστας επαφών"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Εμφάνιση ενός παραθύρου με το επόμενο αδιάβαστο μήνυμα"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
 #, fuzzy
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
@@ -8370,6 +8589,13 @@ msgstr ""
 "Εμφανίζει όλες τις επαφές στη λίστα επαφών. Κάθε επαφή εμφανίζεται σε μια "
 "ξεχωριστή γραμμή"
 
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
+#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
+#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
+#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
 #: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
 #: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
 #: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
@@ -8381,43 +8607,35 @@ msgstr ""
 msgid "account"
 msgstr "λογαριασμός"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "εμφάνιση μόνο των επαφών του συγκεκριμένου λογαριασμού"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Εμφανίζει τη λίστα των καταχωρημένων λογαριασμών"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "Αλλάζει την κατάσταση ενός ή πολλών λογαριασμών"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
 msgid "status"
 msgstr "κατάσταση"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106
 #, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"accoun't previous status"
+msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "μία από τις: αποσυνδεδεμένος, συνδεδεμένος, κουβέντα, απομακρυσμένος, "
 "εκτεταμένα-απομακρυσμένος, dnd, αόρατος "
 
-#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
-msgid "message"
-msgstr "μήνυμα"
-
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "μήνυμα κατάστασης"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8426,52 +8644,24 @@ msgstr ""
 "δοκιμάστε να αλλάξετε την κατάσταση όλων των λογαριασμών που έχουν "
 "ενεργοποιημένη την επιλογή \"συγχρονισμός με τη γενική κατάσταση\""
 
-#: ../src/gajim-remote.py:117
-#, fuzzy
-msgid "Changes the priority of account or accounts"
-msgstr "Αλλάζει την κατάσταση ενός ή πολλών λογαριασμών"
-
-#: ../src/gajim-remote.py:119
-#, fuzzy
-msgid "priority"
-msgstr "Π_ροτεραιότητα:"
-
-#: ../src/gajim-remote.py:119
-#, fuzzy
-msgid "priority you want to give to the account"
-msgstr "_Επιλέξτε εάν επιθυμείτε να καταχωρήσετε νέο jabber λογαριασμό"
-
-#: ../src/gajim-remote.py:121
-#, fuzzy
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-msgstr ""
-"αλλαγή κατάστασης του λογαριασμού \"account\". Εάν δεν έχει καθοριστεί, "
-"δοκιμάστε να αλλάξετε την κατάσταση όλων των λογαριασμών που έχουν "
-"ενεργοποιημένη την επιλογή \"συγχρονισμός με τη γενική κατάσταση\""
-
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Εμφανίζει το διαλόγο κουβέντας ώστε να μπορείτε να στέλνετε μηνύματα σε μια "
 "επαφή"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "το JID της επαφής με την οποία θέλετε να συνομιλήσετε"
 
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
 #: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "εάν έχει καθοριστεί, η επαφή λαμβάνεται από την λίστα επαφών αυτού του "
 "λογαριασμού"
 
-#: ../src/gajim-remote.py:134
-msgid "message content. The account must be specified or \"\""
-msgstr ""
-
-#: ../src/gajim-remote.py:139
+#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -8483,31 +8673,36 @@ msgstr ""
 "'λογαριασμό', χωρίς το 'κλειδί OpenPGP', απλώς θέστε το 'κλειδί OpenPGP' σε "
 "''."
 
+#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
 #: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "το JID της επαφής που θα λάβει το μήνυμα"
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
+#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "περιεχόμενα μηνύματος"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "κλειδί pgp"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "εάν καθοριστεί, το μήνυμα θα κρυπτογραφηθεί χρησιμοποιώντας αυτό το δημόσιο "
 "κλειδί"
 
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
+#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "εάν οριστεί, το μήνυμα θα σταλεί χρησιμοποιώντας αυτόν το λογαριασμό"
 
-#: ../src/gajim-remote.py:152
+#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -8519,149 +8714,304 @@ msgstr ""
 "'λογαριασμό', χωρίς το 'κλειδί OpenPGP', απλώς θέστε το 'κλειδί OpenPGP' σε "
 "''."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "θέμα"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "θέμα μηνύματος"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "το JID της επαφής που θα λάβει το μήνυμα"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Λήψη αναλυτικών πληροφοριών για μία επαφή"
 
+#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
+#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
 #: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
 #: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "το JID της επαφής"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Λήψη αναλυτικών πληροφοριών για ένα λογαριασμό"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Όνομα λογαριασμού"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Αποστολή αρχείου σε μία επαφή"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "file"
 msgstr "αρχείο"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Διαδρομή αρχείου"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "εάν οριστεί, το αρχείο θα σταλεί χρησιμοποιώντας αυτόν το λογαριασμό"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Εμφανίζει όλες τις προτιμήσεις και τις τιμές τους"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Καταχωρεί την 'τιμή' στην τιμή του 'κλειδιού'"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "κλειδί=τιμή"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "Το 'κλειδί' είναι το όνομα της προτίμησης, ενώ 'τιμή' είναι η τιμή που του "
 "έχει προσδιοριστεί"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Διαγράφει μια προτίμηση"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
 msgid "key"
 msgstr "κλειδί"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "όνομα της προτίμησης που πρόκειται να διαγραφεί"
 
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
-"Γράφει την τρέχουσα κατάσταση των προτιμήσεων του Gajim στο .config αρχείο"
+"Γράφει την τρέχουσα κατάσταση των προτιμήσεων του Gajim στο .config αρχείο"
+
+#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
+msgid "Removes contact from roster"
+msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
+
+#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+msgid "Adds contact to roster"
+msgstr "Προσθέτει μια επαφή στη λίστα επαφών"
+
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+msgid "Adds new contact to this account"
+msgstr "Προσθέτει μια νέα επαφή σε αυτό το λογαριασμό."
+
+#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+msgid "Returns current status (the global one unless account is specified)"
+msgstr ""
+"Εμφανίζει την τρέχουσα κατάσταση (τη γενική. εκτός εάν έχει προσδιοριστεί "
+"λογαριασμός)"
+
+#: ../src/gajim-remote-plugin.py:226
+#, fuzzy
+msgid ""
+"Returns current status message(the global one unless account is specified)"
+msgstr ""
+"Εμφανίζει την τρέχουσα κατάσταση (τη γενική. εκτός εάν έχει προσδιοριστεί "
+"λογαριασμός)"
+
+#: ../src/gajim-remote-plugin.py:233 ../src/gajim-remote.py:249
+#, fuzzy
+msgid "Returns number of unread messages"
+msgstr "Αναφέρει τον αριθμό των μη αναγνωσμένων μηνυμάτων"
+
+#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+#, fuzzy
+msgid "Opens 'Start Chat' dialog"
+msgstr "Άνοιγμα του διαλόγου 'Έναρξη κουβέντας'"
+
+#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+msgid "Starts chat, using this account"
+msgstr "Έναρξη κουβέντας με χρήση αυτού του λογαριασμού"
+
+#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+#, fuzzy
+msgid "Sends custom XML"
+msgstr "Προσαρμοσμένο μέγεθος _γραμματοσειράς:"
+
+#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#, fuzzy
+msgid "XML to send"
+msgstr "Αποστολή επιλεγμένου αρχείου στο \"%s\""
+
+#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
+#, fuzzy
+msgid "Handle a xmpp:/ uri"
+msgstr "Το URI \"%s\" δεν είναι έγκυρο."
+
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
+#, fuzzy
+msgid "uri"
+msgstr "Το URI \"%s\" δεν είναι έγκυρο."
+
+#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#, fuzzy
+msgid "Join a MUC room"
+msgstr "_Σύνδεση σε νέο δωμάτιο"
+
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+#, fuzzy
+msgid "room"
+msgstr "Από"
+
+#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+#, fuzzy
+msgid "nick"
+msgstr "Ψευδώνυμο"
+
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+msgid "password"
+msgstr "κωδικός πρόσβασης"
+
+#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#, fuzzy
+msgid "Check if Gajim is running"
+msgstr "Το Gajim εκτελείται ήδη"
+
+#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
+#: ../src/gajim-remote.py:300
+#, fuzzy
+msgid "Shows or hides the ipython window"
+msgstr "Εμφανίζει ή αποκρύπτει το παράθυρο λίστας επαφών"
+
+#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+msgid "Missing argument \"contact_jid\""
+msgstr "Λείπει το όρισμα \"contact_jid\""
+
+#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#, python-format
+msgid ""
+"'%s' is not in your roster.\n"
+"Please specify account for sending the message."
+msgstr ""
+"Η επαφή '%s' δεν είναι στη λίστα σας.\n"
+"Παρακαλώ καθορίστε τον λογαριασμό που θα σταλεί το μήνυμα."
+
+#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+msgid "You have no active account"
+msgstr "Δεν έχετε κανέναν ενεργό λογαριασμό"
+
+#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+msgid "It seems Gajim is not running. So you can't use gajim-remote."
+msgstr ""
 
-#: ../src/gajim-remote.py:218
-msgid "Removes contact from roster"
-msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
+#: ../src/gajim-remote-plugin.py:412
+#, python-format
+msgid ""
+"Usage: %s %s %s \n"
+"\t %s"
+msgstr ""
+"Χρήση: %s %s %s \n"
+"\t %s"
 
-#: ../src/gajim-remote.py:227
-msgid "Adds contact to roster"
-msgstr "Προσθέτει μια επαφή στη λίστα επαφών"
+#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+msgid "Arguments:"
+msgstr "Ορίσματα:"
 
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "jid"
+#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#, python-format
+msgid "%s not found"
+msgstr "μη υπαρκτό %s"
 
-#: ../src/gajim-remote.py:230
-msgid "Adds new contact to this account"
-msgstr "Προσθέτει μια νέα επαφή σε αυτό το λογαριασμό."
+#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
+#, python-format
+msgid ""
+"Usage: %s command [arguments]\n"
+"Command is one of:\n"
+msgstr ""
+"Χρήση: %s εντολή [ορίσματα]\n"
+"Η εντολή είναι μία από τις:\n"
 
-#: ../src/gajim-remote.py:235
-msgid "Returns current status (the global one unless account is specified)"
+#: ../src/gajim-remote-plugin.py:496
+#, fuzzy, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
 msgstr ""
-"Εμφανίζει την τρέχουσα κατάσταση (τη γενική. εκτός εάν έχει προσδιοριστεί "
-"λογαριασμός)"
+"Το όρισμα \"%s\" δεν έχει οριστεί. \n"
+"Πληκτρολογήστε \"%s help %s\" για περισσότερες πληροφορίες"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote-plugin.py:500
+#, fuzzy, python-format
 msgid ""
-"Returns current status message (the global one unless account is specified)"
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
 msgstr ""
-"Εμφανίζει την τρέχουσα κατάσταση (τη γενική. εκτός εάν έχει προσδιοριστεί "
-"λογαριασμός)"
+"Το όρισμα \"%s\" δεν έχει οριστεί. \n"
+"Πληκτρολογήστε \"%s help %s\" για περισσότερες πληροφορίες"
 
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
 #, fuzzy
-msgid "Returns number of unread messages"
-msgstr "Αναφέρει τον αριθμό των μη αναγνωσμένων μηνυμάτων"
+msgid "Wrong uri"
+msgstr "Το URI \"%s\" δεν είναι έγκυρο."
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:109
 #, fuzzy
-msgid "Opens 'Start Chat' dialog"
-msgstr "Άνοιγμα του διαλόγου 'Έναρξη κουβέντας'"
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
+msgstr ""
+"μία από τις: αποσυνδεδεμένος, συνδεδεμένος, κουβέντα, απομακρυσμένος, "
+"εκτεταμένα-απομακρυσμένος, dnd, αόρατος "
 
-#: ../src/gajim-remote.py:255
-msgid "Starts chat, using this account"
-msgstr "Έναρξη κουβέντας με χρήση αυτού του λογαριασμού"
+#: ../src/gajim-remote.py:117
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Αλλάζει την κατάσταση ενός ή πολλών λογαριασμών"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:119
 #, fuzzy
-msgid "Sends custom XML"
-msgstr "Προσαρμοσμένο μέγεθος _γραμματοσειράς:"
+msgid "priority"
+msgstr "Π_ροτεραιότητα:"
+
+#: ../src/gajim-remote.py:119
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "_Επιλέξτε εάν επιθυμείτε να καταχωρήσετε νέο jabber λογαριασμό"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:121
 #, fuzzy
-msgid "XML to send"
-msgstr "Αποστολή επιλεγμένου αρχείου στο \"%s\""
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"αλλαγή κατάστασης του λογαριασμού \"account\". Εάν δεν έχει καθοριστεί, "
+"δοκιμάστε να αλλάξετε την κατάσταση όλων των λογαριασμών που έχουν "
+"ενεργοποιημένη την επιλογή \"συγχρονισμός με τη γενική κατάσταση\""
+
+#: ../src/gajim-remote.py:134
+msgid "message content. The account must be specified or \"\""
+msgstr ""
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:242
 msgid ""
-"Account in which the xml will be sent; if not specified, xml will be sent to "
-"all accounts"
+"Returns current status message (the global one unless account is specified)"
 msgstr ""
+"Εμφανίζει την τρέχουσα κατάσταση (τη γενική. εκτός εάν έχει προσδιοριστεί "
+"λογαριασμός)"
 
 #: ../src/gajim-remote.py:268
 #, fuzzy
@@ -8679,16 +9029,6 @@ msgid ""
 "be set for all accounts"
 msgstr ""
 
-#: ../src/gajim-remote.py:277
-#, fuzzy
-msgid "Handle a xmpp:/ uri"
-msgstr "Το URI \"%s\" δεν είναι έγκυρο."
-
-#: ../src/gajim-remote.py:279
-#, fuzzy
-msgid "uri"
-msgstr "Το URI \"%s\" δεν είναι έγκυρο."
-
 #: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr ""
@@ -8702,35 +9042,16 @@ msgstr ""
 msgid "Message content"
 msgstr "περιεχόμενα μηνύματος"
 
-#: ../src/gajim-remote.py:286
-#, fuzzy
-msgid "Join a MUC room"
-msgstr "_Σύνδεση σε νέο δωμάτιο"
-
-#: ../src/gajim-remote.py:288
-#, fuzzy
-msgid "room"
-msgstr "Από"
-
 #: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "Room JID"
 msgstr "Δωμάτιο:"
 
-#: ../src/gajim-remote.py:289
-#, fuzzy
-msgid "nick"
-msgstr "Ψευδώνυμο"
-
 #: ../src/gajim-remote.py:289
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Δεν βρέθηκε το ψευδώνυμο: %s"
 
-#: ../src/gajim-remote.py:290
-msgid "password"
-msgstr "κωδικός πρόσβασης"
-
 #: ../src/gajim-remote.py:290
 #, fuzzy
 msgid "Password to enter the room"
@@ -8740,37 +9061,6 @@ msgstr "Οι κωδικοί δεν ταιριάζουν"
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:296
-#, fuzzy
-msgid "Check if Gajim is running"
-msgstr "Το Gajim εκτελείται ήδη"
-
-#: ../src/gajim-remote.py:300
-#, fuzzy
-msgid "Shows or hides the ipython window"
-msgstr "Εμφανίζει ή αποκρύπτει το παράθυρο λίστας επαφών"
-
-#: ../src/gajim-remote.py:327
-msgid "Missing argument \"contact_jid\""
-msgstr "Λείπει το όρισμα \"contact_jid\""
-
-#: ../src/gajim-remote.py:348
-#, python-format
-msgid ""
-"'%s' is not in your roster.\n"
-"Please specify account for sending the message."
-msgstr ""
-"Η επαφή '%s' δεν είναι στη λίστα σας.\n"
-"Παρακαλώ καθορίστε τον λογαριασμό που θα σταλεί το μήνυμα."
-
-#: ../src/gajim-remote.py:351
-msgid "You have no active account"
-msgstr "Δεν έχετε κανέναν ενεργό λογαριασμό"
-
-#: ../src/gajim-remote.py:404
-msgid "It seems Gajim is not running. So you can't use gajim-remote."
-msgstr ""
-
 #: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
@@ -8778,24 +9068,6 @@ msgid ""
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:435
-msgid "Arguments:"
-msgstr "Ορίσματα:"
-
-#: ../src/gajim-remote.py:439
-#, python-format
-msgid "%s not found"
-msgstr "μη υπαρκτό %s"
-
-#: ../src/gajim-remote.py:445
-#, python-format
-msgid ""
-"Usage: %s command [arguments]\n"
-"Command is one of:\n"
-msgstr ""
-"Χρήση: %s εντολή [ορίσματα]\n"
-"Η εντολή είναι μία από τις:\n"
-
 #: ../src/gajim-remote.py:514
 #, fuzzy, python-format
 msgid ""
@@ -8818,11 +9090,6 @@ msgstr ""
 msgid "No uri given"
 msgstr ""
 
-#: ../src/gajim-remote.py:540
-#, fuzzy
-msgid "Wrong uri"
-msgstr "Το URI \"%s\" δεν είναι έγκυρο."
-
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Θέμα"
@@ -8849,203 +9116,201 @@ msgstr "Δεν είναι δυνατή η διαγραφή του τρέχοντ
 msgid "Please first choose another for your current theme."
 msgstr "Παρακαλώ επιλέξτε ένα άλλο θέμα πρώτα."
 
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:170
 msgid "Sending private message failed"
 msgstr "Αποτυχία αποστολής προσωπικού μηνύματος"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:171
+#: ../src/groupchat_control.py:172
 #, 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:450
+#: ../src/groupchat_control.py:455
 msgid "Insert Nickname"
 msgstr "Εισάγετε ψευδώνυμο"
 
-#: ../src/groupchat_control.py:631
+#: ../src/groupchat_control.py:636
 #, fuzzy
 msgid "Conversation with "
 msgstr "Ιστορικό συζητήσεων"
 
-#: ../src/groupchat_control.py:633
+#: ../src/groupchat_control.py:638
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Σύνδεση"
 
-#. Can be a message (see handle_event_gc_config_change in
-#. gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1272 ../src/gui_interface.py:1080
+#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1286
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1288
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Ο νέος σας λογαριασμός δημιουργήθηκε με επιτυχία"
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1291
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1287
+#: ../src/groupchat_control.py:1297
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "Ο %(nick)s πετάχτηκε έξω: %(reason)s"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1300
 #, 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:1300
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "Ο %(nick)s έχει απαγορευτεί: %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1312
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "Ο %(nick)s έχει απαγορευτεί από τον %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1314 ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
 #, python-format
 msgid "You are now known as %s"
 msgstr "Είστε τώρα γνωστός ως %s"
 
-#: ../src/groupchat_control.py:1330 ../src/gui_interface.py:919
+#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "Ο %s είναι τώρα γνωστός ως %s"
 
-#: ../src/groupchat_control.py:1372 ../src/groupchat_control.py:1377
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1392
 #, 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:1374
+#: ../src/groupchat_control.py:1383
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Συσχέτιση: "
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1388
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1394
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1470
+#: ../src/groupchat_control.py:1477
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1474
+#: ../src/groupchat_control.py:1481
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1489
+#: ../src/groupchat_control.py:1496
 #, 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:1493
+#: ../src/groupchat_control.py:1500
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "Ο %(nick)s πετάχτηκε έξω: %(reason)s"
 
-#: ../src/groupchat_control.py:1522
+#: ../src/groupchat_control.py:1530
 #, python-format
 msgid "%s has left"
 msgstr "Ο %s έφυγε"
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1535
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Ο/Η %s μπήκε στο δωμάτιο"
 
-#: ../src/groupchat_control.py:1529 ../src/gui_interface.py:946
+#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
 #: ../src/history_window.py:447 ../src/notify.py:234
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "Ο %(nick)s είναι τώρα %(status)s"
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1774
 #, fuzzy, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Είστε σίγουροι ότι θέλετε να φύγετε από το δωμάτιο \"%s\";"
 
-#: ../src/groupchat_control.py:1761
+#: ../src/groupchat_control.py:1776
 #, fuzzy
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Αν κλείσετε αυτό το παράθυρο, θα αποσυνδεθείτε από αυτό το δωμάτιο."
 
-#: ../src/groupchat_control.py:1765 ../src/gui_interface.py:1216
-#: ../src/gui_interface.py:1992 ../src/gui_interface.py:2029
-#: ../src/gui_interface.py:2064 ../src/message_window.py:224
-#: ../src/roster_window.py:2739 ../src/roster_window.py:3399
-#: ../src/roster_window.py:4123
+#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
+#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
+#: ../src/gui_interface.py:1853 ../src/message_window.py:224
+#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
+#: ../src/roster_window.py:4195
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "Μη_ν με ξαναρωτήσεις"
 
-#: ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:1814
 msgid "Changing Subject"
 msgstr "Αλλαγή θέματος"
 
-#: ../src/groupchat_control.py:1800
+#: ../src/groupchat_control.py:1815
 msgid "Please specify the new subject:"
 msgstr "Παρακαλώ καθορίστε το νέο θέμα:"
 
-#: ../src/groupchat_control.py:1807
+#: ../src/groupchat_control.py:1822
 msgid "Changing Nickname"
 msgstr "Αλλαγή ψευδωνύμου"
 
-#: ../src/groupchat_control.py:1808
+#: ../src/groupchat_control.py:1823
 msgid "Please specify the new nickname you want to use:"
 msgstr "Παρακαλώ καθορίστε το νέο ψευδώνυμο που θέλετε να χρησιμοποιείτε:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1839
+#: ../src/groupchat_control.py:1854
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Περιγραφή: %s"
 
-#: ../src/groupchat_control.py:1840
+#: ../src/groupchat_control.py:1855
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1842
+#: ../src/groupchat_control.py:1857
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2028
+#: ../src/groupchat_control.py:2046
 #, python-format
 msgid "Kicking %s"
 msgstr "Διώχνοντας τον %s"
 
-#: ../src/groupchat_control.py:2029 ../src/groupchat_control.py:2356
+#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
 msgid "You may specify a reason below:"
 msgstr "Μπορείτε να προσδιορίσετε ένα λόγο παρακάτω:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2355
+#: ../src/groupchat_control.py:2373
 #, python-format
 msgid "Banning %s"
 msgstr "Απαγορεύοντας την πρόσβαση στον %s"
@@ -9071,22 +9336,22 @@ msgid "Details"
 msgstr "<b>Λεπτομέρειες</b>"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
+#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Σφάλμα: το αρχείο %s δε μπορεί να ανοιχθεί για ανάγνωση"
 
-#: ../src/gtkgui_helpers.py:400
+#: ../src/gtkgui_helpers.py:404
 msgid "Error reading file:"
 msgstr "Σφάλμα κατά την ανάγνωση του αρχείου:"
 
-#: ../src/gtkgui_helpers.py:403
+#: ../src/gtkgui_helpers.py:407
 msgid "Error parsing file:"
 msgstr "Σφάλμα κατά την ανάλυση του αρχείου:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:444
+#: ../src/gtkgui_helpers.py:448
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
@@ -9094,36 +9359,45 @@ msgstr ""
 "συνεδριών"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:818
+#: ../src/gtkgui_helpers.py:822
 #, fuzzy
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim - ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
 
-#: ../src/gtkgui_helpers.py:819
+#: ../src/gtkgui_helpers.py:823
 #, fuzzy
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Θέλετε να αντικατασταθεί;"
 
-#: ../src/gtkgui_helpers.py:820
+#: ../src/gtkgui_helpers.py:824
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:887
+#: ../src/gtkgui_helpers.py:891
 msgid "Extension not supported"
 msgstr "Η επέκταση δεν υποστηρίζεται"
 
-#: ../src/gtkgui_helpers.py:888
+#: ../src/gtkgui_helpers.py:892
 #, 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:924
+#: ../src/gtkgui_helpers.py:928
 msgid "Save Image as..."
 msgstr "Αποθήκευση εικόνας ως..."
 
-#: ../src/gui_interface.py:140
+#. we are banned
+#. group chat does not exist
+#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
+#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
+#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
+#: ../src/gui_interface.py:348
+msgid "Unable to join group chat"
+msgstr "Δεν ήταν δυνατή η σύνδεση στην ομαδική συζήτηση"
+
+#: ../src/gui_interface.py:138
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9133,165 +9407,194 @@ msgstr ""
 "Το επιθυμητό ψευδώνυμο είναι σε χρήση ή καταχωρημένο από κάποιον άλλο.\n"
 "Παρακαλώ προσδιορίστε ένα άλλο παρακάτω:"
 
-#: ../src/gui_interface.py:143
+#: ../src/gui_interface.py:141
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:159
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Δέχεστε αυτό το αίτημα;"
 
-#: ../src/gui_interface.py:161
+#: ../src/gui_interface.py:160
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Δέχεστε αυτό το αίτημα;"
 
-#: ../src/gui_interface.py:164
+#: ../src/gui_interface.py:163
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) Εξουσιοδότηση για %s (id: %s)"
 
-#: ../src/gui_interface.py:213 ../src/notify.py:493
+#: ../src/gui_interface.py:209 ../src/notify.py:493
 msgid "Connection Failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: ../src/gui_interface.py:606 ../src/gui_interface.py:610
+#: ../src/gui_interface.py:312
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Απαιτείται συνθηματικό για τη είσοδο σας σε αυτή την ομαδική συζήτηση."
+
+#: ../src/gui_interface.py:324
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/gui_interface.py:333
+#, fuzzy, python-format
+msgid "You are banned from group chat %s."
+msgstr "Σας έχει απαγορευτεί η είσοδος σε αυτή την ομαδική συζήτηση."
+
+#: ../src/gui_interface.py:338
+#, fuzzy, python-format
+msgid "Group chat %s does not exist."
+msgstr "Δεν υπάρχει τέτοια συζήτηση."
+
+#: ../src/gui_interface.py:341
+msgid "Group chat creation is restricted."
+msgstr "Δεν επιτρέπεται η δημιουργία ομαδικών συζητήσεων."
+
+#: ../src/gui_interface.py:344
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Πρέπει να χρησιμοποιηθεί το καταχωρημένο σας ψευδώνυμο."
+
+#: ../src/gui_interface.py:349
+#, fuzzy, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Δεν είστε στη λίστα μελών."
+
+#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:621 ../src/gui_interface.py:636
+#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "σφάλμα κατά την αποστολή του %s ( %s )"
 
-#: ../src/gui_interface.py:663 ../src/notify.py:495
+#: ../src/gui_interface.py:540 ../src/notify.py:495
 #, fuzzy
 msgid "Subscription request"
 msgstr "Αίτηση εγγραφής"
 
-#: ../src/gui_interface.py:688
+#: ../src/gui_interface.py:565
 msgid "Authorization accepted"
 msgstr "Λήψη εξουσιοδότησης"
 
-#: ../src/gui_interface.py:689
+#: ../src/gui_interface.py:566
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Η επαφή \"%s\" σας εξουσιοδότησε να βλέπετε την κατάστασή της."
 
-#: ../src/gui_interface.py:702
+#: ../src/gui_interface.py:579
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Η επαφή \"%s\" αφαίρεσαι την εγγραφή από εσάς"
 
-#: ../src/gui_interface.py:703
+#: ../src/gui_interface.py:580
 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/gui_interface.py:727 ../src/notify.py:497
+#: ../src/gui_interface.py:604 ../src/notify.py:497
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Εγγραφή"
 
-#: ../src/gui_interface.py:754
+#: ../src/gui_interface.py:631
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Δεν ήταν δυνατή η επαφή με \"%s\""
 
-#: ../src/gui_interface.py:1015
+#: ../src/gui_interface.py:859
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1083
+#: ../src/gui_interface.py:926
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gui_interface.py:1085
+#: ../src/gui_interface.py:928
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gui_interface.py:1087
+#: ../src/gui_interface.py:930
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:1091
+#: ../src/gui_interface.py:934
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1093
+#: ../src/gui_interface.py:936
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1095
+#: ../src/gui_interface.py:938
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1098
+#: ../src/gui_interface.py:941
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1101
+#: ../src/gui_interface.py:944
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1133
-#, fuzzy, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Απαιτείται συνθηματικό για τη είσοδο σας σε αυτή την ομαδική συζήτηση."
-
-#: ../src/gui_interface.py:1180
+#: ../src/gui_interface.py:985
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gui_interface.py:1182 ../src/gui_interface.py:1189
+#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Είστε συνδεδεμένοι χωρίς τη χρήση του OpenPGP κλειδιού σας."
 
-#: ../src/gui_interface.py:1184
+#: ../src/gui_interface.py:989
 msgid "Your passphrase is incorrect"
 msgstr "H φράση πρόσβασης είναι λανθασμένη"
 
-#: ../src/gui_interface.py:1188
+#: ../src/gui_interface.py:993
 #, fuzzy
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "H φράση πρόσβασης είναι λανθασμένη"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid "GPG key not trusted"
 msgstr ""
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
 msgstr ""
 
-#: ../src/gui_interface.py:1226
+#: ../src/gui_interface.py:1031
 msgid ""
 "Gnome Keyring is installed but not                 correctly started "
 "(environment variable probably not                 correctly set)"
 msgstr ""
 
-#: ../src/gui_interface.py:1330
+#: ../src/gui_interface.py:1131
 #, fuzzy, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Νέα αλληλογραφία στο %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1332
+#: ../src/gui_interface.py:1133
 #, 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/gui_interface.py:1345
+#: ../src/gui_interface.py:1146
 #, python-format
 msgid ""
 "\n"
@@ -9301,106 +9604,106 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1418
+#: ../src/gui_interface.py:1215
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "O/Η %s επιθυμεί να σας στείλει ένα αρχείο."
 
-#: ../src/gui_interface.py:1455 ../src/roster_window.py:1856
+#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: ../src/gui_interface.py:1458 ../src/roster_window.py:1858
+#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
 #, fuzzy
 msgid "Error opening file"
 msgstr "Σφάλμα κατά την ανάγνωση του αρχείου:"
 
-#: ../src/gui_interface.py:1490
+#: ../src/gui_interface.py:1287
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Λάβατε το αρχείο %(filename)s από τον/την %(name)s επιτυχώς."
 
 #. ft stopped
-#: ../src/gui_interface.py:1494
+#: ../src/gui_interface.py:1291
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Η μεταφορά του αρχείου %(filename)s από τον/την %(name)s σταμάτησε."
 
-#: ../src/gui_interface.py:1507
+#: ../src/gui_interface.py:1304
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Έχετε στείλει με επιτυχία το %(filename)s στον/ους %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1511
+#: ../src/gui_interface.py:1308
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Η μεταφορά του αρχείου %(filename)s στον/ους %(name)s σταμάτησε."
 
-#: ../src/gui_interface.py:1623
+#: ../src/gui_interface.py:1426
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gui_interface.py:1630
+#: ../src/gui_interface.py:1433
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Σε κάθε _μήνυμα"
 
-#: ../src/gui_interface.py:1702
+#: ../src/gui_interface.py:1505
 #, fuzzy
 msgid "Username Conflict"
 msgstr "Θα πρέπει να προσδιορίσετε ένα όνομα χρήστη !"
 
-#: ../src/gui_interface.py:1703
+#: ../src/gui_interface.py:1506
 #, fuzzy
 msgid "Please type a new username for your local account"
 msgstr "<b>Παρακαλώ συμπληρώστε τα δεδομένα για το νέο λογαριασμό σας</b>"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1519
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gui_interface.py:1729
+#: ../src/gui_interface.py:1532
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gui_interface.py:1740
+#: ../src/gui_interface.py:1543
 #, fuzzy
 msgid "Error."
 msgstr "Σφάλμα:"
 
-#: ../src/gui_interface.py:1768
+#: ../src/gui_interface.py:1556
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Θα πρέπει να προσδιορίσετε ένα όνομα χρήστη !"
 
-#: ../src/gui_interface.py:1769
+#: ../src/gui_interface.py:1557
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1816
+#: ../src/gui_interface.py:1604
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "O/Η %s επιθυμεί να σας στείλει ένα αρχείο."
 
-#: ../src/gui_interface.py:1819
+#: ../src/gui_interface.py:1607
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Αίτηση μεταφοράς αρχείου"
 
-#: ../src/gui_interface.py:1927
+#: ../src/gui_interface.py:1716
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1928
+#: ../src/gui_interface.py:1717
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9408,15 +9711,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1936
+#: ../src/gui_interface.py:1725
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1956
+#: ../src/gui_interface.py:1745
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gui_interface.py:1957
+#: ../src/gui_interface.py:1746
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9427,13 +9730,13 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gui_interface.py:1987 ../src/gui_interface.py:2024
-#: ../src/gui_interface.py:2060
+#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
+#: ../src/gui_interface.py:1849
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Σύνδεση"
 
-#: ../src/gui_interface.py:1988
+#: ../src/gui_interface.py:1777
 #, fuzzy
 msgid ""
 "You are about to connect to the server with an insecure connection. This "
@@ -9443,18 +9746,18 @@ msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: ../src/gui_interface.py:1991 ../src/gui_interface.py:2028
-#: ../src/gui_interface.py:2063
+#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
+#: ../src/gui_interface.py:1852
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gui_interface.py:2025
+#: ../src/gui_interface.py:1814
 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/gui_interface.py:2061
+#: ../src/gui_interface.py:1850
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9464,59 +9767,59 @@ msgstr ""
 "άλλες επαφές."
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2624 ../src/gui_interface.py:2647
+#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
 
-#: ../src/gui_interface.py:2625
+#: ../src/gui_interface.py:2423
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2648
+#: ../src/gui_interface.py:2446
 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/gui_interface.py:2679 ../src/roster_window.py:3560
+#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
 #, 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/gui_interface.py:3058
+#: ../src/gui_interface.py:2871
 msgid "Could not save your settings and preferences"
 msgstr "Δεν ήταν δυνατή η αποθήκευση των προτιμήσεων σας"
 
-#: ../src/gui_interface.py:3592
+#: ../src/gui_interface.py:3411
 msgid "Passphrase Required"
 msgstr "Απαιτείται φράση πρόσβασης"
 
-#: ../src/gui_interface.py:3593
+#: ../src/gui_interface.py:3412
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Πληκτρολογήστε τη φράση πρόσβασης GPG για το λογαριασμό %s"
 
-#: ../src/gui_interface.py:3607
+#: ../src/gui_interface.py:3426
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gui_interface.py:3608
+#: ../src/gui_interface.py:3427
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Θα συνδεθείτε με %s χωρίς OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3617
+#: ../src/gui_interface.py:3436
 msgid "Wrong Passphrase"
 msgstr "Εσφαλμένη φράση πρόσβασης"
 
-#: ../src/gui_interface.py:3618
+#: ../src/gui_interface.py:3437
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Παρακαλώ εισάγετε ξανά τη φράση πρόσβασης GPG σας, ή επιλέξτε Ακύρωση."
 
@@ -9555,6 +9858,11 @@ msgstr "Όνομα χρήστη"
 msgid "Message"
 msgstr "Μήνυμα"
 
+#. holds subject
+#: ../src/history_manager.py:188 ../src/history_manager.py:219
+msgid "Subject"
+msgstr "Θέμα"
+
 #: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -9658,19 +9966,19 @@ msgstr "Δεν είστε συνδεδεμένος στο διακομιστή"
 msgid "Do you really want to close them all?"
 msgstr "Θέλετε σίγουρα να διαγράψετε το επιλεγμένο μήνυμα;"
 
-#: ../src/message_window.py:484
+#: ../src/message_window.py:485
 msgid "Chats"
 msgstr "Συζητήσεις"
 
-#: ../src/message_window.py:486
+#: ../src/message_window.py:487
 msgid "Group Chats"
 msgstr "Ομαδικές συζητήσεις"
 
-#: ../src/message_window.py:488
+#: ../src/message_window.py:489
 msgid "Private Chats"
 msgstr "Προσωπικές συζητήσεις"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:495
 msgid "Messages"
 msgstr "Μηνύματα"
 
@@ -9727,64 +10035,64 @@ msgstr "Νέο μήνυμα από %(nickname)s"
 msgid "Ignore"
 msgstr "εννιά"
 
-#: ../src/profile_window.py:57
+#: ../src/profile_window.py:58
 #, fuzzy
 msgid "Retrieving profile..."
 msgstr "Όνομα προφίλ:"
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2935
+#: ../src/profile_window.py:111 ../src/roster_window.py:3001
 #, fuzzy
 msgid "File is empty"
 msgstr "Διαδρομή αρχείου"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2938
+#: ../src/profile_window.py:114 ../src/roster_window.py:3004
 #, fuzzy
 msgid "File does not exist"
 msgstr "Δεν υπάρχει τέτοια συζήτηση."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2940 ../src/roster_window.py:2951
+#: ../src/profile_window.py:128 ../src/profile_window.py:144
+#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
 msgid "Could not load image"
 msgstr "Δεν ήταν δυνατό το φόρτωμα της εικόνας"
 
-#: ../src/profile_window.py:214
+#: ../src/profile_window.py:215
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Πληροφορίες επαφής"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:216
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Μορφή: ΕΕΕΕ-ΜΜ-ΗΗ"
 
-#: ../src/profile_window.py:269
+#: ../src/profile_window.py:270
 #, fuzzy
 msgid "Information received"
 msgstr "Περισσότερες πληροφορίες..."
 
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:341
 msgid "Without a connection you can not publish your contact information."
 msgstr ""
 "Πρέπει να είστε συνδεδεμένος για να δημοσιεύσετε τις πληροφορίες της επαφής "
 "σας"
 
-#: ../src/profile_window.py:353
+#: ../src/profile_window.py:354
 #, fuzzy
 msgid "Sending profile..."
 msgstr "Όνομα προφίλ:"
 
-#: ../src/profile_window.py:368
+#: ../src/profile_window.py:369
 #, fuzzy
 msgid "Information NOT published"
 msgstr "Δεν ήταν δυνατή η εκτέλεση του \"%s\""
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:376
 msgid "vCard publication failed"
 msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:377
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9792,52 +10100,52 @@ msgstr ""
 "Υπήρξε ένα σφάλμα κατά τη δημοσιοποίηση των προσωπικών πληροφοριών σας, "
 "δοκιμάστε αργότερα."
 
-#: ../src/roster_window.py:256 ../src/roster_window.py:1012
+#: ../src/roster_window.py:262 ../src/roster_window.py:1026
 msgid "Merged accounts"
 msgstr "Συνενωμένοι λογαριασμοί"
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1942
 msgid "Authorization has been sent"
 msgstr "Η εξουσιοδότηση έχει σταλεί"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1943
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Τώρα ο/η \"%s\" θα γνωρίζει την κατάσταση σας."
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1966
 msgid "Subscription request has been sent"
 msgstr "Η αίτηση εγγραφής έχει σταλεί"
 
-#: ../src/roster_window.py:1944
+#: ../src/roster_window.py:1967
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Εάν ο/η \"%s\" αποδεχθεί αυτή την αίτηση, θα γνωρίζετε την κατάσταση του/της."
 
-#: ../src/roster_window.py:1958
+#: ../src/roster_window.py:1981
 msgid "Authorization has been removed"
 msgstr "Η εξουσιοδότηση έχει αφαιρεθεί"
 
-#: ../src/roster_window.py:1959
+#: ../src/roster_window.py:1982
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Τώρα ο/η \"%s\" θα σας βλέπει πάντα ως αποσυνδεδεμένο/η."
 
-#: ../src/roster_window.py:1986
+#: ../src/roster_window.py:2009
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:1987
+#: ../src/roster_window.py:2010
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Θα συνδεθείτε με %s χωρίς OpenPGP."
 
-#: ../src/roster_window.py:2199 ../src/roster_window.py:3496
+#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
 msgid "You are participating in one or more group chats"
 msgstr "Συμμετέχετε σε μία ή περισσότερες ομαδικές κουβέντες"
 
-#: ../src/roster_window.py:2200 ../src/roster_window.py:3497
+#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9845,39 +10153,39 @@ msgstr ""
 "Εάν αλλάξετε την κατάστασή σας σε αόρατη, θα αποσυνδεθείτε από αυτές τις "
 "ομαδικές συζητήσεις. Είστε σίγουρος/η ότι θέλετε να γίνεται αόρατος/η;"
 
-#: ../src/roster_window.py:2226
+#: ../src/roster_window.py:2249
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2288
+#: ../src/roster_window.py:2311
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2289
+#: ../src/roster_window.py:2312
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Είστε σίγουροι ότι θέλετε να φύγετε από τα δωμάτια \"%s\";"
 
-#: ../src/roster_window.py:2290
+#: ../src/roster_window.py:2313
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2373
+#: ../src/roster_window.py:2396
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Ακύρωση μεταφοράς αρχείου"
 
-#: ../src/roster_window.py:2374
+#: ../src/roster_window.py:2397
 msgid ""
-"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2405 ../src/roster_window.py:2653
+#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
 msgid "You have unread messages"
 msgstr "Έχετε μη-αναγνωσμένα μηνύματα"
 
-#: ../src/roster_window.py:2406
+#: ../src/roster_window.py:2429
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9886,19 +10194,19 @@ msgstr ""
 "Τα μηνύματα θα είναι διαθέσιμα για ανάγνωση αργότερα μόνο αν έχετε "
 "ενεργοποιημένο το ιστορικό."
 
-#: ../src/roster_window.py:2654
+#: ../src/roster_window.py:2720
 #, fuzzy
 msgid "You must read them before removing this transport."
 msgstr ""
 "Ανάγνωση όλων των γεγονότων που εκκρεμούν, πριν την αφαίρεση αυτού του "
 "λογαριασμού."
 
-#: ../src/roster_window.py:2657
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Η μεταφορά \"%s\" θα αφαιρεθεί"
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2724
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -9907,12 +10215,12 @@ msgstr ""
 "Δε θα μπορείτε να στείλετε και να λάβετε μηνύματα στις επαφές από αυτή τη "
 "μεταφορά."
 
-#: ../src/roster_window.py:2661
+#: ../src/roster_window.py:2727
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Αυτό το ραντεβού θα απομακρυνθεί οριστικά."
 
-#: ../src/roster_window.py:2666
+#: ../src/roster_window.py:2732
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9921,73 +10229,73 @@ msgstr ""
 "Δε θα μπορείτε να στείλετε και να λάβετε μηνύματα στις επαφές από αυτή τη "
 "μεταφορά."
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2800
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: ../src/roster_window.py:2736
+#: ../src/roster_window.py:2802
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2827
+#: ../src/roster_window.py:2893
 #, fuzzy
 msgid "Rename Contact"
 msgstr "_Μετονομασία αρχείων"
 
-#: ../src/roster_window.py:2828
+#: ../src/roster_window.py:2894
 #, fuzzy, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Πληκτρολογήστε τη φράση πρόσβασης GPG για το λογαριασμό %s"
 
-#: ../src/roster_window.py:2835
+#: ../src/roster_window.py:2901
 #, fuzzy
 msgid "Rename Group"
 msgstr "Ιδιοκτήτης / Ομάδα"
 
-#: ../src/roster_window.py:2836
+#: ../src/roster_window.py:2902
 #, fuzzy, python-format
 msgid "Enter a new name for group %s"
 msgstr "Επιλέξτε ένα όνομα για τη νέα συνεδρία:"
 
-#: ../src/roster_window.py:2881
+#: ../src/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Διαγραφή ομάδας"
 
-#: ../src/roster_window.py:2882
+#: ../src/roster_window.py:2948
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: ../src/roster_window.py:2883
+#: ../src/roster_window.py:2949
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: ../src/roster_window.py:2922
+#: ../src/roster_window.py:2988
 msgid "Assign OpenPGP Key"
 msgstr "Ανάθεση OpenPGP κλειδιού"
 
-#: ../src/roster_window.py:2923
+#: ../src/roster_window.py:2989
 msgid "Select a key to apply to the contact"
 msgstr "Επιλέξτε το κλειδί που θέλετε να εφαρμόσετε στην επαφή"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3372
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Η επαφή \"%s\" θα αφαιρεθεί από τη λίστα επαφών σας"
 
-#: ../src/roster_window.py:3308
+#: ../src/roster_window.py:3374
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3313
+#: ../src/roster_window.py:3379
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9996,12 +10304,12 @@ msgstr ""
 "συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3319
+#: ../src/roster_window.py:3385
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Τι θέλετε να κάνετε;"
 
-#: ../src/roster_window.py:3323
+#: ../src/roster_window.py:3389
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -10009,17 +10317,17 @@ msgstr ""
 "Αφαιρώντας αυτή την επαφή αφαιρείται επίσης και την εξουσιοδότηση, με "
 "συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
 
-#: ../src/roster_window.py:3326
+#: ../src/roster_window.py:3392
 msgid "I want this contact to know my status after removal"
 msgstr "Επιθυμώ αυτή η επαφή να γνωρίζει την κατάστασή μου μετά την αφαίρεση"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3330
+#: ../src/roster_window.py:3396
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Η επαφή \"%s\" θα αφαιρεθεί από τη λίστα επαφών σας"
 
-#: ../src/roster_window.py:3335
+#: ../src/roster_window.py:3401
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -10028,7 +10336,7 @@ msgstr ""
 "Αφαιρώντας αυτή την επαφή αφαιρείται επίσης και την εξουσιοδότηση, με "
 "συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
 
-#: ../src/roster_window.py:3393
+#: ../src/roster_window.py:3459
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want  to continue?"
@@ -10036,34 +10344,34 @@ msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: ../src/roster_window.py:3395
+#: ../src/roster_window.py:3461
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he or she will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3414
+#: ../src/roster_window.py:3480
 msgid "No account available"
 msgstr "Κανένας λογαριασμός δεν είναι διαθέσιμος"
 
-#: ../src/roster_window.py:3415
+#: ../src/roster_window.py:3481
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: ../src/roster_window.py:4023
+#: ../src/roster_window.py:4095
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: ../src/roster_window.py:4025
+#: ../src/roster_window.py:4097
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: ../src/roster_window.py:4117
+#: ../src/roster_window.py:4189
 #, fuzzy
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
@@ -10071,31 +10379,31 @@ msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: ../src/roster_window.py:4119
+#: ../src/roster_window.py:4191
 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:4234
+#: ../src/roster_window.py:4306
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Μη έγκυρο αρχείο"
 
-#: ../src/roster_window.py:4246
+#: ../src/roster_window.py:4318
 #, 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:4361
+#: ../src/roster_window.py:4433
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Αποστολή %s"
 
-#: ../src/roster_window.py:4367
+#: ../src/roster_window.py:4439
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Μετατροπή των %s και %s σε μεταεπαφές"
@@ -10105,153 +10413,153 @@ msgstr "Μετατροπή των %s και %s σε μεταεπαφές"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4816 ../src/roster_window.py:4889
-#: ../src/roster_window.py:4898 ../src/statusicon.py:246
-#: ../src/statusicon.py:293 ../src/statusicon.py:299
+#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
+#: ../src/roster_window.py:4970 ../src/statusicon.py:263
+#: ../src/statusicon.py:310 ../src/statusicon.py:316
 #, python-format
 msgid "using account %s"
 msgstr "με χρήση του λογαριασμού %s"
 
 #. add
-#: ../src/roster_window.py:4905
+#: ../src/roster_window.py:4977
 #, python-format
 msgid "to %s account"
 msgstr "στο λογαριασμό %s"
 
 #. disco
-#: ../src/roster_window.py:4910
+#: ../src/roster_window.py:4982
 #, python-format
 msgid "using %s account"
 msgstr "χρήση του λογαριασμού %s"
 
-#: ../src/roster_window.py:4948 ../src/statusicon.py:309
+#: ../src/roster_window.py:5020 ../src/statusicon.py:326
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "/Προβολή/_Διαχείριση"
 
 #. profile, avatar
-#: ../src/roster_window.py:4968
+#: ../src/roster_window.py:5040
 #, python-format
 msgid "of account %s"
 msgstr "για το λογαριασμό %s"
 
-#: ../src/roster_window.py:5009
+#: ../src/roster_window.py:5081
 #, python-format
 msgid "for account %s"
 msgstr "για το λογαριασμό %s"
 
-#: ../src/roster_window.py:5069 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
 msgid "_Change Status Message"
 msgstr "Α_λλαγή μηνύματος κατάστασης"
 
-#: ../src/roster_window.py:5102
+#: ../src/roster_window.py:5174
 msgid "Publish Tune"
 msgstr ""
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5176
 msgid "Publish Location"
 msgstr ""
 
-#: ../src/roster_window.py:5107
+#: ../src/roster_window.py:5179
 #, fuzzy
 msgid "Configure Services..."
 msgstr "Εύρεση _υπηρεσιών..."
 
-#: ../src/roster_window.py:5252
+#: ../src/roster_window.py:5324
 msgid "_Maximize All"
 msgstr ""
 
-#: ../src/roster_window.py:5262 ../src/roster_window.py:5436
+#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "Αρχηγός ομάδας παραθύρων"
 
-#: ../src/roster_window.py:5270
+#: ../src/roster_window.py:5342
 msgid "To all users"
 msgstr "Σε όλους τους χρήστες"
 
-#: ../src/roster_window.py:5274
+#: ../src/roster_window.py:5346
 msgid "To all online users"
 msgstr "Σε όλους τους συνδεδεμένους χρήστες"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5456
+#: ../src/roster_window.py:5528
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "_Μετονομασία αρχείων"
 
 #. Edit Groups
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5537
 msgid "Edit _Groups"
 msgstr "Επεξεργασία _ομάδων"
 
 #. Send single message
-#: ../src/roster_window.py:5520
+#: ../src/roster_window.py:5592
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Αποστολή μονού μηνύματος"
 
 #. Execute Command
-#: ../src/roster_window.py:5567
+#: ../src/roster_window.py:5639
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Αδυναμία εκτέλεσης της εντολής:"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5577
+#: ../src/roster_window.py:5649
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Μεταφορές"
 
 #. Modify Transport
-#: ../src/roster_window.py:5586
+#: ../src/roster_window.py:5658
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Προβολή ιδιοτήτων εκτυπωτή"
 
 #. Rename
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5668
 msgid "_Rename"
 msgstr "_Μετονομασία"
 
-#: ../src/roster_window.py:5656
+#: ../src/roster_window.py:5728
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5665
+#: ../src/roster_window.py:5737
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Αποσύνδεση επαφής"
 
-#: ../src/roster_window.py:5672
+#: ../src/roster_window.py:5744
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Αποσύνδεση επαφής"
 
 #. History manager
-#: ../src/roster_window.py:5754
+#: ../src/roster_window.py:5833
 msgid "History Manager"
 msgstr "Διαχειριστής ιστορικού"
 
-#: ../src/roster_window.py:5765
+#: ../src/roster_window.py:5844
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "_Είσοδος σε Ομαδική Συζήτηση"
 
-#: ../src/roster_window.py:5938
+#: ../src/roster_window.py:6019
 msgid "Change Status Message..."
 msgstr "Αλλαγή μηνύματος κατάστασης..."
 
-#: ../src/search_window.py:94
+#: ../src/search_window.py:105
 msgid "Waiting for results"
 msgstr ""
 
-#: ../src/search_window.py:132 ../src/search_window.py:210
+#: ../src/search_window.py:143 ../src/search_window.py:220
 msgid "Error in received dataform"
 msgstr ""
 
 #. No result
-#: ../src/search_window.py:166 ../src/search_window.py:202
+#: ../src/search_window.py:177 ../src/search_window.py:212
 msgid "No result"
 msgstr ""
 
@@ -10264,21 +10572,22 @@ msgstr ""
 msgid "Subject: %s"
 msgstr "Θέμα: %s"
 
-#: ../src/session.py:433 ../src/session.py:468
+#: ../src/session.py:447 ../src/session.py:491
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:435
+#: ../src/session.py:448
 #, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
+"The remote client wants '\n"
+"                            'to negotiate an session with these features:\n"
 "\n"
 "%s\n"
 "\n"
 "Are these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:469
+#: ../src/session.py:492
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10288,16 +10597,16 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/statusicon.py:210
+#: ../src/statusicon.py:227
 msgid "_Change Status Message..."
 msgstr "Αλλαγή μηνύματος _κατάστασης..."
 
-#: ../src/statusicon.py:322
+#: ../src/statusicon.py:339
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Εκτέλεση στο Τερματικό"
 
-#: ../src/statusicon.py:333
+#: ../src/statusicon.py:350
 msgid "Hide this menu"
 msgstr "Απόκρυψη αυτού του μενού"
 
@@ -10439,34 +10748,34 @@ msgstr ""
 "Αυτή η υπηρεσία δεν μπόρεσε να απαντήσει με λεπτομερείς πληροφορίες.\n"
 "Είναι είτε χαλασμένη είτε πεπαλαιωμένη."
 
-#: ../src/vcard.py:251
+#: ../src/vcard.py:265
 msgid "?Client:Unknown"
 msgstr "?Πελάτης: Άγνωστος"
 
-#: ../src/vcard.py:253
+#: ../src/vcard.py:267
 msgid "?OS:Unknown"
 msgstr "?Λειτ. Σύστημα: Άγνωστο"
 
-#: ../src/vcard.py:274
+#: ../src/vcard.py:288
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "?Πελάτης: Άγνωστος"
 
-#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
+#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
 #, python-format
 msgid "since %s"
 msgstr "από τις %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:345
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:349
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Εφαρμογές</b>"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:357
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10474,7 +10783,7 @@ msgstr ""
 "Αυτή η επαφή ενδιαφέρεται για την παρουσία σας ή μη, αλλά εσείς δεν "
 "ενδιαφέρεστε για την παρουσία του/της"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:359
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10482,12 +10791,12 @@ msgstr ""
 "Εσείς ενδιαφέρεστε για την παρουσία αυτής της επαφής, αλλά αυτός/η δεν "
 "ενδιαφέρεται για τη δική σας"
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:361
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Εσείς και η επαφή ενδιαφέρεστε για την παρουσία ή μη του άλλου"
 
 #. None
-#: ../src/vcard.py:349
+#: ../src/vcard.py:363
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10495,18 +10804,57 @@ msgstr ""
 "Δεν ενδιαφέρεστε για την παρουσία ή μη της επαφής, και ούτε αυτός/η "
 "ενδιαφέρεται για εσάς"
 
-#: ../src/vcard.py:356
+#: ../src/vcard.py:370
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Περιμένετε την απάντηση της επαφής για την αίτηση συνδρομής σας"
 
-#: ../src/vcard.py:358
+#: ../src/vcard.py:372
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
+#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
 msgid " resource with priority "
 msgstr " πόρος με προτεραιότητα"
 
+#, fuzzy
+#~ msgid "_Show event in systray"
+#~ msgstr "_Προβολή τίτλου στο κουμπί"
+
+#, fuzzy
+#~ msgid "Autodetect on every Gajim startup"
+#~ msgstr "Σύνδεση κατά την ε_κκίνηση του Gajim"
+
+#, fuzzy
+#~ msgid "Show systray:"
+#~ msgstr "_Προβολή τίτλου στο κουμπί"
+
+#~ msgid "Nickname not allowed: %s"
+#~ msgstr "Δεν επιτρέπεται το ψευδώνυμο: %s"
+
+#, fuzzy
+#~ msgid "Room has been destroyed"
+#~ msgstr "Η εξουσιοδότηση έχει αφαιρεθεί"
+
+#~ msgid "I would like to add you to my roster."
+#~ msgstr "Επιθυμώ να σε προσθέσω στη λίστα επαφών μου."
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "Ο %s μόλις σας εξουσιοδότησε"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "αίτηση αφαίρεσης εξουσιοδότησης από %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "πραγματοποιήθηκε αφαίρεση εξουσιοδότησης από %s"
+
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "Το Jid %s δεν είναι σύμμορφο προς το RFC. Δεν θα προστεθεί στη λίστα "
+#~ "επαφών σας. Χρησιμοποιήστε κάποιο εργαλείο διαχείρισης όπως το http://jru."
+#~ "jabberstudio.org για να το αφαιρέσετε"
+
 #~ msgid "Account Modification"
 #~ msgstr "Τροποποίηση λογαριασμού"
 
@@ -10581,34 +10929,6 @@ msgstr " πόρος με προτεραιότητα"
 #~ msgid "gtk-delete"
 #~ msgstr "Διαγραφή"
 
-#, fuzzy
-#~ msgid "Add this contact to roster (Ctrl+D)"
-#~ msgstr "Προσθέτει μια επαφή στη λίστα επαφών"
-
-#, fuzzy
-#~ msgid "Bookmark this room (Ctrl+B)"
-#~ msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
-
-#, fuzzy
-#~ msgid "Change your nickname (Ctrl+N)"
-#~ msgstr "Αλλαγή _ψευδώνυμου"
-
-#, fuzzy
-#~ msgid "Invite contacts to the conversation (Ctrl+G)"
-#~ msgstr "έχει την προσοχή του στην κουβέντα"
-
-#, fuzzy
-#~ msgid "Show a list of emoticons (Alt+M)"
-#~ msgstr "Κάντε κλικ για να εισάγετε φατσούλα (Alt+M)"
-
-#, fuzzy
-#~ msgid "Show a list of formattings"
-#~ msgstr "Κάντε κλικ για να εισάγετε φατσούλα (Alt+M)"
-
-#, fuzzy
-#~ msgid "Show a menu of advanced functions (Alt+D)"
-#~ msgstr "Κάντε κλικ για να εισάγετε φατσούλα (Alt+M)"
-
 #~ msgid ""
 #~ "All chat states\n"
 #~ "Composing only\n"
@@ -10635,9 +10955,6 @@ msgstr " πόρος με προτεραιότητα"
 #~ msgid "gtk-cancel"
 #~ msgstr "Διαγραφή"
 
-#~ msgid "_Preferences"
-#~ msgstr "_Προτιμήσεις"
-
 #~ msgid "_Quit"
 #~ msgstr "_Έξοδος"
 
@@ -11033,9 +11350,6 @@ msgstr " πόρος με προτεραιότητα"
 #~ msgid "The auto not available status message"
 #~ msgstr "Αυτόματο μήνυμα για κατάσταση μη διαθέσιμος"
 
-#~ msgid "Use t_rayicon (aka. notification area icon)"
-#~ msgstr "_Εικονίδιο στην περιοχή γνωστοποίησης"
-
 #~ msgid ""
 #~ "When a new event (message, file transfer request etc..) is received, the "
 #~ "following methods may be used to inform you about it. Please note that "
@@ -11068,9 +11382,6 @@ msgstr " πόρος με προτεραιότητα"
 #~ msgid "Given:"
 #~ msgstr "Δοθέν όνομα:"
 
-#~ msgid "Homepage:"
-#~ msgstr "Προσωπ. σελίδα:"
-
 #~ msgid "Middle:"
 #~ msgstr "Μέσο:"
 
@@ -11156,13 +11467,6 @@ msgstr " πόρος με προτεραιότητα"
 #~ "Η υποστήριξη για Διαχείριση συνόδων δεν είναι διαθέσιμη (δεν υπάρχει το "
 #~ "άρθρωμα του gnome.ui)"
 
-#~ msgid ""
-#~ "Usage: %s %s %s \n"
-#~ "\t %s"
-#~ msgstr ""
-#~ "Χρήση: %s %s %s \n"
-#~ "\t %s"
-
 #~ msgid "Private Chat"
 #~ msgstr "Προσωπική συζήτηση"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 619e7604be3d5fc9bb427a44733892f1bf20ede1..2e651a0b8b081ad0df14768a2a5de7b526b07229 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -3,11 +3,15 @@
 # This file is distributed under the same license as the Gajim - A Jabber Instant Messager package.
 #
 # Jeff Bailes <thepizzaking@gmail.com>, 2006, 2009.
+#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim - A Jabber Instant Messager 0.13\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 11:28+0200\n"
+"POT-Creation-Date: 2010-10-01 20:39+0200\n"
 "PO-Revision-Date: 2009-11-20 20:49+1100\n"
 "Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
 "Language-Team: English <en_gb@li.org>\n"
@@ -25,7 +29,7 @@ msgstr "Join _Group Chat..."
 msgid "_Add Contact..."
 msgstr "_Add Contact..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:17
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
 msgid "_Discover Services"
 msgstr "_Discover Services"
 
@@ -45,7 +49,7 @@ msgstr "_Open Gmail Inbox"
 msgid "_Personal Events"
 msgstr "_Personal Events"
 
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:23
+#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
 msgid "_Start Chat..."
 msgstr "_Start Chat..."
 
@@ -77,10 +81,6 @@ msgid "<b>Please select a server</b>"
 msgstr "<b>Please select a server</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid "@"
-msgstr "@"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
@@ -88,64 +88,64 @@ msgstr ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:10
 msgid "Anon_ymous authentication"
 msgstr "Anon_ymous authentication"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Connect when I press Finish"
 msgstr "Connect when I press Finish"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Account Creation Wizard"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "I already have an account I want to _use"
 msgstr "I already have an account I want to _use"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I want to _register for a new account"
 msgstr "I want to _register for a new account"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:16
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 #: ../data/gui/accounts_window.ui.h:28
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "If ticked, Gajim will remember the password for this account"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:17
+#: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Manage..."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:18
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
 #: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2263 ../src/config.py:2342
-#: ../src/config.py:2355 ../src/config.py:3596 ../src/config.py:3671
-#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513
-#: ../src/dialogs.py:526 ../src/roster_window.py:2890
-#: ../src/roster_window.py:2896 ../src/roster_window.py:2901
+#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
+#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
+#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
+#: ../src/dialogs.py:527 ../src/roster_window.py:2956
+#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
 msgid "None"
 msgstr "None"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:19
+#: ../data/gui/account_creation_wizard_window.ui.h:18
 msgid "Prox_y:"
 msgstr "Prox_y:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #: ../data/gui/accounts_window.ui.h:48
 msgid "Save pass_word"
 msgstr "Save pass_word"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:21
+#: ../data/gui/account_creation_wizard_window.ui.h:20
 msgid "Set my profile when I connect"
 msgstr "Set my profile when I connect"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:22
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Use custom hostname/port"
 msgstr "Use custom hostname/port"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:23
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -153,34 +153,34 @@ msgstr ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-#: ../data/gui/roster_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:16
 msgid "_Advanced"
 msgstr "_Advanced"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:25
 msgid "_Finish"
 msgstr "_Finish"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:27
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Hostname:"
 msgstr "_Hostname:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #: ../data/gui/accounts_window.ui.h:62
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:28
 #: ../data/gui/accounts_window.ui.h:64
 msgid "_Password:"
 msgstr "_Password:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:29
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:31
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Server:"
 msgstr "_Server:"
 
@@ -288,17 +288,17 @@ msgstr "First Name:"
 #. No configured account
 #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
 #: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592
-#: ../src/notify.py:608
+#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
+#: ../src/notify.py:616
 msgid "Gajim"
 msgstr "Gajim"
 
 #. FIXME: Ugly workaround.
 #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
 #. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:61
-#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121
-#: ../src/roster_window.py:2832 ../src/roster_window.py:5379
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
+#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
 msgid "General"
 msgstr "General"
 
@@ -356,7 +356,7 @@ msgstr "Information about you, as stored in the server"
 
 #: ../data/gui/accounts_window.ui.h:35
 #: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:830
+#: ../src/dialogs.py:831
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -370,7 +370,7 @@ msgid "Mer_ge accounts"
 msgstr "Mer_ge accounts"
 
 #: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2356
+#: ../src/config.py:2358
 msgid "No key selected"
 msgstr "No key selected"
 
@@ -397,7 +397,7 @@ msgid "Priority will change automatically according to your status."
 msgstr "Priority will change automatically according to your status."
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5329
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
 msgid "Re_name"
 msgstr "Re_name"
 
@@ -621,38 +621,43 @@ msgid "Deletes Message of the Day"
 msgstr "Deletes Message of the Day"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
+#, fuzzy
+msgid "Edit Archi_ving Preferences"
+msgstr "_Preferences"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Edit _Privacy Lists..."
 msgstr "Edit _Privacy Lists..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sends a message to users currently connected to this server"
 msgstr "Sends a message to users currently connected to this server"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Set MOTD..."
 msgstr "Set MOTD..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Sets Message of the Day"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Show _XML Console"
 msgstr "Show _XML Console"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "Update MOTD..."
 msgstr "Update MOTD..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "Updates Message of the Day"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:11
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:11
+#: ../data/gui/advanced_menuitem_menu.ui.h:12
 msgid "_Send Server Message..."
 msgstr "_Send Server Message..."
 
@@ -686,7 +691,7 @@ msgid "All statuses"
 msgstr "All statuses"
 
 #: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:233
+#: ../src/common/commands.py:106 ../src/common/helpers.py:239
 #: ../src/tooltips.py:193
 msgid "Away"
 msgstr "Away"
@@ -739,7 +744,7 @@ msgid "Have "
 msgstr "Have "
 
 #: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:249
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -748,7 +753,7 @@ msgid "Launch a command"
 msgstr "Launch a command"
 
 #: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:216 ../src/tooltips.py:197
+#: ../src/common/helpers.py:222 ../src/tooltips.py:197
 msgid "Not Available"
 msgstr "Not Available"
 
@@ -792,12 +797,13 @@ msgid "_Disable existing sound for this event"
 msgstr "_Disable existing sound for this event"
 
 #: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in roster"
+#, fuzzy
+msgid "_Disable showing event in notification area"
 msgstr "_Disable showing event in roster"
 
 #: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in systray"
-msgstr "_Disable showing event in systray"
+msgid "_Disable showing event in roster"
+msgstr "_Disable showing event in roster"
 
 #: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
@@ -808,12 +814,13 @@ msgid "_Open chat window with user"
 msgstr "_Open chat window with user"
 
 #: ../data/gui/advanced_notifications_window.ui.h:35
-msgid "_Show event in roster"
+#, fuzzy
+msgid "_Show event in notification area"
 msgstr "_Show event in roster"
 
 #: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in systray"
-msgstr "_Show event in systray"
+msgid "_Show event in roster"
+msgstr "_Show event in roster"
 
 #: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
@@ -841,6 +848,45 @@ msgstr "Groups"
 msgid "when I'm in"
 msgstr "when I'm in"
 
+#: ../data/gui/archiving_preferences_window.ui.h:1
+msgid "<i>Method Auto</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "<i>Method Local</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:3
+msgid "<i>Method Manual</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:4
+#, fuzzy
+msgid "Auto"
+msgstr "Auto join"
+
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Concede"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "Forbid"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:7
+#, fuzzy
+msgid "No"
+msgstr "None"
+
+#: ../data/gui/archiving_preferences_window.ui.h:8
+#, fuzzy
+msgid "Prefer"
+msgstr "Preferences"
+
+#: ../data/gui/archiving_preferences_window.ui.h:9
+msgid "Yes"
+msgstr ""
+
 #: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Entry:"
@@ -867,8 +913,8 @@ msgstr "Blocked Contacts"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5348
-#: ../src/roster_window.py:5476 ../src/roster_window.py:5609
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
+#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
 msgid "_Unblock"
 msgstr "_Unblock"
 
@@ -956,7 +1002,7 @@ msgid "_Start Chat"
 msgstr "_Start Chat"
 
 #. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4184
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
 msgid "#"
 msgstr "#"
 
@@ -1004,13 +1050,50 @@ msgstr ""
 msgid "9"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:13
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Add this contact to roster (Ctrl+D)"
+
 #: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Browse the chat history (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:15
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Invite contacts to the conversation (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Show a list of emoticons (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
+msgid "Show a list of formattings"
+msgstr "Show a list of formattings"
+
+#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Show a menu of advanced functions (Alt+A)"
+
+#: ../data/gui/chat_control.ui.h:19
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr "Show the contact's profile (Ctrl+I)"
+
+#: ../data/gui/chat_control.ui.h:20
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:21
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
 #: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Send"
 
-#: ../data/gui/chat_control.ui.h:15 ../data/gui/groupchat_control.ui.h:3
+#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
 msgid "label"
 msgstr ""
 
@@ -1060,8 +1143,8 @@ msgstr "Edit _Groups..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5284
-#: ../src/roster_window.py:5444
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
+#: ../src/roster_window.py:5516
 msgid "In_vite to"
 msgstr "In_vite to"
 
@@ -1073,8 +1156,8 @@ msgstr "Invite _Contacts"
 msgid "Remo_ve"
 msgstr "Remo_ve"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5294
-#: ../src/roster_window.py:5533
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
+#: ../src/roster_window.py:5605
 msgid "Send Cus_tom Status"
 msgstr "Send Cus_tom Status"
 
@@ -1107,8 +1190,8 @@ msgid "_Allow him/her to see my status"
 msgstr "_Allow him/her to see my status"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5482 ../src/roster_window.py:5612
+#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
+#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
 msgid "_Block"
 msgstr "_Block"
 
@@ -1118,8 +1201,8 @@ msgstr "_Forbid him/her to see my status"
 
 #: ../data/gui/contact_context_menu.ui.h:20
 #: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:21
-#: ../src/roster_window.py:5683
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
+#: ../src/roster_window.py:5755
 msgid "_History"
 msgstr "_History"
 
@@ -1252,7 +1335,7 @@ msgstr "<b>Chatstate Tab Colours</b>"
 msgid "Account row"
 msgstr "Account"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:925
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
 msgid "Bold"
 msgstr "Bold"
 
@@ -1290,7 +1373,7 @@ msgstr "Group"
 msgid "Inactive"
 msgstr "Inactive"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:926
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
 msgid "Italic"
 msgstr "Italic"
 
@@ -1338,7 +1421,7 @@ msgstr "Change _Subject..."
 msgid "Configure _Room..."
 msgstr "Configure _Room..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1782
+#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
 msgid "_Bookmark"
 msgstr "_Bookmark"
 
@@ -1398,19 +1481,31 @@ msgstr "_Send Private Message"
 msgid "_Voice"
 msgstr "_Voice"
 
+#: ../data/gui/groupchat_control.ui.h:1
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Bookmark this room (Ctrl+B)"
+
+#: ../data/gui/groupchat_control.ui.h:3
+msgid "Change the room's subject (Alt+T)"
+msgstr "Change the room's subject (Alt+T)"
+
+#: ../data/gui/groupchat_control.ui.h:4
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Change your nickname (Ctrl+N)"
+
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Create new post"
 
-#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
-msgid "From"
-msgstr "From"
+#: ../data/gui/groups_post_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:2
+msgid "From:"
+msgstr "From:"
 
-#. holds subject
-#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
-#: ../src/history_manager.py:219
-msgid "Subject"
-msgstr "Subject"
+#: ../data/gui/groups_post_window.ui.h:3
+#: ../data/gui/single_message_window.ui.h:7
+msgid "Subject:"
+msgstr "Subject:"
 
 #: ../data/gui/history_manager.ui.h:1
 msgid ""
@@ -1427,8 +1522,8 @@ msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3208
-#: ../src/dialogs.py:3305
+#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
+#: ../src/dialogs.py:3321
 msgid "Delete"
 msgstr "Delete"
 
@@ -1486,12 +1581,75 @@ msgstr "Search:"
 msgid "_Log conversation history"
 msgstr "_Log conversation history"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
+msgid "approve"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:2
+msgid "body"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:3
+msgid "concede"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:4
+msgid "expire"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:5
+msgid "false"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:6
+msgid "forbid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:7
+#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+msgid "jid"
+msgstr "jid"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:8
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
+#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
+msgid "message"
+msgstr "message"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
+msgid "oppose"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
+#, fuzzy
+msgid "otr"
+msgstr "Hot"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:11
+msgid "prefer"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:12
+msgid "require"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:13
+msgid "save"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:14
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
 msgid "Bro_wse Rooms"
 msgstr "_Browse"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2180
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
 msgid "Join Group Chat"
 msgstr "Join Group Chat"
 
@@ -1529,8 +1687,8 @@ msgstr "Server:"
 msgid "_Bookmark this room"
 msgstr "Bookmark this room"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1341
-#: ../src/disco.py:1786
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../src/disco.py:1804
 msgid "_Join"
 msgstr "_Join"
 
@@ -1634,6 +1792,75 @@ msgstr "_Username:"
 msgid "Passphrase"
 msgstr "Passphrase"
 
+#: ../data/gui/plugins_window.ui.h:1
+msgid "&lt;empty&gt;"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:2
+msgid "<empty>"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:3
+#, fuzzy
+msgid "Authors:"
+msgstr "Au_thorise"
+
+#: ../data/gui/plugins_window.ui.h:4
+#, fuzzy
+msgid "Available"
+msgstr "_Available"
+
+#: ../data/gui/plugins_window.ui.h:5
+#, fuzzy
+msgid "Configure"
+msgstr "_Configure"
+
+#: ../data/gui/plugins_window.ui.h:6
+#, fuzzy
+msgid "Descrition:"
+msgstr "Description: "
+
+#: ../data/gui/plugins_window.ui.h:7
+#, fuzzy
+msgid "Homepage:"
+msgstr "<b>Homepage:</b>"
+
+#: ../data/gui/plugins_window.ui.h:8
+msgid "Install"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:9
+#, fuzzy
+msgid "Installed"
+msgstr "Stalled"
+
+#: ../data/gui/plugins_window.ui.h:10
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:11
+msgid "Plugins"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:12
+msgid "Uninstall"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:13
+#, fuzzy
+msgid "Version:"
+msgstr "GTK+ Version:"
+
+#: ../data/gui/plugins_window.ui.h:14
+msgid "button"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:15
+msgid "homepage url"
+msgstr ""
+
 #: ../data/gui/popup_notification_window.ui.h:1
 #, fuzzy
 msgid "Event Type"
@@ -1760,123 +1987,103 @@ msgid "Always"
 msgstr "Away"
 
 #: ../data/gui/preferences_window.ui.h:31
-#, fuzzy
-msgid "Always use GNOME default applications"
-msgstr "Always use OS/X default applications"
-
-#: ../data/gui/preferences_window.ui.h:32
-#, fuzzy
-msgid "Always use KDE default applications"
-msgstr "Always use OS/X default applications"
-
-#: ../data/gui/preferences_window.ui.h:33
-#, fuzzy
-msgid "Always use Xfce default applications"
-msgstr "Always use OS/X default applications"
-
-#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Ask status message when I:"
 
-#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
 msgid "Audio / Video"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:33
 msgid "Audio input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Audio output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:38
-#, fuzzy
-msgid "Autodetect on every Gajim startup"
-msgstr "C_onnect on Gajim startup"
-
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:35
 msgid "Chat message:"
 msgstr "Chat message:"
 
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:36
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Check on startup if Gajim is the _default Jabber client"
 
-#: ../data/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:37
 #, fuzzy
 msgid "Composing only"
 msgstr "Composing"
 
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:38
 msgid "Configure color and font of the interface"
 msgstr "Configure colour and font of the interface"
 
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Chat message:"
 
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Contact name"
 
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:41
 msgid "Custom"
 msgstr "Custom"
 
-#: ../data/gui/preferences_window.ui.h:46
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Detached roster with chat grouped by account"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Detached roster with detached chats"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:45
 msgid "Detached roster with single chat"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
-#: ../src/config.py:671
+#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
+#: ../src/config.py:665
 msgid "Disabled"
 msgstr "Disabled"
 
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:47
 msgid "Display _activity of contacts in roster"
 msgstr "Display _activity of contacts in roster"
 
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:48
 msgid "Display _extra email details"
 msgstr "Display _extra e-mail details"
 
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:49
 #, fuzzy
 msgid "Display _location of contacts in roster"
 msgstr "Display m_ood of contacts in roster"
 
-#: ../data/gui/preferences_window.ui.h:54
+#: ../data/gui/preferences_window.ui.h:50
 msgid "Display _tunes of contacts in roster"
 msgstr "Display _tunes of contacts in roster"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display a_vatars of contacts in roster"
 msgstr "Display a_vatars of contacts in roster"
 
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display m_ood of contacts in roster"
 msgstr "Display m_ood of contacts in roster"
 
-#: ../data/gui/preferences_window.ui.h:57
+#: ../data/gui/preferences_window.ui.h:53
 msgid "Display status _messages of contacts in roster"
 msgstr "Display status _messages of contacts in roster"
 
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:54
 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 "
@@ -1886,7 +2093,7 @@ msgstr ""
 "may have with a contact. Here you can specify which chatstates you want to "
 "display in chat windows."
 
-#: ../data/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:55
 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 "
@@ -1896,7 +2103,7 @@ msgstr ""
 "may have with a contact. Here you can specify which chatstates you want to "
 "send to the other party."
 
-#: ../data/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:56
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1904,11 +2111,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/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:58
 msgid "Hide all buttons in chat windows"
 msgstr "Hide all buttons in chat windows"
 
-#: ../data/gui/preferences_window.ui.h:63
+#: ../data/gui/preferences_window.ui.h:59
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1916,7 +2123,7 @@ msgstr ""
 "If ticked, Gajim will allow others to detect the operation system you are "
 "using"
 
-#: ../data/gui/preferences_window.ui.h:64
+#: ../data/gui/preferences_window.ui.h:60
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1924,13 +2131,13 @@ msgstr ""
 "If ticked, Gajim will also include information about the sender of the new e-"
 "mails"
 
-#: ../data/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:61
 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/gui/preferences_window.ui.h:66
+#: ../data/gui/preferences_window.ui.h:62
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1938,7 +2145,7 @@ msgstr ""
 "If ticked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 
-#: ../data/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1946,7 +2153,7 @@ msgstr ""
 "If ticked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
 
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1954,32 +2161,32 @@ msgstr ""
 "If ticked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
 
-#: ../data/gui/preferences_window.ui.h:69
+#: ../data/gui/preferences_window.ui.h:65
 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/gui/preferences_window.ui.h:70
+#: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the location of contacts in the roster window"
 msgstr ""
 "If ticked, Gajim will display the mood of contacts in the roster window"
 
-#: ../data/gui/preferences_window.ui.h:71
+#: ../data/gui/preferences_window.ui.h:67
 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/gui/preferences_window.ui.h:72
+#: ../data/gui/preferences_window.ui.h:68
 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/gui/preferences_window.ui.h:73
+#: ../data/gui/preferences_window.ui.h:69
 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 "
@@ -1989,7 +2196,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/gui/preferences_window.ui.h:74
+#: ../data/gui/preferences_window.ui.h:70
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1999,7 +2206,7 @@ msgstr ""
 "with caution, because it blocks all messages from any contact that is not in "
 "the roster"
 
-#: ../data/gui/preferences_window.ui.h:75
+#: ../data/gui/preferences_window.ui.h:71
 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 "
@@ -2009,7 +2216,7 @@ msgstr ""
 "when using E2E encryption the remote party has to agree on logging, else the "
 "messages will not be logged."
 
-#: ../data/gui/preferences_window.ui.h:76
+#: ../data/gui/preferences_window.ui.h:72
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -2017,7 +2224,7 @@ msgstr ""
 "If ticked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
 
-#: ../data/gui/preferences_window.ui.h:77
+#: ../data/gui/preferences_window.ui.h:73
 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, "
@@ -2027,7 +2234,7 @@ msgstr ""
 "from MSN will have the equivalent MSN icon for status online, away, busy, "
 "etc...)"
 
-#: ../data/gui/preferences_window.ui.h:78
+#: ../data/gui/preferences_window.ui.h:74
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -2035,7 +2242,7 @@ msgstr ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 
-#: ../data/gui/preferences_window.ui.h:79
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2043,45 +2250,45 @@ msgstr ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
 
-#: ../data/gui/preferences_window.ui.h:80
+#: ../data/gui/preferences_window.ui.h:76
 msgid "Log _encrypted chat session"
 msgstr "Log _encrypted chat session"
 
-#: ../data/gui/preferences_window.ui.h:81
+#: ../data/gui/preferences_window.ui.h:77
 msgid "Ma_ke message windows compact"
 msgstr "Ma_ke message windows compact"
 
-#: ../data/gui/preferences_window.ui.h:82
+#: ../data/gui/preferences_window.ui.h:78
 msgid "Ma_nage..."
 msgstr "Ma_nage..."
 
-#: ../data/gui/preferences_window.ui.h:83
+#: ../data/gui/preferences_window.ui.h:79
 #, fuzzy
 msgid "Never"
 msgstr "_Never"
 
-#: ../data/gui/preferences_window.ui.h:84
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Notifications"
 msgstr "Notifications"
 
-#: ../data/gui/preferences_window.ui.h:85
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Notify me about contacts that sign _in"
 msgstr "Notify me about contacts that sign _in"
 
-#: ../data/gui/preferences_window.ui.h:86
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Notify me about contacts that sign _out"
 msgstr "Notify me about contacts that sign _out"
 
-#: ../data/gui/preferences_window.ui.h:87
+#: ../data/gui/preferences_window.ui.h:83
 #, fuzzy
 msgid "Notify me about it"
 msgstr "_Notify me about it"
 
-#: ../data/gui/preferences_window.ui.h:88
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notify on new _GMail email"
 msgstr "Notify on new _GMail email"
 
-#: ../data/gui/preferences_window.ui.h:89
+#: ../data/gui/preferences_window.ui.h:85
 #, fuzzy
 msgid "Only when pending events"
 msgstr ""
@@ -2089,56 +2296,57 @@ msgstr ""
 "Only when pending events\n"
 "Always"
 
-#: ../data/gui/preferences_window.ui.h:90
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Personal Events"
 msgstr "Personal Events"
 
-#: ../data/gui/preferences_window.ui.h:91
+#: ../data/gui/preferences_window.ui.h:87
 msgid "Play _sounds"
 msgstr "Play _sounds"
 
-#: ../data/gui/preferences_window.ui.h:92
+#: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
 msgid "Pop it up"
 msgstr "_Pop it up"
 
-#: ../data/gui/preferences_window.ui.h:93
+#: ../data/gui/preferences_window.ui.h:89
 msgid "Preferences"
 msgstr "Preferences"
 
-#: ../data/gui/preferences_window.ui.h:94
+#: ../data/gui/preferences_window.ui.h:90
 msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:96
+#: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
 msgid "STUN server:"
 msgstr "Server:"
 
-#: ../data/gui/preferences_window.ui.h:97
+#: ../data/gui/preferences_window.ui.h:93
+#, fuzzy
+msgid "Show notification area icon:"
+msgstr "Use t_rayicon (aka. notification area icon)"
+
+#: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
 msgid "Show only in roster"
 msgstr "Show only in _roster"
 
-#: ../data/gui/preferences_window.ui.h:98
-msgid "Show systray:"
-msgstr "Show systray:"
-
-#: ../data/gui/preferences_window.ui.h:99
+#: ../data/gui/preferences_window.ui.h:95
 msgid "Sign _in"
 msgstr "Sign _in"
 
-#: ../data/gui/preferences_window.ui.h:100
+#: ../data/gui/preferences_window.ui.h:96
 msgid "Sign _out"
 msgstr "Sign _out"
 
-#: ../data/gui/preferences_window.ui.h:101
+#: ../data/gui/preferences_window.ui.h:97
 msgid "Single window for everything"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:102
+#: ../data/gui/preferences_window.ui.h:98
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2146,27 +2354,27 @@ msgstr ""
 "Some messages may include rich content (formatting, colours etc). If ticked, "
 "Gajim will just display the raw message text."
 
-#: ../data/gui/preferences_window.ui.h:103
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sort contacts by status"
 msgstr "Sort contacts by status"
 
-#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
 msgid "Status"
 msgstr "Status"
 
-#: ../data/gui/preferences_window.ui.h:105
+#: ../data/gui/preferences_window.ui.h:101
 msgid "Status _iconset:"
 msgstr "Status _iconset:"
 
-#: ../data/gui/preferences_window.ui.h:106
+#: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Style"
 
-#: ../data/gui/preferences_window.ui.h:107
+#: ../data/gui/preferences_window.ui.h:103
 msgid "T_heme:"
 msgstr "T_heme:"
 
-#: ../data/gui/preferences_window.ui.h:108
+#: ../data/gui/preferences_window.ui.h:104
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2178,7 +2386,7 @@ msgstr ""
 "$S will be replaced by previous status message\n"
 "$T will be replaced by auto-away timeout"
 
-#: ../data/gui/preferences_window.ui.h:111
+#: ../data/gui/preferences_window.ui.h:107
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2190,121 +2398,126 @@ msgstr ""
 "$S will be replaced by previous status message\n"
 "$T will be replaced by auto-not-available timeout"
 
-#: ../data/gui/preferences_window.ui.h:114
+#: ../data/gui/preferences_window.ui.h:110
 msgid "Use _transports icons"
 msgstr "Use _transports icons"
 
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:111
+#, fuzzy
+msgid "Use default applications"
+msgstr "Always use OS/X default applications"
+
+#: ../data/gui/preferences_window.ui.h:112
 msgid "Use system _default"
 msgstr "Use system _default"
 
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:113
 msgid "Video framerate"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:117
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Video input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:118
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Video output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:119
+#: ../data/gui/preferences_window.ui.h:116
 msgid "Video size"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:120
+#: ../data/gui/preferences_window.ui.h:117
 msgid "When new event is received:"
 msgstr "When new event is received:"
 
-#: ../data/gui/preferences_window.ui.h:121
+#: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
 msgid "Your message:"
 msgstr "Error message: %s"
 
-#: ../data/gui/preferences_window.ui.h:122
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your nickname:"
 msgstr "B_efore nickname:"
 
-#: ../data/gui/preferences_window.ui.h:123
+#: ../data/gui/preferences_window.ui.h:120
 msgid "_Away after:"
 msgstr "_Away after:"
 
-#: ../data/gui/preferences_window.ui.h:124
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../data/gui/preferences_window.ui.h:125
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Display chat state notifications:"
 msgstr "_Display chat state notifications:"
 
-#: ../data/gui/preferences_window.ui.h:126
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Emoticons:"
 msgstr "_Emoticons:"
 
-#: ../data/gui/preferences_window.ui.h:127
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_File manager:"
 msgstr "_File manager:"
 
-#: ../data/gui/preferences_window.ui.h:128
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_Highlight misspelled words"
 msgstr "_Highlight misspelt words"
 
-#: ../data/gui/preferences_window.ui.h:129
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignore events from contacts not in the roster"
 
-#: ../data/gui/preferences_window.ui.h:130
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignore rich content in incoming messages"
 
-#: ../data/gui/preferences_window.ui.h:131
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Log status changes of contacts"
 msgstr "_Log status changes of contacts"
 
-#: ../data/gui/preferences_window.ui.h:132
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Mail client:"
 msgstr "_Mail client:"
 
-#: ../data/gui/preferences_window.ui.h:133
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Not available after:"
 msgstr "_Not available after:"
 
-#: ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Open..."
 msgstr "_Open..."
 
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Reset to Default Colors"
 msgstr "_Reset to Default Colours"
 
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Send chat state notifications:"
 msgstr "_Send chat state notifications:"
 
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Status message:"
 msgstr "_Status message:"
 
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_URL highlight:"
 msgstr "_URL highlight:"
 
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_Window behavior:"
 msgstr "_Window behaviour:"
 
-#: ../data/gui/preferences_window.ui.h:140
+#: ../data/gui/preferences_window.ui.h:137
 msgid "in _group chats"
 msgstr "in _group chats"
 
-#: ../data/gui/preferences_window.ui.h:141
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _roster"
 msgstr "in _roster"
 
-#: ../data/gui/preferences_window.ui.h:142
+#: ../data/gui/preferences_window.ui.h:139
 msgid "minutes"
 msgstr "minutes"
 
@@ -2356,7 +2569,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Order:"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3436
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
 msgid "Privacy List"
 msgstr "Privacy List"
 
@@ -2567,8 +2780,8 @@ msgstr "Remove account from Gajim and from _server"
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5492 ../src/roster_window.py:5622
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
+#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
 msgid "_Remove"
 msgstr "_Remove"
 
@@ -2614,56 +2827,60 @@ msgid "Help online"
 msgstr "Help online"
 
 #: ../data/gui/roster_window.ui.h:8
+msgid "P_lugins"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:9
 msgid "Profile, A_vatar"
 msgstr "Profile, A_vatar"
 
-#: ../data/gui/roster_window.ui.h:9
+#: ../data/gui/roster_window.ui.h:10
 msgid "Show Only _Active Contacts"
 msgstr "Show Only _Active Contacts"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
 msgid "Show Trans_ports"
 msgstr "Show Trans_ports"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
 msgid "Show _Offline Contacts"
 msgstr "Show _Offline Contacts"
 
-#: ../data/gui/roster_window.ui.h:12 ../src/statusicon.py:326
+#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
 msgid "Show _Roster"
 msgstr "Show _Roster"
 
-#: ../data/gui/roster_window.ui.h:13
+#: ../data/gui/roster_window.ui.h:14
 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/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
 #: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Actions"
 
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
 msgid "_Contents"
 msgstr "_Contents"
 
-#: ../data/gui/roster_window.ui.h:18 ../src/disco.py:1502
+#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
 msgid "_Edit"
 msgstr "_Edit"
 
-#: ../data/gui/roster_window.ui.h:19
+#: ../data/gui/roster_window.ui.h:20
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Help"
 msgstr "_Help"
 
-#: ../data/gui/roster_window.ui.h:22
+#: ../data/gui/roster_window.ui.h:23
 msgid "_Send Single Message..."
 msgstr "_Send Single Message..."
 
-#: ../data/gui/roster_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:25
 msgid "_View"
 msgstr "_View"
 
@@ -2680,11 +2897,11 @@ msgid "_Add contact"
 msgstr "_Add contact"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5634
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
 msgid "_Information"
 msgstr "_Information"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1353
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
 msgid "_Search"
 msgstr "_Search"
 
@@ -2704,10 +2921,6 @@ msgstr "Register to"
 msgid "_Cancel"
 msgstr "_Cancel"
 
-#: ../data/gui/single_message_window.ui.h:2
-msgid "From:"
-msgstr "From:"
-
 #: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Reply to this message"
@@ -2724,10 +2937,6 @@ msgstr "Send message"
 msgid "Send message and close window"
 msgstr "Send message and close window"
 
-#: ../data/gui/single_message_window.ui.h:7
-msgid "Subject:"
-msgstr "Subject:"
-
 #: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "To:"
@@ -2937,26 +3146,36 @@ msgstr "Gajim Instant Messenger"
 msgid "Jabber IM Client"
 msgstr "Jabber IM Client"
 
-#: ../src/adhoc_commands.py:314
+#: ../src/adhoc_commands.py:323
 msgid "Cancel confirmation"
 msgstr "Cancel confirmation"
 
-#: ../src/adhoc_commands.py:315
+#: ../src/adhoc_commands.py:324
 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:351 ../src/adhoc_commands.py:374
+#: ../src/adhoc_commands.py:370
+#, fuzzy
+msgid "Invalid Form"
+msgstr "Invalid room"
+
+#: ../src/adhoc_commands.py:371
+#, fuzzy
+msgid "The form is not filled correctly."
+msgstr "The nickname has not allowed characters."
+
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
 msgid "Service sent malformed data"
 msgstr "Service sent malformed data"
 
-#: ../src/adhoc_commands.py:360
+#: ../src/adhoc_commands.py:399
 msgid "Service changed the session identifier."
 msgstr "Service changed the session identifier."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:471
+#: ../src/adhoc_commands.py:513
 msgid "Service returned an error."
 msgstr "Service returned an error."
 
@@ -2981,7 +3200,7 @@ msgstr "Integer"
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:945
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
 msgid "Color"
 msgstr "Colour"
 
@@ -3018,185 +3237,185 @@ msgstr[1] "You have received new entries (and %(count)d not displayed):"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "English"
 msgstr "English"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Belarusian"
 msgstr "Belarusian"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Bulgarian"
 msgstr "Bulgarian"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Breton"
 msgstr "Breton"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Czech"
 msgstr "Czech"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "German"
 msgstr "German"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Greek"
 msgstr "Greek"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "British"
 msgstr "British"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Spanish"
 msgstr "Spanish"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Basque"
 msgstr "Basque"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "French"
 msgstr "French"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Croatian"
 msgstr "Croatian"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Italian"
 msgstr "Italian"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian (b)"
 msgstr "Norwegian (b)"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Dutch"
 msgstr "Dutch"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian"
 msgstr "Norwegian"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Polish"
 msgstr "Polish"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Portuguese"
 msgstr "Portuguese"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Brazilian Portuguese"
 msgstr "Brazilian Portuguese"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Russian"
 msgstr "Russian"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Serbian"
 msgstr "Serbian"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Slovak"
 msgstr "Slovak"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Swedish"
 msgstr "Swedish"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Chinese (Ch)"
 msgstr "Chinese (Ch)"
 
-#: ../src/chat_control.py:479
+#: ../src/chat_control.py:496
 msgid "Spelling language"
 msgstr "Spelling language"
 
 #. we are not connected
-#: ../src/chat_control.py:511 ../src/chat_control.py:720
+#: ../src/chat_control.py:528 ../src/chat_control.py:737
 msgid "A connection is not available"
 msgstr "A connection is not available"
 
-#: ../src/chat_control.py:512 ../src/chat_control.py:721
+#: ../src/chat_control.py:529 ../src/chat_control.py:738
 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:927
+#: ../src/chat_control.py:944
 msgid "Underline"
 msgstr "Underline"
 
-#: ../src/chat_control.py:928
+#: ../src/chat_control.py:945
 msgid "Strike"
 msgstr "Strike"
 
-#: ../src/chat_control.py:951
+#: ../src/chat_control.py:968
 msgid "Font"
 msgstr "Font"
 
-#: ../src/chat_control.py:960
+#: ../src/chat_control.py:977
 msgid "Clear formating"
 msgstr "Clear formating"
 
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1055
 msgid "Really send file?"
 msgstr "Really send file?"
 
-#: ../src/chat_control.py:1039
+#: ../src/chat_control.py:1056
 #, 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:1503 ../src/chat_control.py:1987
+#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
 msgid "GPG encryption enabled"
 msgstr "GPG encryption enabled"
 
 #. Add to roster
-#: ../src/chat_control.py:1528 ../src/common/contacts.py:158
+#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
 #: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:245 ../src/dialogs.py:1064 ../src/dialogs.py:2078
-#: ../src/dialogs.py:2107 ../src/gui_interface.py:674
+#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
+#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
 #: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1610 ../src/roster_window.py:1612
-#: ../src/roster_window.py:1942 ../src/roster_window.py:3289
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
+#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
+#: ../src/roster_window.py:3382
 msgid "Not in Roster"
 msgstr "Not in Roster"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1575
 msgid "This contact does not support file transfer."
 msgstr "This contact does not support file transfer."
 
-#: ../src/chat_control.py:1561
+#: ../src/chat_control.py:1578
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 "You need to know the real JID of the contact to send him or her a file."
 
-#: ../src/chat_control.py:1656
+#: ../src/chat_control.py:1677
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:1869
 #, 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:1967 ../src/dialogs.py:4866
+#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
 msgid "No GPG key assigned"
 msgstr "No GPG key assigned"
 
-#: ../src/chat_control.py:1968
+#: ../src/chat_control.py:1991
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3204,50 +3423,50 @@ msgstr ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 
-#: ../src/chat_control.py:1977
+#: ../src/chat_control.py:2000
 msgid "GPG encryption disabled"
 msgstr "GPG encryption disabled"
 
-#: ../src/chat_control.py:2003
+#: ../src/chat_control.py:2026
 msgid "Session WILL be logged"
 msgstr "Session WILL be logged"
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:2028
 msgid "Session WILL NOT be logged"
 msgstr "Session WILL NOT be logged"
 
 #. encryption %s active
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is"
 msgstr "is"
 
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is NOT"
 msgstr "is NOT"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will"
 msgstr "will"
 
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will NOT"
 msgstr "will NOT"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2051
 msgid "and authenticated"
 msgstr "and authenticated"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2032
+#: ../src/chat_control.py:2055
 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:2039
+#: ../src/chat_control.py:2062
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3256,23 +3475,32 @@ msgstr ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 
-#: ../src/chat_control.py:2182
+#: ../src/chat_control.py:2205
 msgid "Session negotiation cancelled"
 msgstr "Session negotiation cancelled"
 
-#: ../src/chat_control.py:2191
+#: ../src/chat_control.py:2215
+msgid "This session WILL be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2217
+#, fuzzy
+msgid "This session WILL NOT be archived on server"
+msgstr "Session WILL NOT be logged"
+
+#: ../src/chat_control.py:2226
 msgid "This session is encrypted"
 msgstr "This session is encrypted"
 
-#: ../src/chat_control.py:2194
+#: ../src/chat_control.py:2229
 msgid " and WILL be logged"
 msgstr " and WILL be logged"
 
-#: ../src/chat_control.py:2196
+#: ../src/chat_control.py:2231
 msgid " and WILL NOT be logged"
 msgstr " and WILL NOT be logged"
 
-#: ../src/chat_control.py:2201
+#: ../src/chat_control.py:2236
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3280,25 +3508,25 @@ msgstr ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 
-#: ../src/chat_control.py:2203
+#: ../src/chat_control.py:2238
 msgid "E2E encryption disabled"
 msgstr "E2E encryption disabled"
 
-#: ../src/chat_control.py:2241 ../src/chat_control.py:2254
+#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
 msgid "The following message was NOT encrypted"
 msgstr "The following message was NOT encrypted"
 
-#: ../src/chat_control.py:2247
+#: ../src/chat_control.py:2288
 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:2519
+#: ../src/chat_control.py:2566
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "You just received a new message from \"%s\""
 
-#: ../src/chat_control.py:2520
+#: ../src/chat_control.py:2567
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3306,15 +3534,13 @@ msgstr ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 
-#: ../src/chat_control.py:2663 ../src/common/connection_handlers.py:1635
-#: ../src/common/connection_handlers.py:1758
-#: ../src/common/connection_handlers.py:1960
-#: ../src/common/connection_handlers.py:2110 ../src/common/connection.py:452
+#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
 #: ../src/gajim.py:159 ../src/session.py:138
 msgid "Database Error"
 msgstr "Database Error"
 
-#: ../src/chat_control.py:2664
+#: ../src/chat_control.py:2714
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3323,7 +3549,7 @@ msgstr ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 
-#: ../src/chat_control.py:2906
+#: ../src/chat_control.py:2962
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s is now %(status)s"
@@ -3337,28 +3563,28 @@ msgstr "creating logs database"
 msgid "creating cache database"
 msgstr "creating logs database"
 
-#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
-#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
-#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
-#: ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
 #, 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:275 ../src/common/check_paths.py:282
-#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
-#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
-#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:333
+#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
+#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
+#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
 msgid "Gajim will now exit"
 msgstr "Gajim will now exit"
 
-#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
+#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
 #, 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:342
+#: ../src/common/check_paths.py:351
 #, python-format
 msgid "creating %s directory"
 msgstr "creating %s directory"
@@ -3422,9 +3648,9 @@ msgstr "Choose the groupchats you want to leave"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:801
-#: ../src/roster_window.py:1614 ../src/roster_window.py:1616
-#: ../src/roster_window.py:5251
+#: ../src/common/helpers.py:57 ../src/roster_window.py:815
+#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
+#: ../src/roster_window.py:5323
 msgid "Groupchats"
 msgstr "Groupchats"
 
@@ -3482,7 +3708,9 @@ 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:88
-msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+#, fuzzy
+msgid ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr "When to show systray icon. Can be 'never', 'on_event', 'always'."
 
 #: ../src/common/config.py:93
@@ -3532,9 +3760,9 @@ msgstr ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:501
-#: ../src/common/optparser.py:290 ../src/common/optparser.py:486
-#: ../src/common/optparser.py:520 ../src/gui_interface.py:3370
+#: ../src/common/config.py:106 ../src/common/config.py:505
+#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
+#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
 msgid "default"
 msgstr "default"
 
@@ -3753,7 +3981,8 @@ msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 
 #: ../src/common/config.py:197
-msgid "Notify of events in the system trayicon."
+#, fuzzy
+msgid "Notify of events in the notification area."
 msgstr "Notify of events in the system trayicon."
 
 #: ../src/common/config.py:203
@@ -3791,9 +4020,10 @@ msgstr ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 
 #: ../src/common/config.py:221
+#, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
+"setting is taken into account only if notification icon is used."
 msgstr ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -4064,9 +4294,10 @@ msgstr ""
 "cleared."
 
 #: ../src/common/config.py:270
+#, fuzzy
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
-"systray icon."
+"notification icon."
 msgstr ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -4260,11 +4491,15 @@ msgstr ""
 msgid "Message that is sent to contacts you want to add"
 msgstr "Please fill in the data of the contact you want to add"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:374
+msgid "Last time we syncronized with logs from server."
+msgstr ""
+
+#: ../src/common/config.py:436
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Is OpenPGP enabled for this contact?"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4272,101 +4507,108 @@ msgstr ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 
-#: ../src/common/config.py:437 ../src/common/config.py:440
+#: ../src/common/config.py:438 ../src/common/config.py:441
 msgid "Language for which we want to check misspelled words"
 msgstr "Language for which we want to check misspelt words"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:447
 msgid "all or space separated status"
 msgstr "all or space separated status"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:448
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', or 'both'"
 
-#: ../src/common/config.py:448 ../src/common/config.py:450
-#: ../src/common/config.py:451 ../src/common/config.py:454
-#: ../src/common/config.py:455
+#: ../src/common/config.py:449 ../src/common/config.py:451
+#: ../src/common/config.py:452 ../src/common/config.py:455
+#: ../src/common/config.py:456
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' or ''"
 
-#: ../src/common/config.py:461 ../src/common/pep.py:157
+#: ../src/common/config.py:460
+msgid ""
+"State whether plugins should be activated on exit (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
+msgstr ""
+
+#: ../src/common/config.py:465 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Sleeping"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back soon"
 msgstr "Back soon"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back in some minutes."
 msgstr "Back in some minutes."
 
-#: ../src/common/config.py:463 ../src/common/pep.py:127
+#: ../src/common/config.py:467 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Eating"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:467
 msgid "I'm eating, so leave me a message."
 msgstr "I'm eating, so leave me a message."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "Movie"
 msgstr "Movie"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "I'm watching a movie."
 msgstr "I'm watching a movie."
 
-#: ../src/common/config.py:465 ../src/common/pep.py:186
+#: ../src/common/config.py:469 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Working"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:469
 msgid "I'm working."
 msgstr "I'm working."
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "Phone"
 msgstr "Phone"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "I'm on the phone."
 msgstr "I'm on the phone."
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "Out"
 msgstr "Out"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "I'm out enjoying life."
 msgstr "I'm out enjoying life."
 
-#: ../src/common/config.py:478
+#: ../src/common/config.py:482
 msgid "I'm available."
 msgstr "I'm available."
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:483
 msgid "I'm free for chat."
 msgstr "I'm free for chat."
 
-#: ../src/common/config.py:480 ../src/config.py:1600
+#: ../src/common/config.py:484 ../src/config.py:1600
 msgid "Be right back."
 msgstr "Be right back."
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:485
 msgid "I'm not available."
 msgstr "I'm not available."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:486
 msgid "Do not disturb."
 msgstr "Do not disturb."
 
-#: ../src/common/config.py:483 ../src/common/config.py:484
+#: ../src/common/config.py:487 ../src/common/config.py:488
 msgid "Bye!"
 msgstr "Bye!"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:498
 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."
@@ -4374,88 +4616,84 @@ 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:495
+#: ../src/common/config.py:499
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sound to play when any MUC message arrives."
 
-#: ../src/common/config.py:504 ../src/common/optparser.py:304
+#: ../src/common/config.py:508 ../src/common/optparser.py:308
 msgid "green"
 msgstr "green"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:290
+#: ../src/common/config.py:512 ../src/common/optparser.py:294
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:512
+#: ../src/common/config.py:516
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:520
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:84
+#: ../src/common/connection_handlers.py:94
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Unable to load idle module"
 
-#: ../src/common/connection_handlers.py:117
+#: ../src/common/connection_handlers.py:127
 #, 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:124
+#: ../src/common/connection_handlers.py:134
 msgid "Registration succeeded"
 msgstr "Registration succeeded"
 
-#: ../src/common/connection_handlers.py:125
+#: ../src/common/connection_handlers.py:135
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registration with agent %s succeeded"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 msgid "Registration failed"
 msgstr "Registration failed"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 
-#: ../src/common/connection_handlers.py:445
-#: ../src/common/connection_handlers.py:1633
-#: ../src/common/connection_handlers.py:1756
-#: ../src/common/connection_handlers.py:1957
-#: ../src/common/connection_handlers.py:2108 ../src/common/connection.py:449
+#: ../src/common/connection_handlers.py:466
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
 #: ../src/gajim.py:341
 msgid "Disk Write Error"
 msgstr "Disk Write Error"
 
-#: ../src/common/connection_handlers.py:678 ../src/common/connection.py:1472
+#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
 msgid "Invisibility not supported"
 msgstr "Invisibility not supported"
 
-#: ../src/common/connection_handlers.py:679 ../src/common/connection.py:1473
+#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Account %s doesn't support invisibility."
 
-#: ../src/common/connection_handlers.py:1446 ../src/common/connection.py:253
-#: ../src/config.py:2091 ../src/config.py:2100 ../src/config.py:2168
-#: ../src/config.py:3560 ../src/dataforms_widget.py:597 ../src/dialogs.py:2931
+#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
+#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
+#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
 msgid "Invalid Jabber ID"
 msgstr "Invalid Jabber ID"
 
-#: ../src/common/connection_handlers.py:1447
+#: ../src/common/connection_handlers.py:1405
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr "A message from a non-valid JID arrived, it has been ignored."
 
-#: ../src/common/connection_handlers.py:1636
-#: ../src/common/connection_handlers.py:1759
-#: ../src/common/connection_handlers.py:1961
-#: ../src/common/connection_handlers.py:2111 ../src/common/connection.py:453
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
 #: ../src/gajim.py:160 ../src/session.py:139
 #, python-format
 msgid ""
@@ -4465,89 +4703,6 @@ 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:1805
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Nickname not allowed: %s"
-
-#: ../src/common/connection_handlers.py:1902
-#: ../src/common/connection_handlers.py:1911
-#: ../src/common/connection_handlers.py:1918
-#: ../src/common/connection_handlers.py:1922
-#: ../src/common/connection_handlers.py:1926
-#: ../src/common/connection_handlers.py:1931 ../src/gui_interface.py:139
-msgid "Unable to join group chat"
-msgstr "Unable to join group chat"
-
-#: ../src/common/connection_handlers.py:1903
-#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr "Maximum number of users for %s has been reached"
-
-#: ../src/common/connection_handlers.py:1912
-#, python-format
-msgid "You are banned from group chat %s."
-msgstr "You are banned from group chat %s."
-
-#: ../src/common/connection_handlers.py:1919
-#, python-format
-msgid "Group chat %s does not exist."
-msgstr "Group chat %s does not exist."
-
-#: ../src/common/connection_handlers.py:1923
-msgid "Group chat creation is restricted."
-msgstr "Group chat creation is restricted."
-
-#: ../src/common/connection_handlers.py:1927
-#, 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:1932
-#, 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:1976
-msgid "Room has been destroyed"
-msgstr "Room has been destroyed"
-
-#: ../src/common/connection_handlers.py:1984
-#, python-format
-msgid "You can join this room instead: %s"
-msgstr "You can join this room instead: %s"
-
-#: ../src/common/connection_handlers.py:2020
-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:2041
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "we are now subscribed to %s"
-
-#: ../src/common/connection_handlers.py:2043
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "unsubscribe request from %s"
-
-#: ../src/common/connection_handlers.py:2045
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "we are now unsubscribed from %s"
-
-#: ../src/common/connection_handlers.py:2240
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr "Unable to get issuer certificate"
@@ -4676,27 +4831,27 @@ msgstr "Key usage does not include certificate signing"
 msgid "Application verification failure"
 msgstr "Application verification failure"
 
-#: ../src/common/connection.py:254 ../src/dialogs.py:2932
+#: ../src/common/connection.py:256 ../src/dialogs.py:2948
 #, 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 a message to %s, this JID is not valid."
 
-#: ../src/common/connection.py:276
+#: ../src/common/connection.py:278
 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:279
+#: ../src/common/connection.py:281
 #, 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:331
+#: ../src/common/connection.py:333
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[This message is *encrypted* (See :XEP:`27`]"
 
-#: ../src/common/connection.py:439
+#: ../src/common/connection.py:441
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4705,76 +4860,76 @@ msgstr ""
 "Subject: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:807
+#: ../src/common/connection.py:809
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Connection with account \"%s\" has been lost"
 
-#: ../src/common/connection.py:808
+#: ../src/common/connection.py:810
 msgid "Reconnect manually."
 msgstr "Reconnect manually."
 
-#: ../src/common/connection.py:820
+#: ../src/common/connection.py:822
 #, 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:854
+#: ../src/common/connection.py:856
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s provided a different registration form"
 
-#: ../src/common/connection.py:867
+#: ../src/common/connection.py:869
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Unknown SSL error: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:882
+#: ../src/common/connection.py:884
 msgid "Invalid answer"
 msgstr "Invalid answer"
 
-#: ../src/common/connection.py:883
+#: ../src/common/connection.py:885
 #, 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:1165 ../src/common/connection.py:1294
-#: ../src/common/connection.py:1784
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
+#: ../src/common/connection.py:1792
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Could not connect to \"%s\""
 
-#: ../src/common/connection.py:1166 ../src/gui_interface.py:755
+#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
 msgid "Check your connection or try again later."
 msgstr "Check your connection or try again later."
 
-#: ../src/common/connection.py:1171
+#: ../src/common/connection.py:1173
 #, python-format
 msgid "Server replied: %s"
 msgstr "Server replied: %s"
 
-#: ../src/common/connection.py:1184
+#: ../src/common/connection.py:1186
 msgid "Connection to proxy failed"
 msgstr "Connection to proxy failed"
 
-#: ../src/common/connection.py:1215 ../src/common/connection.py:1274
+#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Could not connect to account %s"
 
-#: ../src/common/connection.py:1216 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
 #, 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:1241
+#: ../src/common/connection.py:1243
 #, 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:1244
+#: ../src/common/connection.py:1246
 #, python-format
 msgid ""
 "\n"
@@ -4783,7 +4938,7 @@ msgstr ""
 "\n"
 "SSL Error: <b>%s</b>"
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1248
 #, python-format
 msgid ""
 "\n"
@@ -4792,24 +4947,24 @@ msgstr ""
 "\n"
 "Unknown SSL error: %d"
 
-#: ../src/common/connection.py:1295
+#: ../src/common/connection.py:1297
 msgid "Check your connection or try again later"
 msgstr "Check your connection or try again later"
 
-#: ../src/common/connection.py:1324
+#: ../src/common/connection.py:1329
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Authentication failed with \"%s\""
 
-#: ../src/common/connection.py:1326
+#: ../src/common/connection.py:1331
 msgid "Please check your login and password for correctness."
 msgstr "Please check your login and password for correctness."
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1400
 msgid "Error while removing privacy list"
 msgstr "Error while removing privacy list"
 
-#: ../src/common/connection.py:1396
+#: ../src/common/connection.py:1401
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4818,39 +4973,39 @@ 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:1650
+#: ../src/common/connection.py:1658
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Sent contact: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1653
+#: ../src/common/connection.py:1661
 msgid "Sent contacts:"
 msgstr "Sent contacts:"
 
-#: ../src/common/connection.py:1799 ../src/common/connection.py:1822
+#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
 msgid "Not fetched because of invisible status"
 msgstr "Not fetched because of invisible status"
 
-#: ../src/common/connection.py:2254
+#: ../src/common/connection.py:2262
 msgid "Unregister failed"
 msgstr "Unregister failed"
 
-#: ../src/common/connection.py:2255
+#: ../src/common/connection.py:2263
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr "Unregistration with server %(server)s failed: %(error)s"
 
 #: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:674
+#: ../src/gui_interface.py:551
 msgid "Observers"
 msgstr "Observers"
 
 #: ../src/common/contacts.py:139 ../src/common/contacts.py:366
 #: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1499 ../src/gui_interface.py:424
-#: ../src/roster_window.py:840 ../src/roster_window.py:1525
-#: ../src/roster_window.py:1606 ../src/roster_window.py:1608
-#: ../src/roster_window.py:1769
+#: ../src/disco.py:1517 ../src/roster_window.py:854
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
+#: ../src/roster_window.py:2466
 msgid "Transports"
 msgstr "Transports"
 
@@ -5076,203 +5231,219 @@ msgstr "End of week"
 msgid "Weekend!"
 msgstr "Weekend!"
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:148
+msgid "Username must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:153
 msgid "Invalid character in username."
 msgstr "Invalid character in username."
 
-#: ../src/common/helpers.py:156
-msgid "Server address required."
-msgstr "Server address required."
+#: ../src/common/helpers.py:159
+msgid "Server must be between 1 and 1023 chars"
+msgstr ""
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 msgid "Invalid character in hostname."
 msgstr "Invalid character in hostname."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:166
+msgid "Server address required."
+msgstr "Server address required."
+
+#: ../src/common/helpers.py:170
+msgid "Resource must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:175
 msgid "Invalid character in resource."
 msgstr "Invalid character in resource."
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:215
 msgid "_Busy"
 msgstr "_Busy"
 
-#: ../src/common/helpers.py:211 ../src/tooltips.py:195
+#: ../src/common/helpers.py:217 ../src/tooltips.py:195
 msgid "Busy"
 msgstr "Busy"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:220
 msgid "_Not Available"
 msgstr "_Not Available"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:225
 msgid "_Free for Chat"
 msgstr "_Free for Chat"
 
-#: ../src/common/helpers.py:221 ../src/tooltips.py:191
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Free for Chat"
 msgstr "Free for Chat"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:230
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "Paused"
 
-#: ../src/common/helpers.py:226 ../src/tooltips.py:189
+#: ../src/common/helpers.py:232 ../src/tooltips.py:189
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Paused"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:234
 msgid "Connecting"
 msgstr "Connecting"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:237
 msgid "A_way"
 msgstr "A_way"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:242
 msgid "_Offline"
 msgstr "_Offline"
 
-#: ../src/common/helpers.py:238 ../src/tooltips.py:199
+#: ../src/common/helpers.py:244 ../src/tooltips.py:199
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:247
 msgid "_Invisible"
 msgstr "_Invisible"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:253
 msgid "?contact has status:Unknown"
 msgstr "Unknown"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:255
 msgid "?contact has status:Has errors"
 msgstr "Has errors"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:260
 msgid "?Subscription we already have:None"
 msgstr "None"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:262
 msgid "To"
 msgstr "To"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
+msgid "From"
+msgstr "From"
+
+#: ../src/common/helpers.py:266
 msgid "Both"
 msgstr "Both"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:274
 msgid "?Ask (for Subscription):None"
 msgstr "None"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:276
 msgid "Subscribe"
 msgstr "Subscribe"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:285
 msgid "?Group Chat Contact Role:None"
 msgstr "None"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:288
 msgid "Moderators"
 msgstr "Moderators"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:290
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:293
 msgid "Participants"
 msgstr "Participants"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:295
 msgid "Participant"
 msgstr "Participant"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:298
 msgid "Visitors"
 msgstr "Visitors"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:300
 msgid "Visitor"
 msgstr "Visitor"
 
-#: ../src/common/helpers.py:300 ../src/tooltips.py:210
+#: ../src/common/helpers.py:306 ../src/tooltips.py:210
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "None"
 
-#: ../src/common/helpers.py:302 ../src/tooltips.py:216
+#: ../src/common/helpers.py:308 ../src/tooltips.py:216
 msgid "Owner"
 msgstr "Owner"
 
-#: ../src/common/helpers.py:304 ../src/tooltips.py:214
+#: ../src/common/helpers.py:310 ../src/tooltips.py:214
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:212
+#: ../src/common/helpers.py:312 ../src/tooltips.py:212
 msgid "Member"
 msgstr "Member"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:351
 msgid "is paying attention to the conversation"
 msgstr "is paying attention to the conversation"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:353
 msgid "is doing something else"
 msgstr "is doing something else"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:355
 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:352
+#: ../src/common/helpers.py:358
 msgid "paused composing a message"
 msgstr "paused composing a message"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:360
 msgid "has closed the chat window or tab"
 msgstr "has closed the chat window or tab"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:619
+#: ../src/common/helpers.py:625
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:622
+#: ../src/common/helpers.py:628
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:626
+#: ../src/common/helpers.py:632
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:629
+#: ../src/common/helpers.py:635
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:633
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:636
+#: ../src/common/helpers.py:642
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:645
 #, python-format
 msgid "%s B"
 msgstr "%s B"
@@ -5315,12 +5486,12 @@ msgstr "Gajim - %s"
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:111
+#: ../src/common/jingle_rtp.py:107
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Room Configuration"
 
-#: ../src/common/jingle_rtp.py:112
+#: ../src/common/jingle_rtp.py:108
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5332,30 +5503,30 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:209
+#: ../src/common/jingle_rtp.py:205
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:210
+#: ../src/common/jingle_rtp.py:206
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Error message: %s"
 
-#: ../src/common/jingle_rtp.py:336
+#: ../src/common/jingle_rtp.py:335
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:339
+#: ../src/common/jingle_rtp.py:338
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:382
+#: ../src/common/jingle_rtp.py:381
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:390
+#: ../src/common/jingle_rtp.py:389
 msgid "video output"
 msgstr ""
 
@@ -5432,11 +5603,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "error: cannot open %s for reading"
 
-#: ../src/common/optparser.py:299 ../src/common/optparser.py:300
+#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:379
+#: ../src/common/optparser.py:383
 msgid "migrating logs database to indices"
 msgstr "migrating logs database to indices"
 
@@ -6109,7 +6280,7 @@ msgstr ""
 "cancelled."
 
 #. we're not english
-#: ../src/common/stanza_session.py:303
+#: ../src/common/stanza_session.py:423
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6117,11 +6288,11 @@ msgstr ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:178
+#: ../src/common/zeroconf/connection_zeroconf.py:181
 msgid "Avahi error"
 msgstr "Avahi error"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:179
+#: ../src/common/zeroconf/connection_zeroconf.py:182
 #, python-format
 msgid ""
 "%s\n"
@@ -6130,44 +6301,44 @@ msgstr ""
 "%s\n"
 "Link-local messaging might not work properly."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:190
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Please check if Avahi or Bonjour is installed."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:199
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Could not start local service"
 msgstr "Could not start local service"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Unable to bind to port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-#: ../src/common/zeroconf/connection_zeroconf.py:283
-#: ../src/common/zeroconf/connection_zeroconf.py:294
-#: ../src/common/zeroconf/connection_zeroconf.py:308
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:286
+#: ../src/common/zeroconf/connection_zeroconf.py:297
+#: ../src/common/zeroconf/connection_zeroconf.py:311
 msgid "Please check if avahi-daemon is running."
 msgstr "Please check if avahi-daemon is running."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:282
-#: ../src/common/zeroconf/connection_zeroconf.py:293
-#: ../src/common/zeroconf/connection_zeroconf.py:307
+#: ../src/common/zeroconf/connection_zeroconf.py:285
+#: ../src/common/zeroconf/connection_zeroconf.py:296
+#: ../src/common/zeroconf/connection_zeroconf.py:310
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Could not change status of account \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:325
+#: ../src/common/zeroconf/connection_zeroconf.py:328
 msgid "Your message could not be sent."
 msgstr "Your message could not be sent."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:335
+#: ../src/common/zeroconf/connection_zeroconf.py:338
 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:360
+#: ../src/common/zeroconf/connection_zeroconf.py:363
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6187,16 +6358,16 @@ msgstr "Default Message"
 msgid "Enabled"
 msgstr "Enabled"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3078
+#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
 msgid "Default"
 msgstr "Default"
 
-#: ../src/config.py:739 ../src/dialogs.py:1395
+#: ../src/config.py:733 ../src/dialogs.py:1409
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Dictionary for lang %s not available"
 
-#: ../src/config.py:740
+#: ../src/config.py:734
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6214,9 +6385,9 @@ msgid "status message text"
 msgstr "status message text"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2383 ../src/dialogs.py:2449
-#: ../src/dialogs.py:3215 ../src/disco.py:866 ../src/disco.py:1726
-#: ../src/disco.py:2030 ../src/history_window.py:90
+#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
+#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
+#: ../src/disco.py:2048 ../src/history_window.py:90
 msgid "Name"
 msgstr "Name"
 
@@ -6250,7 +6421,7 @@ 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:1976 ../src/config.py:2509 ../src/config.py:2545
+#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
 msgid "You are currently connected to the server"
 msgstr "You are currently connected to the server"
 
@@ -6286,131 +6457,131 @@ msgstr "Account name cannot be empty."
 msgid "Account name cannot contain spaces."
 msgstr "Account name cannot contain spaces."
 
-#: ../src/config.py:2072
+#: ../src/config.py:2074
 msgid "Rename Account"
 msgstr "Rename Account"
 
-#: ../src/config.py:2073
+#: ../src/config.py:2075
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Enter a new name for account %s"
 
-#: ../src/config.py:2101
+#: ../src/config.py:2103
 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:2318 ../src/config.py:3606
+#: ../src/config.py:2320 ../src/config.py:3623
 msgid "Invalid entry"
 msgstr "Invalid entry"
 
-#: ../src/config.py:2319 ../src/config.py:3607
+#: ../src/config.py:2321 ../src/config.py:3624
 msgid "Custom port must be a port number."
 msgstr "Custom port must be a port number."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2342
 msgid "Failed to get secret keys"
 msgstr "Failed to get secret keys"
 
-#: ../src/config.py:2341
+#: ../src/config.py:2343
 msgid "There is no OpenPGP secret key available."
 msgstr "There is no OpenPGP secret key available."
 
-#: ../src/config.py:2375
+#: ../src/config.py:2377
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Key Selection"
 
-#: ../src/config.py:2376
+#: ../src/config.py:2378
 msgid "Choose your OpenPGP key"
 msgstr "Choose your OpenPGP key"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2385
 msgid "No such account available"
 msgstr "No such account available"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2386
 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:2391 ../src/dialogs.py:2136 ../src/dialogs.py:2371
-#: ../src/dialogs.py:2557 ../src/disco.py:511 ../src/profile_window.py:339
+#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
+#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
 msgid "You are not connected to the server"
 msgstr "You are not connected to the server"
 
-#: ../src/config.py:2392
+#: ../src/config.py:2394
 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:2396
+#: ../src/config.py:2398
 msgid "Your server doesn't support Vcard"
 msgstr "Your server doesn't support Vcard"
 
-#: ../src/config.py:2397
+#: ../src/config.py:2399
 msgid "Your server can't save your personal information."
 msgstr "Your server can't save your personal information."
 
-#: ../src/config.py:2510 ../src/config.py:2546
+#: ../src/config.py:2512 ../src/config.py:2548
 msgid "To disable the account, you must be disconnected."
 msgstr "To disable the account, you must be disconnected."
 
-#: ../src/config.py:2515
+#: ../src/config.py:2517
 msgid "Account Local already exists."
 msgstr "Account Local already exists."
 
-#: ../src/config.py:2516
+#: ../src/config.py:2518
 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:2673
+#: ../src/config.py:2675
 #, python-format
 msgid "Edit %s"
 msgstr "Edit %s"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2677
 #, python-format
 msgid "Register to %s"
 msgstr "Register to %s"
 
 #. list at the beginning
-#: ../src/config.py:2711
+#: ../src/config.py:2713
 msgid "Ban List"
 msgstr "Ban List"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2714
 msgid "Member List"
 msgstr "Member List"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2714
 msgid "Owner List"
 msgstr "Owner List"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2715
 msgid "Administrator List"
 msgstr "Administrator List"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2763 ../src/disco.py:873 ../src/history_manager.py:201
+#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2773
+#: ../src/config.py:2789
 msgid "Reason"
 msgstr "Reason"
 
-#: ../src/config.py:2780
+#: ../src/config.py:2796
 msgid "Nick"
 msgstr "Nick"
 
-#: ../src/config.py:2786
+#: ../src/config.py:2802
 msgid "Role"
 msgstr "Role"
 
-#: ../src/config.py:2813
+#: ../src/config.py:2829
 msgid "Banning..."
 msgstr "Banning..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2815
+#: ../src/config.py:2831
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6418,11 +6589,11 @@ msgstr ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 
-#: ../src/config.py:2817
+#: ../src/config.py:2833
 msgid "Adding Member..."
 msgstr "Adding Member..."
 
-#: ../src/config.py:2818
+#: ../src/config.py:2834
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6430,11 +6601,11 @@ msgstr ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2836
 msgid "Adding Owner..."
 msgstr "Adding Owner..."
 
-#: ../src/config.py:2821
+#: ../src/config.py:2837
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6442,11 +6613,11 @@ msgstr ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 
-#: ../src/config.py:2823
+#: ../src/config.py:2839
 msgid "Adding Administrator..."
 msgstr "Adding Administrator..."
 
-#: ../src/config.py:2824
+#: ../src/config.py:2840
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6454,7 +6625,7 @@ msgstr ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2825
+#: ../src/config.py:2841
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6470,110 +6641,110 @@ msgstr ""
 "4. domain (the domain itself matches, as does any user@domain,\n"
 "domain/resource, or address containing a subdomain)."
 
-#: ../src/config.py:2926
+#: ../src/config.py:2943
 #, python-format
 msgid "Removing %s account"
 msgstr "Removing %s account"
 
-#: ../src/config.py:2941
+#: ../src/config.py:2958
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Emoticons disabled"
 
-#: ../src/config.py:2942
+#: ../src/config.py:2959
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2955 ../src/gui_interface.py:1132
-#: ../src/gui_interface.py:1243
+#: ../src/config.py:2972 ../src/gui_interface.py:311
+#: ../src/gui_interface.py:1048
 msgid "Password Required"
 msgstr "Password Required"
 
-#: ../src/config.py:2956 ../src/gui_interface.py:1223
+#: ../src/config.py:2973 ../src/gui_interface.py:1028
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enter your password for account %s"
 
-#: ../src/config.py:2957 ../src/gui_interface.py:1243
+#: ../src/config.py:2974 ../src/gui_interface.py:1048
 msgid "Save password"
 msgstr "Save password"
 
-#: ../src/config.py:2967
+#: ../src/config.py:2984
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Account \"%s\" is connected to the server"
 
-#: ../src/config.py:2968
+#: ../src/config.py:2985
 msgid "If you remove it, the connection will be lost."
 msgstr "If you remove it, the connection will be lost."
 
-#: ../src/config.py:2982
+#: ../src/config.py:2999
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Connection to proxy failed"
 
-#: ../src/config.py:2983
+#: ../src/config.py:3000
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "What do you want to do?"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3001
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Remove account _only from Gajim"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3002
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3078
+#: ../src/config.py:3095
 msgid "?print_status:All"
 msgstr "All"
 
-#: ../src/config.py:3079
+#: ../src/config.py:3096
 msgid "Enter and leave only"
 msgstr "Enter and leave only"
 
-#: ../src/config.py:3080
+#: ../src/config.py:3097
 msgid "?print_status:None"
 msgstr "None"
 
-#: ../src/config.py:3150
+#: ../src/config.py:3167
 msgid "New Group Chat"
 msgstr "New Group Chat"
 
-#: ../src/config.py:3183
+#: ../src/config.py:3200
 msgid "This bookmark has invalid data"
 msgstr "This bookmark has invalid data"
 
-#: ../src/config.py:3184
+#: ../src/config.py:3201
 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."
 
 #. invalid char
-#: ../src/config.py:3302 ../src/dialogs.py:1934
+#: ../src/config.py:3319 ../src/dialogs.py:1950
 msgid "Invalid nickname"
 msgstr "Invalid nickname"
 
-#: ../src/config.py:3303 ../src/config.py:3317 ../src/config.py:3331
+#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
 msgid "Character not allowed"
 msgstr "Character not allowed"
 
-#: ../src/config.py:3316 ../src/config.py:3582
+#: ../src/config.py:3333 ../src/config.py:3599
 msgid "Invalid server"
 msgstr "Invalid server"
 
-#: ../src/config.py:3330
+#: ../src/config.py:3347
 msgid "Invalid room"
 msgstr "Invalid room"
 
-#: ../src/config.py:3498
+#: ../src/config.py:3515
 msgid "Account has been added successfully"
 msgstr "Account has been added successfully"
 
-#: ../src/config.py:3499 ../src/config.py:3505
+#: ../src/config.py:3516 ../src/config.py:3522
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menu item under the Edit menu from the main "
@@ -6583,32 +6754,32 @@ msgstr ""
 "later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 
-#: ../src/config.py:3504
+#: ../src/config.py:3521
 msgid "Your new account has been created successfully"
 msgstr "Your new account has been successfully created"
 
-#: ../src/config.py:3543
+#: ../src/config.py:3560
 msgid "Invalid username"
 msgstr "Invalid username"
 
-#: ../src/config.py:3545
+#: ../src/config.py:3562
 msgid "You must provide a username to configure this account."
 msgstr "You must provide a username to configure this account."
 
-#: ../src/config.py:3583
+#: ../src/config.py:3600
 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:3639 ../src/gui_interface.py:1904
+#: ../src/config.py:3656 ../src/gui_interface.py:1693
 msgid "Certificate Already in File"
 msgstr "Certificate Already in File"
 
-#: ../src/config.py:3640 ../src/gui_interface.py:1905
+#: ../src/config.py:3657 ../src/gui_interface.py:1694
 #, 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:3717
+#: ../src/config.py:3734
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6623,7 +6794,7 @@ msgstr ""
 "SSL Error: %(error)s\n"
 "Do you still want to connect to this server?"
 
-#: ../src/config.py:3723 ../src/gui_interface.py:1932
+#: ../src/config.py:3740 ../src/gui_interface.py:1721
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6634,63 +6805,72 @@ msgstr ""
 "SHA1 fingerprint of the certificate:\n"
 "%s"
 
-#: ../src/config.py:3755 ../src/config.py:3789
+#: ../src/config.py:3772 ../src/config.py:3806
 msgid "An error occurred during account creation"
 msgstr "An error occurred during account creation"
 
-#: ../src/config.py:3854
+#: ../src/config.py:3871
 msgid "Account name is in use"
 msgstr "Account name is in use"
 
-#: ../src/config.py:3855
+#: ../src/config.py:3872
 msgid "You already have an account using this name."
 msgstr "You already have an account using this name."
 
-#: ../src/config.py:4009
+#: ../src/config.py:3991
+msgid "PEP node was not removed"
+msgstr "PEP node was not removed"
+
+#: ../src/config.py:3992
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr "PEP node %(node)s was not removed: %(message)s"
+
+#: ../src/config.py:4036
 msgid "Active"
 msgstr "Active"
 
-#: ../src/config.py:4017
+#: ../src/config.py:4044
 msgid "Event"
 msgstr "Event"
 
-#: ../src/config.py:4052
+#: ../src/config.py:4079
 msgid "First Message Received"
 msgstr "First Message Received"
 
-#: ../src/config.py:4053
+#: ../src/config.py:4080
 msgid "Next Message Received Focused"
 msgstr "Next Message Received Focused"
 
-#: ../src/config.py:4055
+#: ../src/config.py:4082
 msgid "Next Message Received Unfocused"
 msgstr "Next Message Received Unfocused"
 
-#: ../src/config.py:4056
+#: ../src/config.py:4083
 msgid "Contact Connected"
 msgstr "Contact Connected"
 
-#: ../src/config.py:4057
+#: ../src/config.py:4084
 msgid "Contact Disconnected"
 msgstr "Contact Disconnected"
 
-#: ../src/config.py:4058
+#: ../src/config.py:4085
 msgid "Message Sent"
 msgstr "Message Sent"
 
-#: ../src/config.py:4059
+#: ../src/config.py:4086
 msgid "Group Chat Message Highlight"
 msgstr "Group Chat Message Highlight"
 
-#: ../src/config.py:4060
+#: ../src/config.py:4087
 msgid "Group Chat Message Received"
 msgstr "Group Chat Message Received"
 
-#: ../src/config.py:4061
+#: ../src/config.py:4088
 msgid "GMail Email Received"
 msgstr "GMail E-mail Received"
 
-#: ../src/conversation_textview.py:600
+#: ../src/conversation_textview.py:601
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6700,7 +6880,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:619
+#: ../src/conversation_textview.py:620
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6708,44 +6888,44 @@ 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:739
+#: ../src/conversation_textview.py:740
 msgid "_Quote"
 msgstr "_Quote"
 
-#: ../src/conversation_textview.py:746
+#: ../src/conversation_textview.py:747
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Actions for \"%s\""
 
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Read _Wikipedia Article"
 msgstr "Read _Wikipedia Article"
 
-#: ../src/conversation_textview.py:763
+#: ../src/conversation_textview.py:765
 msgid "Look it up in _Dictionary"
 msgstr "Look it up in _Dictionary"
 
-#: ../src/conversation_textview.py:780
+#: ../src/conversation_textview.py:782
 #, 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:793
+#: ../src/conversation_textview.py:795
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Search URL is missing an \"%s\""
 
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 msgid "Web _Search for it"
 msgstr "Web _Search for it"
 
-#: ../src/conversation_textview.py:802
+#: ../src/conversation_textview.py:804
 msgid "Open as _Link"
 msgstr "Open as _Link"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1296
+#: ../src/conversation_textview.py:1298
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6753,186 +6933,191 @@ msgstr[0] "Yesterday"
 msgstr[1] "Yesterday"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1344 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Subject: %s\n"
 
-#: ../src/dataforms_widget.py:544
+#: ../src/dataforms_widget.py:545
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Unable to load idle module"
 
-#: ../src/dataforms_widget.py:546
+#: ../src/dataforms_widget.py:547
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Invisibility not supported"
 
-#: ../src/dataforms_widget.py:601
+#: ../src/dataforms_widget.py:562
+msgid "This field is required"
+msgstr ""
+
+#: ../src/dataforms_widget.py:607
 msgid "Jabber ID already in list"
 msgstr "Jabber ID already in list"
 
-#: ../src/dataforms_widget.py:602
+#: ../src/dataforms_widget.py:608
 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:613
+#: ../src/dataforms_widget.py:619
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:616 ../src/dataforms_widget.py:618
+#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Contact name: <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:195
 msgid "Group"
 msgstr "Group"
 
-#: ../src/dialogs.py:201
+#: ../src/dialogs.py:202
 msgid "In the group"
 msgstr "In the group"
 
-#: ../src/dialogs.py:292
+#: ../src/dialogs.py:293
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:297
+#: ../src/dialogs.py:298
 msgid "Contact name"
 msgstr "Contact name"
 
-#: ../src/dialogs.py:469
+#: ../src/dialogs.py:470
 msgid "Set Mood"
 msgstr "Set Mood"
 
-#: ../src/dialogs.py:589
+#: ../src/dialogs.py:590
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Message"
 
-#: ../src/dialogs.py:603
+#: ../src/dialogs.py:604
 msgid "Status Message"
 msgstr "Status Message"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:794
 msgid "Overwrite Status Message?"
 msgstr "Overwrite Status Message?"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:795
 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:802
+#: ../src/dialogs.py:803
 msgid "Save as Preset Status Message"
 msgstr "Save as Preset Status Message"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:804
 msgid "Please type a name for this status message"
 msgstr "Please type a name for this status message"
 
-#: ../src/dialogs.py:831
+#: ../src/dialogs.py:832
 msgid "AIM Address:"
 msgstr "AIM Address:"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:833
 msgid "GG Number:"
 msgstr "GG Number:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:834
 msgid "ICQ Number:"
 msgstr "ICQ Number:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:835
 msgid "MSN Address:"
 msgstr "MSN Address:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:836
 msgid "Yahoo! Address:"
 msgstr "Yahoo! Address:"
 
-#: ../src/dialogs.py:872
+#: ../src/dialogs.py:873
 #, 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:875
+#: ../src/dialogs.py:876
 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:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
+#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
+#: ../src/dialogs.py:3464
 msgid "Invalid User ID"
 msgstr "Invalid User ID"
 
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1052
 msgid "The user ID must not contain a resource."
 msgstr "The user ID must not contain a resource."
 
-#: ../src/dialogs.py:1051
+#: ../src/dialogs.py:1057
 msgid "You cannot add yourself to your roster."
 msgstr "You cannot add yourself to your roster."
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1071
 msgid "Contact already in roster"
 msgstr "Contact already in roster"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1072
 msgid "This contact is already listed in your roster."
 msgstr "This contact is already listed in your roster."
 
-#: ../src/dialogs.py:1112
+#: ../src/dialogs.py:1118
 msgid "User ID:"
 msgstr "User ID:"
 
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1189
 msgid "A GTK+ jabber client"
 msgstr "A GTK+ jabber client"
 
-#: ../src/dialogs.py:1176
+#: ../src/dialogs.py:1190
 msgid "GTK+ Version:"
 msgstr "GTK+ Version:"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1191
 msgid "PyGTK Version:"
 msgstr "PyGTK Version:"
 
-#: ../src/dialogs.py:1187
+#: ../src/dialogs.py:1201
 msgid "Current Developers:"
 msgstr "Current Developers:"
 
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1203
 msgid "Past Developers:"
 msgstr "Past Developers:"
 
-#: ../src/dialogs.py:1195
+#: ../src/dialogs.py:1209
 msgid "THANKS:"
 msgstr "THANKS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1215
 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:1213
+#: ../src/dialogs.py:1227
 msgid "translator-credits"
 msgstr "Jeff Bailes <thepizzaking@gmail.com>"
 
-#: ../src/dialogs.py:1396
+#: ../src/dialogs.py:1410
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6945,101 +7130,101 @@ msgstr ""
 "\n"
 "Highlighting misspelt words feature will not be used"
 
-#: ../src/dialogs.py:1935 ../src/dialogs.py:2322
+#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
 msgid "The nickname has not allowed characters."
 msgstr "The nickname has not allowed characters."
 
-#: ../src/dialogs.py:2053
+#: ../src/dialogs.py:2069
 #, 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:2056
+#: ../src/dialogs.py:2072
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Subscription request from %s"
 
-#: ../src/dialogs.py:2131 ../src/gui_interface.py:2672
+#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "You are already in group chat %s"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2153
 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:2178
+#: ../src/dialogs.py:2194
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Join Group Chat with account %s"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2325
 msgid "Invalid Account"
 msgstr "Invalid Account"
 
-#: ../src/dialogs.py:2310
+#: ../src/dialogs.py:2326
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr ""
 "You have to choose an account from which you want to join the groupchat."
 
-#: ../src/dialogs.py:2321
+#: ../src/dialogs.py:2337
 msgid "Invalid Nickname"
 msgstr "Invalid Nickname"
 
-#: ../src/dialogs.py:2326 ../src/dialogs.py:2332
-#: ../src/groupchat_control.py:1832
+#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
+#: ../src/groupchat_control.py:1847
 msgid "Invalid group chat Jabber ID"
 msgstr "Invalid group chat Jabber ID"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2343
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "The group chat Jabber ID has invalid characters."
 
-#: ../src/dialogs.py:2333 ../src/groupchat_control.py:1833
+#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "The group chat Jabber ID has invalid characters."
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2356
 msgid "This is not a group chat"
 msgstr "This is not a group chat"
 
-#: ../src/dialogs.py:2341
+#: ../src/dialogs.py:2357
 #, 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:2372
+#: ../src/dialogs.py:2388
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Without a connection, you can not synchronise your contacts."
 
-#: ../src/dialogs.py:2386
+#: ../src/dialogs.py:2402
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2421
+#: ../src/dialogs.py:2437
 msgid "This account is not connected to the server"
 msgstr "This account is not connected to the server"
 
-#: ../src/dialogs.py:2422
+#: ../src/dialogs.py:2438
 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:2446
+#: ../src/dialogs.py:2462
 msgid "Synchronise"
 msgstr "Synchronise"
 
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2523
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start Chat with account %s"
 
-#: ../src/dialogs.py:2509
+#: ../src/dialogs.py:2525
 msgid "Start Chat"
 msgstr "Start Chat"
 
-#: ../src/dialogs.py:2510
+#: ../src/dialogs.py:2526
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7048,168 +7233,168 @@ msgstr ""
 "to send a chat message to:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2536 ../src/dialogs.py:2917 ../src/dialogs.py:3129
+#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
 msgid "Connection not available"
 msgstr "Connection not available"
 
-#: ../src/dialogs.py:2537 ../src/dialogs.py:2918 ../src/dialogs.py:3130
+#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Please make sure you are connected with \"%s\"."
 
-#: ../src/dialogs.py:2546 ../src/dialogs.py:2549
+#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
 msgid "Invalid JID"
 msgstr "Invalid JID"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2565
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Unable to parse \"%s\"."
 
-#: ../src/dialogs.py:2558
+#: ../src/dialogs.py:2574
 msgid "Without a connection, you can not change your password."
 msgstr "Without a connection, you can not change your password."
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "Invalid password"
 msgstr "Invalid password"
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "You must enter a password."
 msgstr "You must enter a password."
 
-#: ../src/dialogs.py:2581
+#: ../src/dialogs.py:2597
 msgid "Passwords do not match"
 msgstr "Passwords do not match"
 
-#: ../src/dialogs.py:2582
+#: ../src/dialogs.py:2598
 msgid "The passwords typed in both fields must be identical."
 msgstr "The passwords typed in both fields must be identical."
 
 #. default value
-#: ../src/dialogs.py:2619 ../src/notify.py:247 ../src/notify.py:473
+#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
 msgid "Contact Signed In"
 msgstr "Contact Signed In"
 
-#: ../src/dialogs.py:2621 ../src/notify.py:255 ../src/notify.py:475
+#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
 msgid "Contact Signed Out"
 msgstr "Contact Signed Out"
 
 #. chat message
-#: ../src/dialogs.py:2623 ../src/notify.py:277 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
 msgid "New Message"
 msgstr "New Message"
 
 #. single message
-#: ../src/dialogs.py:2623 ../src/notify.py:259 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
 msgid "New Single Message"
 msgstr "New Single Message"
 
 #. private message
-#: ../src/dialogs.py:2624 ../src/notify.py:265 ../src/notify.py:478
+#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
 msgid "New Private Message"
 msgstr "New Private Message"
 
-#: ../src/dialogs.py:2624 ../src/gui_interface.py:1358 ../src/notify.py:487
+#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
 msgid "New E-mail"
 msgstr "New E-mail"
 
-#: ../src/dialogs.py:2626 ../src/gui_interface.py:1420 ../src/notify.py:480
+#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
 msgid "File Transfer Request"
 msgstr "File Transfer Request"
 
-#: ../src/dialogs.py:2628 ../src/gui_interface.py:1320
-#: ../src/gui_interface.py:1389 ../src/notify.py:482
+#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
+#: ../src/gui_interface.py:1186 ../src/notify.py:482
 msgid "File Transfer Error"
 msgstr "File Transfer Error"
 
-#: ../src/dialogs.py:2630 ../src/gui_interface.py:1466
-#: ../src/gui_interface.py:1489 ../src/gui_interface.py:1506
+#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
+#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
 #: ../src/notify.py:484
 msgid "File Transfer Completed"
 msgstr "File Transfer Completed"
 
-#: ../src/dialogs.py:2631 ../src/gui_interface.py:1469 ../src/notify.py:485
+#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
 msgid "File Transfer Stopped"
 msgstr "File Transfer Stopped"
 
-#: ../src/dialogs.py:2633 ../src/gui_interface.py:1152 ../src/notify.py:489
+#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
 msgid "Groupchat Invitation"
 msgstr "Groupchat Invitation"
 
-#: ../src/dialogs.py:2635 ../src/notify.py:239 ../src/notify.py:491
+#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
 msgid "Contact Changed Status"
 msgstr "Contact Changed Status"
 
-#: ../src/dialogs.py:2836
+#: ../src/dialogs.py:2852
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Single Message using account %s"
 
-#: ../src/dialogs.py:2838
+#: ../src/dialogs.py:2854
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Single Message in account %s"
 
-#: ../src/dialogs.py:2840
+#: ../src/dialogs.py:2856
 msgid "Single Message"
 msgstr "Single Message"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2843
+#: ../src/dialogs.py:2859
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:2882
 #, python-format
 msgid "Received %s"
 msgstr "Received %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2889
+#: ../src/dialogs.py:2905
 #, 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:2968
+#: ../src/dialogs.py:2984
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:2985
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s wrote:\n"
 
-#: ../src/dialogs.py:3028
+#: ../src/dialogs.py:3044
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Console for %s"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3046
 msgid "XML Console"
 msgstr "XML Console"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "add"
 msgstr "Sad"
 
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "modify"
 msgstr "Modify"
 
-#: ../src/dialogs.py:3160
+#: ../src/dialogs.py:3176
 #, fuzzy
 msgid "remove"
 msgstr "Remo_ve"
 
-#: ../src/dialogs.py:3188
+#: ../src/dialogs.py:3204
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7217,154 +7402,188 @@ msgid ""
 msgstr "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3204 ../src/dialogs.py:3250
+#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
 msgid "Add"
 msgstr "Add"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3206 ../src/dialogs.py:3281
+#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
 msgid "Modify"
 msgstr "Modify"
 
-#: ../src/dialogs.py:3212
+#: ../src/dialogs.py:3228
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3218
+#: ../src/dialogs.py:3234
 msgid "Groups"
 msgstr "Groups"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3342
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s suggested me to add you in my roster."
 
-#: ../src/dialogs.py:3340
+#: ../src/dialogs.py:3356
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "_Add contact"
 
-#: ../src/dialogs.py:3377
+#: ../src/dialogs.py:3393
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Removes contact from roster"
 
-#: ../src/dialogs.py:3430
+#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#, python-format
+msgid "Archiving Preferences for %s"
+msgstr ""
+
+#: ../src/dialogs.py:3473
+#, fuzzy
+msgid "Invalid expire value"
+msgstr "Invalid Server Name"
+
+#: ../src/dialogs.py:3474
+msgid "Expire must be a valid positive integer."
+msgstr ""
+
+#: ../src/dialogs.py:3521
+msgid "There is an error with the form"
+msgstr ""
+
+#: ../src/dialogs.py:3732
+#, fuzzy
+msgid "There is an error"
+msgstr "Service returned an error."
+
+#: ../src/dialogs.py:3796
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privacy List <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3434
+#: ../src/dialogs.py:3800
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privacy List for %s"
 
-#: ../src/dialogs.py:3490
+#: ../src/dialogs.py:3856
 #, 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:3495
+#: ../src/dialogs.py:3861
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Order: %(order)s, action: %(action)s"
 
-#: ../src/dialogs.py:3539
+#: ../src/dialogs.py:3905
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Edit a rule</b>"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:4016
 msgid "<b>Add a rule</b>"
 msgstr "<b>Add a rule</b>"
 
-#: ../src/dialogs.py:3750
+#: ../src/dialogs.py:4116
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privacy Lists for %s"
 
-#: ../src/dialogs.py:3752
+#: ../src/dialogs.py:4118
 msgid "Privacy Lists"
 msgstr "Privacy Lists"
 
-#: ../src/dialogs.py:3822
+#: ../src/dialogs.py:4188
 msgid "Invalid List Name"
 msgstr "Invalid List Name"
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4189
 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:3855
+#: ../src/dialogs.py:4221
 msgid "You are invited to a groupchat"
 msgstr "You are invited to a groupchat"
 
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4224
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact has invited you to join a discussion"
 
-#: ../src/dialogs.py:3860
+#: ../src/dialogs.py:4226
 #, 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:3868
+#: ../src/dialogs.py:4234
 #, python-format
 msgid "Comment: %s"
 msgstr "Comment: %s"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4236
 msgid "Do you want to accept the invitation?"
 msgstr "Do you want to accept the invitation?"
 
-#: ../src/dialogs.py:3932
+#: ../src/dialogs.py:4298
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:3942 ../src/dialogs.py:3985 ../src/dialogs.py:4041
+#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
+#: ../src/dialogs.py:4495
 msgid "All files"
 msgstr "All files"
 
-#: ../src/dialogs.py:3947
+#: ../src/dialogs.py:4313
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:3975
+#: ../src/dialogs.py:4341
 msgid "Choose Sound"
 msgstr "Choose Sound"
 
-#: ../src/dialogs.py:3990
+#: ../src/dialogs.py:4356
 msgid "Wav Sounds"
 msgstr "Wav Sounds"
 
-#: ../src/dialogs.py:4028
+#: ../src/dialogs.py:4394
 msgid "Choose Image"
 msgstr "Choose Image"
 
-#: ../src/dialogs.py:4046
+#: ../src/dialogs.py:4412
 msgid "Images"
 msgstr "Images"
 
-#: ../src/dialogs.py:4113
+#: ../src/dialogs.py:4482
+#, fuzzy
+msgid "Choose Archive"
+msgstr "Choose Image"
+
+#: ../src/dialogs.py:4500
+#, fuzzy
+msgid "Zip files"
+msgstr "All files"
+
+#: ../src/dialogs.py:4525
 #, python-format
 msgid "When %s becomes:"
 msgstr "When %s becomes:"
 
-#: ../src/dialogs.py:4115
+#: ../src/dialogs.py:4527
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Adding Special Notification for %s"
 
-#: ../src/dialogs.py:4190
+#: ../src/dialogs.py:4602
 msgid "Condition"
 msgstr "Condition"
 
-#: ../src/dialogs.py:4310
+#: ../src/dialogs.py:4722
 msgid "when I am "
 msgstr "when I am "
 
-#: ../src/dialogs.py:4786
+#: ../src/dialogs.py:5198
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7375,19 +7594,19 @@ msgstr ""
 "\n"
 "This session's Short Authentication String is <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4789
+#: ../src/dialogs.py:5201
 msgid "You have already verified this contact's identity."
 msgstr "You have already verified this contact's identity."
 
-#: ../src/dialogs.py:4795 ../src/dialogs.py:4879
+#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
 msgid "Contact's identity verified"
 msgstr "Contact's identity verified"
 
-#: ../src/dialogs.py:4801
+#: ../src/dialogs.py:5213
 msgid "Verify again..."
 msgstr "Verify again..."
 
-#: ../src/dialogs.py:4806
+#: ../src/dialogs.py:5218
 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 "
@@ -7397,19 +7616,19 @@ msgstr ""
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 
-#: ../src/dialogs.py:4809 ../src/dialogs.py:4860 ../src/dialogs.py:4873
+#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
 msgid "Contact's identity NOT verified"
 msgstr "Contact's identity NOT verified"
 
-#: ../src/dialogs.py:4814
+#: ../src/dialogs.py:5226
 msgid "Verify..."
 msgstr "Verify..."
 
-#: ../src/dialogs.py:4825
+#: ../src/dialogs.py:5237
 msgid "Have you verified the contact's identity?"
 msgstr "Have you verified the contact's identity?"
 
-#: ../src/dialogs.py:4826
+#: ../src/dialogs.py:5238
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7424,22 +7643,22 @@ msgstr ""
 "\n"
 "This session's Short Authentication String is <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4827
+#: ../src/dialogs.py:5239
 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:4861
+#: ../src/dialogs.py:5273
 #, 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:4867
+#: ../src/dialogs.py:5279
 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:4874
+#: ../src/dialogs.py:5286
 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."
@@ -7447,7 +7666,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:4880
+#: ../src/dialogs.py:5292
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7455,19 +7674,19 @@ msgstr ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 
-#: ../src/dialogs.py:4945
+#: ../src/dialogs.py:5357
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4947
+#: ../src/dialogs.py:5359
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4949
+#: ../src/dialogs.py:5361
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4953
+#: ../src/dialogs.py:5365
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7483,24 +7702,24 @@ msgstr "Others"
 msgid "Conference"
 msgstr "Conference"
 
-#: ../src/disco.py:512
+#: ../src/disco.py:513
 msgid "Without a connection, you can not browse available services"
 msgstr "Without a connection, you can not browse available services"
 
-#: ../src/disco.py:589
+#: ../src/disco.py:600
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Service Discovery using account %s"
 
-#: ../src/disco.py:591
+#: ../src/disco.py:602
 msgid "Service Discovery"
 msgstr "Service Discovery"
 
-#: ../src/disco.py:741
+#: ../src/disco.py:758
 msgid "The service could not be found"
 msgstr "The service could not be found"
 
-#: ../src/disco.py:742
+#: ../src/disco.py:759
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7508,93 +7727,93 @@ msgstr ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
 
-#: ../src/disco.py:746 ../src/disco.py:1082
+#: ../src/disco.py:763 ../src/disco.py:1100
 msgid "The service is not browsable"
 msgstr "The service is not browsable"
 
-#: ../src/disco.py:747
+#: ../src/disco.py:764
 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:786 ../src/disco.py:796
+#: ../src/disco.py:804 ../src/disco.py:814
 msgid "Invalid Server Name"
 msgstr "Invalid Server Name"
 
-#: ../src/disco.py:850
+#: ../src/disco.py:868
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Browsing %(address)s using account %(account)s"
 
-#: ../src/disco.py:894
+#: ../src/disco.py:912
 msgid "_Browse"
 msgstr "_Browse"
 
-#: ../src/disco.py:1083
+#: ../src/disco.py:1101
 msgid "This service does not contain any items to browse."
 msgstr "This service does not contain any items to browse."
 
-#: ../src/disco.py:1323
+#: ../src/disco.py:1341
 msgid "_Execute Command"
 msgstr "_Execute Command"
 
-#: ../src/disco.py:1333 ../src/disco.py:1504
+#: ../src/disco.py:1351 ../src/disco.py:1522
 msgid "Re_gister"
 msgstr "Re_gister"
 
-#: ../src/disco.py:1545
+#: ../src/disco.py:1563
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Scanning %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1736
+#: ../src/disco.py:1754
 msgid "Users"
 msgstr "Users"
 
 #. Description column
-#: ../src/disco.py:1744
+#: ../src/disco.py:1762
 msgid "Description"
 msgstr "Description"
 
 #. Id column
-#: ../src/disco.py:1752
+#: ../src/disco.py:1770
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1817 ../src/gui_interface.py:3182
+#: ../src/disco.py:1835 ../src/gui_interface.py:2995
 msgid "Bookmark already set"
 msgstr "Bookmark already set"
 
-#: ../src/disco.py:1818 ../src/gui_interface.py:3183
+#: ../src/disco.py:1836 ../src/gui_interface.py:2996
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Group Chat \"%s\" is already in your bookmarks."
 
-#: ../src/disco.py:1827 ../src/gui_interface.py:3197
+#: ../src/disco.py:1845 ../src/gui_interface.py:3010
 msgid "Bookmark has been added successfully"
 msgstr "Bookmark has been added successfully"
 
-#: ../src/disco.py:1828 ../src/gui_interface.py:3198
+#: ../src/disco.py:1846 ../src/gui_interface.py:3011
 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:2039
+#: ../src/disco.py:2057
 msgid "Subscribed"
 msgstr "Subscribed"
 
-#: ../src/disco.py:2047
+#: ../src/disco.py:2065
 msgid "Node"
 msgstr "Node"
 
-#: ../src/disco.py:2111
+#: ../src/disco.py:2129
 msgid "New post"
 msgstr "New post"
 
-#: ../src/disco.py:2117
+#: ../src/disco.py:2135
 msgid "_Subscribe"
 msgstr "_Subscribe"
 
-#: ../src/disco.py:2123
+#: ../src/disco.py:2141
 msgid "_Unsubscribe"
 msgstr "_Unsubscribe"
 
@@ -7764,17 +7983,19 @@ msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Transform LaTeX expressions between $$ $$."
 
 #: ../src/features_window.py:95
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
-"in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
 "in the Advanced Configuration Editor."
 
 #: ../src/features_window.py:96
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
+"You have to set 'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 "Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
 "'use_latex' to True in the Advanced Configuration Editor."
@@ -7931,12 +8152,12 @@ msgstr "Description: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s wants to send you a file:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Cannot overwrite existing file \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -7944,22 +8165,22 @@ msgstr ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 msgid "This file already exists"
 msgstr "This file already exists"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 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:369 ../src/gtkgui_helpers.py:914
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Directory \"%s\" is not writable"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
 msgid "You do not have permission to create files in this directory."
 msgstr "You do not have permission to create files in this directory."
 
@@ -8062,28 +8283,28 @@ msgstr ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
 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:80
+#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
 msgid "command"
 msgstr "command"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "show help on command"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Shows or hides the roster window"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Pops up a window with the next pending event"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8091,6 +8312,13 @@ msgstr ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
+#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
+#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
+#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
 #: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
 #: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
 #: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
@@ -8102,41 +8330,33 @@ msgstr ""
 msgid "account"
 msgstr "account"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "show only contacts of the given account"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Prints a list of registered accounts"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
 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:109
+#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106
 #, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"accoun't previous status"
+msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "one of: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
-msgid "message"
-msgstr "message"
-
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "status message"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8144,43 +8364,20 @@ 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:117
-msgid "Changes the priority of account or accounts"
-msgstr "Changes the priority of account or accounts"
-
-#: ../src/gajim-remote.py:119
-msgid "priority"
-msgstr "priority"
-
-#: ../src/gajim-remote.py:119
-msgid "priority you want to give to the account"
-msgstr "priority you want to give to the account"
-
-#: ../src/gajim-remote.py:121
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-msgstr ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
 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:129
+#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
 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-plugin.py:118 ../src/gajim-remote-plugin.py:205
 #: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 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:134
-msgid "message content. The account must be specified or \"\""
-msgstr "message content. The account must be specified or \"\""
-
-#: ../src/gajim-remote.py:139
+#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
 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 "
@@ -8190,29 +8387,34 @@ msgstr ""
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 
+#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
 #: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID of the contact that will receive the message"
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
+#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "message contents"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "pgp key"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 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:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
+#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
 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:152
+#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
 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 "
@@ -8222,140 +8424,279 @@ msgstr ""
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "subject"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "message subject"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Sends new message to a groupchat you've joined."
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "JID of the room that will receive the message"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Gets detailed info on a contact"
 
+#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
+#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
 #: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
 #: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID of the contact"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Gets detailed info on a account"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Name of the account"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Sends file to a contact"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "file"
 msgstr "file"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "File path"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "if specified, file will be sent using this account"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Lists all preferences and their values"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sets value of 'key' to 'value'."
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "key=value"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 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:207
-msgid "Deletes a preference item"
-msgstr "Deletes a preference item"
+#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
+msgid "Deletes a preference item"
+msgstr "Deletes a preference item"
+
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "key"
+msgstr "key"
+
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "name of the preference to be deleted"
+msgstr "name of the preference to be deleted"
+
+#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+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-plugin.py:202 ../src/gajim-remote.py:218
+msgid "Removes contact from roster"
+msgstr "Removes contact from roster"
+
+#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+msgid "Adds contact to roster"
+msgstr "Adds contact to roster"
+
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+msgid "Adds new contact to this account"
+msgstr "Adds new contact to this account"
+
+#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+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-plugin.py:226
+#, fuzzy
+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-plugin.py:233 ../src/gajim-remote.py:249
+msgid "Returns number of unread messages"
+msgstr "Returns number of unread messages"
+
+#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+msgid "Opens 'Start Chat' dialog"
+msgstr "Opens 'Start Chat' dialogue"
+
+#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+msgid "Starts chat, using this account"
+msgstr "Starts chat, using this account"
+
+#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+msgid "Sends custom XML"
+msgstr "Sends custom XML"
+
+#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+msgid "XML to send"
+msgstr "XML to send"
+
+#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+
+#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
+msgid "Handle a xmpp:/ uri"
+msgstr "Handle a xmpp:/ uri"
+
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
+msgid "uri"
+msgstr "uri"
+
+#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+msgid "Join a MUC room"
+msgstr "Join a MUC room"
+
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+msgid "room"
+msgstr "room"
+
+#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+msgid "nick"
+msgstr "nick"
+
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+msgid "password"
+msgstr "password"
+
+#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+msgid "Check if Gajim is running"
+msgstr "Check if Gajim is running"
+
+#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
+#: ../src/gajim-remote.py:300
+msgid "Shows or hides the ipython window"
+msgstr "Shows or hides the ipython window"
+
+#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+msgid "Missing argument \"contact_jid\""
+msgstr "Missing argument \"contact_jid\""
+
+#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#, python-format
+msgid ""
+"'%s' is not in your roster.\n"
+"Please specify account for sending the message."
+msgstr ""
+"'%s' is not in your roster.\n"
+"Please specify account for sending the message."
+
+#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+msgid "You have no active account"
+msgstr "You have no active account"
 
-#: ../src/gajim-remote.py:209
-msgid "key"
-msgstr "key"
+#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+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:209
-msgid "name of the preference to be deleted"
-msgstr "name of the preference to be deleted"
+#: ../src/gajim-remote-plugin.py:412
+#, python-format
+msgid ""
+"Usage: %s %s %s \n"
+"\t %s"
+msgstr ""
+"Usage: %s %s %s \n"
+"\t %s"
 
-#: ../src/gajim-remote.py:213
-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-plugin.py:415 ../src/gajim-remote.py:435
+msgid "Arguments:"
+msgstr "Arguments:"
 
-#: ../src/gajim-remote.py:218
-msgid "Removes contact from roster"
-msgstr "Removes contact from roster"
+#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#, python-format
+msgid "%s not found"
+msgstr "%s not found"
 
-#: ../src/gajim-remote.py:227
-msgid "Adds contact to roster"
-msgstr "Adds contact to roster"
+#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
+#, python-format
+msgid ""
+"Usage: %s command [arguments]\n"
+"Command is one of:\n"
+msgstr ""
+"Usage: %s command [arguments]\n"
+"Command is one of:\n"
 
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "jid"
+#: ../src/gajim-remote-plugin.py:496
+#, fuzzy, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Too many arguments. \n"
+"Type \"%(basename)s help %(command)s\" for more info"
 
-#: ../src/gajim-remote.py:230
-msgid "Adds new contact to this account"
-msgstr "Adds new contact to this account"
+#: ../src/gajim-remote-plugin.py:500
+#, fuzzy, python-format
+msgid ""
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Argument \"%(arg)s\" is not specified. \n"
+"Type \"%(basename)s help %(command)s\" for more info"
 
-#: ../src/gajim-remote.py:235
-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-plugin.py:518 ../src/gajim-remote.py:540
+msgid "Wrong uri"
+msgstr "Wrong uri"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:109
+#, fuzzy
 msgid ""
-"Returns current status message (the global one unless account is specified)"
-msgstr ""
-"Returns current status message (the global one unless account is specified)"
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
+msgstr "one of: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:249
-msgid "Returns number of unread messages"
-msgstr "Returns number of unread messages"
+#: ../src/gajim-remote.py:117
+msgid "Changes the priority of account or accounts"
+msgstr "Changes the priority of account or accounts"
 
-#: ../src/gajim-remote.py:253
-msgid "Opens 'Start Chat' dialog"
-msgstr "Opens 'Start Chat' dialogue"
+#: ../src/gajim-remote.py:119
+msgid "priority"
+msgstr "priority"
 
-#: ../src/gajim-remote.py:255
-msgid "Starts chat, using this account"
-msgstr "Starts chat, using this account"
+#: ../src/gajim-remote.py:119
+msgid "priority you want to give to the account"
+msgstr "priority you want to give to the account"
 
-#: ../src/gajim-remote.py:259
-msgid "Sends custom XML"
-msgstr "Sends custom XML"
+#: ../src/gajim-remote.py:121
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
 
-#: ../src/gajim-remote.py:261
-msgid "XML to send"
-msgstr "XML to send"
+#: ../src/gajim-remote.py:134
+msgid "message content. The account must be specified or \"\""
+msgstr "message content. The account must be specified or \"\""
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:242
 msgid ""
-"Account in which the xml will be sent; if not specified, xml will be sent to "
-"all accounts"
+"Returns current status message (the global one unless account is specified)"
 msgstr ""
-"Account in which the xml will be sent; if not specified, xml will be sent to "
-"all accounts"
+"Returns current status message (the global one unless account is specified)"
 
 #: ../src/gajim-remote.py:268
 #, fuzzy
@@ -8376,14 +8717,6 @@ msgstr ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 
-#: ../src/gajim-remote.py:277
-msgid "Handle a xmpp:/ uri"
-msgstr "Handle a xmpp:/ uri"
-
-#: ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "uri"
-
 #: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr "URI to handle"
@@ -8396,30 +8729,14 @@ msgstr "Account in which you want to handle it"
 msgid "Message content"
 msgstr "Message content"
 
-#: ../src/gajim-remote.py:286
-msgid "Join a MUC room"
-msgstr "Join a MUC room"
-
-#: ../src/gajim-remote.py:288
-msgid "room"
-msgstr "room"
-
 #: ../src/gajim-remote.py:288
 msgid "Room JID"
 msgstr "Room JID"
 
-#: ../src/gajim-remote.py:289
-msgid "nick"
-msgstr "nick"
-
 #: ../src/gajim-remote.py:289
 msgid "Nickname to use"
 msgstr "Nickname to use"
 
-#: ../src/gajim-remote.py:290
-msgid "password"
-msgstr "password"
-
 #: ../src/gajim-remote.py:290
 msgid "Password to enter the room"
 msgstr "Password to enter the room"
@@ -8428,35 +8745,6 @@ msgstr "Password to enter the room"
 msgid "Account from which you want to enter the room"
 msgstr "Account from which you want to enter the room"
 
-#: ../src/gajim-remote.py:296
-msgid "Check if Gajim is running"
-msgstr "Check if Gajim is running"
-
-#: ../src/gajim-remote.py:300
-msgid "Shows or hides the ipython window"
-msgstr "Shows or hides the ipython window"
-
-#: ../src/gajim-remote.py:327
-msgid "Missing argument \"contact_jid\""
-msgstr "Missing argument \"contact_jid\""
-
-#: ../src/gajim-remote.py:348
-#, python-format
-msgid ""
-"'%s' is not in your roster.\n"
-"Please specify account for sending the message."
-msgstr ""
-"'%s' is not in your roster.\n"
-"Please specify account for sending the message."
-
-#: ../src/gajim-remote.py:351
-msgid "You have no active account"
-msgstr "You have no active account"
-
-#: ../src/gajim-remote.py:404
-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:431
 #, python-format
 msgid ""
@@ -8466,24 +8754,6 @@ msgstr ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:435
-msgid "Arguments:"
-msgstr "Arguments:"
-
-#: ../src/gajim-remote.py:439
-#, python-format
-msgid "%s not found"
-msgstr "%s not found"
-
-#: ../src/gajim-remote.py:445
-#, python-format
-msgid ""
-"Usage: %s command [arguments]\n"
-"Command is one of:\n"
-msgstr ""
-"Usage: %s command [arguments]\n"
-"Command is one of:\n"
-
 #: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
@@ -8506,10 +8776,6 @@ msgstr ""
 msgid "No uri given"
 msgstr ""
 
-#: ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Wrong uri"
-
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Theme"
@@ -8535,179 +8801,177 @@ msgstr "You cannot delete your current theme"
 msgid "Please first choose another for your current theme."
 msgstr "Please first choose another for your current theme."
 
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:170
 msgid "Sending private message failed"
 msgstr "Sending private message failed"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:171
+#: ../src/groupchat_control.py:172
 #, 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:450
+#: ../src/groupchat_control.py:455
 msgid "Insert Nickname"
 msgstr "Insert Nickname"
 
-#: ../src/groupchat_control.py:631
+#: ../src/groupchat_control.py:636
 msgid "Conversation with "
 msgstr "Conversation with "
 
-#: ../src/groupchat_control.py:633
+#: ../src/groupchat_control.py:638
 msgid "Continued conversation"
 msgstr "Continued conversation"
 
-#. Can be a message (see handle_event_gc_config_change in
-#. gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1272 ../src/gui_interface.py:1080
+#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Any occupant is allowed to see your full JID"
 
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1286
 msgid "Room logging is enabled"
 msgstr "Room logging is enabled"
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1288
 msgid "A new room has been created"
 msgstr "A new room has been created"
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1291
 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:1287
+#: ../src/groupchat_control.py:1297
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s has been kicked: %(reason)s"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1300
 #, 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:1300
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s has been banned: %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1312
 #, 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:1314 ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
 #, python-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
 
-#: ../src/groupchat_control.py:1330 ../src/gui_interface.py:919
+#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s is now known as %(new_nick)s"
 
-#: ../src/groupchat_control.py:1372 ../src/groupchat_control.py:1377
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1392
 #, 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:1374
+#: ../src/groupchat_control.py:1383
 msgid "affiliation changed"
 msgstr "affiliation changed"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1388
 msgid "room configuration changed to members-only"
 msgstr "room configuration changed to members-only"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1394
 msgid "system shutdown"
 msgstr "system shutdown"
 
-#: ../src/groupchat_control.py:1470
+#: ../src/groupchat_control.py:1477
 #, 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:1474
+#: ../src/groupchat_control.py:1481
 #, 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:1489
+#: ../src/groupchat_control.py:1496
 #, 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:1493
+#: ../src/groupchat_control.py:1500
 #, 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:1522
+#: ../src/groupchat_control.py:1530
 #, python-format
 msgid "%s has left"
 msgstr "%s has left"
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1535
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s has joined the group chat"
 
-#: ../src/groupchat_control.py:1529 ../src/gui_interface.py:946
+#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
 #: ../src/history_window.py:447 ../src/notify.py:234
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s is now %(status)s"
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1774
 #, 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:1761
+#: ../src/groupchat_control.py:1776
 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:1765 ../src/gui_interface.py:1216
-#: ../src/gui_interface.py:1992 ../src/gui_interface.py:2029
-#: ../src/gui_interface.py:2064 ../src/message_window.py:224
-#: ../src/roster_window.py:2739 ../src/roster_window.py:3399
-#: ../src/roster_window.py:4123
+#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
+#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
+#: ../src/gui_interface.py:1853 ../src/message_window.py:224
+#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
+#: ../src/roster_window.py:4195
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "Do _not ask me again"
 
-#: ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:1814
 msgid "Changing Subject"
 msgstr "Changing Subject"
 
-#: ../src/groupchat_control.py:1800
+#: ../src/groupchat_control.py:1815
 msgid "Please specify the new subject:"
 msgstr "Please specify the new subject:"
 
-#: ../src/groupchat_control.py:1807
+#: ../src/groupchat_control.py:1822
 msgid "Changing Nickname"
 msgstr "Changing Nickname"
 
-#: ../src/groupchat_control.py:1808
+#: ../src/groupchat_control.py:1823
 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:1839
+#: ../src/groupchat_control.py:1854
 #, python-format
 msgid "Destroying %s"
 msgstr "Destroying %s"
 
-#: ../src/groupchat_control.py:1840
+#: ../src/groupchat_control.py:1855
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8715,22 +8979,22 @@ msgstr ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 
-#: ../src/groupchat_control.py:1842
+#: ../src/groupchat_control.py:1857
 msgid "You may also enter an alternate venue:"
 msgstr "You may also enter an alternate venue:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2028
+#: ../src/groupchat_control.py:2046
 #, python-format
 msgid "Kicking %s"
 msgstr "Kicking %s"
 
-#: ../src/groupchat_control.py:2029 ../src/groupchat_control.py:2356
+#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
 msgid "You may specify a reason below:"
 msgstr "You may specify a reason below:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2355
+#: ../src/groupchat_control.py:2373
 #, python-format
 msgid "Banning %s"
 msgstr "Banning %s"
@@ -8756,53 +9020,62 @@ msgid "Details"
 msgstr "Details"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
+#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Error: cannot open %s for reading"
 
-#: ../src/gtkgui_helpers.py:400
+#: ../src/gtkgui_helpers.py:404
 msgid "Error reading file:"
 msgstr "Error reading file:"
 
-#: ../src/gtkgui_helpers.py:403
+#: ../src/gtkgui_helpers.py:407
 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:444
+#: ../src/gtkgui_helpers.py:448
 #, 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:818
+#: ../src/gtkgui_helpers.py:822
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim is not the default Jabber client"
 
-#: ../src/gtkgui_helpers.py:819
+#: ../src/gtkgui_helpers.py:823
 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:820
+#: ../src/gtkgui_helpers.py:824
 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:887
+#: ../src/gtkgui_helpers.py:891
 msgid "Extension not supported"
 msgstr "Extension not supported"
 
-#: ../src/gtkgui_helpers.py:888
+#: ../src/gtkgui_helpers.py:892
 #, 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:924
+#: ../src/gtkgui_helpers.py:928
 msgid "Save Image as..."
 msgstr "Save Image as..."
 
-#: ../src/gui_interface.py:140
+#. we are banned
+#. group chat does not exist
+#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
+#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
+#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
+#: ../src/gui_interface.py:348
+msgid "Unable to join group chat"
+msgstr "Unable to join group chat"
+
+#: ../src/gui_interface.py:138
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8813,58 +9086,92 @@ msgstr ""
 "occupant.\n"
 "Please specify another nickname below:"
 
-#: ../src/gui_interface.py:143
+#: ../src/gui_interface.py:141
 msgid "Always use this nickname when there is a conflict"
 msgstr "Always use this nickname when there is a conflict"
 
-#: ../src/gui_interface.py:159
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Do you accept this request?"
 
-#: ../src/gui_interface.py:161
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Do you accept this request on account %s?"
 
-#: ../src/gui_interface.py:164
+#: ../src/gui_interface.py:163
 #, 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/gui_interface.py:213 ../src/notify.py:493
+#: ../src/gui_interface.py:209 ../src/notify.py:493
 msgid "Connection Failed"
 msgstr "Connection Failed"
 
-#: ../src/gui_interface.py:606 ../src/gui_interface.py:610
+#: ../src/gui_interface.py:312
+#, 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/gui_interface.py:324
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr "Maximum number of users for %s has been reached"
+
+#: ../src/gui_interface.py:333
+#, python-format
+msgid "You are banned from group chat %s."
+msgstr "You are banned from group chat %s."
+
+#: ../src/gui_interface.py:338
+#, python-format
+msgid "Group chat %s does not exist."
+msgstr "Group chat %s does not exist."
+
+#: ../src/gui_interface.py:341
+msgid "Group chat creation is restricted."
+msgstr "Group chat creation is restricted."
+
+#: ../src/gui_interface.py:344
+#, 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/gui_interface.py:349
+#, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "You are not in the members list in groupchat %s."
+
+#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Error %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:621 ../src/gui_interface.py:636
+#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "error while sending %(message)s ( %(error)s )"
 
-#: ../src/gui_interface.py:663 ../src/notify.py:495
+#: ../src/gui_interface.py:540 ../src/notify.py:495
 msgid "Subscription request"
 msgstr "Subscription request"
 
-#: ../src/gui_interface.py:688
+#: ../src/gui_interface.py:565
 msgid "Authorization accepted"
 msgstr "Authorisation accepted"
 
-#: ../src/gui_interface.py:689
+#: ../src/gui_interface.py:566
 #, 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/gui_interface.py:702
+#: ../src/gui_interface.py:579
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contact \"%s\" removed subscription from you"
 
-#: ../src/gui_interface.py:703
+#: ../src/gui_interface.py:580
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8872,59 +9179,54 @@ msgstr ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
 
-#: ../src/gui_interface.py:727 ../src/notify.py:497
+#: ../src/gui_interface.py:604 ../src/notify.py:497
 msgid "Unsubscribed"
 msgstr "Unsubscribed"
 
-#: ../src/gui_interface.py:754
+#: ../src/gui_interface.py:631
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contact with \"%s\" cannot be established"
 
-#: ../src/gui_interface.py:1015
+#: ../src/gui_interface.py:859
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s has set the subject to %(subject)s"
 
-#: ../src/gui_interface.py:1083
+#: ../src/gui_interface.py:926
 msgid "Room now shows unavailable member"
 msgstr "Room now shows unavailable member"
 
-#: ../src/gui_interface.py:1085
+#: ../src/gui_interface.py:928
 msgid "room now does not show unavailable members"
 msgstr "room now does not show unavailable members"
 
-#: ../src/gui_interface.py:1087
+#: ../src/gui_interface.py:930
 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/gui_interface.py:1091
+#: ../src/gui_interface.py:934
 msgid "Room logging is now enabled"
 msgstr "Room logging is now enabled"
 
-#: ../src/gui_interface.py:1093
+#: ../src/gui_interface.py:936
 msgid "Room logging is now disabled"
 msgstr "Room logging is now disabled"
 
-#: ../src/gui_interface.py:1095
+#: ../src/gui_interface.py:938
 msgid "Room is now non-anonymous"
 msgstr "Room is now non-anonymous"
 
-#: ../src/gui_interface.py:1098
+#: ../src/gui_interface.py:941
 msgid "Room is now semi-anonymous"
 msgstr "Room is now semi-anonymous"
 
-#: ../src/gui_interface.py:1101
+#: ../src/gui_interface.py:944
 msgid "Room is now fully-anonymous"
 msgstr "Room is now fully-anonymous"
 
-#: ../src/gui_interface.py:1133
-#, 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/gui_interface.py:1180
+#: ../src/gui_interface.py:985
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -8932,23 +9234,23 @@ msgstr ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
 
-#: ../src/gui_interface.py:1182 ../src/gui_interface.py:1189
+#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
 msgid "You are currently connected without your OpenPGP key."
 msgstr "You are currently connected without your OpenPGP key."
 
-#: ../src/gui_interface.py:1184
+#: ../src/gui_interface.py:989
 msgid "Your passphrase is incorrect"
 msgstr "Your passphrase is incorrect"
 
-#: ../src/gui_interface.py:1188
+#: ../src/gui_interface.py:993
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "OpenGPG Passphrase Incorrect"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid "GPG key not trusted"
 msgstr "GPG key not trusted"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
@@ -8956,7 +9258,7 @@ msgstr ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
 
-#: ../src/gui_interface.py:1226
+#: ../src/gui_interface.py:1031
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not                 correctly started "
@@ -8965,19 +9267,19 @@ msgstr ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
 "variable probably not \t\t\t\tcorrectly set)"
 
-#: ../src/gui_interface.py:1330
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "New mail on %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1332
+#: ../src/gui_interface.py:1133
 #, 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/gui_interface.py:1345
+#: ../src/gui_interface.py:1146
 #, python-format
 msgid ""
 "\n"
@@ -8992,42 +9294,42 @@ msgstr ""
 "Subject: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1418
+#: ../src/gui_interface.py:1215
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s wants to send you a file."
 
-#: ../src/gui_interface.py:1455 ../src/roster_window.py:1856
+#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
 msgid "Remote contact stopped transfer"
 msgstr "Remote contact stopped transfer"
 
-#: ../src/gui_interface.py:1458 ../src/roster_window.py:1858
+#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
 msgid "Error opening file"
 msgstr "Error opening file"
 
-#: ../src/gui_interface.py:1490
+#: ../src/gui_interface.py:1287
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "You successfully received %(filename)s from %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1494
+#: ../src/gui_interface.py:1291
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: ../src/gui_interface.py:1507
+#: ../src/gui_interface.py:1304
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "You successfully sent %(filename)s to %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1511
+#: ../src/gui_interface.py:1308
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "File transfer of %(filename)s to %(name)s stopped."
 
-#: ../src/gui_interface.py:1623
+#: ../src/gui_interface.py:1426
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -9036,36 +9338,36 @@ msgstr ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 
-#: ../src/gui_interface.py:1630
+#: ../src/gui_interface.py:1433
 msgid "Unable to decrypt message"
 msgstr "Unable to decrypt message"
 
-#: ../src/gui_interface.py:1702
+#: ../src/gui_interface.py:1505
 msgid "Username Conflict"
 msgstr "Username Conflict"
 
-#: ../src/gui_interface.py:1703
+#: ../src/gui_interface.py:1506
 msgid "Please type a new username for your local account"
 msgstr "Please type a new username for your local account"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1519
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gui_interface.py:1729
+#: ../src/gui_interface.py:1532
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gui_interface.py:1740
+#: ../src/gui_interface.py:1543
 msgid "Error."
 msgstr "Error."
 
-#: ../src/gui_interface.py:1768
+#: ../src/gui_interface.py:1556
 msgid "Resource Conflict"
 msgstr "Resource Conflict"
 
-#: ../src/gui_interface.py:1769
+#: ../src/gui_interface.py:1557
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -9074,21 +9376,21 @@ msgstr ""
 "type a new one"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1816
+#: ../src/gui_interface.py:1604
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s wants to send you a file."
 
-#: ../src/gui_interface.py:1819
+#: ../src/gui_interface.py:1607
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "File Transfer Request"
 
-#: ../src/gui_interface.py:1927
+#: ../src/gui_interface.py:1716
 msgid "Error verifying SSL certificate"
 msgstr "Error verifying SSL certificate"
 
-#: ../src/gui_interface.py:1928
+#: ../src/gui_interface.py:1717
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9099,15 +9401,15 @@ msgstr ""
 "%(error)s\n"
 "Do you still want to connect to this server?"
 
-#: ../src/gui_interface.py:1936
+#: ../src/gui_interface.py:1725
 msgid "Ignore this error for this certificate."
 msgstr "Ignore this error for this certificate."
 
-#: ../src/gui_interface.py:1956
+#: ../src/gui_interface.py:1745
 msgid "SSL certificate error"
 msgstr "SSL certificate error"
 
-#: ../src/gui_interface.py:1957
+#: ../src/gui_interface.py:1746
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9124,12 +9426,12 @@ msgstr ""
 "\n"
 "Do you still want to connect and update the fingerprint of the certificate?"
 
-#: ../src/gui_interface.py:1987 ../src/gui_interface.py:2024
-#: ../src/gui_interface.py:2060
+#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
+#: ../src/gui_interface.py:1849
 msgid "Insecure connection"
 msgstr "Insecure connection"
 
-#: ../src/gui_interface.py:1988
+#: ../src/gui_interface.py:1777
 #, fuzzy
 msgid ""
 "You are about to connect to the server with an insecure connection. This "
@@ -9139,12 +9441,12 @@ 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/gui_interface.py:1991 ../src/gui_interface.py:2028
-#: ../src/gui_interface.py:2063
+#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
+#: ../src/gui_interface.py:1852
 msgid "Yes, I really want to connect insecurely"
 msgstr "Yes, I really want to connect insecurely"
 
-#: ../src/gui_interface.py:2025
+#: ../src/gui_interface.py:1814
 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?"
@@ -9152,7 +9454,7 @@ 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/gui_interface.py:2061
+#: ../src/gui_interface.py:1850
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9162,11 +9464,11 @@ msgstr ""
 "sure you want to do that?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2624 ../src/gui_interface.py:2647
+#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
 msgid "Emoticons disabled"
 msgstr "Emoticons disabled"
 
-#: ../src/gui_interface.py:2625
+#: ../src/gui_interface.py:2423
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -9174,7 +9476,7 @@ msgstr ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 
-#: ../src/gui_interface.py:2648
+#: ../src/gui_interface.py:2446
 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 "
@@ -9184,40 +9486,40 @@ msgstr ""
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
 "for more details."
 
-#: ../src/gui_interface.py:2679 ../src/roster_window.py:3560
+#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
 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/gui_interface.py:3058
+#: ../src/gui_interface.py:2871
 msgid "Could not save your settings and preferences"
 msgstr "Could not save your settings and preferences"
 
-#: ../src/gui_interface.py:3592
+#: ../src/gui_interface.py:3411
 msgid "Passphrase Required"
 msgstr "Passphrase Required"
 
-#: ../src/gui_interface.py:3593
+#: ../src/gui_interface.py:3412
 #, 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/gui_interface.py:3607
+#: ../src/gui_interface.py:3426
 msgid "GPG key expired"
 msgstr "GPG key expired"
 
-#: ../src/gui_interface.py:3608
+#: ../src/gui_interface.py:3427
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Your GPG key has expied, you will be connected to %s without OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3617
+#: ../src/gui_interface.py:3436
 msgid "Wrong Passphrase"
 msgstr "Wrong Passphrase"
 
-#: ../src/gui_interface.py:3618
+#: ../src/gui_interface.py:3437
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Please retype your GPG passphrase or press Cancel."
 
@@ -9255,6 +9557,11 @@ msgstr "Nickname"
 msgid "Message"
 msgstr "Message"
 
+#. holds subject
+#: ../src/history_manager.py:188 ../src/history_manager.py:219
+msgid "Subject"
+msgstr "Subject"
+
 #: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -9351,19 +9658,19 @@ msgstr "You are going to close several tabs"
 msgid "Do you really want to close them all?"
 msgstr "Do you really want to close them all?"
 
-#: ../src/message_window.py:484
+#: ../src/message_window.py:485
 msgid "Chats"
 msgstr "Chats"
 
-#: ../src/message_window.py:486
+#: ../src/message_window.py:487
 msgid "Group Chats"
 msgstr "Group Chats"
 
-#: ../src/message_window.py:488
+#: ../src/message_window.py:489
 msgid "Private Chats"
 msgstr "Private Chats"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:495
 msgid "Messages"
 msgstr "Messages"
 
@@ -9419,56 +9726,56 @@ msgstr "New Message from %(nickname)s"
 msgid "Ignore"
 msgstr "Ignore"
 
-#: ../src/profile_window.py:57
+#: ../src/profile_window.py:58
 msgid "Retrieving profile..."
 msgstr "Retrieving profile..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2935
+#: ../src/profile_window.py:111 ../src/roster_window.py:3001
 msgid "File is empty"
 msgstr "File is empty"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2938
+#: ../src/profile_window.py:114 ../src/roster_window.py:3004
 msgid "File does not exist"
 msgstr "File does not exist"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2940 ../src/roster_window.py:2951
+#: ../src/profile_window.py:128 ../src/profile_window.py:144
+#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
 msgid "Could not load image"
 msgstr "Could not load image"
 
-#: ../src/profile_window.py:214
+#: ../src/profile_window.py:215
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Personal Information"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:216
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Format: YYYY-MM-DD"
 
-#: ../src/profile_window.py:269
+#: ../src/profile_window.py:270
 msgid "Information received"
 msgstr "Information received"
 
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:341
 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:353
+#: ../src/profile_window.py:354
 msgid "Sending profile..."
 msgstr "Sending profile..."
 
-#: ../src/profile_window.py:368
+#: ../src/profile_window.py:369
 msgid "Information NOT published"
 msgstr "Information NOT published"
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:376
 msgid "vCard publication failed"
 msgstr "vCard publication failed"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:377
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9476,51 +9783,51 @@ msgstr ""
 "There was an error while publishing your personal information, try again "
 "later."
 
-#: ../src/roster_window.py:256 ../src/roster_window.py:1012
+#: ../src/roster_window.py:262 ../src/roster_window.py:1026
 msgid "Merged accounts"
 msgstr "Merged accounts"
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1942
 msgid "Authorization has been sent"
 msgstr "Authorisation has been sent"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1943
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Now \"%s\" will know your status."
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1966
 msgid "Subscription request has been sent"
 msgstr "Subscription request has been sent"
 
-#: ../src/roster_window.py:1944
+#: ../src/roster_window.py:1967
 #, 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:1958
+#: ../src/roster_window.py:1981
 msgid "Authorization has been removed"
 msgstr "Authorisation has been removed"
 
-#: ../src/roster_window.py:1959
+#: ../src/roster_window.py:1982
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Now \"%s\" will always see you as offline."
 
-#: ../src/roster_window.py:1986
+#: ../src/roster_window.py:2009
 msgid "GPG is not usable"
 msgstr "GPG is not usable"
 
-#: ../src/roster_window.py:1987
+#: ../src/roster_window.py:2010
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "You will be connected to %s without OpenPGP."
 
-#: ../src/roster_window.py:2199 ../src/roster_window.py:3496
+#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
 msgid "You are participating in one or more group chats"
 msgstr "You are participating in one or more group chats"
 
-#: ../src/roster_window.py:2200 ../src/roster_window.py:3497
+#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9528,38 +9835,38 @@ 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:2226
+#: ../src/roster_window.py:2249
 msgid "desync'ed"
 msgstr "desync'ed"
 
-#: ../src/roster_window.py:2288
+#: ../src/roster_window.py:2311
 msgid "Really quit Gajim?"
 msgstr "Really quit Gajim?"
 
-#: ../src/roster_window.py:2289
+#: ../src/roster_window.py:2312
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Are you sure you want to quit Gajim?"
 
-#: ../src/roster_window.py:2290
+#: ../src/roster_window.py:2313
 msgid "Always close Gajim"
 msgstr "Always close Gajim"
 
-#: ../src/roster_window.py:2373
+#: ../src/roster_window.py:2396
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Cancel file transfer"
 
-#: ../src/roster_window.py:2374
+#: ../src/roster_window.py:2397
 msgid ""
-"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2405 ../src/roster_window.py:2653
+#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
 msgid "You have unread messages"
 msgstr "You have unread messages"
 
-#: ../src/roster_window.py:2406
+#: ../src/roster_window.py:2429
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9567,16 +9874,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:2654
+#: ../src/roster_window.py:2720
 msgid "You must read them before removing this transport."
 msgstr "You must read them before removing this transport."
 
-#: ../src/roster_window.py:2657
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" will be removed"
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2724
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9584,11 +9891,11 @@ msgstr ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 
-#: ../src/roster_window.py:2661
+#: ../src/roster_window.py:2727
 msgid "Transports will be removed"
 msgstr "Transports will be removed"
 
-#: ../src/roster_window.py:2666
+#: ../src/roster_window.py:2732
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9597,11 +9904,11 @@ msgstr ""
 "You will no longer be able to send and receive messages to contacts from "
 "these transports: %s"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2800
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "You are about to block a contact. Are you sure you want to continue?"
 
-#: ../src/roster_window.py:2736
+#: ../src/roster_window.py:2802
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -9610,56 +9917,56 @@ msgstr ""
 "send you."
 
 #. it's jid
-#: ../src/roster_window.py:2827
+#: ../src/roster_window.py:2893
 msgid "Rename Contact"
 msgstr "Rename Contact"
 
-#: ../src/roster_window.py:2828
+#: ../src/roster_window.py:2894
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Enter a new nickname for contact %s"
 
-#: ../src/roster_window.py:2835
+#: ../src/roster_window.py:2901
 msgid "Rename Group"
 msgstr "Rename Group"
 
-#: ../src/roster_window.py:2836
+#: ../src/roster_window.py:2902
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Enter a new name for group %s"
 
-#: ../src/roster_window.py:2881
+#: ../src/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Remove Group"
 
-#: ../src/roster_window.py:2882
+#: ../src/roster_window.py:2948
 #, 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:2883
+#: ../src/roster_window.py:2949
 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:2922
+#: ../src/roster_window.py:2988
 msgid "Assign OpenPGP Key"
 msgstr "Assign OpenPGP Key"
 
-#: ../src/roster_window.py:2923
+#: ../src/roster_window.py:2989
 msgid "Select a key to apply to the contact"
 msgstr "Select a key to apply to the contact"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3372
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contact \"%s\" will be removed from your roster"
 
-#: ../src/roster_window.py:3308
+#: ../src/roster_window.py:3374
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 
-#: ../src/roster_window.py:3313
+#: ../src/roster_window.py:3379
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9668,11 +9975,11 @@ msgstr ""
 "her always seeing you as offline."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3319
+#: ../src/roster_window.py:3385
 msgid "Do you want to continue?"
 msgstr "Do you want to continue?"
 
-#: ../src/roster_window.py:3323
+#: ../src/roster_window.py:3389
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9680,16 +9987,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:3326
+#: ../src/roster_window.py:3392
 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:3330
+#: ../src/roster_window.py:3396
 msgid "Contacts will be removed from your roster"
 msgstr "Contacts will be removed from your roster"
 
-#: ../src/roster_window.py:3335
+#: ../src/roster_window.py:3401
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9698,14 +10005,14 @@ msgstr ""
 "By removing these contacts:%s\n"
 "you also remove authorisation resulting in them always seeing you as offline."
 
-#: ../src/roster_window.py:3393
+#: ../src/roster_window.py:3459
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want  to continue?"
 msgstr ""
 "You are about to send a custom status. Are you sure you want to continue?"
 
-#: ../src/roster_window.py:3395
+#: ../src/roster_window.py:3461
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -9714,19 +10021,19 @@ msgstr ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then they will see your global status."
 
-#: ../src/roster_window.py:3414
+#: ../src/roster_window.py:3480
 msgid "No account available"
 msgstr "No account available"
 
-#: ../src/roster_window.py:3415
+#: ../src/roster_window.py:3481
 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:4023
+#: ../src/roster_window.py:4095
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metacontacts storage not supported by your server"
 
-#: ../src/roster_window.py:4025
+#: ../src/roster_window.py:4097
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9734,13 +10041,13 @@ msgstr ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 
-#: ../src/roster_window.py:4117
+#: ../src/roster_window.py:4189
 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:4119
+#: ../src/roster_window.py:4191
 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 "
@@ -9750,23 +10057,23 @@ msgstr ""
 "is used when the same person has several Jabber accounts or transport "
 "accounts."
 
-#: ../src/roster_window.py:4234
+#: ../src/roster_window.py:4306
 msgid "Invalid file URI:"
 msgstr "Invalid file URI:"
 
-#: ../src/roster_window.py:4246
+#: ../src/roster_window.py:4318
 #, 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:4361
+#: ../src/roster_window.py:4433
 #, python-format
 msgid "Send %s to %s"
 msgstr "Send %s to %s"
 
-#: ../src/roster_window.py:4367
+#: ../src/roster_window.py:4439
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Make %s and %s metacontacts"
@@ -9776,143 +10083,143 @@ msgstr "Make %s and %s metacontacts"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4816 ../src/roster_window.py:4889
-#: ../src/roster_window.py:4898 ../src/statusicon.py:246
-#: ../src/statusicon.py:293 ../src/statusicon.py:299
+#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
+#: ../src/roster_window.py:4970 ../src/statusicon.py:263
+#: ../src/statusicon.py:310 ../src/statusicon.py:316
 #, python-format
 msgid "using account %s"
 msgstr "using account %s"
 
 #. add
-#: ../src/roster_window.py:4905
+#: ../src/roster_window.py:4977
 #, python-format
 msgid "to %s account"
 msgstr "to %s account"
 
 #. disco
-#: ../src/roster_window.py:4910
+#: ../src/roster_window.py:4982
 #, python-format
 msgid "using %s account"
 msgstr "using %s account"
 
-#: ../src/roster_window.py:4948 ../src/statusicon.py:309
+#: ../src/roster_window.py:5020 ../src/statusicon.py:326
 msgid "_Manage Bookmarks..."
 msgstr "_Manage Bookmarks..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4968
+#: ../src/roster_window.py:5040
 #, python-format
 msgid "of account %s"
 msgstr "of account %s"
 
-#: ../src/roster_window.py:5009
+#: ../src/roster_window.py:5081
 #, python-format
 msgid "for account %s"
 msgstr "for account %s"
 
-#: ../src/roster_window.py:5069 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
 msgid "_Change Status Message"
 msgstr "_Change Status Message"
 
-#: ../src/roster_window.py:5102
+#: ../src/roster_window.py:5174
 msgid "Publish Tune"
 msgstr "Publish Tune"
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5176
 #, fuzzy
 msgid "Publish Location"
 msgstr "Publish Tune"
 
-#: ../src/roster_window.py:5107
+#: ../src/roster_window.py:5179
 msgid "Configure Services..."
 msgstr "Configure Services..."
 
-#: ../src/roster_window.py:5252
+#: ../src/roster_window.py:5324
 msgid "_Maximize All"
 msgstr "_Maximise All"
 
-#: ../src/roster_window.py:5262 ../src/roster_window.py:5436
+#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
 msgid "Send Group M_essage"
 msgstr "Send Group M_essage"
 
-#: ../src/roster_window.py:5270
+#: ../src/roster_window.py:5342
 msgid "To all users"
 msgstr "To all users"
 
-#: ../src/roster_window.py:5274
+#: ../src/roster_window.py:5346
 msgid "To all online users"
 msgstr "To all online users"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5456
+#: ../src/roster_window.py:5528
 msgid "_Manage Contacts"
 msgstr "_Manage Contacts"
 
 #. Edit Groups
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5537
 msgid "Edit _Groups"
 msgstr "Edit _Groups"
 
 #. Send single message
-#: ../src/roster_window.py:5520
+#: ../src/roster_window.py:5592
 msgid "Send Single Message"
 msgstr "Send Single Message"
 
 #. Execute Command
-#: ../src/roster_window.py:5567
+#: ../src/roster_window.py:5639
 msgid "Execute Command..."
 msgstr "Execute Command..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5577
+#: ../src/roster_window.py:5649
 msgid "_Manage Transport"
 msgstr "_Manage Transport"
 
 #. Modify Transport
-#: ../src/roster_window.py:5586
+#: ../src/roster_window.py:5658
 msgid "_Modify Transport"
 msgstr "_Modify Transport"
 
 #. Rename
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5668
 msgid "_Rename"
 msgstr "_Rename"
 
-#: ../src/roster_window.py:5656
+#: ../src/roster_window.py:5728
 msgid "_Maximize"
 msgstr "_Maximise"
 
-#: ../src/roster_window.py:5665
+#: ../src/roster_window.py:5737
 msgid "_Reconnect"
 msgstr "_Reconnect"
 
-#: ../src/roster_window.py:5672
+#: ../src/roster_window.py:5744
 msgid "_Disconnect"
 msgstr "_Disconnect"
 
 #. History manager
-#: ../src/roster_window.py:5754
+#: ../src/roster_window.py:5833
 msgid "History Manager"
 msgstr "History Manager"
 
-#: ../src/roster_window.py:5765
+#: ../src/roster_window.py:5844
 msgid "_Join New Group Chat"
 msgstr "_Join New Group Chat"
 
-#: ../src/roster_window.py:5938
+#: ../src/roster_window.py:6019
 msgid "Change Status Message..."
 msgstr "Change Status Message..."
 
-#: ../src/search_window.py:94
+#: ../src/search_window.py:105
 msgid "Waiting for results"
 msgstr "Waiting for results"
 
-#: ../src/search_window.py:132 ../src/search_window.py:210
+#: ../src/search_window.py:143 ../src/search_window.py:220
 msgid "Error in received dataform"
 msgstr "Error in received dataform"
 
 #. No result
-#: ../src/search_window.py:166 ../src/search_window.py:202
+#: ../src/search_window.py:177 ../src/search_window.py:212
 msgid "No result"
 msgstr "No result"
 
@@ -9925,14 +10232,15 @@ msgstr "Disk WriteError"
 msgid "Subject: %s"
 msgstr "Subject: %s"
 
-#: ../src/session.py:433 ../src/session.py:468
+#: ../src/session.py:447 ../src/session.py:491
 msgid "Confirm these session options"
 msgstr "Confirm these session options"
 
-#: ../src/session.py:435
+#: ../src/session.py:448
 #, fuzzy, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
+"The remote client wants '\n"
+"                            'to negotiate an session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -9944,7 +10252,7 @@ msgstr ""
 "\n"
 "\tAre these options acceptable?"
 
-#: ../src/session.py:469
+#: ../src/session.py:492
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9959,16 +10267,16 @@ msgstr ""
 "\n"
 "Continue with the session?"
 
-#: ../src/statusicon.py:210
+#: ../src/statusicon.py:227
 msgid "_Change Status Message..."
 msgstr "_Change Status Message..."
 
-#: ../src/statusicon.py:322
+#: ../src/statusicon.py:339
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "in _roster"
 
-#: ../src/statusicon.py:333
+#: ../src/statusicon.py:350
 msgid "Hide this menu"
 msgstr "Hide this menu"
 
@@ -10107,32 +10415,32 @@ msgstr ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
 
-#: ../src/vcard.py:251
+#: ../src/vcard.py:265
 msgid "?Client:Unknown"
 msgstr "Unknown"
 
-#: ../src/vcard.py:253
+#: ../src/vcard.py:267
 msgid "?OS:Unknown"
 msgstr "Unknown"
 
-#: ../src/vcard.py:274
+#: ../src/vcard.py:288
 msgid "?Time:Unknown"
 msgstr "Unknown"
 
-#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
+#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
 #, python-format
 msgid "since %s"
 msgstr "since %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:345
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:349
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Affiliation:</b>"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:357
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10140,7 +10448,7 @@ msgstr ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:359
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10148,13 +10456,13 @@ msgstr ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:361
 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:349
+#: ../src/vcard.py:363
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10162,26 +10470,69 @@ msgstr ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 
-#: ../src/vcard.py:356
+#: ../src/vcard.py:370
 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:358
+#: ../src/vcard.py:372
 msgid "There is no pending subscription request."
 msgstr "There is no pending subscription request."
 
-#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
+#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
 msgid " resource with priority "
 msgstr " resource with priority "
 
-#~ msgid "_Available"
-#~ msgstr "_Available"
+#~ msgid "@"
+#~ msgstr "@"
+
+#~ msgid "_Disable showing event in systray"
+#~ msgstr "_Disable showing event in systray"
 
-#~ msgid "PEP node was not removed"
-#~ msgstr "PEP node was not removed"
+#~ msgid "_Show event in systray"
+#~ msgstr "_Show event in systray"
 
-#~ msgid "PEP node %(node)s was not removed: %(message)s"
-#~ msgstr "PEP node %(node)s was not removed: %(message)s"
+#, fuzzy
+#~ msgid "Always use GNOME default applications"
+#~ msgstr "Always use OS/X default applications"
+
+#, fuzzy
+#~ msgid "Always use Xfce default applications"
+#~ msgstr "Always use OS/X default applications"
+
+#, fuzzy
+#~ msgid "Autodetect on every Gajim startup"
+#~ msgstr "C_onnect on Gajim startup"
+
+#~ msgid "Show systray:"
+#~ msgstr "Show systray:"
+
+#~ msgid "Nickname not allowed: %s"
+#~ msgstr "Nickname not allowed: %s"
+
+#~ msgid "Room has been destroyed"
+#~ msgstr "Room has been destroyed"
+
+#~ msgid "You can join this room instead: %s"
+#~ msgstr "You can join this room instead: %s"
+
+#~ msgid "I would like to add you to my roster."
+#~ msgstr "I would like to add you to my roster."
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "we are now subscribed to %s"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "unsubscribe request from %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "we are now unsubscribed from %s"
+
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
 
 #~ msgid "Account Modification"
 #~ msgstr "Account Modification"
@@ -10291,40 +10642,9 @@ msgstr " resource with priority "
 #~ msgid "gtk-delete"
 #~ msgstr "gtk-delete"
 
-#~ msgid "Add this contact to roster (Ctrl+D)"
-#~ msgstr "Add this contact to roster (Ctrl+D)"
-
-#~ msgid "Bookmark this room (Ctrl+B)"
-#~ msgstr "Bookmark this room (Ctrl+B)"
-
-#~ msgid "Browse the chat history (Ctrl+H)"
-#~ msgstr "Browse the chat history (Ctrl+H)"
-
-#~ msgid "Change the room's subject (Alt+T)"
-#~ msgstr "Change the room's subject (Alt+T)"
-
-#~ msgid "Change your nickname (Ctrl+N)"
-#~ msgstr "Change your nickname (Ctrl+N)"
-
-#~ msgid "Invite contacts to the conversation (Ctrl+G)"
-#~ msgstr "Invite contacts to the conversation (Ctrl+G)"
-
 #~ msgid "Send a file (Ctrl+F)"
 #~ msgstr "Send a file (Ctrl+F)"
 
-#~ msgid "Show a list of emoticons (Alt+M)"
-#~ msgstr "Show a list of emoticons (Alt+M)"
-
-#~ msgid "Show a list of formattings"
-#~ msgstr "Show a list of formattings"
-
-#, fuzzy
-#~ msgid "Show a menu of advanced functions (Alt+D)"
-#~ msgstr "Show a menu of advanced functions (Alt+A)"
-
-#~ msgid "Show the contact's profile (Ctrl+I)"
-#~ msgstr "Show the contact's profile (Ctrl+I)"
-
 #~ msgid ""
 #~ "All chat states\n"
 #~ "Composing only\n"
@@ -10383,9 +10703,6 @@ msgstr " resource with priority "
 #~ msgid "gtk-cancel"
 #~ msgstr "gtk-cancel"
 
-#~ msgid "_Preferences"
-#~ msgstr "_Preferences"
-
 #~ msgid "_Quit"
 #~ msgstr "_Quit"
 
@@ -10911,9 +11228,6 @@ msgstr " resource with priority "
 #~ msgid "The auto not available status message"
 #~ msgstr "The auto not available status message"
 
-#~ msgid "Use t_rayicon (aka. notification area icon)"
-#~ msgstr "Use t_rayicon (aka. notification area icon)"
-
 #~ msgid ""
 #~ "When a new event (message, file transfer request etc..) is received, the "
 #~ "following methods may be used to inform you about it. Please note that "
@@ -11023,13 +11337,6 @@ msgstr " resource with priority "
 #~ "\n"
 #~ "From: %(from_address)s"
 
-#~ msgid ""
-#~ "Usage: %s %s %s \n"
-#~ "\t %s"
-#~ msgstr ""
-#~ "Usage: %s %s %s \n"
-#~ "\t %s"
-
 #~ msgid "Private Chat"
 #~ msgstr "Private Chat"
 
diff --git a/po/eo.po b/po/eo.po
index 11c32b009c621a128b2f4c3db8e4ebea0c3d4000..d00a5a2217c4cd83dbc8d17039057d668f1df71b 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -4,11 +4,15 @@
 #
 #
 # Sergio Ĥlutĉin <Sergey.Khlutchin@gmail.com>, 20, 2009.
+#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.10.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 11:28+0200\n"
+"POT-Creation-Date: 2010-10-01 20:39+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"
@@ -27,7 +31,7 @@ msgstr "Eniri en babilejon"
 msgid "_Add Contact..."
 msgstr "_Aldoni kontakton..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:17
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
 msgid "_Discover Services"
 msgstr "_Serĉi servojn"
 
@@ -49,7 +53,7 @@ msgstr "_Malfermi poŝtkeston de Gmail"
 msgid "_Personal Events"
 msgstr "Persona detalaĵoj"
 
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:23
+#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
 #, fuzzy
 msgid "_Start Chat..."
 msgstr "_Ekparoli"
@@ -84,76 +88,72 @@ msgid "<b>Please select a server</b>"
 msgstr ""
 
 #: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid "@"
-msgstr ""
-
-#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
 msgstr ""
 
-#: ../data/gui/account_creation_wizard_window.ui.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:10
 #, fuzzy
 msgid "Anon_ymous authentication"
 msgstr "Uzi aÅ­tentokontrolon"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Connect when I press Finish"
 msgstr "Konekti kiam vi premos Finigi"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Kontkreilo"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 #, fuzzy
 msgid "I already have an account I want to _use"
 msgstr "Mi jam havas konton, mi volas uzi ĝin"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I want to _register for a new account"
 msgstr "Mi volas registri novan konton"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:16
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 #: ../data/gui/accounts_window.ui.h:28
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Se markitas, Gajim memoros la pasvorton por tiu ĉi konto"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:17
+#: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Administri..."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:18
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
 #: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2263 ../src/config.py:2342
-#: ../src/config.py:2355 ../src/config.py:3596 ../src/config.py:3671
-#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513
-#: ../src/dialogs.py:526 ../src/roster_window.py:2890
-#: ../src/roster_window.py:2896 ../src/roster_window.py:2901
+#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
+#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
+#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
+#: ../src/dialogs.py:527 ../src/roster_window.py:2956
+#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
 msgid "None"
 msgstr "Neniu"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:19
+#: ../data/gui/account_creation_wizard_window.ui.h:18
 #, fuzzy
 msgid "Prox_y:"
 msgstr "Prokura servilo:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #: ../data/gui/accounts_window.ui.h:48
 msgid "Save pass_word"
 msgstr "Konservi pasvorton"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:21
+#: ../data/gui/account_creation_wizard_window.ui.h:20
 msgid "Set my profile when I connect"
 msgstr "Korekti vian personan informon kiam vi konektitos"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:22
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Use custom hostname/port"
 msgstr "Uzi propran servilnomon/pordon"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:23
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -161,35 +161,35 @@ msgstr ""
 "Vi bezonas havi konton por ke konekti\n"
 "al la jaber-reto."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-#: ../data/gui/roster_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:16
 msgid "_Advanced"
 msgstr "_Krome"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:25
 msgid "_Finish"
 msgstr "_Finigi"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:27
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 #, fuzzy
 msgid "_Hostname:"
 msgstr "Servilnomo: "
 
-#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #: ../data/gui/accounts_window.ui.h:62
 msgid "_Jabber ID:"
 msgstr "_Jabber-ID:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:28
 #: ../data/gui/accounts_window.ui.h:64
 msgid "_Password:"
 msgstr "_Pasvorto:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:29
 msgid "_Port:"
 msgstr "_Pordo:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:31
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Server:"
 msgstr "_Servilo:"
 
@@ -300,17 +300,17 @@ msgstr "Nomo:"
 #. No configured account
 #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
 #: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592
-#: ../src/notify.py:608
+#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
+#: ../src/notify.py:616
 msgid "Gajim"
 msgstr "Gajim"
 
 #. FIXME: Ugly workaround.
 #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
 #. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:61
-#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121
-#: ../src/roster_window.py:2832 ../src/roster_window.py:5379
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
+#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
 msgid "General"
 msgstr "Äœenerala"
 
@@ -366,7 +366,7 @@ msgstr "Informo pri vi, kiel estas en la servilo"
 
 #: ../data/gui/accounts_window.ui.h:35
 #: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:830
+#: ../src/dialogs.py:831
 msgid "Jabber ID:"
 msgstr "Jabber-ID:"
 
@@ -380,7 +380,7 @@ msgid "Mer_ge accounts"
 msgstr "_Unuigi kontojn"
 
 #: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2356
+#: ../src/config.py:2358
 msgid "No key selected"
 msgstr "Neniu ŝlosilo elektita"
 
@@ -407,7 +407,7 @@ msgid "Priority will change automatically according to your status."
 msgstr "Prioritato ŝanĝiĝos aŭtomate laŭ via stato."
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5329
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
 msgid "Re_name"
 msgstr "Re_nomigi"
 
@@ -643,40 +643,45 @@ msgstr "Forigas mesaĝon de la tago"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
 #, fuzzy
+msgid "Edit Archi_ving Preferences"
+msgstr "_Agordo"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#, fuzzy
 msgid "Edit _Privacy Lists..."
 msgstr "_Privataj listoj"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sends a message to users currently connected to this server"
 msgstr "Sendas mesaĝon al uzuloj nuntempe konektitaj al tiu ĉi servilo"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 #, fuzzy
 msgid "Set MOTD..."
 msgstr "Enigi tagmesaĝon"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Instalas mesaĝon de la tago"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Show _XML Console"
 msgstr "Montri _XML-konzolon"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "Renovigi tagmesaĝon"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "Renovigas mesaĝon de la tago"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:11
 msgid "_Administrator"
 msgstr "_Administristo"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:11
+#: ../data/gui/advanced_menuitem_menu.ui.h:12
 #, fuzzy
 msgid "_Send Server Message..."
 msgstr "_Sendi servilan mesaĝon"
@@ -711,7 +716,7 @@ msgid "All statuses"
 msgstr "ia ajn stato"
 
 #: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:233
+#: ../src/common/commands.py:106 ../src/common/helpers.py:239
 #: ../src/tooltips.py:193
 msgid "Away"
 msgstr "Fora"
@@ -764,7 +769,7 @@ msgid "Have "
 msgstr "Havas "
 
 #: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:249
 msgid "Invisible"
 msgstr "Nevidebla"
 
@@ -773,7 +778,7 @@ msgid "Launch a command"
 msgstr "Lanĉi komandon"
 
 #: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:216 ../src/tooltips.py:197
+#: ../src/common/helpers.py:222 ../src/tooltips.py:197
 msgid "Not Available"
 msgstr "Nedisponebla"
 
@@ -818,12 +823,13 @@ msgid "_Disable existing sound for this event"
 msgstr "_Malŝalti ekzistan sonon por tiu ĉi evento"
 
 #: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in roster"
+#, fuzzy
+msgid "_Disable showing event in notification area"
 msgstr "_Malŝalti eventmontron en kontaktlisto"
 
 #: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in systray"
-msgstr "_Malŝalti montron de evento en taskopleto"
+msgid "_Disable showing event in roster"
+msgstr "_Malŝalti eventmontron en kontaktlisto"
 
 #: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
@@ -834,12 +840,13 @@ msgid "_Open chat window with user"
 msgstr "Malfermi interparolan _fenestron por uzulo"
 
 #: ../data/gui/advanced_notifications_window.ui.h:35
-msgid "_Show event in roster"
+#, fuzzy
+msgid "_Show event in notification area"
 msgstr "Montri eventon en _kontaktlisto"
 
 #: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in systray"
-msgstr "Montri eventon en _taskopleto"
+msgid "_Show event in roster"
+msgstr "Montri eventon en _kontaktlisto"
 
 #: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
@@ -867,6 +874,45 @@ msgstr "Grupo"
 msgid "when I'm in"
 msgstr "dum mi estas je"
 
+#: ../data/gui/archiving_preferences_window.ui.h:1
+msgid "<i>Method Auto</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "<i>Method Local</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:3
+msgid "<i>Method Manual</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:4
+#, fuzzy
+msgid "Auto"
+msgstr "Aŭtomate aliĝi"
+
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Concede"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "Forbid"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:7
+#, fuzzy
+msgid "No"
+msgstr "Neniu"
+
+#: ../data/gui/archiving_preferences_window.ui.h:8
+#, fuzzy
+msgid "Prefer"
+msgstr "Agordo"
+
+#: ../data/gui/archiving_preferences_window.ui.h:9
+msgid "Yes"
+msgstr ""
+
 #: ../data/gui/atom_entry_window.ui.h:1
 #, fuzzy
 msgid "Entry:"
@@ -898,8 +944,8 @@ msgstr "Kontaktoj"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5348
-#: ../src/roster_window.py:5476 ../src/roster_window.py:5609
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
+#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
 msgid "_Unblock"
 msgstr ""
 
@@ -993,7 +1039,7 @@ msgid "_Start Chat"
 msgstr "_Ekparoli"
 
 #. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4184
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
 msgid "#"
 msgstr "n°"
 
@@ -1041,13 +1087,55 @@ msgstr ""
 msgid "9"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:13
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Aligas kontakton en kontaktliston"
+
 #: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
+msgid "Browse the chat history (Ctrl+H)"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:15
+#, fuzzy
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "atentas al la komunikado"
+
+#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+#, fuzzy
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Klaku por enigi mienon (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
+#, fuzzy
+msgid "Show a list of formattings"
+msgstr "Klaku por enigi mienon (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Klaku por enigi mienon (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:19
+#, fuzzy
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr "Aligas kontakton en kontaktliston"
+
+#: ../data/gui/chat_control.ui.h:20
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:21
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
 #: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Sendi"
 
-#: ../data/gui/chat_control.ui.h:15 ../data/gui/groupchat_control.ui.h:3
+#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
 msgid "label"
 msgstr ""
 
@@ -1101,8 +1189,8 @@ msgstr "Aranĝi _Grupojn"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5284
-#: ../src/roster_window.py:5444
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
+#: ../src/roster_window.py:5516
 msgid "In_vite to"
 msgstr "In_viti al"
 
@@ -1116,8 +1204,8 @@ msgstr "Kontaktoj"
 msgid "Remo_ve"
 msgstr "_Forigi"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5294
-#: ../src/roster_window.py:5533
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
+#: ../src/roster_window.py:5605
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Sendi propran XML"
@@ -1153,8 +1241,8 @@ msgid "_Allow him/her to see my status"
 msgstr "_Permesi al li/ŝi vidi vian staton"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5482 ../src/roster_window.py:5612
+#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
+#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
 msgid "_Block"
 msgstr ""
 
@@ -1164,8 +1252,8 @@ msgstr "_Malpermesi al li/ŝi vidi vian staton"
 
 #: ../data/gui/contact_context_menu.ui.h:20
 #: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:21
-#: ../src/roster_window.py:5683
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
+#: ../src/roster_window.py:5755
 msgid "_History"
 msgstr "_Historio"
 
@@ -1305,7 +1393,7 @@ msgstr "<b>Koloroj de babilstataj langetoj</b>"
 msgid "Account row"
 msgstr "Konto"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:925
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
 msgid "Bold"
 msgstr "Dika"
 
@@ -1343,7 +1431,7 @@ msgstr "Grupo"
 msgid "Inactive"
 msgstr "Neaktiva"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:926
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
 msgid "Italic"
 msgstr "Kursiva"
 
@@ -1394,7 +1482,7 @@ msgstr "Ŝanĝi _temon"
 msgid "Configure _Room..."
 msgstr "Administri _babilejon"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1782
+#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
 #, fuzzy
 msgid "_Bookmark"
 msgstr "Starigi legosignon por tiu babilejo"
@@ -1458,20 +1546,34 @@ msgstr "_Sendi privatan mesaĝon"
 msgid "_Voice"
 msgstr "_Voĉo"
 
+#: ../data/gui/groupchat_control.ui.h:1
+#, fuzzy
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Starigi legosignon por tiu babilejo"
+
+#: ../data/gui/groupchat_control.ui.h:3
+msgid "Change the room's subject (Alt+T)"
+msgstr ""
+
+#: ../data/gui/groupchat_control.ui.h:4
+#, fuzzy
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Ŝanĝi kaŝ_nomon"
+
 #: ../data/gui/groups_post_window.ui.h:1
 #, fuzzy
 msgid "Create new post"
 msgstr "Nova mesaĝo"
 
-#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
-msgid "From"
-msgstr "De"
+#: ../data/gui/groups_post_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:2
+msgid "From:"
+msgstr "De:"
 
-#. holds subject
-#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
-#: ../src/history_manager.py:219
-msgid "Subject"
-msgstr "Temo"
+#: ../data/gui/groups_post_window.ui.h:3
+#: ../data/gui/single_message_window.ui.h:7
+msgid "Subject:"
+msgstr "Temo:"
 
 #: ../data/gui/history_manager.ui.h:1
 #, fuzzy
@@ -1495,8 +1597,8 @@ msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Gajim administrilo de protokoloj"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3208
-#: ../src/dialogs.py:3305
+#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
+#: ../src/dialogs.py:3321
 msgid "Delete"
 msgstr "Forigi"
 
@@ -1550,12 +1652,75 @@ msgstr "Serĉi"
 msgid "_Log conversation history"
 msgstr "_Protokoli komunikadan historion"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
+msgid "approve"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:2
+msgid "body"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:3
+msgid "concede"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:4
+msgid "expire"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:5
+msgid "false"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:6
+msgid "forbid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:7
+#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+msgid "jid"
+msgstr "JID"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:8
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
+#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
+msgid "message"
+msgstr "mesaĝo"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
+msgid "oppose"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
+#, fuzzy
+msgid "otr"
+msgstr "_Retnodo:"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:11
+msgid "prefer"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:12
+msgid "require"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:13
+msgid "save"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:14
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
 msgid "Bro_wse Rooms"
 msgstr "_Rigardi"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2180
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
 msgid "Join Group Chat"
 msgstr "Eniri babilejen"
 
@@ -1593,8 +1758,8 @@ msgstr "Servilo:"
 msgid "_Bookmark this room"
 msgstr "Starigi legosignon por tiu babilejo"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1341
-#: ../src/disco.py:1786
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../src/disco.py:1804
 msgid "_Join"
 msgstr "_Aliĝi"
 
@@ -1705,6 +1870,75 @@ msgstr "_Salutnomo:"
 msgid "Passphrase"
 msgstr "Pasfrazo"
 
+#: ../data/gui/plugins_window.ui.h:1
+msgid "&lt;empty&gt;"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:2
+msgid "<empty>"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:3
+#, fuzzy
+msgid "Authors:"
+msgstr "_Permesi"
+
+#: ../data/gui/plugins_window.ui.h:4
+#, fuzzy
+msgid "Available"
+msgstr "_Enrete"
+
+#: ../data/gui/plugins_window.ui.h:5
+#, fuzzy
+msgid "Configure"
+msgstr "_DaÅ­rigi"
+
+#: ../data/gui/plugins_window.ui.h:6
+#, fuzzy
+msgid "Descrition:"
+msgstr "Priskribo: %s"
+
+#: ../data/gui/plugins_window.ui.h:7
+#, fuzzy
+msgid "Homepage:"
+msgstr "Hejmpaĝo:"
+
+#: ../data/gui/plugins_window.ui.h:8
+msgid "Install"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:9
+#, fuzzy
+msgid "Installed"
+msgstr "Malrapidas"
+
+#: ../data/gui/plugins_window.ui.h:10
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:11
+msgid "Plugins"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:12
+msgid "Uninstall"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:13
+#, fuzzy
+msgid "Version:"
+msgstr "Versio de GTK+:"
+
+#: ../data/gui/plugins_window.ui.h:14
+msgid "button"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:15
+msgid "homepage url"
+msgstr ""
+
 #: ../data/gui/popup_notification_window.ui.h:1
 #, fuzzy
 msgid "Event Type"
@@ -1840,126 +2074,109 @@ msgid "Always"
 msgstr "Fora"
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Always use GNOME default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:32
-msgid "Always use KDE default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:33
-msgid "Always use Xfce default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Demandi statmesaĝon kiam mi:"
 
-#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
 msgid "Audio / Video"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:33
 msgid "Audio input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Audio output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:38
-#, fuzzy
-msgid "Autodetect on every Gajim startup"
-msgstr "K_onekti dum lanĉo de Gajim"
-
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:35
 #, fuzzy
 msgid "Chat message:"
 msgstr "_Statmesaĝo:"
 
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:36
 #, 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/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:37
 #, fuzzy
 msgid "Composing only"
 msgstr "Tajpas mesaĝon"
 
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:38
 msgid "Configure color and font of the interface"
 msgstr "Agordo de koloro kaj tiparo de la fasado"
 
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
 msgid "Contact's message:"
 msgstr "_Statmesaĝo:"
 
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Kontaktnomo"
 
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:41
 #, fuzzy
 msgid "Custom"
 msgstr "<b>Propraj</b>"
 
-#: ../data/gui/preferences_window.ui.h:46
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Detached roster with chat grouped by account"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Detached roster with detached chats"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:45
 msgid "Detached roster with single chat"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
-#: ../src/config.py:671
+#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
+#: ../src/config.py:665
 msgid "Disabled"
 msgstr "malŝaltitaj"
 
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:47
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
 
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:48
 msgid "Display _extra email details"
 msgstr "Montri _kromajn detalojn pri retleteroj"
 
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:49
 #, fuzzy
 msgid "Display _location of contacts in roster"
 msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
 
-#: ../data/gui/preferences_window.ui.h:54
+#: ../data/gui/preferences_window.ui.h:50
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display a_vatars of contacts in roster"
 msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
 
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:52
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
 
-#: ../data/gui/preferences_window.ui.h:57
+#: ../data/gui/preferences_window.ui.h:53
 msgid "Display status _messages of contacts in roster"
 msgstr "Montri stat_mesaĝojn de kontaktoj en kontaktlisto"
 
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:54
 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 "
@@ -1969,7 +2186,7 @@ msgstr ""
 "povas havi kun kontakto. Tie ĉi vi povas specifi kiujn babilstatojn vi volas "
 "montri en interparolaj fenestroj."
 
-#: ../data/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:55
 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 "
@@ -1979,7 +2196,7 @@ msgstr ""
 "Tie ĉi vi povas specifi pri kiuj babilstatoj vi volas mesaĝi al "
 "interparolanto."
 
-#: ../data/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:56
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1987,36 +2204,36 @@ msgstr ""
 "Gajim avizos vin per ŝprucfenestro en la malsupra dekstra angulo de la "
 "ekrano pri kontaktoj kiu ĵus elsalutis"
 
-#: ../data/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:58
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "Kaŝas la butonojn en babileja fenestro."
 
-#: ../data/gui/preferences_window.ui.h:63
+#: ../data/gui/preferences_window.ui.h:59
 #, 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/gui/preferences_window.ui.h:64
+#: ../data/gui/preferences_window.ui.h:60
 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/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:61
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:66
+#: ../data/gui/preferences_window.ui.h:62
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -2024,7 +2241,7 @@ msgstr ""
 "Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
 "fenestro kaj en babilejoj"
 
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -2032,7 +2249,7 @@ msgstr ""
 "Se markitas, Gajim montros statmesaĝojn de kontaktoj sub la kontaktnomo en "
 "la kontaktlisto kaj en babilejoj"
 
-#: ../data/gui/preferences_window.ui.h:69
+#: ../data/gui/preferences_window.ui.h:65
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -2040,7 +2257,7 @@ msgstr ""
 "Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
 "fenestro kaj en babilejoj"
 
-#: ../data/gui/preferences_window.ui.h:70
+#: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the location of contacts in the roster window"
@@ -2048,7 +2265,7 @@ msgstr ""
 "Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
 "fenestro kaj en babilejoj"
 
-#: ../data/gui/preferences_window.ui.h:71
+#: ../data/gui/preferences_window.ui.h:67
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -2056,7 +2273,7 @@ msgstr ""
 "Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
 "fenestro kaj en babilejoj"
 
-#: ../data/gui/preferences_window.ui.h:72
+#: ../data/gui/preferences_window.ui.h:68
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -2064,14 +2281,14 @@ msgstr ""
 "Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
 "fenestro kaj en babilejoj"
 
-#: ../data/gui/preferences_window.ui.h:73
+#: ../data/gui/preferences_window.ui.h:69
 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/gui/preferences_window.ui.h:74
+#: ../data/gui/preferences_window.ui.h:70
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -2082,21 +2299,21 @@ msgstr ""
 "singarde, ĉar tio blokas ĉiujn mesaĝojn de ĉiuj kontaktoj kiuj mankas en via "
 "kontaktlisto"
 
-#: ../data/gui/preferences_window.ui.h:75
+#: ../data/gui/preferences_window.ui.h:71
 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/gui/preferences_window.ui.h:76
+#: ../data/gui/preferences_window.ui.h:72
 #, 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/gui/preferences_window.ui.h:77
+#: ../data/gui/preferences_window.ui.h:73
 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, "
@@ -2106,13 +2323,13 @@ msgstr ""
 "kontakto el MSN havos ekvivalentajn piktogramojn de MSN por statoj konekta, "
 "fora, okupata ktp...)"
 
-#: ../data/gui/preferences_window.ui.h:78
+#: ../data/gui/preferences_window.ui.h:74
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:79
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2120,104 +2337,104 @@ msgstr ""
 "Se ne malŝaltita, Gajim anstataŭigas ASCII mienojn, kiel \":)\", per "
 "ekvivalentaj animaciataj aÅ­ statikaj grafikaj mienoj"
 
-#: ../data/gui/preferences_window.ui.h:80
+#: ../data/gui/preferences_window.ui.h:76
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:81
+#: ../data/gui/preferences_window.ui.h:77
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "_Unu mesaĝfenestro:"
 
-#: ../data/gui/preferences_window.ui.h:82
+#: ../data/gui/preferences_window.ui.h:78
 msgid "Ma_nage..."
 msgstr "Admi_nistri..."
 
-#: ../data/gui/preferences_window.ui.h:83
+#: ../data/gui/preferences_window.ui.h:79
 #, fuzzy
 msgid "Never"
 msgstr "_Neniam"
 
-#: ../data/gui/preferences_window.ui.h:84
+#: ../data/gui/preferences_window.ui.h:80
 #, fuzzy
 msgid "Notifications"
 msgstr "Konta korektado"
 
-#: ../data/gui/preferences_window.ui.h:85
+#: ../data/gui/preferences_window.ui.h:81
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Avizi min pri kontaktoj kiuj: "
 
-#: ../data/gui/preferences_window.ui.h:86
+#: ../data/gui/preferences_window.ui.h:82
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Avizi min pri kontaktoj kiuj: "
 
-#: ../data/gui/preferences_window.ui.h:87
+#: ../data/gui/preferences_window.ui.h:83
 #, fuzzy
 msgid "Notify me about it"
 msgstr "_Avizi min pri tio"
 
-#: ../data/gui/preferences_window.ui.h:88
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notify on new _GMail email"
 msgstr "Avizi pri novaj _Gmail-leteroj"
 
-#: ../data/gui/preferences_window.ui.h:89
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Only when pending events"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:90
+#: ../data/gui/preferences_window.ui.h:86
 #, fuzzy
 msgid "Personal Events"
 msgstr "Persona detalaĵoj"
 
-#: ../data/gui/preferences_window.ui.h:91
+#: ../data/gui/preferences_window.ui.h:87
 msgid "Play _sounds"
 msgstr "Ludi _sonojn"
 
-#: ../data/gui/preferences_window.ui.h:92
+#: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
 msgid "Pop it up"
 msgstr "_AntaÅ­igi la fenestron"
 
-#: ../data/gui/preferences_window.ui.h:93
+#: ../data/gui/preferences_window.ui.h:89
 msgid "Preferences"
 msgstr "Agordo"
 
-#: ../data/gui/preferences_window.ui.h:94
+#: ../data/gui/preferences_window.ui.h:90
 msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:96
+#: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
 msgid "STUN server:"
 msgstr "Servilo:"
 
-#: ../data/gui/preferences_window.ui.h:97
+#: ../data/gui/preferences_window.ui.h:93
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Montri nur en _kontaktlisto"
+msgid "Show notification area icon:"
+msgstr "Uzi pletpiktogramon"
 
-#: ../data/gui/preferences_window.ui.h:98
+#: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
-msgid "Show systray:"
-msgstr "Montri eventon en _taskopleto"
+msgid "Show only in roster"
+msgstr "Montri nur en _kontaktlisto"
 
-#: ../data/gui/preferences_window.ui.h:99
+#: ../data/gui/preferences_window.ui.h:95
 msgid "Sign _in"
 msgstr "E_nsalutas"
 
-#: ../data/gui/preferences_window.ui.h:100
+#: ../data/gui/preferences_window.ui.h:96
 msgid "Sign _out"
 msgstr "E_lsalutas"
 
-#: ../data/gui/preferences_window.ui.h:101
+#: ../data/gui/preferences_window.ui.h:97
 msgid "Single window for everything"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:102
+#: ../data/gui/preferences_window.ui.h:98
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2225,30 +2442,30 @@ msgstr ""
 "Iuj mesaĝoj povas enteni tekstatributojn (aranĝo, koloro k.t.p.). Se "
 "markitas, Gajim simple montros krudan mesaĝan tekston."
 
-#: ../data/gui/preferences_window.ui.h:103
+#: ../data/gui/preferences_window.ui.h:99
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "_Ordigi kontaktojn per stato"
 
-#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
 msgid "Status"
 msgstr "Stato"
 
-#: ../data/gui/preferences_window.ui.h:105
+#: ../data/gui/preferences_window.ui.h:101
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "DefaÅ­lta stata p_iktogramaro:"
 
-#: ../data/gui/preferences_window.ui.h:106
+#: ../data/gui/preferences_window.ui.h:102
 #, fuzzy
 msgid "Style"
 msgstr "Malrapidas"
 
-#: ../data/gui/preferences_window.ui.h:107
+#: ../data/gui/preferences_window.ui.h:103
 msgid "T_heme:"
 msgstr "_Etoso:"
 
-#: ../data/gui/preferences_window.ui.h:108
+#: ../data/gui/preferences_window.ui.h:104
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2256,7 +2473,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:111
+#: ../data/gui/preferences_window.ui.h:107
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2264,131 +2481,135 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:114
+#: ../data/gui/preferences_window.ui.h:110
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Uzi _transportilajn piktogramarojn"
 
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:111
+msgid "Use default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:112
 msgid "Use system _default"
 msgstr "Uzi sisteman defaÅ­lton"
 
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:113
 msgid "Video framerate"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:117
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Video input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:118
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Video output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:119
+#: ../data/gui/preferences_window.ui.h:116
 msgid "Video size"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:120
+#: ../data/gui/preferences_window.ui.h:117
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Kiam ricevas novan eventon"
 
-#: ../data/gui/preferences_window.ui.h:121
+#: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
 msgid "Your message:"
 msgstr "Erara mesaĝo: %s"
 
-#: ../data/gui/preferences_window.ui.h:122
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your nickname:"
 msgstr "Antaŭ kaŝnomo:"
 
-#: ../data/gui/preferences_window.ui.h:123
+#: ../data/gui/preferences_window.ui.h:120
 #, fuzzy
 msgid "_Away after:"
 msgstr "AÅ­tomate _fora post:"
 
-#: ../data/gui/preferences_window.ui.h:124
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Rigardilo:"
 
-#: ../data/gui/preferences_window.ui.h:125
+#: ../data/gui/preferences_window.ui.h:122
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "Montrataj babilstataj _avizoj:"
 
-#: ../data/gui/preferences_window.ui.h:126
+#: ../data/gui/preferences_window.ui.h:123
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Mienoj:"
 
-#: ../data/gui/preferences_window.ui.h:127
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_File manager:"
 msgstr "_Dosieradministrilo:"
 
-#: ../data/gui/preferences_window.ui.h:128
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_Highlight misspelled words"
 msgstr "_Emfazi misskribajn vortojn"
 
-#: ../data/gui/preferences_window.ui.h:129
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignori eventojn de kontaktoj kiuj mankas en kontaktlisto"
 
-#: ../data/gui/preferences_window.ui.h:130
+#: ../data/gui/preferences_window.ui.h:127
 #, fuzzy
 msgid "_Ignore rich content in incoming messages"
 msgstr "Ignori formatadon en venantaj mesaĝoj"
 
-#: ../data/gui/preferences_window.ui.h:131
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Log status changes of contacts"
 msgstr "_Protokoli statŝanĝojn de kontaktoj"
 
-#: ../data/gui/preferences_window.ui.h:132
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Mail client:"
 msgstr "Ret_poŝtkliento:"
 
-#: ../data/gui/preferences_window.ui.h:133
+#: ../data/gui/preferences_window.ui.h:130
 #, fuzzy
 msgid "_Not available after:"
 msgstr "AÅ­tomate nedisponebla post:"
 
-#: ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Open..."
 msgstr "_Malfermi..."
 
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Reset to Default Colors"
 msgstr "_Reŝargi kolorojn per defaŭlto"
 
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:133
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "Montrataj babilstataj _avizoj:"
 
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Status message:"
 msgstr "_Statmesaĝo:"
 
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:140
+#: ../data/gui/preferences_window.ui.h:137
 #, fuzzy
 msgid "in _group chats"
 msgstr "Eniri en babilejon"
 
-#: ../data/gui/preferences_window.ui.h:141
+#: ../data/gui/preferences_window.ui.h:138
 #, fuzzy
 msgid "in _roster"
 msgstr "Mankas en kontaktlisto"
 
-#: ../data/gui/preferences_window.ui.h:142
+#: ../data/gui/preferences_window.ui.h:139
 msgid "minutes"
 msgstr "minutoj"
 
@@ -2441,7 +2662,7 @@ msgstr "Jabber-ID"
 msgid "Order:"
 msgstr "Ordnumero:"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3436
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
 msgid "Privacy List"
 msgstr "Privata listo"
 
@@ -2676,8 +2897,8 @@ msgstr "Forigi konton el Gajim kaj el _servilo"
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5492 ../src/roster_window.py:5622
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
+#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
 msgid "_Remove"
 msgstr "_Forigi"
 
@@ -2723,59 +2944,63 @@ msgid "Help online"
 msgstr "Helpo reta"
 
 #: ../data/gui/roster_window.ui.h:8
+msgid "P_lugins"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:9
 msgid "Profile, A_vatar"
 msgstr "_Vizitkarto"
 
-#: ../data/gui/roster_window.ui.h:9
+#: ../data/gui/roster_window.ui.h:10
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "Montri _senkonektajn kontaktojn"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
 msgid "Show Trans_ports"
 msgstr "Montri Trans_portilojn"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
 msgid "Show _Offline Contacts"
 msgstr "Montri _senkonektajn kontaktojn"
 
-#: ../data/gui/roster_window.ui.h:12 ../src/statusicon.py:326
+#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
 msgid "Show _Roster"
 msgstr "Montri _kontaktliston"
 
-#: ../data/gui/roster_window.ui.h:13
+#: ../data/gui/roster_window.ui.h:14
 #, 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/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
 #: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Agoj"
 
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
 msgid "_Contents"
 msgstr "_Enhavo"
 
-#: ../data/gui/roster_window.ui.h:18 ../src/disco.py:1502
+#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
 msgid "_Edit"
 msgstr "A_dministri"
 
-#: ../data/gui/roster_window.ui.h:19
+#: ../data/gui/roster_window.ui.h:20
 msgid "_FAQ"
 msgstr "_Respondaro"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Help"
 msgstr "_Helpo"
 
-#: ../data/gui/roster_window.ui.h:22
+#: ../data/gui/roster_window.ui.h:23
 #, fuzzy
 msgid "_Send Single Message..."
 msgstr "Sendi unuopan _mesaĝon..."
 
-#: ../data/gui/roster_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:25
 msgid "_View"
 msgstr "_Vido"
 
@@ -2793,12 +3018,12 @@ msgid "_Add contact"
 msgstr "Aldoni _kontakton"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5634
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
 #, fuzzy
 msgid "_Information"
 msgstr "Kontakta informo"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1353
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
 msgid "_Search"
 msgstr "_Serĉi"
 
@@ -2818,10 +3043,6 @@ msgstr "Registri ĉe"
 msgid "_Cancel"
 msgstr "_Nuligi"
 
-#: ../data/gui/single_message_window.ui.h:2
-msgid "From:"
-msgstr "De:"
-
 #: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Respondi al tiu mesaĝo"
@@ -2838,10 +3059,6 @@ msgstr "Sendi mesaĝon"
 msgid "Send message and close window"
 msgstr "Sendi mesaĝon kaj fermi fenestron"
 
-#: ../data/gui/single_message_window.ui.h:7
-msgid "Subject:"
-msgstr "Temo:"
-
 #: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Al:"
@@ -3061,26 +3278,36 @@ msgstr "Gajim tujmesaĝilo"
 msgid "Jabber IM Client"
 msgstr "Jabber-tujmesaĝilo"
 
-#: ../src/adhoc_commands.py:314
+#: ../src/adhoc_commands.py:323
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Kontakta informo"
 
-#: ../src/adhoc_commands.py:315
+#: ../src/adhoc_commands.py:324
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:351 ../src/adhoc_commands.py:374
+#: ../src/adhoc_commands.py:370
+#, fuzzy
+msgid "Invalid Form"
+msgstr "Malkorekta rikordo"
+
+#: ../src/adhoc_commands.py:371
+#, fuzzy
+msgid "The form is not filled correctly."
+msgstr "La babileja jabber-ID enhavas nepermesajn signojn."
+
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:360
+#: ../src/adhoc_commands.py:399
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:471
+#: ../src/adhoc_commands.py:513
 msgid "Service returned an error."
 msgstr ""
 
@@ -3105,7 +3332,7 @@ msgstr "Entjera"
 msgid "Text"
 msgstr "Teksto"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:945
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
 msgid "Color"
 msgstr "Koloro"
 
@@ -3142,235 +3369,235 @@ msgstr[1] ""
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "English"
 msgstr "Angla"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Belarusian"
 msgstr "Belorusa"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Bulgarian"
 msgstr "Bulgara"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Breton"
 msgstr "Bretona"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Czech"
 msgstr "Ĉeĥa"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "German"
 msgstr "Germana"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Greek"
 msgstr "Greka"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "British"
 msgstr "Brita"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Spanish"
 msgstr "Hispana"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Basque"
 msgstr "EÅ­ska"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "French"
 msgstr "Franca"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Croatian"
 msgstr "Kroata"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Italian"
 msgstr "Itala"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian (b)"
 msgstr "Norvega (b)"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Dutch"
 msgstr "Nederlanda"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian"
 msgstr "Norvega"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Polish"
 msgstr "Pola"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Portuguese"
 msgstr "Portugala"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Brazilian Portuguese"
 msgstr "Brazila Portugala"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Russian"
 msgstr "Rusa"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Serbian"
 msgstr "Germana"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Slovak"
 msgstr "Slovaka"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Swedish"
 msgstr "Sveda"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Chinese (Ch)"
 msgstr "Ĉina (Ch)"
 
-#: ../src/chat_control.py:479
+#: ../src/chat_control.py:496
 msgid "Spelling language"
 msgstr "Lingvo de literumado"
 
 #. we are not connected
-#: ../src/chat_control.py:511 ../src/chat_control.py:720
+#: ../src/chat_control.py:528 ../src/chat_control.py:737
 msgid "A connection is not available"
 msgstr "Konekto mankas"
 
-#: ../src/chat_control.py:512 ../src/chat_control.py:721
+#: ../src/chat_control.py:529 ../src/chat_control.py:738
 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:927
+#: ../src/chat_control.py:944
 #, fuzzy
 msgid "Underline"
 msgstr "Substreko"
 
-#: ../src/chat_control.py:928
+#: ../src/chat_control.py:945
 #, fuzzy
 msgid "Strike"
 msgstr "Kaŝnomo"
 
-#: ../src/chat_control.py:951
+#: ../src/chat_control.py:968
 #, fuzzy
 msgid "Font"
 msgstr "_Tiparo:"
 
-#: ../src/chat_control.py:960
+#: ../src/chat_control.py:977
 #, fuzzy
 msgid "Clear formating"
 msgstr "Kontakta informo"
 
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1055
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:1039
+#: ../src/chat_control.py:1056
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1503 ../src/chat_control.py:1987
+#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Ĉifrado ebligata"
 
 #. Add to roster
-#: ../src/chat_control.py:1528 ../src/common/contacts.py:158
+#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
 #: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:245 ../src/dialogs.py:1064 ../src/dialogs.py:2078
-#: ../src/dialogs.py:2107 ../src/gui_interface.py:674
+#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
+#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
 #: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1610 ../src/roster_window.py:1612
-#: ../src/roster_window.py:1942 ../src/roster_window.py:3289
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
+#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
+#: ../src/roster_window.py:3382
 msgid "Not in Roster"
 msgstr "Mankas en kontaktlisto"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1575
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Listo de aktivaj, plenumitaj kaj haltitaj dosiertransmetoj"
 
-#: ../src/chat_control.py:1561
+#: ../src/chat_control.py:1578
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1656
+#: ../src/chat_control.py:1677
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:1869
 #, 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:1967 ../src/dialogs.py:4866
+#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1968
+#: ../src/chat_control.py:1991
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1977
+#: ../src/chat_control.py:2000
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Ĉifrado malebligata"
 
-#: ../src/chat_control.py:2003
+#: ../src/chat_control.py:2026
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:2028
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2051
 #, fuzzy
 msgid "and authenticated"
 msgstr "Uzi aÅ­tentokontrolon"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2032
+#: ../src/chat_control.py:2055
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Uzi aÅ­tentokontrolon"
@@ -3378,58 +3605,66 @@ 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:2039
+#: ../src/chat_control.py:2062
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2182
+#: ../src/chat_control.py:2205
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2191
+#: ../src/chat_control.py:2215
+msgid "This session WILL be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2217
+msgid "This session WILL NOT be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2226
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Tiu ĉi mesaĝo estas ĉifrita]"
 
-#: ../src/chat_control.py:2194
+#: ../src/chat_control.py:2229
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2196
+#: ../src/chat_control.py:2231
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2201
+#: ../src/chat_control.py:2236
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2203
+#: ../src/chat_control.py:2238
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Ĉifrado malebligata"
 
-#: ../src/chat_control.py:2241 ../src/chat_control.py:2254
+#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Tiu ĉi mesaĝo estas ĉifrita]"
 
-#: ../src/chat_control.py:2247
+#: ../src/chat_control.py:2288
 #, 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:2519
+#: ../src/chat_control.py:2566
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Vi ĵus ricevis novan mesaĝon de \"%s\""
 
-#: ../src/chat_control.py:2520
+#: ../src/chat_control.py:2567
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3437,22 +3672,20 @@ msgstr ""
 "Se vi fermos tiun ĉi slipon kaj la historio estas malŝalta, tiu ĉi mesaĝo "
 "perdiĝos."
 
-#: ../src/chat_control.py:2663 ../src/common/connection_handlers.py:1635
-#: ../src/common/connection_handlers.py:1758
-#: ../src/common/connection_handlers.py:1960
-#: ../src/common/connection_handlers.py:2110 ../src/common/connection.py:452
+#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
 #: ../src/gajim.py:159 ../src/session.py:138
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2664
+#: ../src/chat_control.py:2714
 #, 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:2906
+#: ../src/chat_control.py:2962
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s nun estas %(status)s"
@@ -3466,28 +3699,28 @@ msgstr "kreadas protokolan datumbazon"
 msgid "creating cache database"
 msgstr "kreadas protokolan datumbazon"
 
-#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
-#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
-#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
-#: ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
 #, 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:275 ../src/common/check_paths.py:282
-#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
-#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
-#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:333
+#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
+#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
+#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
 msgid "Gajim will now exit"
 msgstr "Gajim fermos tuj"
 
-#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
+#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
 #, 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:342
+#: ../src/common/check_paths.py:351
 #, python-format
 msgid "creating %s directory"
 msgstr "kreas dosierujon %s"
@@ -3559,9 +3792,9 @@ msgstr ""
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:801
-#: ../src/roster_window.py:1614 ../src/roster_window.py:1616
-#: ../src/roster_window.py:5251
+#: ../src/common/helpers.py:57 ../src/roster_window.py:815
+#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
+#: ../src/roster_window.py:5323
 #, fuzzy
 msgid "Groupchats"
 msgstr "Babilejoj"
@@ -3624,7 +3857,8 @@ msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
 #: ../src/common/config.py:88
-msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgid ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
 #: ../src/common/config.py:93
@@ -3678,9 +3912,9 @@ msgid ""
 msgstr "Listo (spacetseparita) de lineoj (kontoj kaj grupoj) kiuj rulitas."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:501
-#: ../src/common/optparser.py:290 ../src/common/optparser.py:486
-#: ../src/common/optparser.py:520 ../src/gui_interface.py:3370
+#: ../src/common/config.py:106 ../src/common/config.py:505
+#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
+#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
 #, fuzzy
 msgid "default"
 msgstr "DefaÅ­lte"
@@ -3901,7 +4135,8 @@ msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC normo diras: KiB = 1024 bajtoj, KB = 1000 bajtoj."
 
 #: ../src/common/config.py:197
-msgid "Notify of events in the system trayicon."
+#, fuzzy
+msgid "Notify of events in the notification area."
 msgstr "Avizi eventojn en la sistema taskopleta bildeto."
 
 #: ../src/common/config.py:203
@@ -3935,9 +4170,10 @@ msgstr ""
 "Listo de punktokome separataj vortoj, kiuj estos emfazataj en babilejo."
 
 #: ../src/common/config.py:221
+#, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
+"setting is taken into account only if notification icon is used."
 msgstr ""
 "Se \"True\", finas Gajim kiam oni alklakas fenestran sisteman butonon X. "
 "Tiun ĉi parametron mi konsideras nur se pleta piktogramo uzatas."
@@ -4208,7 +4444,7 @@ msgstr ""
 #: ../src/common/config.py:270
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
-"systray icon."
+"notification icon."
 msgstr ""
 
 #: ../src/common/config.py:271
@@ -4379,111 +4615,122 @@ msgstr ""
 msgid "Message that is sent to contacts you want to add"
 msgstr "Bonvolu pleni la datumon pri kontakto, kiun vi volas aldoni"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:374
+msgid "Last time we syncronized with logs from server."
+msgstr ""
+
+#: ../src/common/config.py:436
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Ĉu OpenPGP estas ŝaltita por tiu ĉi kontakto?"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:437 ../src/common/config.py:440
+#: ../src/common/config.py:438 ../src/common/config.py:441
 msgid "Language for which we want to check misspelled words"
 msgstr "Lingvo por kiu ni volas kontroli mistajpajn vortojn"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:447
 msgid "all or space separated status"
 msgstr "'all' aÅ­ spacetseparitaj statoj"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:448
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', aÅ­ 'both'"
 
-#: ../src/common/config.py:448 ../src/common/config.py:450
-#: ../src/common/config.py:451 ../src/common/config.py:454
-#: ../src/common/config.py:455
+#: ../src/common/config.py:449 ../src/common/config.py:451
+#: ../src/common/config.py:452 ../src/common/config.py:455
+#: ../src/common/config.py:456
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' aÅ­ ''"
 
-#: ../src/common/config.py:461 ../src/common/pep.py:157
+#: ../src/common/config.py:460
+msgid ""
+"State whether plugins should be activated on exit (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
+msgstr ""
+
+#: ../src/common/config.py:465 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Dormas"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back soon"
 msgstr "Revenos baldaÅ­"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back in some minutes."
 msgstr "Revenos post kelkaj minutoj."
 
-#: ../src/common/config.py:463 ../src/common/pep.py:127
+#: ../src/common/config.py:467 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Manĝas"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:467
 msgid "I'm eating, so leave me a message."
 msgstr "Mi manĝas, do restigu mesaĝon por mi."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "Movie"
 msgstr "Kino"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "I'm watching a movie."
 msgstr "Mi spektas filmon."
 
-#: ../src/common/config.py:465 ../src/common/pep.py:186
+#: ../src/common/config.py:469 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Laboras"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:469
 msgid "I'm working."
 msgstr "Mi laboras."
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "Phone"
 msgstr "Telefonado"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "I'm on the phone."
 msgstr "Mi telefonas."
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "Out"
 msgstr "Eliris"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "I'm out enjoying life."
 msgstr "Mi eliris por amuziĝi."
 
-#: ../src/common/config.py:478
+#: ../src/common/config.py:482
 msgid "I'm available."
 msgstr "Mi disponeblas."
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:483
 msgid "I'm free for chat."
 msgstr "Mi babilemas."
 
-#: ../src/common/config.py:480 ../src/config.py:1600
+#: ../src/common/config.py:484 ../src/config.py:1600
 msgid "Be right back."
 msgstr "Revenos baldaÅ­."
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:485
 msgid "I'm not available."
 msgstr "Mi ne disponeblas."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:486
 msgid "Do not disturb."
 msgstr "Ne malhelpu."
 
-#: ../src/common/config.py:483 ../src/common/config.py:484
+#: ../src/common/config.py:487 ../src/common/config.py:488
 msgid "Bye!"
 msgstr "Äœis!"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:498
 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."
@@ -4491,90 +4738,86 @@ msgstr ""
 "Sono por ludi kiam babileja mesaĝo enhavas vorton, listitan en "
 "muc_highlight_words, aŭ vian kaŝnomon."
 
-#: ../src/common/config.py:495
+#: ../src/common/config.py:499
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sono ludota kiam ĉiu babileja mesaĝo venas."
 
-#: ../src/common/config.py:504 ../src/common/optparser.py:304
+#: ../src/common/config.py:508 ../src/common/optparser.py:308
 msgid "green"
 msgstr "verda"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:290
+#: ../src/common/config.py:512 ../src/common/optparser.py:294
 msgid "grocery"
 msgstr "manĝbutiko"
 
-#: ../src/common/config.py:512
+#: ../src/common/config.py:516
 msgid "human"
 msgstr "homa"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:520
 msgid "marine"
 msgstr "mara"
 
-#: ../src/common/connection_handlers.py:84
+#: ../src/common/connection_handlers.py:94
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Neeblas ŝargi senfaran modulon"
 
-#: ../src/common/connection_handlers.py:117
+#: ../src/common/connection_handlers.py:127
 #, 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:124
+#: ../src/common/connection_handlers.py:134
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Vizitkarto estas sukcese publicita"
 
-#: ../src/common/connection_handlers.py:125
+#: ../src/common/connection_handlers.py:135
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 #, fuzzy
 msgid "Registration failed"
 msgstr "Konektado malsukcesis"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:445
-#: ../src/common/connection_handlers.py:1633
-#: ../src/common/connection_handlers.py:1756
-#: ../src/common/connection_handlers.py:1957
-#: ../src/common/connection_handlers.py:2108 ../src/common/connection.py:449
+#: ../src/common/connection_handlers.py:466
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
 #: ../src/gajim.py:341
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:678 ../src/common/connection.py:1472
+#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Kromaĵo ne subtenatas"
 
-#: ../src/common/connection_handlers.py:679 ../src/common/connection.py:1473
+#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1446 ../src/common/connection.py:253
-#: ../src/config.py:2091 ../src/config.py:2100 ../src/config.py:2168
-#: ../src/config.py:3560 ../src/dataforms_widget.py:597 ../src/dialogs.py:2931
+#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
+#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
+#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
 msgid "Invalid Jabber ID"
 msgstr "Malkorekta jabber-ID"
 
-#: ../src/common/connection_handlers.py:1447
+#: ../src/common/connection_handlers.py:1405
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1636
-#: ../src/common/connection_handlers.py:1759
-#: ../src/common/connection_handlers.py:1961
-#: ../src/common/connection_handlers.py:2111 ../src/common/connection.py:453
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
 #: ../src/gajim.py:160 ../src/session.py:139
 #, python-format
 msgid ""
@@ -4582,90 +4825,6 @@ msgid ""
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1805
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Kaŝnomo malpermesita: %s"
-
-#: ../src/common/connection_handlers.py:1902
-#: ../src/common/connection_handlers.py:1911
-#: ../src/common/connection_handlers.py:1918
-#: ../src/common/connection_handlers.py:1922
-#: ../src/common/connection_handlers.py:1926
-#: ../src/common/connection_handlers.py:1931 ../src/gui_interface.py:139
-msgid "Unable to join group chat"
-msgstr "Neeblas aliĝi al babilejo"
-
-#: ../src/common/connection_handlers.py:1903
-#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:1912
-#, 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:1919
-#, fuzzy, python-format
-msgid "Group chat %s does not exist."
-msgstr "Tiu babilejo ne ekzistas."
-
-#: ../src/common/connection_handlers.py:1923
-msgid "Group chat creation is restricted."
-msgstr "Babileja kreado limigitas."
-
-#: ../src/common/connection_handlers.py:1927
-#, 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:1932
-#, 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:1976
-#, fuzzy
-msgid "Room has been destroyed"
-msgstr "Permeso estas forigita"
-
-#: ../src/common/connection_handlers.py:1984
-#, python-format
-msgid "You can join this room instead: %s"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:2020
-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:2041
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "nun ni abonas %s"
-
-#: ../src/common/connection_handlers.py:2043
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "ordono pri abona fino de %s"
-
-#: ../src/common/connection_handlers.py:2045
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "ni nun ne abonas pri %s"
-
-#: ../src/common/connection_handlers.py:2240
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"JID %s ne estas norma laÅ­ la RFC. Äœi ne aldonitos al via kontaktlisto. Uzu "
-"kontaktlistan agordan ilon kiel http://jru.jabberstudio.org/ por forigi ĝin"
-
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr ""
@@ -4797,28 +4956,28 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:254 ../src/dialogs.py:2932
+#: ../src/common/connection.py:256 ../src/dialogs.py:2948
 #, 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:276
+#: ../src/common/connection.py:278
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:281
 #, 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:331
+#: ../src/common/connection.py:333
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Tiu ĉi mesaĝo estas *ĉifrita* (Vidu :JEP:`27`]"
 
-#: ../src/common/connection.py:439
+#: ../src/common/connection.py:441
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4827,108 +4986,108 @@ msgstr ""
 "Temo: %s\n"
 "%s"
 
-#: ../src/common/connection.py:807
+#: ../src/common/connection.py:809
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Konekto kun konto \"%s\" rompiĝis"
 
-#: ../src/common/connection.py:808
+#: ../src/common/connection.py:810
 msgid "Reconnect manually."
 msgstr "Rekonektu mane."
 
-#: ../src/common/connection.py:820
+#: ../src/common/connection.py:822
 #, 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:854
+#: ../src/common/connection.py:856
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:867
+#: ../src/common/connection.py:869
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Nekonata versio de D-BUS: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:882
+#: ../src/common/connection.py:884
 msgid "Invalid answer"
 msgstr "Nekorekta respondo"
 
-#: ../src/common/connection.py:883
+#: ../src/common/connection.py:885
 #, 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:1165 ../src/common/connection.py:1294
-#: ../src/common/connection.py:1784
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
+#: ../src/common/connection.py:1792
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Ne povas konekti al \"%s\""
 
-#: ../src/common/connection.py:1166 ../src/gui_interface.py:755
+#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
 msgid "Check your connection or try again later."
 msgstr "Kontrolu vian konekton aÅ­ provu denove poste."
 
-#: ../src/common/connection.py:1171
+#: ../src/common/connection.py:1173
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Konservita kiel: %s"
 
-#: ../src/common/connection.py:1184
+#: ../src/common/connection.py:1186
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Konektado malsukcesis"
 
-#: ../src/common/connection.py:1215 ../src/common/connection.py:1274
+#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Ne povas konekti al \"%s\""
 
-#: ../src/common/connection.py:1216 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Konekto kun konto \"%s\" rompiĝis"
 
-#: ../src/common/connection.py:1241
+#: ../src/common/connection.py:1243
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1244
+#: ../src/common/connection.py:1246
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1248
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Nekonata versio de D-BUS: %s"
 
-#: ../src/common/connection.py:1295
+#: ../src/common/connection.py:1297
 msgid "Check your connection or try again later"
 msgstr "Kontrolu vian konekton aÅ­ provu denove poste"
 
-#: ../src/common/connection.py:1324
+#: ../src/common/connection.py:1329
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Aŭtentokontrolo malsukcesis ĉe \"%s\""
 
-#: ../src/common/connection.py:1326
+#: ../src/common/connection.py:1331
 msgid "Please check your login and password for correctness."
 msgstr "Bonvolu kontroli korektecon de viaj salutnomo kaj pasvorto."
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1400
 msgid "Error while removing privacy list"
 msgstr "Eraro dum forigado de privata listo"
 
-#: ../src/common/connection.py:1396
+#: ../src/common/connection.py:1401
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4937,41 +5096,41 @@ 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:1650
+#: ../src/common/connection.py:1658
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1653
+#: ../src/common/connection.py:1661
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Kontaktoj"
 
-#: ../src/common/connection.py:1799 ../src/common/connection.py:1822
+#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
 msgid "Not fetched because of invisible status"
 msgstr "Ne obtenita pro nevidebla stato"
 
-#: ../src/common/connection.py:2254
+#: ../src/common/connection.py:2262
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Konektado malsukcesis"
 
-#: ../src/common/connection.py:2255
+#: ../src/common/connection.py:2263
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
 #: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:674
+#: ../src/gui_interface.py:551
 msgid "Observers"
 msgstr "Rigardiloj"
 
 #: ../src/common/contacts.py:139 ../src/common/contacts.py:366
 #: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1499 ../src/gui_interface.py:424
-#: ../src/roster_window.py:840 ../src/roster_window.py:1525
-#: ../src/roster_window.py:1606 ../src/roster_window.py:1608
-#: ../src/roster_window.py:1769
+#: ../src/disco.py:1517 ../src/roster_window.py:854
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
+#: ../src/roster_window.py:2466
 msgid "Transports"
 msgstr "Transportiloj"
 
@@ -5198,203 +5357,219 @@ msgstr "Fino de semajno"
 msgid "Weekend!"
 msgstr "Semajnofino!"
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:148
+msgid "Username must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:153
 msgid "Invalid character in username."
 msgstr "Malkorekta signo en salutnomo."
 
-#: ../src/common/helpers.py:156
-msgid "Server address required."
-msgstr "Necesas adreso de servilo."
+#: ../src/common/helpers.py:159
+msgid "Server must be between 1 and 1023 chars"
+msgstr ""
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 msgid "Invalid character in hostname."
 msgstr "Malkorekta signo en servilnomo."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:166
+msgid "Server address required."
+msgstr "Necesas adreso de servilo."
+
+#: ../src/common/helpers.py:170
+msgid "Resource must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:175
 msgid "Invalid character in resource."
 msgstr "Malkorekta signo en risurcnomo."
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:215
 msgid "_Busy"
 msgstr "_Okupata"
 
-#: ../src/common/helpers.py:211 ../src/tooltips.py:195
+#: ../src/common/helpers.py:217 ../src/tooltips.py:195
 msgid "Busy"
 msgstr "Okupata"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:220
 msgid "_Not Available"
 msgstr "_Nedisponebla"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:225
 msgid "_Free for Chat"
 msgstr "_Babilema"
 
-#: ../src/common/helpers.py:221 ../src/tooltips.py:191
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Free for Chat"
 msgstr "Babilema"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:230
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "PaÅ­zas"
 
-#: ../src/common/helpers.py:226 ../src/tooltips.py:189
+#: ../src/common/helpers.py:232 ../src/tooltips.py:189
 #, fuzzy
 msgid "?user status:Available"
 msgstr "PaÅ­zas"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:234
 msgid "Connecting"
 msgstr "Konektas"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:237
 msgid "A_way"
 msgstr "_Fora"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:242
 msgid "_Offline"
 msgstr "_Senkonekta"
 
-#: ../src/common/helpers.py:238 ../src/tooltips.py:199
+#: ../src/common/helpers.py:244 ../src/tooltips.py:199
 msgid "Offline"
 msgstr "Senkonekta"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:247
 msgid "_Invisible"
 msgstr "Ne_videbla"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:253
 msgid "?contact has status:Unknown"
 msgstr "Nekonata"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:255
 msgid "?contact has status:Has errors"
 msgstr "Eraroj"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:260
 msgid "?Subscription we already have:None"
 msgstr "Neniu"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:262
 msgid "To"
 msgstr "Al"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
+msgid "From"
+msgstr "De"
+
+#: ../src/common/helpers.py:266
 msgid "Both"
 msgstr "AmbaÅ­"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:274
 msgid "?Ask (for Subscription):None"
 msgstr "Nenion"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:276
 msgid "Subscribe"
 msgstr "Aboni"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:285
 msgid "?Group Chat Contact Role:None"
 msgstr "Neniu"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:288
 msgid "Moderators"
 msgstr "Moderigantoj"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:290
 msgid "Moderator"
 msgstr "Moderiganto"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:293
 msgid "Participants"
 msgstr "Partoprenantoj"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:295
 msgid "Participant"
 msgstr "Partoprenanto"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:298
 msgid "Visitors"
 msgstr "Vizitantoj"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:300
 msgid "Visitor"
 msgstr "Vizitanto"
 
-#: ../src/common/helpers.py:300 ../src/tooltips.py:210
+#: ../src/common/helpers.py:306 ../src/tooltips.py:210
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Neniu"
 
-#: ../src/common/helpers.py:302 ../src/tooltips.py:216
+#: ../src/common/helpers.py:308 ../src/tooltips.py:216
 msgid "Owner"
 msgstr "Mastro"
 
-#: ../src/common/helpers.py:304 ../src/tooltips.py:214
+#: ../src/common/helpers.py:310 ../src/tooltips.py:214
 msgid "Administrator"
 msgstr "Administristo"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:212
+#: ../src/common/helpers.py:312 ../src/tooltips.py:212
 msgid "Member"
 msgstr "Membro"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:351
 msgid "is paying attention to the conversation"
 msgstr "atentas al la komunikado"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:353
 msgid "is doing something else"
 msgstr "faras ion alian"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:355
 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:352
+#: ../src/common/helpers.py:358
 msgid "paused composing a message"
 msgstr "paŭzas tajpi mesaĝon"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:360
 msgid "has closed the chat window or tab"
 msgstr "fermis la interparolan fenestron aÅ­ slipon"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:619
+#: ../src/common/helpers.py:625
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:622
+#: ../src/common/helpers.py:628
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:626
+#: ../src/common/helpers.py:632
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:629
+#: ../src/common/helpers.py:635
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:633
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:636
+#: ../src/common/helpers.py:642
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:645
 #, python-format
 msgid "%s B"
 msgstr "%s B"
@@ -5437,12 +5612,12 @@ msgstr "Gajim - %s"
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:111
+#: ../src/common/jingle_rtp.py:107
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Agordo de babilejo"
 
-#: ../src/common/jingle_rtp.py:112
+#: ../src/common/jingle_rtp.py:108
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5454,30 +5629,30 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:209
+#: ../src/common/jingle_rtp.py:205
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:210
+#: ../src/common/jingle_rtp.py:206
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Erara mesaĝo: %s"
 
-#: ../src/common/jingle_rtp.py:336
+#: ../src/common/jingle_rtp.py:335
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:339
+#: ../src/common/jingle_rtp.py:338
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:382
+#: ../src/common/jingle_rtp.py:381
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:390
+#: ../src/common/jingle_rtp.py:389
 msgid "video output"
 msgstr ""
 
@@ -5554,11 +5729,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "eraro: %s nedisponeblas por legi"
 
-#: ../src/common/optparser.py:299 ../src/common/optparser.py:300
+#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
 msgid "cyan"
 msgstr "blua"
 
-#: ../src/common/optparser.py:379
+#: ../src/common/optparser.py:383
 msgid "migrating logs database to indices"
 msgstr "indeksigas protokolan datumbazon"
 
@@ -6298,17 +6473,17 @@ msgstr ""
 "estos nuligita."
 
 #. we're not english
-#: ../src/common/stanza_session.py:303
+#: ../src/common/stanza_session.py:423
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:178
+#: ../src/common/zeroconf/connection_zeroconf.py:181
 msgid "Avahi error"
 msgstr "Eraro de Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:179
+#: ../src/common/zeroconf/connection_zeroconf.py:182
 #, python-format
 msgid ""
 "%s\n"
@@ -6317,46 +6492,46 @@ msgstr ""
 "%s\n"
 "Lig-loka komunikado ne povas funkcii korekte."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:190
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Bonvolu certiĝi ke Avahi estas instalita."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:199
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Could not start local service"
 msgstr "Ne povas lanĉi lokan servon"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Neeblas aliĝi al pordo %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-#: ../src/common/zeroconf/connection_zeroconf.py:283
-#: ../src/common/zeroconf/connection_zeroconf.py:294
-#: ../src/common/zeroconf/connection_zeroconf.py:308
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:286
+#: ../src/common/zeroconf/connection_zeroconf.py:297
+#: ../src/common/zeroconf/connection_zeroconf.py:311
 msgid "Please check if avahi-daemon is running."
 msgstr "Bonvolu certiĝi ke avahi-demono estas aktiva."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:282
-#: ../src/common/zeroconf/connection_zeroconf.py:293
-#: ../src/common/zeroconf/connection_zeroconf.py:307
+#: ../src/common/zeroconf/connection_zeroconf.py:285
+#: ../src/common/zeroconf/connection_zeroconf.py:296
+#: ../src/common/zeroconf/connection_zeroconf.py:310
 #, 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:325
+#: ../src/common/zeroconf/connection_zeroconf.py:328
 #, 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:335
+#: ../src/common/zeroconf/connection_zeroconf.py:338
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakto estas senkonekta. Via mesaĝo ne estas sendita."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:363
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "Konekto kun retnodo malsukcesis: Templimo atingitis dum datumsendado."
@@ -6377,16 +6552,16 @@ msgstr "Defaŭlta statmesaĝo"
 msgid "Enabled"
 msgstr "Ebligi"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3078
+#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
 msgid "Default"
 msgstr "DefaÅ­lte"
 
-#: ../src/config.py:739 ../src/dialogs.py:1395
+#: ../src/config.py:733 ../src/dialogs.py:1409
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Vortaro mankas por %s lingvo"
 
-#: ../src/config.py:740
+#: ../src/config.py:734
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6404,9 +6579,9 @@ msgid "status message text"
 msgstr "statmesaĝa teksto"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2383 ../src/dialogs.py:2449
-#: ../src/dialogs.py:3215 ../src/disco.py:866 ../src/disco.py:1726
-#: ../src/disco.py:2030 ../src/history_window.py:90
+#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
+#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
+#: ../src/disco.py:2048 ../src/history_window.py:90
 msgid "Name"
 msgstr "Nomo"
 
@@ -6440,7 +6615,7 @@ msgstr "Vi havas aktivan konversacion ĉe konto %s"
 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:1976 ../src/config.py:2509 ../src/config.py:2545
+#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
 msgid "You are currently connected to the server"
 msgstr "Nun vi estas konektita al la servilo"
 
@@ -6475,134 +6650,134 @@ msgstr "Kontnomo ne povas esti malplena."
 msgid "Account name cannot contain spaces."
 msgstr "Kontnomo ne povas enteni spacetojn."
 
-#: ../src/config.py:2072
+#: ../src/config.py:2074
 #, fuzzy
 msgid "Rename Account"
 msgstr "Administri kontojn"
 
-#: ../src/config.py:2073
+#: ../src/config.py:2075
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Enigu novan nomon por la grupo %s"
 
-#: ../src/config.py:2101
+#: ../src/config.py:2103
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber-ID devas esti en la formo \"uzulo@servilnomo\"."
 
-#: ../src/config.py:2318 ../src/config.py:3606
+#: ../src/config.py:2320 ../src/config.py:3623
 msgid "Invalid entry"
 msgstr "Malkorekta rikordo"
 
-#: ../src/config.py:2319 ../src/config.py:3607
+#: ../src/config.py:2321 ../src/config.py:3624
 msgid "Custom port must be a port number."
 msgstr "La pordo devas esti nombro."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2342
 msgid "Failed to get secret keys"
 msgstr "Ricevado de sekreta ĉifroŝlosilo malsukcesis"
 
-#: ../src/config.py:2341
+#: ../src/config.py:2343
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Estas problemo ricevi vian sekretan OpenPGP-ĉifrŝlosilon."
 
-#: ../src/config.py:2375
+#: ../src/config.py:2377
 msgid "OpenPGP Key Selection"
 msgstr "Elekto de OpenPGP-ĉifrŝlosilo"
 
-#: ../src/config.py:2376
+#: ../src/config.py:2378
 msgid "Choose your OpenPGP key"
 msgstr "Elektu vian OpenPGP-ĉifrŝlosilon"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2385
 msgid "No such account available"
 msgstr "Tia konto nedisponebla"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2386
 msgid "You must create your account before editing your personal information."
 msgstr "Vi devas krei konton antaÅ­ korekti vian personan informon."
 
-#: ../src/config.py:2391 ../src/dialogs.py:2136 ../src/dialogs.py:2371
-#: ../src/dialogs.py:2557 ../src/disco.py:511 ../src/profile_window.py:339
+#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
+#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
 msgid "You are not connected to the server"
 msgstr "Vi nekonektitas al la servilo"
 
-#: ../src/config.py:2392
+#: ../src/config.py:2394
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Senkonekte vi ne povas ŝanĝi vian personan informon."
 
-#: ../src/config.py:2396
+#: ../src/config.py:2398
 msgid "Your server doesn't support Vcard"
 msgstr "Via servilo ne subtenas Vizitkarton"
 
-#: ../src/config.py:2397
+#: ../src/config.py:2399
 msgid "Your server can't save your personal information."
 msgstr "Via servilo ne povas konservi vian personan informon."
 
-#: ../src/config.py:2510 ../src/config.py:2546
+#: ../src/config.py:2512 ../src/config.py:2548
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Por ke ŝanĝi kontnomon, vi devas esti senkonekta."
 
-#: ../src/config.py:2515
+#: ../src/config.py:2517
 msgid "Account Local already exists."
 msgstr "Loka konto jam ekzistas."
 
-#: ../src/config.py:2516
+#: ../src/config.py:2518
 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:2673
+#: ../src/config.py:2675
 #, python-format
 msgid "Edit %s"
 msgstr "Administri %s"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2677
 #, python-format
 msgid "Register to %s"
 msgstr "Registri ĉe %s"
 
 #. list at the beginning
-#: ../src/config.py:2711
+#: ../src/config.py:2713
 msgid "Ban List"
 msgstr "Listo de malpermesoj"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2714
 msgid "Member List"
 msgstr "Membra listo"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2714
 msgid "Owner List"
 msgstr "Listo de mastroj"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2715
 msgid "Administrator List"
 msgstr "Estra listo"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2763 ../src/disco.py:873 ../src/history_manager.py:201
+#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2773
+#: ../src/config.py:2789
 msgid "Reason"
 msgstr "Kialo"
 
-#: ../src/config.py:2780
+#: ../src/config.py:2796
 msgid "Nick"
 msgstr "Kaŝnomo"
 
-#: ../src/config.py:2786
+#: ../src/config.py:2802
 msgid "Role"
 msgstr "Rolo"
 
-#: ../src/config.py:2813
+#: ../src/config.py:2829
 msgid "Banning..."
 msgstr "Malpermesas..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2815
+#: ../src/config.py:2831
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6610,11 +6785,11 @@ msgstr ""
 "<b>Por kiu vi volas malpermesi aliĝon?</b>\n"
 "\n"
 
-#: ../src/config.py:2817
+#: ../src/config.py:2833
 msgid "Adding Member..."
 msgstr "Aligas membron..."
 
-#: ../src/config.py:2818
+#: ../src/config.py:2834
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6622,11 +6797,11 @@ msgstr ""
 "<b>Kiun vi volas fari membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2836
 msgid "Adding Owner..."
 msgstr "Aligas mastron..."
 
-#: ../src/config.py:2821
+#: ../src/config.py:2837
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6634,11 +6809,11 @@ msgstr ""
 "<b>Kiun vi volas fari mastro?</b>\n"
 "\n"
 
-#: ../src/config.py:2823
+#: ../src/config.py:2839
 msgid "Adding Administrator..."
 msgstr "Aligas administriston..."
 
-#: ../src/config.py:2824
+#: ../src/config.py:2840
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6646,7 +6821,7 @@ msgstr ""
 "<b>Kiun vi volas fari administristo?</b>\n"
 "\n"
 
-#: ../src/config.py:2825
+#: ../src/config.py:2841
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6663,83 +6838,83 @@ msgstr ""
 "4. domajno (iu kombinaĵo de risurco kaj uzulo\n"
 "kun tiu domajno aÅ­ subdomajno)."
 
-#: ../src/config.py:2926
+#: ../src/config.py:2943
 #, python-format
 msgid "Removing %s account"
 msgstr "Forigado de konto %s"
 
-#: ../src/config.py:2941
+#: ../src/config.py:2958
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Ĉifrado malebligata"
 
-#: ../src/config.py:2942
+#: ../src/config.py:2959
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2955 ../src/gui_interface.py:1132
-#: ../src/gui_interface.py:1243
+#: ../src/config.py:2972 ../src/gui_interface.py:311
+#: ../src/gui_interface.py:1048
 msgid "Password Required"
 msgstr "Pasvorto necesas"
 
-#: ../src/config.py:2956 ../src/gui_interface.py:1223
+#: ../src/config.py:2973 ../src/gui_interface.py:1028
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enigi vian pasvorton por konto %s"
 
-#: ../src/config.py:2957 ../src/gui_interface.py:1243
+#: ../src/config.py:2974 ../src/gui_interface.py:1048
 msgid "Save password"
 msgstr "Konservi pasvorton"
 
-#: ../src/config.py:2967
+#: ../src/config.py:2984
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" estas konektita al la servilo"
 
-#: ../src/config.py:2968
+#: ../src/config.py:2985
 msgid "If you remove it, the connection will be lost."
 msgstr "Se vi forigos ĝin, la konekto disiĝos."
 
-#: ../src/config.py:2982
+#: ../src/config.py:2999
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Konektado malsukcesis"
 
-#: ../src/config.py:2983
+#: ../src/config.py:3000
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Kion vi volas fari?"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3001
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Forigi konton _nur el Gajim"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3002
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3078
+#: ../src/config.py:3095
 msgid "?print_status:All"
 msgstr "Ĉiujn"
 
-#: ../src/config.py:3079
+#: ../src/config.py:3096
 msgid "Enter and leave only"
 msgstr "Nur en/el-iradojn"
 
-#: ../src/config.py:3080
+#: ../src/config.py:3097
 msgid "?print_status:None"
 msgstr "Neniujn"
 
-#: ../src/config.py:3150
+#: ../src/config.py:3167
 msgid "New Group Chat"
 msgstr "Nova babilejo"
 
-#: ../src/config.py:3183
+#: ../src/config.py:3200
 msgid "This bookmark has invalid data"
 msgstr "Tiu ĉi legosigno havas malkorektan datumon"
 
-#: ../src/config.py:3184
+#: ../src/config.py:3201
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6747,31 +6922,31 @@ msgstr ""
 "tiun ĉi legosignon."
 
 #. invalid char
-#: ../src/config.py:3302 ../src/dialogs.py:1934
+#: ../src/config.py:3319 ../src/dialogs.py:1950
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/config.py:3303 ../src/config.py:3317 ../src/config.py:3331
+#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Kaŝnomo malpermesita: %s"
 
-#: ../src/config.py:3316 ../src/config.py:3582
+#: ../src/config.py:3333 ../src/config.py:3599
 #, fuzzy
 msgid "Invalid server"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/config.py:3330
+#: ../src/config.py:3347
 #, fuzzy
 msgid "Invalid room"
 msgstr "Malkorekta rikordo"
 
-#: ../src/config.py:3498
+#: ../src/config.py:3515
 msgid "Account has been added successfully"
 msgstr "Konto estas sukcese aldonita"
 
-#: ../src/config.py:3499 ../src/config.py:3505
+#: ../src/config.py:3516 ../src/config.py:3522
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6781,34 +6956,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:3504
+#: ../src/config.py:3521
 msgid "Your new account has been created successfully"
 msgstr "Via nova konto estas sukcese kreita"
 
-#: ../src/config.py:3543
+#: ../src/config.py:3560
 msgid "Invalid username"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/config.py:3545
+#: ../src/config.py:3562
 msgid "You must provide a username to configure this account."
 msgstr "Vi devas enigi salutnomon por administri tiun ĉi konton."
 
-#: ../src/config.py:3583
+#: ../src/config.py:3600
 #, 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:3639 ../src/gui_interface.py:1904
+#: ../src/config.py:3656 ../src/gui_interface.py:1693
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Kontakto jam estas en kontaktlisto"
 
-#: ../src/config.py:3640 ../src/gui_interface.py:1905
+#: ../src/config.py:3657 ../src/gui_interface.py:1694
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3717
+#: ../src/config.py:3734
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6818,7 +6993,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3723 ../src/gui_interface.py:1932
+#: ../src/config.py:3740 ../src/gui_interface.py:1721
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6826,72 +7001,81 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3755 ../src/config.py:3789
+#: ../src/config.py:3772 ../src/config.py:3806
 msgid "An error occurred during account creation"
 msgstr "Eraro okazis dum kreado de konto"
 
-#: ../src/config.py:3854
+#: ../src/config.py:3871
 msgid "Account name is in use"
 msgstr "Kontnomo estas uzata"
 
-#: ../src/config.py:3855
+#: ../src/config.py:3872
 msgid "You already have an account using this name."
 msgstr "Vi jam havas konto kun tiu nomo."
 
-#: ../src/config.py:4009
+#: ../src/config.py:3991
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/config.py:3992
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#: ../src/config.py:4036
 msgid "Active"
 msgstr "Aktiva"
 
-#: ../src/config.py:4017
+#: ../src/config.py:4044
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:4052
+#: ../src/config.py:4079
 msgid "First Message Received"
 msgstr "Unua mesaĝo ricevita"
 
-#: ../src/config.py:4053
+#: ../src/config.py:4080
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Sekva mesaĝo ricevita"
 
-#: ../src/config.py:4055
+#: ../src/config.py:4082
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Sekva mesaĝo ricevita"
 
-#: ../src/config.py:4056
+#: ../src/config.py:4083
 msgid "Contact Connected"
 msgstr "Kontakto konektita"
 
-#: ../src/config.py:4057
+#: ../src/config.py:4084
 msgid "Contact Disconnected"
 msgstr "Kontakto malkonektita"
 
-#: ../src/config.py:4058
+#: ../src/config.py:4085
 msgid "Message Sent"
 msgstr "Mesaĝo sendita"
 
-#: ../src/config.py:4059
+#: ../src/config.py:4086
 msgid "Group Chat Message Highlight"
 msgstr "Emfazado de mesaĝoj en babilejo"
 
-#: ../src/config.py:4060
+#: ../src/config.py:4087
 msgid "Group Chat Message Received"
 msgstr "Ricevitas mesaĝo en babilejo"
 
-#: ../src/config.py:4061
+#: ../src/config.py:4088
 msgid "GMail Email Received"
 msgstr "GMail-retletero venis"
 
-#: ../src/conversation_textview.py:600
+#: ../src/conversation_textview.py:601
 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:619
+#: ../src/conversation_textview.py:620
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6900,45 +7084,45 @@ msgstr ""
 "Teksto sub tiu ĉi lineo estas, kio estas dirita post kiam vi lastfoje "
 "atentis al tiu ĉi babilejo"
 
-#: ../src/conversation_textview.py:739
+#: ../src/conversation_textview.py:740
 #, fuzzy
 msgid "_Quote"
 msgstr "_Eliri"
 
-#: ../src/conversation_textview.py:746
+#: ../src/conversation_textview.py:747
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Agoj por \"%s\""
 
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Read _Wikipedia Article"
 msgstr "Legi _vikipedian artikolon"
 
-#: ../src/conversation_textview.py:763
+#: ../src/conversation_textview.py:765
 msgid "Look it up in _Dictionary"
 msgstr "Serĉi tion en _vortaro"
 
-#: ../src/conversation_textview.py:780
+#: ../src/conversation_textview.py:782
 #, 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:793
+#: ../src/conversation_textview.py:795
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Retserĉila URL ne enhavas \"%s\""
 
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 msgid "Web _Search for it"
 msgstr "Retserĉi tion"
 
-#: ../src/conversation_textview.py:802
+#: ../src/conversation_textview.py:804
 msgid "Open as _Link"
 msgstr "Malfermi  kiel _ligilon"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1296
+#: ../src/conversation_textview.py:1298
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6946,191 +7130,196 @@ msgstr[0] "HieraÅ­"
 msgstr[1] "HieraÅ­"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1344 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Temo: %s\n"
 
-#: ../src/dataforms_widget.py:544
+#: ../src/dataforms_widget.py:545
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Neeblas ŝargi senfaran modulon"
 
-#: ../src/dataforms_widget.py:546
+#: ../src/dataforms_widget.py:547
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Kromaĵo ne subtenatas"
 
-#: ../src/dataforms_widget.py:601
+#: ../src/dataforms_widget.py:562
+msgid "This field is required"
+msgstr ""
+
+#: ../src/dataforms_widget.py:607
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Jabber-tujmesaĝilo"
 
-#: ../src/dataforms_widget.py:602
+#: ../src/dataforms_widget.py:608
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:613
+#: ../src/dataforms_widget.py:619
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:616 ../src/dataforms_widget.py:618
+#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktnomo: <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber-ID: <i>%s</i>"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:195
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:201
+#: ../src/dialogs.py:202
 msgid "In the group"
 msgstr "En la grupo"
 
-#: ../src/dialogs.py:292
+#: ../src/dialogs.py:293
 msgid "KeyID"
 msgstr "Åœlosil-ID"
 
-#: ../src/dialogs.py:297
+#: ../src/dialogs.py:298
 msgid "Contact name"
 msgstr "Kontaktnomo"
 
-#: ../src/dialogs.py:469
+#: ../src/dialogs.py:470
 #, fuzzy
 msgid "Set Mood"
 msgstr "Enigi tagmesaĝon"
 
-#: ../src/dialogs.py:589
+#: ../src/dialogs.py:590
 #, python-format
 msgid "%s Status Message"
 msgstr "Mesaĝo por la stato \"%s\""
 
-#: ../src/dialogs.py:603
+#: ../src/dialogs.py:604
 msgid "Status Message"
 msgstr "Statmesaĝo"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:794
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Statmesaĝo"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:795
 #, 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:802
+#: ../src/dialogs.py:803
 msgid "Save as Preset Status Message"
 msgstr "Konservi kiel antaŭpreparita statmesaĝo"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:804
 msgid "Please type a name for this status message"
 msgstr "Bonvolu tajpi nomon de tiu statmesaĝo"
 
-#: ../src/dialogs.py:831
+#: ../src/dialogs.py:832
 msgid "AIM Address:"
 msgstr "AIM-adreso:"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:833
 msgid "GG Number:"
 msgstr "GG numero:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:834
 msgid "ICQ Number:"
 msgstr "ICQ numero:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:835
 msgid "MSN Address:"
 msgstr "MSN-adreso:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:836
 msgid "Yahoo! Address:"
 msgstr "Yahoo-adreso:"
 
-#: ../src/dialogs.py:872
+#: ../src/dialogs.py:873
 #, 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:875
+#: ../src/dialogs.py:876
 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:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
+#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
+#: ../src/dialogs.py:3464
 msgid "Invalid User ID"
 msgstr "Malkorekta uzula ID"
 
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1052
 msgid "The user ID must not contain a resource."
 msgstr "La uzula ID devas ne enteni risurcon."
 
-#: ../src/dialogs.py:1051
+#: ../src/dialogs.py:1057
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Mi volus aldoni vin al mia kontaktlisto."
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1071
 msgid "Contact already in roster"
 msgstr "Kontakto jam estas en kontaktlisto"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1072
 msgid "This contact is already listed in your roster."
 msgstr "Tiu kontakto jam ĉeestas en via kontaktlisto."
 
-#: ../src/dialogs.py:1112
+#: ../src/dialogs.py:1118
 msgid "User ID:"
 msgstr "Uzula ID:"
 
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1189
 msgid "A GTK+ jabber client"
 msgstr "GTK+ jabber-kliento"
 
-#: ../src/dialogs.py:1176
+#: ../src/dialogs.py:1190
 msgid "GTK+ Version:"
 msgstr "Versio de GTK+:"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1191
 msgid "PyGTK Version:"
 msgstr "Versio de PyGTK:"
 
-#: ../src/dialogs.py:1187
+#: ../src/dialogs.py:1201
 msgid "Current Developers:"
 msgstr "Nunaj programistoj:"
 
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1203
 msgid "Past Developers:"
 msgstr "Äœisnunaj programistoj:"
 
-#: ../src/dialogs.py:1195
+#: ../src/dialogs.py:1209
 msgid "THANKS:"
 msgstr "DANKON AL:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1215
 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:1213
+#: ../src/dialogs.py:1227
 msgid "translator-credits"
 msgstr "Sergio Ĥlutĉin <Sergey.Khlutchin@gmail.com>"
 
-#: ../src/dialogs.py:1396
+#: ../src/dialogs.py:1410
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7141,107 +7330,107 @@ msgstr ""
 "Vi bezonas Instali la vortaron %s por uzi literumadon, aÅ­ elekti alian "
 "lingvon ĉe la agordero \"speller_language\"."
 
-#: ../src/dialogs.py:1935 ../src/dialogs.py:2322
+#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr "La babileja jabber-ID enhavas nepermesajn signojn."
 
-#: ../src/dialogs.py:2053
+#: ../src/dialogs.py:2069
 #, 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:2056
+#: ../src/dialogs.py:2072
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Demando pri abono de %s"
 
-#: ../src/dialogs.py:2131 ../src/gui_interface.py:2672
+#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Vi jam estas en babilejo %s"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2153
 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:2178
+#: ../src/dialogs.py:2194
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Eniri en babilejon per konto %s"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2325
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Malkorekta kontnomo"
 
-#: ../src/dialogs.py:2310
+#: ../src/dialogs.py:2326
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Vi devas krei konton antaÅ­ vi povos paroli kun aliaj kontaktoj."
 
-#: ../src/dialogs.py:2321
+#: ../src/dialogs.py:2337
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/dialogs.py:2326 ../src/dialogs.py:2332
-#: ../src/groupchat_control.py:1832
+#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
+#: ../src/groupchat_control.py:1847
 msgid "Invalid group chat Jabber ID"
 msgstr "Malkorekta babileja jabber-ID"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2343
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "La babileja jabber-ID enhavas nepermesajn signojn."
 
-#: ../src/dialogs.py:2333 ../src/groupchat_control.py:1833
+#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "La babileja jabber-ID enhavas nepermesajn signojn."
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2356
 msgid "This is not a group chat"
 msgstr "Tio ne estas babilejo"
 
-#: ../src/dialogs.py:2341
+#: ../src/dialogs.py:2357
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s ne estas la nomo de babilejo."
 
-#: ../src/dialogs.py:2372
+#: ../src/dialogs.py:2388
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Senkonekta vi ne povas ŝanĝi vian pasvorton."
 
-#: ../src/dialogs.py:2386
+#: ../src/dialogs.py:2402
 msgid "Server"
 msgstr "Servilo"
 
-#: ../src/dialogs.py:2421
+#: ../src/dialogs.py:2437
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Konto \"%s\" estas konektita al la servilo"
 
-#: ../src/dialogs.py:2422
+#: ../src/dialogs.py:2438
 #, 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:2446
+#: ../src/dialogs.py:2462
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2523
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Babili per konto %s"
 
-#: ../src/dialogs.py:2509
+#: ../src/dialogs.py:2525
 msgid "Start Chat"
 msgstr "Babili"
 
-#: ../src/dialogs.py:2510
+#: ../src/dialogs.py:2526
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7250,168 +7439,168 @@ msgstr ""
 "al kiu vi volas sendi mesaĝon:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2536 ../src/dialogs.py:2917 ../src/dialogs.py:3129
+#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
 msgid "Connection not available"
 msgstr "Konekto mankas"
 
-#: ../src/dialogs.py:2537 ../src/dialogs.py:2918 ../src/dialogs.py:3130
+#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Bonvolu konvinkiĝi, ke vi estas konektita kun \"%s\"."
 
-#: ../src/dialogs.py:2546 ../src/dialogs.py:2549
+#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
 msgid "Invalid JID"
 msgstr "Malkorekta jabber-ID"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2565
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Neeblas analizi \"%s\"."
 
-#: ../src/dialogs.py:2558
+#: ../src/dialogs.py:2574
 msgid "Without a connection, you can not change your password."
 msgstr "Senkonekta vi ne povas ŝanĝi vian pasvorton."
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "Invalid password"
 msgstr "Malkorekta pasvorto"
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "You must enter a password."
 msgstr "Vi devas enigi pasvorton."
 
-#: ../src/dialogs.py:2581
+#: ../src/dialogs.py:2597
 msgid "Passwords do not match"
 msgstr "Pasvortoj diversas"
 
-#: ../src/dialogs.py:2582
+#: ../src/dialogs.py:2598
 msgid "The passwords typed in both fields must be identical."
 msgstr "En ambaÅ­ kampoj la pasvortoj devas esti identaj."
 
 #. default value
-#: ../src/dialogs.py:2619 ../src/notify.py:247 ../src/notify.py:473
+#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
 msgid "Contact Signed In"
 msgstr "Kontakto ensalutis"
 
-#: ../src/dialogs.py:2621 ../src/notify.py:255 ../src/notify.py:475
+#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
 msgid "Contact Signed Out"
 msgstr "Kontakto elsalutis"
 
 #. chat message
-#: ../src/dialogs.py:2623 ../src/notify.py:277 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
 msgid "New Message"
 msgstr "Nova mesaĝo"
 
 #. single message
-#: ../src/dialogs.py:2623 ../src/notify.py:259 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
 msgid "New Single Message"
 msgstr "Nova unuobla mesaĝo"
 
 #. private message
-#: ../src/dialogs.py:2624 ../src/notify.py:265 ../src/notify.py:478
+#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
 msgid "New Private Message"
 msgstr "Nova privata mesaĝo"
 
-#: ../src/dialogs.py:2624 ../src/gui_interface.py:1358 ../src/notify.py:487
+#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
 msgid "New E-mail"
 msgstr "Nova retletero"
 
-#: ../src/dialogs.py:2626 ../src/gui_interface.py:1420 ../src/notify.py:480
+#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
 msgid "File Transfer Request"
 msgstr "Mendo de dosiera transmeto"
 
-#: ../src/dialogs.py:2628 ../src/gui_interface.py:1320
-#: ../src/gui_interface.py:1389 ../src/notify.py:482
+#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
+#: ../src/gui_interface.py:1186 ../src/notify.py:482
 msgid "File Transfer Error"
 msgstr "Dosiertransmeta eraro"
 
-#: ../src/dialogs.py:2630 ../src/gui_interface.py:1466
-#: ../src/gui_interface.py:1489 ../src/gui_interface.py:1506
+#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
+#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
 #: ../src/notify.py:484
 msgid "File Transfer Completed"
 msgstr "Dosiera transmeto plenumis"
 
-#: ../src/dialogs.py:2631 ../src/gui_interface.py:1469 ../src/notify.py:485
+#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
 msgid "File Transfer Stopped"
 msgstr "Dosiera transmeto haltitas"
 
-#: ../src/dialogs.py:2633 ../src/gui_interface.py:1152 ../src/notify.py:489
+#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
 msgid "Groupchat Invitation"
 msgstr "Babileja invitilo"
 
-#: ../src/dialogs.py:2635 ../src/notify.py:239 ../src/notify.py:491
+#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
 msgid "Contact Changed Status"
 msgstr "Kontakto ŝanĝis sian staton"
 
-#: ../src/dialogs.py:2836
+#: ../src/dialogs.py:2852
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Unuopa mesaĝo per konto %s"
 
-#: ../src/dialogs.py:2838
+#: ../src/dialogs.py:2854
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Unuopa mesaĝo ĉe konto %s"
 
-#: ../src/dialogs.py:2840
+#: ../src/dialogs.py:2856
 msgid "Single Message"
 msgstr "Unuopa mesaĝo"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2843
+#: ../src/dialogs.py:2859
 #, python-format
 msgid "Send %s"
 msgstr "Sendi %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:2882
 #, python-format
 msgid "Received %s"
 msgstr "Ricevitas %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2889
+#: ../src/dialogs.py:2905
 #, 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:2968
+#: ../src/dialogs.py:2984
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:2985
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skribis:\n"
 
-#: ../src/dialogs.py:3028
+#: ../src/dialogs.py:3044
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML-konzolo por %s"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3046
 msgid "XML Console"
 msgstr "XML-konzolo"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "add"
 msgstr "Malrapidas"
 
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "modify"
 msgstr "_Korekti"
 
-#: ../src/dialogs.py:3160
+#: ../src/dialogs.py:3176
 #, fuzzy
 msgid "remove"
 msgstr "_Forigi"
 
-#: ../src/dialogs.py:3188
+#: ../src/dialogs.py:3204
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7419,159 +7608,192 @@ msgid ""
 msgstr "Mi petas vin permesi aldoni vin en mian kontaktliston."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3204 ../src/dialogs.py:3250
+#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
 msgid "Add"
 msgstr "Aldoni"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3206 ../src/dialogs.py:3281
+#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
 #, fuzzy
 msgid "Modify"
 msgstr "_Korekti"
 
-#: ../src/dialogs.py:3212
+#: ../src/dialogs.py:3228
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber-ID:"
 
-#: ../src/dialogs.py:3218
+#: ../src/dialogs.py:3234
 #, fuzzy
 msgid "Groups"
 msgstr "Grupo"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3342
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Mi volus aldoni vin al mia kontaktlisto."
 
-#: ../src/dialogs.py:3340
+#: ../src/dialogs.py:3356
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "Aldoni _kontakton"
 
-#: ../src/dialogs.py:3377
+#: ../src/dialogs.py:3393
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Forigas kontakton el kontaktlisto"
 
-#: ../src/dialogs.py:3430
+#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#, python-format
+msgid "Archiving Preferences for %s"
+msgstr ""
+
+#: ../src/dialogs.py:3473
+#, fuzzy
+msgid "Invalid expire value"
+msgstr "Malkorekta salutnomo"
+
+#: ../src/dialogs.py:3474
+msgid "Expire must be a valid positive integer."
+msgstr ""
+
+#: ../src/dialogs.py:3521
+msgid "There is an error with the form"
+msgstr ""
+
+#: ../src/dialogs.py:3732
+msgid "There is an error"
+msgstr ""
+
+#: ../src/dialogs.py:3796
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privata listo <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3434
+#: ../src/dialogs.py:3800
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privata listo por %s"
 
-#: ../src/dialogs.py:3490
+#: ../src/dialogs.py:3856
 #, 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:3495
+#: ../src/dialogs.py:3861
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordnumero: %s, ago: %s"
 
-#: ../src/dialogs.py:3539
+#: ../src/dialogs.py:3905
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Redakti regulon</b>"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:4016
 msgid "<b>Add a rule</b>"
 msgstr "<b>Aldoni regulon</b>"
 
-#: ../src/dialogs.py:3750
+#: ../src/dialogs.py:4116
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privataj listoj por %s"
 
-#: ../src/dialogs.py:3752
+#: ../src/dialogs.py:4118
 msgid "Privacy Lists"
 msgstr "Privataj listoj"
 
-#: ../src/dialogs.py:3822
+#: ../src/dialogs.py:4188
 msgid "Invalid List Name"
 msgstr "Malkorekta listnomo"
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4189
 msgid "You must enter a name to create a privacy list."
 msgstr "Vi devas enigi nomon por krei privatan liston."
 
-#: ../src/dialogs.py:3855
+#: ../src/dialogs.py:4221
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Al vi oni malpermesis esti en la babilejo."
 
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4224
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact invitas vin al la babilejo %(room_jid)s"
 
-#: ../src/dialogs.py:3860
+#: ../src/dialogs.py:4226
 #, 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:3868
+#: ../src/dialogs.py:4234
 #, python-format
 msgid "Comment: %s"
 msgstr "Komento: %s"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4236
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3932
+#: ../src/dialogs.py:4298
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:3942 ../src/dialogs.py:3985 ../src/dialogs.py:4041
+#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
+#: ../src/dialogs.py:4495
 msgid "All files"
 msgstr "Ĉiuj dosieroj"
 
-#: ../src/dialogs.py:3947
+#: ../src/dialogs.py:4313
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:3975
+#: ../src/dialogs.py:4341
 msgid "Choose Sound"
 msgstr "Elektu sonon"
 
-#: ../src/dialogs.py:3990
+#: ../src/dialogs.py:4356
 msgid "Wav Sounds"
 msgstr "Wav-sonoj"
 
-#: ../src/dialogs.py:4028
+#: ../src/dialogs.py:4394
 msgid "Choose Image"
 msgstr "Elektu bildon"
 
-#: ../src/dialogs.py:4046
+#: ../src/dialogs.py:4412
 msgid "Images"
 msgstr "Bildoj"
 
-#: ../src/dialogs.py:4113
+#: ../src/dialogs.py:4482
+#, fuzzy
+msgid "Choose Archive"
+msgstr "Elektu bildon"
+
+#: ../src/dialogs.py:4500
+#, fuzzy
+msgid "Zip files"
+msgstr "Ĉiuj dosieroj"
+
+#: ../src/dialogs.py:4525
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kiam %s venas:"
 
-#: ../src/dialogs.py:4115
+#: ../src/dialogs.py:4527
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Aligado de speciala avizo por %s"
 
-#: ../src/dialogs.py:4190
+#: ../src/dialogs.py:4602
 msgid "Condition"
 msgstr "Kondiĉo"
 
-#: ../src/dialogs.py:4310
+#: ../src/dialogs.py:4722
 msgid "when I am "
 msgstr "dum mi estas "
 
-#: ../src/dialogs.py:4786
+#: ../src/dialogs.py:5198
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7579,38 +7801,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4789
+#: ../src/dialogs.py:5201
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4795 ../src/dialogs.py:4879
+#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4801
+#: ../src/dialogs.py:5213
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4806
+#: ../src/dialogs.py:5218
 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:4809 ../src/dialogs.py:4860 ../src/dialogs.py:4873
+#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4814
+#: ../src/dialogs.py:5226
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4825
+#: ../src/dialogs.py:5237
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4826
+#: ../src/dialogs.py:5238
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7620,44 +7842,44 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4827
+#: ../src/dialogs.py:5239
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4861
+#: ../src/dialogs.py:5273
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4867
+#: ../src/dialogs.py:5279
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4874
+#: ../src/dialogs.py:5286
 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:4880
+#: ../src/dialogs.py:5292
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:4945
+#: ../src/dialogs.py:5357
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4947
+#: ../src/dialogs.py:5359
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4949
+#: ../src/dialogs.py:5361
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4953
+#: ../src/dialogs.py:5365
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7673,24 +7895,24 @@ msgstr "Aliaj"
 msgid "Conference"
 msgstr "Babilejoj"
 
-#: ../src/disco.py:512
+#: ../src/disco.py:513
 msgid "Without a connection, you can not browse available services"
 msgstr "Senkonekta vi ne povas rigardi disponeblajn servojn"
 
-#: ../src/disco.py:589
+#: ../src/disco.py:600
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Serĉado de servoj per konto %s"
 
-#: ../src/disco.py:591
+#: ../src/disco.py:602
 msgid "Service Discovery"
 msgstr "Serĉado de servoj"
 
-#: ../src/disco.py:741
+#: ../src/disco.py:758
 msgid "The service could not be found"
 msgstr "Neniu servo estas trovita"
 
-#: ../src/disco.py:742
+#: ../src/disco.py:759
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7698,97 +7920,97 @@ msgstr ""
 "Servo mankas ĉe la adreso, kiun vi enigis, aŭ ĝi ne respondas. Kontrolu la "
 "adreson kaj provu denove."
 
-#: ../src/disco.py:746 ../src/disco.py:1082
+#: ../src/disco.py:763 ../src/disco.py:1100
 msgid "The service is not browsable"
 msgstr "Tiu ĉi servo ne rigardeblas"
 
-#: ../src/disco.py:747
+#: ../src/disco.py:764
 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:786 ../src/disco.py:796
+#: ../src/disco.py:804 ../src/disco.py:814
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/disco.py:850
+#: ../src/disco.py:868
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Rigardado %s per konto %s"
 
-#: ../src/disco.py:894
+#: ../src/disco.py:912
 msgid "_Browse"
 msgstr "_Rigardi"
 
-#: ../src/disco.py:1083
+#: ../src/disco.py:1101
 msgid "This service does not contain any items to browse."
 msgstr "Tiu ĉi servo ne havas erojn por rigardi."
 
-#: ../src/disco.py:1323
+#: ../src/disco.py:1341
 #, fuzzy
 msgid "_Execute Command"
 msgstr "_Plenumi komandon..."
 
-#: ../src/disco.py:1333 ../src/disco.py:1504
+#: ../src/disco.py:1351 ../src/disco.py:1522
 msgid "Re_gister"
 msgstr "Re_gistri"
 
-#: ../src/disco.py:1545
+#: ../src/disco.py:1563
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanas %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1736
+#: ../src/disco.py:1754
 msgid "Users"
 msgstr "Uzuloj"
 
 #. Description column
-#: ../src/disco.py:1744
+#: ../src/disco.py:1762
 msgid "Description"
 msgstr "Priskribo"
 
 #. Id column
-#: ../src/disco.py:1752
+#: ../src/disco.py:1770
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1817 ../src/gui_interface.py:3182
+#: ../src/disco.py:1835 ../src/gui_interface.py:2995
 msgid "Bookmark already set"
 msgstr "Legosigno jam estas metita"
 
-#: ../src/disco.py:1818 ../src/gui_interface.py:3183
+#: ../src/disco.py:1836 ../src/gui_interface.py:2996
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Babilejo \"%s\" jam estas en viajn legosignojn."
 
-#: ../src/disco.py:1827 ../src/gui_interface.py:3197
+#: ../src/disco.py:1845 ../src/gui_interface.py:3010
 msgid "Bookmark has been added successfully"
 msgstr "Legosigno sukcese aldonitas"
 
-#: ../src/disco.py:1828 ../src/gui_interface.py:3198
+#: ../src/disco.py:1846 ../src/gui_interface.py:3011
 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:2039
+#: ../src/disco.py:2057
 msgid "Subscribed"
 msgstr "Abonita"
 
-#: ../src/disco.py:2047
+#: ../src/disco.py:2065
 #, fuzzy
 msgid "Node"
 msgstr "Neniu"
 
-#: ../src/disco.py:2111
+#: ../src/disco.py:2129
 msgid "New post"
 msgstr "Nova mesaĝo"
 
-#: ../src/disco.py:2117
+#: ../src/disco.py:2135
 msgid "_Subscribe"
 msgstr "_Aboni"
 
-#: ../src/disco.py:2123
+#: ../src/disco.py:2141
 msgid "_Unsubscribe"
 msgstr "_Malaboni"
 
@@ -7964,14 +8186,14 @@ msgstr ""
 
 #: ../src/features_window.py:95
 msgid ""
-"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
-"in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 
 #: ../src/features_window.py:96
 msgid ""
-"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
+"You have to set 'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 
 #: ../src/features_window.py:97
@@ -8129,34 +8351,34 @@ msgstr "Priskribo: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s volas sendi al vi dosieron:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Ne povas reskribi ekzistan dosieron \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
 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:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 msgid "This file already exists"
 msgstr "Tiu dosiero jam ekzistas"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 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:369 ../src/gtkgui_helpers.py:914
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Dosierujo \"%s\" ne skribeblas"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
 msgid "You do not have permission to create files in this directory."
 msgstr "Vi ne havas permeson krei dosierojn en ĉi tiu dosierujo."
 
@@ -8259,28 +8481,28 @@ msgstr ""
 "Alia ekzemplero de Gajim ŝajne estas lanĉita\n"
 "Ĉu lanĉu malgraŭ tio?"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
 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:80
+#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
 msgid "command"
 msgstr "komando"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "montri helpon pri komando"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Montras aŭ kaŝas la kontaktlistan fenestron"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "AntaÅ­igas fenestron kun la sekva atendanta evento"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8288,6 +8510,13 @@ msgstr ""
 "Eligas liston de ĉiuj kontaktoj de kontaktlisto. Ĉiu kontakto aperas en "
 "separata lineo"
 
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
+#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
+#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
+#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
 #: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
 #: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
 #: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
@@ -8299,42 +8528,34 @@ msgstr ""
 msgid "account"
 msgstr "konto"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "Montri kontaktojn nur de specifita konto"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Eligas liston de registritaj kontoj"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
 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:109
+#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
 msgid "status"
 msgstr "stato"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106
 #, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"accoun't previous status"
+msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "unu el: senkonekta, enrete, babilas, fora, nedisponebla, okupata, nevidebla "
 
-#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
-msgid "message"
-msgstr "mesaĝo"
-
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "statmesaĝo"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8343,48 +8564,20 @@ msgstr ""
 "statojn de ĉiuj kontoj, kiuj havas ŝaltitan parametron \"sinkronigi kun "
 "komuna stato\""
 
-#: ../src/gajim-remote.py:117
-#, fuzzy
-msgid "Changes the priority of account or accounts"
-msgstr "Ŝanĝas staton de konto aŭ kontoj"
-
-#: ../src/gajim-remote.py:119
-#, fuzzy
-msgid "priority"
-msgstr "Priori_tato:"
-
-#: ../src/gajim-remote.py:119
-#, fuzzy
-msgid "priority you want to give to the account"
-msgstr "Mi volas registri novan konton"
-
-#: ../src/gajim-remote.py:121
-#, fuzzy
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-msgstr ""
-"ŝanĝas staton de konto \"account\". Se ne estas specifita, provas ŝanĝi "
-"statojn de ĉiuj kontoj, kiuj havas ŝaltitan parametron \"sinkronigi kun "
-"komuna stato\""
-
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
 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:129
+#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID de kontakto, kun kiu vi volas interparoli"
 
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
 #: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 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:134
-msgid "message content. The account must be specified or \"\""
-msgstr ""
-
-#: ../src/gajim-remote.py:139
+#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
 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 "
@@ -8394,29 +8587,34 @@ msgstr ""
 "kaj konto estas fakultativaj. Se vi volas specifi nur konton sen OpenPGP-"
 "ŝlosilo, do specifu \"OpenPGP-ŝlosilo\" kiel \"\"."
 
+#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
 #: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID de kontakto, kiu ricevos la mesaĝon"
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
+#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "mesaĝenhavo"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "PGP-ŝlosilo"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 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:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
+#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
 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:152
+#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
 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 "
@@ -8426,140 +8624,286 @@ msgstr ""
 "ŝlosilo kaj konto estas fakultativaj. Se vi volas specifi nur konton sen "
 "OpenPGP-ŝlosilo, do specifu \"OpenPGP-ŝlosilo\" kiel \"\"."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "temo"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "temo de mesaĝo"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID de kontakto, kiu ricevos la mesaĝon"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Ricevas detalan informon pri kontakto"
 
+#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
+#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
 #: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
 #: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID de la kontakto"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Ricevas detalan informon pri konto"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Nomo de la konto"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Sendi dosieron al kontakto"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "file"
 msgstr "dosiero"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Dosierindiko"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "Se specifita, dosiero estos sendita per tiu ĉi konto"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Listo de ĉiuj parametroj kaj ilia valoroj"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Valorigi \"ŝlosilo\" per \"valoro\"."
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "ŝlosilo=valoro"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 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:207
+#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Forigas parametron"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
 msgid "key"
 msgstr "ŝlosilo"
 
-#: ../src/gajim-remote.py:209
-msgid "name of the preference to be deleted"
-msgstr "nomo de forigota parametro"
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "name of the preference to be deleted"
+msgstr "nomo de forigota parametro"
+
+#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+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-plugin.py:202 ../src/gajim-remote.py:218
+msgid "Removes contact from roster"
+msgstr "Forigas kontakton el kontaktlisto"
+
+#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+msgid "Adds contact to roster"
+msgstr "Aligas kontakton en kontaktliston"
+
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+msgid "Adds new contact to this account"
+msgstr "Aldonas novan kontakton en tiun konton"
+
+#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+msgid "Returns current status (the global one unless account is specified)"
+msgstr "Donas nuntempan staton (la komuna se konto estas nespecifita)"
+
+#: ../src/gajim-remote-plugin.py:226
+#, fuzzy
+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-plugin.py:233 ../src/gajim-remote.py:249
+msgid "Returns number of unread messages"
+msgstr "Donas kvanton de nelegitaj mesaĝoj"
+
+#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+msgid "Opens 'Start Chat' dialog"
+msgstr "Malfermi \"Ekparoli\" dialogfenestron"
+
+#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+msgid "Starts chat, using this account"
+msgstr "Babili per tiu ĉi konto"
+
+#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+msgid "Sends custom XML"
+msgstr "Sendi propran XML"
+
+#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+msgid "XML to send"
+msgstr "XML por sendi"
+
+#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+"Konto kien la XML sendotas; se konto nespecifitas, XML sendotas al ĉiuj "
+"kontoj"
+
+#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
+msgid "Handle a xmpp:/ uri"
+msgstr "Prilabori xmpp:/ uri"
+
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
+msgid "uri"
+msgstr "uri"
+
+#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+msgid "Join a MUC room"
+msgstr "Aliĝi al MUC-babilejo"
+
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+msgid "room"
+msgstr "babilejo"
+
+#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+msgid "nick"
+msgstr "kaŝnomo"
+
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+msgid "password"
+msgstr "pasvorto:"
+
+#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#, fuzzy
+msgid "Check if Gajim is running"
+msgstr "Bonvolu certiĝi ke avahi-demono estas aktiva."
+
+#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
+#: ../src/gajim-remote.py:300
+#, fuzzy
+msgid "Shows or hides the ipython window"
+msgstr "Montras aŭ kaŝas la kontaktlistan fenestron"
+
+#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+msgid "Missing argument \"contact_jid\""
+msgstr "Mankas argumento \"kontakt-jid\""
+
+#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#, python-format
+msgid ""
+"'%s' is not in your roster.\n"
+"Please specify account for sending the message."
+msgstr ""
+"%s mankas en via kontaktlisto\n"
+"Bonvolu specifi konton por sendi la mesaĝon."
+
+#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+msgid "You have no active account"
+msgstr "Vi ne havas aktivan konton"
 
-#: ../src/gajim-remote.py:213
-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-plugin.py:383 ../src/gajim-remote.py:404
+msgid "It seems Gajim is not running. So you can't use gajim-remote."
+msgstr ""
 
-#: ../src/gajim-remote.py:218
-msgid "Removes contact from roster"
-msgstr "Forigas kontakton el kontaktlisto"
+#: ../src/gajim-remote-plugin.py:412
+#, python-format
+msgid ""
+"Usage: %s %s %s \n"
+"\t %s"
+msgstr ""
+"Uzado: %s %s %s \n"
+"\t %s"
 
-#: ../src/gajim-remote.py:227
-msgid "Adds contact to roster"
-msgstr "Aligas kontakton en kontaktliston"
+#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+msgid "Arguments:"
+msgstr "Argumentoj:"
 
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "JID"
+#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#, python-format
+msgid "%s not found"
+msgstr "%s ne trovitas"
 
-#: ../src/gajim-remote.py:230
-msgid "Adds new contact to this account"
-msgstr "Aldonas novan kontakton en tiun konton"
+#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
+#, python-format
+msgid ""
+"Usage: %s command [arguments]\n"
+"Command is one of:\n"
+msgstr ""
+"Uzado: %s komando [argumentoj]\n"
+"Komando estas unu el:\n"
 
-#: ../src/gajim-remote.py:235
-msgid "Returns current status (the global one unless account is specified)"
-msgstr "Donas nuntempan staton (la komuna se konto estas nespecifita)"
+#: ../src/gajim-remote-plugin.py:496
+#, fuzzy, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Tro multe da argumentoj. \n"
+"Enigu \"%s help %s\" por plia informo"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote-plugin.py:500
+#, fuzzy, python-format
 msgid ""
-"Returns current status message (the global one unless account is specified)"
-msgstr "Donas nuntempan statmesaĝon (la komuna se konto estas nespecifita)"
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Argumento \"%s\" ne estas specifita. \n"
+"Enigi \"%s help %s\" por plia informo"
 
-#: ../src/gajim-remote.py:249
-msgid "Returns number of unread messages"
-msgstr "Donas kvanton de nelegitaj mesaĝoj"
+#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
+msgid "Wrong uri"
+msgstr "Malprava uri"
 
-#: ../src/gajim-remote.py:253
-msgid "Opens 'Start Chat' dialog"
-msgstr "Malfermi \"Ekparoli\" dialogfenestron"
+#: ../src/gajim-remote.py:109
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
+msgstr ""
+"unu el: senkonekta, enrete, babilas, fora, nedisponebla, okupata, nevidebla "
 
-#: ../src/gajim-remote.py:255
-msgid "Starts chat, using this account"
-msgstr "Babili per tiu ĉi konto"
+#: ../src/gajim-remote.py:117
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Ŝanĝas staton de konto aŭ kontoj"
 
-#: ../src/gajim-remote.py:259
-msgid "Sends custom XML"
-msgstr "Sendi propran XML"
+#: ../src/gajim-remote.py:119
+#, fuzzy
+msgid "priority"
+msgstr "Priori_tato:"
 
-#: ../src/gajim-remote.py:261
-msgid "XML to send"
-msgstr "XML por sendi"
+#: ../src/gajim-remote.py:119
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Mi volas registri novan konton"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:121
+#, fuzzy
 msgid ""
-"Account in which the xml will be sent; if not specified, xml will be sent to "
-"all accounts"
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
 msgstr ""
-"Konto kien la XML sendotas; se konto nespecifitas, XML sendotas al ĉiuj "
-"kontoj"
+"ŝanĝas staton de konto \"account\". Se ne estas specifita, provas ŝanĝi "
+"statojn de ĉiuj kontoj, kiuj havas ŝaltitan parametron \"sinkronigi kun "
+"komuna stato\""
+
+#: ../src/gajim-remote.py:134
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:242
+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:268
 #, fuzzy
@@ -8580,14 +8924,6 @@ msgstr ""
 "Konto kien la XML sendotas; se konto nespecifitas, XML sendotas al ĉiuj "
 "kontoj"
 
-#: ../src/gajim-remote.py:277
-msgid "Handle a xmpp:/ uri"
-msgstr "Prilabori xmpp:/ uri"
-
-#: ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "uri"
-
 #: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr ""
@@ -8601,32 +8937,16 @@ msgstr ""
 msgid "Message content"
 msgstr "mesaĝenhavo"
 
-#: ../src/gajim-remote.py:286
-msgid "Join a MUC room"
-msgstr "Aliĝi al MUC-babilejo"
-
-#: ../src/gajim-remote.py:288
-msgid "room"
-msgstr "babilejo"
-
 #: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "Room JID"
 msgstr "Babilejo:"
 
-#: ../src/gajim-remote.py:289
-msgid "nick"
-msgstr "kaŝnomo"
-
 #: ../src/gajim-remote.py:289
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Kaŝnomo ne trovitas: %s"
 
-#: ../src/gajim-remote.py:290
-msgid "password"
-msgstr "pasvorto:"
-
 #: ../src/gajim-remote.py:290
 #, fuzzy
 msgid "Password to enter the room"
@@ -8636,37 +8956,6 @@ msgstr "Pasvortoj diversas"
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:296
-#, fuzzy
-msgid "Check if Gajim is running"
-msgstr "Bonvolu certiĝi ke avahi-demono estas aktiva."
-
-#: ../src/gajim-remote.py:300
-#, fuzzy
-msgid "Shows or hides the ipython window"
-msgstr "Montras aŭ kaŝas la kontaktlistan fenestron"
-
-#: ../src/gajim-remote.py:327
-msgid "Missing argument \"contact_jid\""
-msgstr "Mankas argumento \"kontakt-jid\""
-
-#: ../src/gajim-remote.py:348
-#, python-format
-msgid ""
-"'%s' is not in your roster.\n"
-"Please specify account for sending the message."
-msgstr ""
-"%s mankas en via kontaktlisto\n"
-"Bonvolu specifi konton por sendi la mesaĝon."
-
-#: ../src/gajim-remote.py:351
-msgid "You have no active account"
-msgstr "Vi ne havas aktivan konton"
-
-#: ../src/gajim-remote.py:404
-msgid "It seems Gajim is not running. So you can't use gajim-remote."
-msgstr ""
-
 #: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
@@ -8674,24 +8963,6 @@ msgid ""
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:435
-msgid "Arguments:"
-msgstr "Argumentoj:"
-
-#: ../src/gajim-remote.py:439
-#, python-format
-msgid "%s not found"
-msgstr "%s ne trovitas"
-
-#: ../src/gajim-remote.py:445
-#, python-format
-msgid ""
-"Usage: %s command [arguments]\n"
-"Command is one of:\n"
-msgstr ""
-"Uzado: %s komando [argumentoj]\n"
-"Komando estas unu el:\n"
-
 #: ../src/gajim-remote.py:514
 #, fuzzy, python-format
 msgid ""
@@ -8714,10 +8985,6 @@ msgstr ""
 msgid "No uri given"
 msgstr ""
 
-#: ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Malprava uri"
-
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Etoso"
@@ -8744,202 +9011,200 @@ msgstr "Vi ne povas forigi aktivan etoson"
 msgid "Please first choose another for your current theme."
 msgstr "Bonvolu komence aktivigi alian etoson."
 
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:170
 msgid "Sending private message failed"
 msgstr "Sendado de privata mesaĝo malsukcesis"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:171
+#: ../src/groupchat_control.py:172
 #, 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:450
+#: ../src/groupchat_control.py:455
 msgid "Insert Nickname"
 msgstr "Enmeti kaŝnomon"
 
-#: ../src/groupchat_control.py:631
+#: ../src/groupchat_control.py:636
 #, fuzzy
 msgid "Conversation with "
 msgstr "Historio de interparoloj"
 
-#: ../src/groupchat_control.py:633
+#: ../src/groupchat_control.py:638
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Konekto"
 
-#. Can be a message (see handle_event_gc_config_change in
-#. gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1272 ../src/gui_interface.py:1080
+#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1286
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1288
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Via nova konto estas sukcese kreita"
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1291
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1287
+#: ../src/groupchat_control.py:1297
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s estas elpelita: %(reason)s"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1300
 #, 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:1300
+#: ../src/groupchat_control.py:1309
 #, 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:1303
+#: ../src/groupchat_control.py:1312
 #, 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:1314 ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
 #, python-format
 msgid "You are now known as %s"
 msgstr "Vi nomiĝas %s"
 
-#: ../src/groupchat_control.py:1330 ../src/gui_interface.py:919
+#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s nomiĝas %s"
 
-#: ../src/groupchat_control.py:1372 ../src/groupchat_control.py:1377
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1392
 #, 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:1374
+#: ../src/groupchat_control.py:1383
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Aparteneco:"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1388
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1394
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1470
+#: ../src/groupchat_control.py:1477
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1474
+#: ../src/groupchat_control.py:1481
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1489
+#: ../src/groupchat_control.py:1496
 #, 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:1493
+#: ../src/groupchat_control.py:1500
 #, 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:1522
+#: ../src/groupchat_control.py:1530
 #, python-format
 msgid "%s has left"
 msgstr "%s foriris"
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1535
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s aliĝis al la babilejo"
 
-#: ../src/groupchat_control.py:1529 ../src/gui_interface.py:946
+#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
 #: ../src/history_window.py:447 ../src/notify.py:234
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s nun estas %(status)s"
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1774
 #, 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:1761
+#: ../src/groupchat_control.py:1776
 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:1765 ../src/gui_interface.py:1216
-#: ../src/gui_interface.py:1992 ../src/gui_interface.py:2029
-#: ../src/gui_interface.py:2064 ../src/message_window.py:224
-#: ../src/roster_window.py:2739 ../src/roster_window.py:3399
-#: ../src/roster_window.py:4123
+#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
+#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
+#: ../src/gui_interface.py:1853 ../src/message_window.py:224
+#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
+#: ../src/roster_window.py:4195
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Ne plu demandi"
 
-#: ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:1814
 msgid "Changing Subject"
 msgstr "Korektas temon"
 
-#: ../src/groupchat_control.py:1800
+#: ../src/groupchat_control.py:1815
 msgid "Please specify the new subject:"
 msgstr "Bonvolu enigi novan temon:"
 
-#: ../src/groupchat_control.py:1807
+#: ../src/groupchat_control.py:1822
 msgid "Changing Nickname"
 msgstr "Ŝanĝas kaŝnomon"
 
-#: ../src/groupchat_control.py:1808
+#: ../src/groupchat_control.py:1823
 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:1839
+#: ../src/groupchat_control.py:1854
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Priskribo: %s"
 
-#: ../src/groupchat_control.py:1840
+#: ../src/groupchat_control.py:1855
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1842
+#: ../src/groupchat_control.py:1857
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2028
+#: ../src/groupchat_control.py:2046
 #, python-format
 msgid "Kicking %s"
 msgstr "Elpelatas %s"
 
-#: ../src/groupchat_control.py:2029 ../src/groupchat_control.py:2356
+#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
 msgid "You may specify a reason below:"
 msgstr "Vi povas specifi kialon sube:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2355
+#: ../src/groupchat_control.py:2373
 #, python-format
 msgid "Banning %s"
 msgstr "Malpermesas %s"
@@ -8963,54 +9228,63 @@ msgid "Details"
 msgstr "Detalaĵoj"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
+#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Eraro: ne povas malfermi %s por legi"
 
-#: ../src/gtkgui_helpers.py:400
+#: ../src/gtkgui_helpers.py:404
 msgid "Error reading file:"
 msgstr "Eraro dum legado de dosiero:"
 
-#: ../src/gtkgui_helpers.py:403
+#: ../src/gtkgui_helpers.py:407
 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:444
+#: ../src/gtkgui_helpers.py:448
 #, 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:818
+#: ../src/gtkgui_helpers.py:822
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim ne estas defaÅ­lta jabber-kliento"
 
-#: ../src/gtkgui_helpers.py:819
+#: ../src/gtkgui_helpers.py:823
 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:820
+#: ../src/gtkgui_helpers.py:824
 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:887
+#: ../src/gtkgui_helpers.py:891
 msgid "Extension not supported"
 msgstr "Kromaĵo ne subtenatas"
 
-#: ../src/gtkgui_helpers.py:888
+#: ../src/gtkgui_helpers.py:892
 #, 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:924
+#: ../src/gtkgui_helpers.py:928
 msgid "Save Image as..."
 msgstr "Konservi bildon kiel..."
 
-#: ../src/gui_interface.py:140
+#. we are banned
+#. group chat does not exist
+#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
+#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
+#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
+#: ../src/gui_interface.py:348
+msgid "Unable to join group chat"
+msgstr "Neeblas aliĝi al babilejo"
+
+#: ../src/gui_interface.py:138
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9020,147 +9294,176 @@ msgstr ""
 "Via dezirata kaŝnomo estas uzata aŭ registrita per alia uzulo.\n"
 "Bonvolu specifi alian kaŝnomon jene:"
 
-#: ../src/gui_interface.py:143
+#: ../src/gui_interface.py:141
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:159
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Ĉu vi akceptas tiun peton?"
 
-#: ../src/gui_interface.py:161
+#: ../src/gui_interface.py:160
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Ĉu vi akceptas tiun peton?"
 
-#: ../src/gui_interface.py:164
+#: ../src/gui_interface.py:163
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) AÅ­tentokontrolo por %s (id: %s)"
 
-#: ../src/gui_interface.py:213 ../src/notify.py:493
+#: ../src/gui_interface.py:209 ../src/notify.py:493
 msgid "Connection Failed"
 msgstr "Konektado malsukcesis"
 
-#: ../src/gui_interface.py:606 ../src/gui_interface.py:610
+#: ../src/gui_interface.py:312
+#, 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/gui_interface.py:324
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/gui_interface.py:333
+#, fuzzy, python-format
+msgid "You are banned from group chat %s."
+msgstr "Al vi oni malpermesis esti en la babilejo."
+
+#: ../src/gui_interface.py:338
+#, fuzzy, python-format
+msgid "Group chat %s does not exist."
+msgstr "Tiu babilejo ne ekzistas."
+
+#: ../src/gui_interface.py:341
+msgid "Group chat creation is restricted."
+msgstr "Babileja kreado limigitas."
+
+#: ../src/gui_interface.py:344
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Vi devas uzi vian registritan kaŝnomon."
+
+#: ../src/gui_interface.py:349
+#, fuzzy, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Vi ne ĉeestas en membrolisto."
+
+#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:621 ../src/gui_interface.py:636
+#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "eraro dum sendado %s ( %s )"
 
-#: ../src/gui_interface.py:663 ../src/notify.py:495
+#: ../src/gui_interface.py:540 ../src/notify.py:495
 #, fuzzy
 msgid "Subscription request"
 msgstr "Mendo de abono"
 
-#: ../src/gui_interface.py:688
+#: ../src/gui_interface.py:565
 msgid "Authorization accepted"
 msgstr "Permespeto akceptitas"
 
-#: ../src/gui_interface.py:689
+#: ../src/gui_interface.py:566
 #, 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/gui_interface.py:702
+#: ../src/gui_interface.py:579
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakto \"%s\" nuligis abonon de vi"
 
-#: ../src/gui_interface.py:703
+#: ../src/gui_interface.py:580
 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/gui_interface.py:727 ../src/notify.py:497
+#: ../src/gui_interface.py:604 ../src/notify.py:497
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Malaboni"
 
-#: ../src/gui_interface.py:754
+#: ../src/gui_interface.py:631
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakto kun \"%s\" neestableblas"
 
-#: ../src/gui_interface.py:1015
+#: ../src/gui_interface.py:859
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1083
+#: ../src/gui_interface.py:926
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gui_interface.py:1085
+#: ../src/gui_interface.py:928
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gui_interface.py:1087
+#: ../src/gui_interface.py:930
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:1091
+#: ../src/gui_interface.py:934
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1093
+#: ../src/gui_interface.py:936
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1095
+#: ../src/gui_interface.py:938
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1098
+#: ../src/gui_interface.py:941
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1101
+#: ../src/gui_interface.py:944
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1133
-#, 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/gui_interface.py:1180
+#: ../src/gui_interface.py:985
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gui_interface.py:1182 ../src/gui_interface.py:1189
+#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Nun vi estas konekta sen uzado de via OpenPGP-ŝlosilo."
 
-#: ../src/gui_interface.py:1184
+#: ../src/gui_interface.py:989
 msgid "Your passphrase is incorrect"
 msgstr "Via pasfrazo estas malvalida"
 
-#: ../src/gui_interface.py:1188
+#: ../src/gui_interface.py:993
 #, fuzzy
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Via pasfrazo estas malvalida"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid "GPG key not trusted"
 msgstr ""
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
 msgstr ""
 
-#: ../src/gui_interface.py:1226
+#: ../src/gui_interface.py:1031
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not                 correctly started "
@@ -9169,19 +9472,19 @@ msgstr ""
 "Gnoma ŝlosilaro (Gnome Keyring) instalitas sed ne estas korekte lanĉita "
 "(medivariablo eble ne korekte valorizitas)"
 
-#: ../src/gui_interface.py:1330
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nova retletero ĉe %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1332
+#: ../src/gui_interface.py:1133
 #, 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/gui_interface.py:1345
+#: ../src/gui_interface.py:1146
 #, python-format
 msgid ""
 "\n"
@@ -9191,103 +9494,103 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1418
+#: ../src/gui_interface.py:1215
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s volas sendi dosieron al vi."
 
-#: ../src/gui_interface.py:1455 ../src/roster_window.py:1856
+#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Forigas kontakton el kontaktlisto"
 
-#: ../src/gui_interface.py:1458 ../src/roster_window.py:1858
+#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
 #, fuzzy
 msgid "Error opening file"
 msgstr "Eraro dum legado de dosiero:"
 
-#: ../src/gui_interface.py:1490
+#: ../src/gui_interface.py:1287
 #, 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/gui_interface.py:1494
+#: ../src/gui_interface.py:1291
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Transmeto de dosiero %(filename)s de %(name)s haltitas."
 
-#: ../src/gui_interface.py:1507
+#: ../src/gui_interface.py:1304
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Vi sukcese sendis %(filename)s al %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1511
+#: ../src/gui_interface.py:1308
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Transmeto de dosiero %(filename)s al %(name)s haltitas."
 
-#: ../src/gui_interface.py:1623
+#: ../src/gui_interface.py:1426
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gui_interface.py:1630
+#: ../src/gui_interface.py:1433
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "En ĉ_iu mesaĝo"
 
-#: ../src/gui_interface.py:1702
+#: ../src/gui_interface.py:1505
 msgid "Username Conflict"
 msgstr "Konflikto de salutnomoj"
 
-#: ../src/gui_interface.py:1703
+#: ../src/gui_interface.py:1506
 msgid "Please type a new username for your local account"
 msgstr "Bonvolu enigi novan salutnomon por via loka konto"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1519
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gui_interface.py:1729
+#: ../src/gui_interface.py:1532
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gui_interface.py:1740
+#: ../src/gui_interface.py:1543
 msgid "Error."
 msgstr ""
 
-#: ../src/gui_interface.py:1768
+#: ../src/gui_interface.py:1556
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Konflikto de salutnomoj"
 
-#: ../src/gui_interface.py:1769
+#: ../src/gui_interface.py:1557
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1816
+#: ../src/gui_interface.py:1604
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s volas sendi dosieron al vi."
 
-#: ../src/gui_interface.py:1819
+#: ../src/gui_interface.py:1607
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Mendo de dosiera transmeto"
 
-#: ../src/gui_interface.py:1927
+#: ../src/gui_interface.py:1716
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1928
+#: ../src/gui_interface.py:1717
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9295,15 +9598,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1936
+#: ../src/gui_interface.py:1725
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1956
+#: ../src/gui_interface.py:1745
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gui_interface.py:1957
+#: ../src/gui_interface.py:1746
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9314,13 +9617,13 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gui_interface.py:1987 ../src/gui_interface.py:2024
-#: ../src/gui_interface.py:2060
+#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
+#: ../src/gui_interface.py:1849
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Konekto"
 
-#: ../src/gui_interface.py:1988
+#: ../src/gui_interface.py:1777
 #, fuzzy
 msgid ""
 "You are about to connect to the server with an insecure connection. This "
@@ -9328,18 +9631,18 @@ msgid ""
 "want to do that?"
 msgstr "Pri kreado de metakontakto. Ĉu vi certas ke vi volas daŭrigi?"
 
-#: ../src/gui_interface.py:1991 ../src/gui_interface.py:2028
-#: ../src/gui_interface.py:2063
+#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
+#: ../src/gui_interface.py:1852
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gui_interface.py:2025
+#: ../src/gui_interface.py:1814
 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/gui_interface.py:2061
+#: ../src/gui_interface.py:1850
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9347,58 +9650,58 @@ msgid ""
 msgstr "Pri kreado de metakontakto. Ĉu vi certas ke vi volas daŭrigi?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2624 ../src/gui_interface.py:2647
+#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Ĉifrado malebligata"
 
-#: ../src/gui_interface.py:2625
+#: ../src/gui_interface.py:2423
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2648
+#: ../src/gui_interface.py:2446
 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/gui_interface.py:2679 ../src/roster_window.py:3560
+#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
 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/gui_interface.py:3058
+#: ../src/gui_interface.py:2871
 msgid "Could not save your settings and preferences"
 msgstr "Ne povis konservi vian agordon"
 
-#: ../src/gui_interface.py:3592
+#: ../src/gui_interface.py:3411
 msgid "Passphrase Required"
 msgstr "Pasfrazo necesas"
 
-#: ../src/gui_interface.py:3593
+#: ../src/gui_interface.py:3412
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Enigi GPG-ŝlosilan pasfrazon por konto %s."
 
-#: ../src/gui_interface.py:3607
+#: ../src/gui_interface.py:3426
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gui_interface.py:3608
+#: ../src/gui_interface.py:3427
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Vi estos konektita al %s sen OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3617
+#: ../src/gui_interface.py:3436
 msgid "Wrong Passphrase"
 msgstr "Malprava pasfrazo"
 
-#: ../src/gui_interface.py:3618
+#: ../src/gui_interface.py:3437
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Bonvolu ripeti vian GPG-pasvorton aÅ­ klaku Nuligi."
 
@@ -9437,6 +9740,11 @@ msgstr "Kaŝnomo"
 msgid "Message"
 msgstr "Mesaĝo"
 
+#. holds subject
+#: ../src/history_manager.py:188 ../src/history_manager.py:219
+msgid "Subject"
+msgstr "Temo"
+
 #: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -9535,19 +9843,19 @@ msgstr "Vi nekonektitas al la servilo"
 msgid "Do you really want to close them all?"
 msgstr "Ĉu vi efektive volas forigi la elektitan mesaĝon?"
 
-#: ../src/message_window.py:484
+#: ../src/message_window.py:485
 msgid "Chats"
 msgstr "Babilejoj"
 
-#: ../src/message_window.py:486
+#: ../src/message_window.py:487
 msgid "Group Chats"
 msgstr "Babilejoj"
 
-#: ../src/message_window.py:488
+#: ../src/message_window.py:489
 msgid "Private Chats"
 msgstr "Privataj interparoloj"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:495
 msgid "Messages"
 msgstr "Mesaĝoj"
 
@@ -9604,108 +9912,108 @@ msgstr "Nova mesaĝo de %(nickname)s"
 msgid "Ignore"
 msgstr "naÅ­"
 
-#: ../src/profile_window.py:57
+#: ../src/profile_window.py:58
 msgid "Retrieving profile..."
 msgstr "Obtenas vizitkarton..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2935
+#: ../src/profile_window.py:111 ../src/roster_window.py:3001
 #, fuzzy
 msgid "File is empty"
 msgstr "Dosierindiko"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2938
+#: ../src/profile_window.py:114 ../src/roster_window.py:3004
 #, fuzzy
 msgid "File does not exist"
 msgstr "Tiu babilejo ne ekzistas."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2940 ../src/roster_window.py:2951
+#: ../src/profile_window.py:128 ../src/profile_window.py:144
+#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
 msgid "Could not load image"
 msgstr "Ne povas alŝuti bildon"
 
-#: ../src/profile_window.py:214
+#: ../src/profile_window.py:215
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Kontakta informo"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:216
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Formato: JJJJ-MM-TT"
 
-#: ../src/profile_window.py:269
+#: ../src/profile_window.py:270
 msgid "Information received"
 msgstr "Informo estas ricevita"
 
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:341
 msgid "Without a connection you can not publish your contact information."
 msgstr "Senkonekte vi ne povas publikigi vian kontaktan informon."
 
-#: ../src/profile_window.py:353
+#: ../src/profile_window.py:354
 msgid "Sending profile..."
 msgstr "Publicas vizitkarton..."
 
-#: ../src/profile_window.py:368
+#: ../src/profile_window.py:369
 msgid "Information NOT published"
 msgstr "Informo NE publicitis"
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:376
 msgid "vCard publication failed"
 msgstr "Publicado de vizitkarto malsukcesis"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:377
 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:256 ../src/roster_window.py:1012
+#: ../src/roster_window.py:262 ../src/roster_window.py:1026
 msgid "Merged accounts"
 msgstr "Unuigaj kontoj"
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1942
 msgid "Authorization has been sent"
 msgstr "Permeso estas sendita"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1943
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ekde nun \"%s\" konos vian staton."
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1966
 msgid "Subscription request has been sent"
 msgstr "Demando pri abono estas sendita"
 
-#: ../src/roster_window.py:1944
+#: ../src/roster_window.py:1967
 #, 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:1958
+#: ../src/roster_window.py:1981
 msgid "Authorization has been removed"
 msgstr "Permeso estas forigita"
 
-#: ../src/roster_window.py:1959
+#: ../src/roster_window.py:1982
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ekde nun \"%s\" ĉiam vidos vin kiel senkonekta."
 
-#: ../src/roster_window.py:1986
+#: ../src/roster_window.py:2009
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:1987
+#: ../src/roster_window.py:2010
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Vi estos konektita al %s sen OpenPGP."
 
-#: ../src/roster_window.py:2199 ../src/roster_window.py:3496
+#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
 msgid "You are participating in one or more group chats"
 msgstr "Vi partoprenas en unu aÅ­ kelkaj babilejoj"
 
-#: ../src/roster_window.py:2200 ../src/roster_window.py:3497
+#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9713,55 +10021,55 @@ 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:2226
+#: ../src/roster_window.py:2249
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2288
+#: ../src/roster_window.py:2311
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2289
+#: ../src/roster_window.py:2312
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Ĉu vi certe volas foriri el babilejo \"%s\"?"
 
-#: ../src/roster_window.py:2290
+#: ../src/roster_window.py:2313
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2373
+#: ../src/roster_window.py:2396
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Nuligi dosiertransmeton"
 
-#: ../src/roster_window.py:2374
+#: ../src/roster_window.py:2397
 msgid ""
-"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2405 ../src/roster_window.py:2653
+#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
 msgid "You have unread messages"
 msgstr "Vi havas nelegitajn mesaĝojn"
 
-#: ../src/roster_window.py:2406
+#: ../src/roster_window.py:2429
 #, 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:2654
+#: ../src/roster_window.py:2720
 msgid "You must read them before removing this transport."
 msgstr "Legu ilin antaÅ­ forigi tiun transportilon."
 
-#: ../src/roster_window.py:2657
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transportilo \"%s\" estos forigita"
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2724
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9769,11 +10077,11 @@ msgstr ""
 "Vi ne plu eblos sendi kaj ricevi mesaĝojn kun kontaktoj el tiu ĉi "
 "transportilo."
 
-#: ../src/roster_window.py:2661
+#: ../src/roster_window.py:2727
 msgid "Transports will be removed"
 msgstr "Transportiloj estos forigita"
 
-#: ../src/roster_window.py:2666
+#: ../src/roster_window.py:2732
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9782,69 +10090,69 @@ msgstr ""
 "Vi ne plu eblos sendi kaj ricevi mesaĝojn kun kontaktoj el tiuj ĉi "
 "transportiloj:%s"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2800
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Pri kreado de metakontakto. Ĉu vi certas ke vi volas daŭrigi?"
 
-#: ../src/roster_window.py:2736
+#: ../src/roster_window.py:2802
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2827
+#: ../src/roster_window.py:2893
 msgid "Rename Contact"
 msgstr "Renomigado de kontakto"
 
-#: ../src/roster_window.py:2828
+#: ../src/roster_window.py:2894
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Enigu novan kaŝnomon por kontakto %s"
 
-#: ../src/roster_window.py:2835
+#: ../src/roster_window.py:2901
 msgid "Rename Group"
 msgstr "Renomigi grupon"
 
-#: ../src/roster_window.py:2836
+#: ../src/roster_window.py:2902
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Enigu novan nomon por la grupo %s"
 
-#: ../src/roster_window.py:2881
+#: ../src/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Forigi grupon"
 
-#: ../src/roster_window.py:2882
+#: ../src/roster_window.py:2948
 #, 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:2883
+#: ../src/roster_window.py:2949
 #, 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:2922
+#: ../src/roster_window.py:2988
 msgid "Assign OpenPGP Key"
 msgstr "Atribui OpenPGP-ŝlosilon"
 
-#: ../src/roster_window.py:2923
+#: ../src/roster_window.py:2989
 msgid "Select a key to apply to the contact"
 msgstr "Elektu ŝlosilon por atribui al la kontakto"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3372
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakto \"%s\" estos forigita el via kontaktlisto"
 
-#: ../src/roster_window.py:3308
+#: ../src/roster_window.py:3374
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3313
+#: ../src/roster_window.py:3379
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9853,12 +10161,12 @@ msgstr ""
 "vidos vin kiel senkonekta."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3319
+#: ../src/roster_window.py:3385
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Kion vi volas fari?"
 
-#: ../src/roster_window.py:3323
+#: ../src/roster_window.py:3389
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9866,16 +10174,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:3326
+#: ../src/roster_window.py:3392
 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:3330
+#: ../src/roster_window.py:3396
 msgid "Contacts will be removed from your roster"
 msgstr "Kontaktoj estos forigita el via kontaktlisto"
 
-#: ../src/roster_window.py:3335
+#: ../src/roster_window.py:3401
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9884,32 +10192,32 @@ msgstr ""
 "Forigante tiujn kontaktojn: %s\n"
 "vi forigas ankaŭ permesojn, rezulte ili ĉiam vidos vin kiel senkonekta."
 
-#: ../src/roster_window.py:3393
+#: ../src/roster_window.py:3459
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want  to continue?"
 msgstr "Pri kreado de metakontakto. Ĉu vi certas ke vi volas daŭrigi?"
 
-#: ../src/roster_window.py:3395
+#: ../src/roster_window.py:3461
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he or she will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3414
+#: ../src/roster_window.py:3480
 msgid "No account available"
 msgstr "Neniu konto disponeblas"
 
-#: ../src/roster_window.py:3415
+#: ../src/roster_window.py:3481
 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:4023
+#: ../src/roster_window.py:4095
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakta tenejo ne estas subtenata de via servilo"
 
-#: ../src/roster_window.py:4025
+#: ../src/roster_window.py:4097
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9918,12 +10226,12 @@ msgstr ""
 "Via servilo ne subtenas konservadon de metakontakta informo. Do tia informo "
 "ne estas konservota dum sekva rekonekto."
 
-#: ../src/roster_window.py:4117
+#: ../src/roster_window.py:4189
 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:4119
+#: ../src/roster_window.py:4191
 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 "
@@ -9933,24 +10241,24 @@ msgstr ""
 "Ĝenerale ĝi estas uzata kiam unu persono havas kelkajn jabber-kontojn aŭ "
 "transportajn kontojn."
 
-#: ../src/roster_window.py:4234
+#: ../src/roster_window.py:4306
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Malkorekta dosiero"
 
-#: ../src/roster_window.py:4246
+#: ../src/roster_window.py:4318
 #, 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:4361
+#: ../src/roster_window.py:4433
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Sendi %s"
 
-#: ../src/roster_window.py:4367
+#: ../src/roster_window.py:4439
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Igi %s kaj %s metakontaktoj"
@@ -9960,151 +10268,151 @@ msgstr "Igi %s kaj %s metakontaktoj"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4816 ../src/roster_window.py:4889
-#: ../src/roster_window.py:4898 ../src/statusicon.py:246
-#: ../src/statusicon.py:293 ../src/statusicon.py:299
+#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
+#: ../src/roster_window.py:4970 ../src/statusicon.py:263
+#: ../src/statusicon.py:310 ../src/statusicon.py:316
 #, python-format
 msgid "using account %s"
 msgstr "per konto %s"
 
 #. add
-#: ../src/roster_window.py:4905
+#: ../src/roster_window.py:4977
 #, python-format
 msgid "to %s account"
 msgstr "al konto %s"
 
 #. disco
-#: ../src/roster_window.py:4910
+#: ../src/roster_window.py:4982
 #, python-format
 msgid "using %s account"
 msgstr "per konto %s"
 
-#: ../src/roster_window.py:4948 ../src/statusicon.py:309
+#: ../src/roster_window.py:5020 ../src/statusicon.py:326
 msgid "_Manage Bookmarks..."
 msgstr "Aranĝi _legosignojn..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4968
+#: ../src/roster_window.py:5040
 #, python-format
 msgid "of account %s"
 msgstr "de konto %s"
 
-#: ../src/roster_window.py:5009
+#: ../src/roster_window.py:5081
 #, python-format
 msgid "for account %s"
 msgstr "por konto %s"
 
-#: ../src/roster_window.py:5069 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
 msgid "_Change Status Message"
 msgstr "Ŝanĝi stat_mesaĝon"
 
-#: ../src/roster_window.py:5102
+#: ../src/roster_window.py:5174
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publici"
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5176
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Publici"
 
-#: ../src/roster_window.py:5107
+#: ../src/roster_window.py:5179
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Serĉi servojn..."
 
-#: ../src/roster_window.py:5252
+#: ../src/roster_window.py:5324
 msgid "_Maximize All"
 msgstr ""
 
-#: ../src/roster_window.py:5262 ../src/roster_window.py:5436
+#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
 msgid "Send Group M_essage"
 msgstr "Sendi _grupan mesaĝon"
 
-#: ../src/roster_window.py:5270
+#: ../src/roster_window.py:5342
 msgid "To all users"
 msgstr "Al ĉiuj uzantoj"
 
-#: ../src/roster_window.py:5274
+#: ../src/roster_window.py:5346
 msgid "To all online users"
 msgstr "Al ĉiuj konektitaj uzantoj"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5456
+#: ../src/roster_window.py:5528
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Renomigado de kontakto"
 
 #. Edit Groups
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5537
 msgid "Edit _Groups"
 msgstr "Aranĝi _Grupojn"
 
 #. Send single message
-#: ../src/roster_window.py:5520
+#: ../src/roster_window.py:5592
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Sendi unuopan mesaĝon"
 
 #. Execute Command
-#: ../src/roster_window.py:5567
+#: ../src/roster_window.py:5639
 msgid "Execute Command..."
 msgstr "Plenumi komandon..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5577
+#: ../src/roster_window.py:5649
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transportiloj"
 
 #. Modify Transport
-#: ../src/roster_window.py:5586
+#: ../src/roster_window.py:5658
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Montri Trans_portilojn"
 
 #. Rename
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5668
 msgid "_Rename"
 msgstr "_Renomigi"
 
-#: ../src/roster_window.py:5656
+#: ../src/roster_window.py:5728
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5665
+#: ../src/roster_window.py:5737
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Kontakto malkonektita"
 
-#: ../src/roster_window.py:5672
+#: ../src/roster_window.py:5744
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Kontakto malkonektita"
 
 #. History manager
-#: ../src/roster_window.py:5754
+#: ../src/roster_window.py:5833
 msgid "History Manager"
 msgstr "Historia administrilo"
 
-#: ../src/roster_window.py:5765
+#: ../src/roster_window.py:5844
 msgid "_Join New Group Chat"
 msgstr "_Eniri babilejen"
 
-#: ../src/roster_window.py:5938
+#: ../src/roster_window.py:6019
 msgid "Change Status Message..."
 msgstr "Ŝanĝi statmesaĝon..."
 
-#: ../src/search_window.py:94
+#: ../src/search_window.py:105
 msgid "Waiting for results"
 msgstr ""
 
-#: ../src/search_window.py:132 ../src/search_window.py:210
+#: ../src/search_window.py:143 ../src/search_window.py:220
 msgid "Error in received dataform"
 msgstr ""
 
 #. No result
-#: ../src/search_window.py:166 ../src/search_window.py:202
+#: ../src/search_window.py:177 ../src/search_window.py:212
 msgid "No result"
 msgstr ""
 
@@ -10117,21 +10425,22 @@ msgstr ""
 msgid "Subject: %s"
 msgstr "Temo: %s"
 
-#: ../src/session.py:433 ../src/session.py:468
+#: ../src/session.py:447 ../src/session.py:491
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:435
+#: ../src/session.py:448
 #, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
+"The remote client wants '\n"
+"                            'to negotiate an session with these features:\n"
 "\n"
 "%s\n"
 "\n"
 "Are these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:469
+#: ../src/session.py:492
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10141,16 +10450,16 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/statusicon.py:210
+#: ../src/statusicon.py:227
 msgid "_Change Status Message..."
 msgstr "Ŝanĝi _statmesaĝon..."
 
-#: ../src/statusicon.py:322
+#: ../src/statusicon.py:339
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Mankas en kontaktlisto"
 
-#: ../src/statusicon.py:333
+#: ../src/statusicon.py:350
 msgid "Hide this menu"
 msgstr "Kaŝi tiun ĉi menuon"
 
@@ -10291,34 +10600,34 @@ msgstr ""
 "Tiu ĉi servo ne povis respondi per detala informo.\n"
 "Ĝi verŝajne estas malnova aŭ rompita"
 
-#: ../src/vcard.py:251
+#: ../src/vcard.py:265
 msgid "?Client:Unknown"
 msgstr "Nekonata"
 
-#: ../src/vcard.py:253
+#: ../src/vcard.py:267
 msgid "?OS:Unknown"
 msgstr "Nekonata"
 
-#: ../src/vcard.py:274
+#: ../src/vcard.py:288
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "Nekonata"
 
-#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
+#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
 #, python-format
 msgid "since %s"
 msgstr "ekde %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:345
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:349
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Programoj</b>"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:357
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10326,38 +10635,76 @@ msgstr ""
 "Tiu ĉi kontakto interesiĝas pri via ĉeesta informo, sed vi ne interesiĝas "
 "pri ŝia/lia ĉeesto"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:359
 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:347
+#: ../src/vcard.py:361
 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:349
+#: ../src/vcard.py:363
 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:356
+#: ../src/vcard.py:370
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Vi atendas respondon de kontakto pri via abona mendo"
 
-#: ../src/vcard.py:358
+#: ../src/vcard.py:372
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
+#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
 msgid " resource with priority "
 msgstr " risurco kun prioritato "
 
-#~ msgid "_Available"
-#~ msgstr "_Enrete"
+#~ msgid "_Disable showing event in systray"
+#~ msgstr "_Malŝalti montron de evento en taskopleto"
+
+#~ msgid "_Show event in systray"
+#~ msgstr "Montri eventon en _taskopleto"
+
+#, fuzzy
+#~ msgid "Autodetect on every Gajim startup"
+#~ msgstr "K_onekti dum lanĉo de Gajim"
+
+#, fuzzy
+#~ msgid "Show systray:"
+#~ msgstr "Montri eventon en _taskopleto"
+
+#~ msgid "Nickname not allowed: %s"
+#~ msgstr "Kaŝnomo malpermesita: %s"
+
+#, fuzzy
+#~ msgid "Room has been destroyed"
+#~ msgstr "Permeso estas forigita"
+
+#~ msgid "I would like to add you to my roster."
+#~ msgstr "Mi volus aldoni vin al mia kontaktlisto."
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "nun ni abonas %s"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "ordono pri abona fino de %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "ni nun ne abonas pri %s"
+
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "JID %s ne estas norma laÅ­ la RFC. Äœi ne aldonitos al via kontaktlisto. "
+#~ "Uzu kontaktlistan agordan ilon kiel http://jru.jabberstudio.org/ por "
+#~ "forigi ĝin"
 
 #~ msgid "Account Modification"
 #~ msgstr "Konta korektado"
@@ -10449,34 +10796,6 @@ msgstr " risurco kun prioritato "
 #~ msgid "gtk-delete"
 #~ msgstr "Forigi"
 
-#, fuzzy
-#~ msgid "Add this contact to roster (Ctrl+D)"
-#~ msgstr "Aligas kontakton en kontaktliston"
-
-#, fuzzy
-#~ msgid "Bookmark this room (Ctrl+B)"
-#~ msgstr "Starigi legosignon por tiu babilejo"
-
-#, fuzzy
-#~ msgid "Change your nickname (Ctrl+N)"
-#~ msgstr "Ŝanĝi kaŝ_nomon"
-
-#, fuzzy
-#~ msgid "Invite contacts to the conversation (Ctrl+G)"
-#~ msgstr "atentas al la komunikado"
-
-#, fuzzy
-#~ msgid "Show a list of emoticons (Alt+M)"
-#~ msgstr "Klaku por enigi mienon (Alt+M)"
-
-#, fuzzy
-#~ msgid "Show a list of formattings"
-#~ msgstr "Klaku por enigi mienon (Alt+M)"
-
-#, fuzzy
-#~ msgid "Show a menu of advanced functions (Alt+D)"
-#~ msgstr "Klaku por enigi mienon (Alt+M)"
-
 #~ msgid ""
 #~ "All chat states\n"
 #~ "Composing only\n"
@@ -10515,9 +10834,6 @@ msgstr " risurco kun prioritato "
 #~ msgid "gtk-cancel"
 #~ msgstr "Forigi"
 
-#~ msgid "_Preferences"
-#~ msgstr "_Agordo"
-
 #~ msgid "_Quit"
 #~ msgstr "_Eliri"
 
@@ -10931,9 +11247,6 @@ msgstr " risurco kun prioritato "
 #~ msgid "Treat all incoming messages as:"
 #~ msgstr "Rigardi ĉiujn venantajn mesaĝojn kiel:"
 
-#~ msgid "Use t_rayicon (aka. notification area icon)"
-#~ msgstr "Uzi pletpiktogramon"
-
 #~ msgid ""
 #~ "When a new event (message, file transfer request etc..) is received, the "
 #~ "following methods may be used to inform you about it. Please note that "
@@ -11052,13 +11365,6 @@ msgstr " risurco kun prioritato "
 #~ msgid "Session Management support not available (missing gnome.ui module)"
 #~ msgstr "Subteno de seancagordo nedisponeblas (mankas modulo gnome.ui)"
 
-#~ msgid ""
-#~ "Usage: %s %s %s \n"
-#~ "\t %s"
-#~ msgstr ""
-#~ "Uzado: %s %s %s \n"
-#~ "\t %s"
-
 #~ msgid "Private Chat"
 #~ msgstr "Privata interparolo"
 
diff --git a/po/es.po b/po/es.po
index 669298458fc3c39fcf7d435437334d0e585bea6b..4f33200699307374c8152997df97aeb106824e8f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -4,11 +4,15 @@
 # This file is distributed under the same license as the gajim package.
 # Automatically generated, 2004.
 #
+#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 11:28+0200\n"
+"POT-Creation-Date: 2010-10-01 20:39+0200\n"
 "PO-Revision-Date: 2009-08-19 23:49+0200\n"
 "Last-Translator: Membris Khan <frank@giingo.org>\n"
 "Language-Team: none <>\n"
@@ -26,7 +30,7 @@ msgstr "Entrar a un grupo de charla"
 msgid "_Add Contact..."
 msgstr "_Añadir contacto..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:17
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
 msgid "_Discover Services"
 msgstr "_Descubrir servicios"
 
@@ -46,7 +50,7 @@ msgstr "_Abrir bandeja de entrada de GMail"
 msgid "_Personal Events"
 msgstr "Eventos _personales"
 
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:23
+#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
 msgid "_Start Chat..."
 msgstr "Iniciar conver_sación"
 
@@ -78,10 +82,6 @@ msgid "<b>Please select a server</b>"
 msgstr "<b>Por favor, selecciona un servidor</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid "@"
-msgstr ""
-
-#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
@@ -89,97 +89,97 @@ msgstr ""
 "Añadir este certificado a la lista de certificados de confianza.\n"
 "Huella SHA1 del certificado:\n"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:10
 msgid "Anon_ymous authentication"
 msgstr "Autentificación a_nónima"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Connect when I press Finish"
 msgstr "Conectar cuando presione Finalizar"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Asistente para crear una cuenta"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "I already have an account I want to _use"
 msgstr "Ya tengo una cuenta y quiero usarla"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I want to _register for a new account"
 msgstr "Quiero _registrar una nueva cuenta de Jabber"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:16
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 #: ../data/gui/accounts_window.ui.h:28
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Si está marcado, Gajim recordará la contraseña para esta cuenta"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:17
+#: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Gestionar..."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:18
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
 #: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2263 ../src/config.py:2342
-#: ../src/config.py:2355 ../src/config.py:3596 ../src/config.py:3671
-#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513
-#: ../src/dialogs.py:526 ../src/roster_window.py:2890
-#: ../src/roster_window.py:2896 ../src/roster_window.py:2901
+#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
+#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
+#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
+#: ../src/dialogs.py:527 ../src/roster_window.py:2956
+#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
 msgid "None"
 msgstr "Ninguno"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:19
+#: ../data/gui/account_creation_wizard_window.ui.h:18
 msgid "Prox_y:"
 msgstr "Pro_xy"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #: ../data/gui/accounts_window.ui.h:48
 msgid "Save pass_word"
 msgstr "_Guardar contraseña"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:21
+#: ../data/gui/account_creation_wizard_window.ui.h:20
 msgid "Set my profile when I connect"
 msgstr "Definir mi perfil cuando me conecte"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:22
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Use custom hostname/port"
 msgstr "Usar nombre de host y puerto personalizados"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:23
+#: ../data/gui/account_creation_wizard_window.ui.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/gui/account_creation_wizard_window.ui.h:25
-#: ../data/gui/roster_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:16
 msgid "_Advanced"
 msgstr "_Avanzado"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:25
 msgid "_Finish"
 msgstr "_Finalizar"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:27
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Hostname:"
 msgstr "Nombre del host:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #: ../data/gui/accounts_window.ui.h:62
 msgid "_Jabber ID:"
 msgstr "ID de _Jabber: "
 
-#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:28
 #: ../data/gui/accounts_window.ui.h:64
 msgid "_Password:"
 msgstr "C_ontraseña:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:29
 msgid "_Port:"
 msgstr "_Puerto:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:31
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Server:"
 msgstr "_Servidor:"
 
@@ -289,17 +289,17 @@ msgstr "Nombre:"
 #. No configured account
 #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
 #: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592
-#: ../src/notify.py:608
+#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
+#: ../src/notify.py:616
 msgid "Gajim"
 msgstr "Gajim"
 
 #. FIXME: Ugly workaround.
 #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
 #. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:61
-#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121
-#: ../src/roster_window.py:2832 ../src/roster_window.py:5379
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
+#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
 msgid "General"
 msgstr "General"
 
@@ -359,7 +359,7 @@ msgstr "Información acerca de tí a guardar en el servidor"
 
 #: ../data/gui/accounts_window.ui.h:35
 #: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:830
+#: ../src/dialogs.py:831
 msgid "Jabber ID:"
 msgstr "ID de Jabber:"
 
@@ -373,7 +373,7 @@ msgid "Mer_ge accounts"
 msgstr "_Combinar las cuentas"
 
 #: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2356
+#: ../src/config.py:2358
 msgid "No key selected"
 msgstr "Ninguna clave seleccionada"
 
@@ -400,7 +400,7 @@ msgid "Priority will change automatically according to your status."
 msgstr "La prioridad cambiará automáticamente acorde a tu estado."
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5329
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
 msgid "Re_name"
 msgstr "Re_nombrar"
 
@@ -626,38 +626,43 @@ msgid "Deletes Message of the Day"
 msgstr "Elimiina mensaje del día"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
+#, fuzzy
+msgid "Edit Archi_ving Preferences"
+msgstr "_Preferencias"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Edit _Privacy Lists..."
 msgstr "Listas de _privacidad"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sends a message to users currently connected to this server"
 msgstr "Envía un mensaje a los usuarios conectados en este momento al servidor"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Set MOTD..."
 msgstr "Definir MOTD..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Define el mensaje del día"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Show _XML Console"
 msgstr "Mostrar consola _XML"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "Update MOTD..."
 msgstr "Actualizar MOTD..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "Actualiza el mensaje del día"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:11
 msgid "_Administrator"
 msgstr "_Administrador"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:11
+#: ../data/gui/advanced_menuitem_menu.ui.h:12
 msgid "_Send Server Message..."
 msgstr "_Enviar mensaje de servidor"
 
@@ -691,7 +696,7 @@ msgid "All statuses"
 msgstr "Todos los estados"
 
 #: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:233
+#: ../src/common/commands.py:106 ../src/common/helpers.py:239
 #: ../src/tooltips.py:193
 msgid "Away"
 msgstr "Ausente"
@@ -744,7 +749,7 @@ msgid "Have "
 msgstr "Tiene "
 
 #: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:249
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -753,7 +758,7 @@ msgid "Launch a command"
 msgstr "Lanzar un comando"
 
 #: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:216 ../src/tooltips.py:197
+#: ../src/common/helpers.py:222 ../src/tooltips.py:197
 msgid "Not Available"
 msgstr "No disponible"
 
@@ -798,12 +803,13 @@ msgid "_Disable existing sound for this event"
 msgstr "_Deshabilitar sonidos existentes para este evento"
 
 #: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in roster"
+#, fuzzy
+msgid "_Disable showing event in notification area"
 msgstr "_Deshabilitar mostar eventos en el roster"
 
 #: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in systray"
-msgstr "_Deshabilitar mostrar eventos en el systray"
+msgid "_Disable showing event in roster"
+msgstr "_Deshabilitar mostar eventos en el roster"
 
 #: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
@@ -814,12 +820,13 @@ msgid "_Open chat window with user"
 msgstr "_Abrir ventana de conversación con este usuario"
 
 #: ../data/gui/advanced_notifications_window.ui.h:35
-msgid "_Show event in roster"
+#, fuzzy
+msgid "_Show event in notification area"
 msgstr "_Mostrar evento en roster"
 
 #: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in systray"
-msgstr "_Mostrar evento en systray"
+msgid "_Show event in roster"
+msgstr "_Mostrar evento en roster"
 
 #: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
@@ -847,6 +854,46 @@ msgstr "Grupos"
 msgid "when I'm in"
 msgstr "cuando esté en"
 
+#: ../data/gui/archiving_preferences_window.ui.h:1
+msgid "<i>Method Auto</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "<i>Method Local</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:3
+msgid "<i>Method Manual</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:4
+#, fuzzy
+msgid "Auto"
+msgstr "Auto conectar"
+
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Concede"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "Forbid"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:7
+#, fuzzy
+msgid "No"
+msgstr "Ninguno"
+
+#: ../data/gui/archiving_preferences_window.ui.h:8
+#, fuzzy
+msgid "Prefer"
+msgstr "Preferencias"
+
+#: ../data/gui/archiving_preferences_window.ui.h:9
+#, fuzzy
+msgid "Yes"
+msgstr "español"
+
 #: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Entrada:"
@@ -873,8 +920,8 @@ msgstr "Contactos bloqueados"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5348
-#: ../src/roster_window.py:5476 ../src/roster_window.py:5609
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
+#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
 msgid "_Unblock"
 msgstr "_Desbloquear"
 
@@ -962,7 +1009,7 @@ msgid "_Start Chat"
 msgstr "Iniciar conversación"
 
 #. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4184
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
 msgid "#"
 msgstr ""
 
@@ -1010,13 +1057,50 @@ msgstr ""
 msgid "9"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:13
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Añade éste contacto al roster (Ctrl+D)"
+
 #: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Navegar en el histórico de la conversación (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:15
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Invitar contactos a esta conversación (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Mostrar una lista de emoticonos (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
+msgid "Show a list of formattings"
+msgstr "Mostrar una lista de formateos"
+
+#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Muestra un menú de funciones avanzadas (Alt+A)"
+
+#: ../data/gui/chat_control.ui.h:19
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr "Muestra el perfil del contacto (Ctrl+I)"
+
+#: ../data/gui/chat_control.ui.h:20
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:21
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
 #: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../data/gui/chat_control.ui.h:15 ../data/gui/groupchat_control.ui.h:3
+#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
 msgid "label"
 msgstr ""
 
@@ -1067,8 +1151,8 @@ msgstr "Editar _grupos..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5284
-#: ../src/roster_window.py:5444
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
+#: ../src/roster_window.py:5516
 msgid "In_vite to"
 msgstr "In_vitar a"
 
@@ -1080,8 +1164,8 @@ msgstr "Invitar _Contactos"
 msgid "Remo_ve"
 msgstr "_Eliminar"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5294
-#: ../src/roster_window.py:5533
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
+#: ../src/roster_window.py:5605
 msgid "Send Cus_tom Status"
 msgstr "Envía estado personalizado"
 
@@ -1114,8 +1198,8 @@ msgid "_Allow him/her to see my status"
 msgstr "Permitirle ver mi estado"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5482 ../src/roster_window.py:5612
+#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
+#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
 msgid "_Block"
 msgstr "_Bloquear"
 
@@ -1125,8 +1209,8 @@ msgstr "Prohibirle ver mi estado"
 
 #: ../data/gui/contact_context_menu.ui.h:20
 #: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:21
-#: ../src/roster_window.py:5683
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
+#: ../src/roster_window.py:5755
 msgid "_History"
 msgstr "_Histórico"
 
@@ -1263,7 +1347,7 @@ msgstr "<b>Colores de la pestaña para los estados de conversación</b>"
 msgid "Account row"
 msgstr "Cuenta"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:925
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
 msgid "Bold"
 msgstr "Negrita"
 
@@ -1301,7 +1385,7 @@ msgstr "Grupo"
 msgid "Inactive"
 msgstr "Inactivo"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:926
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
 msgid "Italic"
 msgstr "Cursiva"
 
@@ -1349,7 +1433,7 @@ msgstr "Cambiar el _tema"
 msgid "Configure _Room..."
 msgstr "Configurar el salón"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1782
+#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
 msgid "_Bookmark"
 msgstr "_Marcador"
 
@@ -1409,19 +1493,31 @@ msgstr "_Enviar mensaje privado"
 msgid "_Voice"
 msgstr "_Voz"
 
+#: ../data/gui/groupchat_control.ui.h:1
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Añadir este salón a marcadores (Ctrl+B)"
+
+#: ../data/gui/groupchat_control.ui.h:3
+msgid "Change the room's subject (Alt+T)"
+msgstr "Cambiar el tema del salón (Alt+T)"
+
+#: ../data/gui/groupchat_control.ui.h:4
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Cambiar tu _alias (Ctrl+N)"
+
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Crear nuevo post"
 
-#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
-msgid "From"
-msgstr "De"
+#: ../data/gui/groups_post_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:2
+msgid "From:"
+msgstr "De:"
 
-#. holds subject
-#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
-#: ../src/history_manager.py:219
-msgid "Subject"
-msgstr "Tema"
+#: ../data/gui/groups_post_window.ui.h:3
+#: ../data/gui/single_message_window.ui.h:7
+msgid "Subject:"
+msgstr "Tema:"
 
 #: ../data/gui/history_manager.ui.h:1
 msgid ""
@@ -1439,8 +1535,8 @@ msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Bienvenido al gestor de históricos de Gajim</b></big>"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3208
-#: ../src/dialogs.py:3305
+#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
+#: ../src/dialogs.py:3321
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -1498,12 +1594,75 @@ msgstr "Buscar"
 msgid "_Log conversation history"
 msgstr "Histórico de conversaciones"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
+msgid "approve"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:2
+msgid "body"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:3
+msgid "concede"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:4
+msgid "expire"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:5
+msgid "false"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:6
+msgid "forbid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:7
+#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+msgid "jid"
+msgstr "jid"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:8
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
+#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
+msgid "message"
+msgstr "mensaje"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
+msgid "oppose"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
+#, fuzzy
+msgid "otr"
+msgstr "Caliente"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:11
+msgid "prefer"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:12
+msgid "require"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:13
+msgid "save"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:14
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
 msgid "Bro_wse Rooms"
 msgstr "_Navegar"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2180
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
 msgid "Join Group Chat"
 msgstr "Entrar a un salón de chat"
 
@@ -1541,8 +1700,8 @@ msgstr "Servidor:"
 msgid "_Bookmark this room"
 msgstr "Añadir este salón a marcadores (Ctrl+B)"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1341
-#: ../src/disco.py:1786
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../src/disco.py:1804
 msgid "_Join"
 msgstr "_Entrar"
 
@@ -1646,6 +1805,75 @@ msgstr "_Nombre"
 msgid "Passphrase"
 msgstr "Contraseña"
 
+#: ../data/gui/plugins_window.ui.h:1
+msgid "&lt;empty&gt;"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:2
+msgid "<empty>"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:3
+#, fuzzy
+msgid "Authors:"
+msgstr "Au_torizar"
+
+#: ../data/gui/plugins_window.ui.h:4
+#, fuzzy
+msgid "Available"
+msgstr "En líne_a"
+
+#: ../data/gui/plugins_window.ui.h:5
+#, fuzzy
+msgid "Configure"
+msgstr "_Configurar"
+
+#: ../data/gui/plugins_window.ui.h:6
+#, fuzzy
+msgid "Descrition:"
+msgstr "Descripción: "
+
+#: ../data/gui/plugins_window.ui.h:7
+#, fuzzy
+msgid "Homepage:"
+msgstr "<b>Página web:</b>"
+
+#: ../data/gui/plugins_window.ui.h:8
+msgid "Install"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:9
+#, fuzzy
+msgid "Installed"
+msgstr "Atascado"
+
+#: ../data/gui/plugins_window.ui.h:10
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:11
+msgid "Plugins"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:12
+msgid "Uninstall"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:13
+#, fuzzy
+msgid "Version:"
+msgstr "Versión de GTK+:"
+
+#: ../data/gui/plugins_window.ui.h:14
+msgid "button"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:15
+msgid "homepage url"
+msgstr ""
+
 #: ../data/gui/popup_notification_window.ui.h:1
 #, fuzzy
 msgid "Event Type"
@@ -1774,123 +2002,103 @@ msgid "Always"
 msgstr "Ausente"
 
 #: ../data/gui/preferences_window.ui.h:31
-#, fuzzy
-msgid "Always use GNOME default applications"
-msgstr "¿Usar siempre las aplicaciones por defecto de OS/X?"
-
-#: ../data/gui/preferences_window.ui.h:32
-#, fuzzy
-msgid "Always use KDE default applications"
-msgstr "¿Usar siempre las aplicaciones por defecto de OS/X?"
-
-#: ../data/gui/preferences_window.ui.h:33
-#, fuzzy
-msgid "Always use Xfce default applications"
-msgstr "¿Usar siempre las aplicaciones por defecto de OS/X?"
-
-#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Preguntar mensaje de estado cuando esté: "
 
-#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
 msgid "Audio / Video"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:33
 msgid "Audio input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Audio output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:38
-#, fuzzy
-msgid "Autodetect on every Gajim startup"
-msgstr "C_onectar al inicio de Gajim"
-
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:35
 msgid "Chat message:"
 msgstr "Mensaje de conversación:"
 
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:36
 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/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:37
 #, fuzzy
 msgid "Composing only"
 msgstr "Componiendo"
 
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:38
 msgid "Configure color and font of the interface"
 msgstr "Configurar colores y fuentes de la interfaz"
 
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Mensaje de conversación:"
 
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Nombre de contacto"
 
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:41
 msgid "Custom"
 msgstr "Personalizado"
 
-#: ../data/gui/preferences_window.ui.h:46
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Detached roster with chat grouped by account"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Detached roster with detached chats"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:45
 msgid "Detached roster with single chat"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
-#: ../src/config.py:671
+#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
+#: ../src/config.py:665
 msgid "Disabled"
 msgstr "Deshabilitado"
 
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:47
 msgid "Display _activity of contacts in roster"
 msgstr "Mostrar la _actividad de los contactos en el roster"
 
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:48
 msgid "Display _extra email details"
 msgstr "Mostrar detalles _extra en los correos electrónicos"
 
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:49
 #, fuzzy
 msgid "Display _location of contacts in roster"
 msgstr "Mostrar estad_o de ánimo de los contactos en el roster"
 
-#: ../data/gui/preferences_window.ui.h:54
+#: ../data/gui/preferences_window.ui.h:50
 msgid "Display _tunes of contacts in roster"
 msgstr "Mostrar _ajustes de los contactos en el roster"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display a_vatars of contacts in roster"
 msgstr "Mostrar en el roster los a_vatares de los contactos"
 
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display m_ood of contacts in roster"
 msgstr "Mostrar estad_o de ánimo de los contactos en el roster"
 
-#: ../data/gui/preferences_window.ui.h:57
+#: ../data/gui/preferences_window.ui.h:53
 msgid "Display status _messages of contacts in roster"
 msgstr "Mostrar en el roster los _mensajes de estado de los contactos"
 
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:54
 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 "
@@ -1900,7 +2108,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/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:55
 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 "
@@ -1910,7 +2118,7 @@ msgstr ""
 "conversación que puedas tener con un contacto. Aquí puedes especificar qué "
 "estados de conversación enviar a la potra parte."
 
-#: ../data/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:56
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1918,11 +2126,11 @@ msgstr ""
 "Gajim notificará con un mensaje emergente en la parte inferior derecha de la "
 "pantalla cuando un contacto se desconecte"
 
-#: ../data/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:58
 msgid "Hide all buttons in chat windows"
 msgstr "Oculta los botones en las ventanas de conversación."
 
-#: ../data/gui/preferences_window.ui.h:63
+#: ../data/gui/preferences_window.ui.h:59
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1930,7 +2138,7 @@ msgstr ""
 "Si está marcado, Gajim permitirá a otros detectar el sistema operativo que "
 "estás usando"
 
-#: ../data/gui/preferences_window.ui.h:64
+#: ../data/gui/preferences_window.ui.h:60
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1938,14 +2146,14 @@ msgstr ""
 "Si está marcado, Gajim también incluirá información acerca del remitente de "
 "los nuevos correos electrónicos"
 
-#: ../data/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:61
 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/gui/preferences_window.ui.h:66
+#: ../data/gui/preferences_window.ui.h:62
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1953,7 +2161,7 @@ msgstr ""
 "Si está marcado, Gajim cambiará el estado a no disponible cuando el "
 "ordenador ya no se use"
 
-#: ../data/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1961,7 +2169,7 @@ msgstr ""
 "Si está marcado, Gajim mostrará los avatares de los contactos en el roster y "
 "grupos de conversación"
 
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1969,13 +2177,13 @@ 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/gui/preferences_window.ui.h:69
+#: ../data/gui/preferences_window.ui.h:65
 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/gui/preferences_window.ui.h:70
+#: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the location of contacts in the roster window"
@@ -1983,20 +2191,20 @@ msgstr ""
 "Si está marcado, Gajim mostrará el estado de ánimo de los contactos en el "
 "roster"
 
-#: ../data/gui/preferences_window.ui.h:71
+#: ../data/gui/preferences_window.ui.h:67
 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/gui/preferences_window.ui.h:72
+#: ../data/gui/preferences_window.ui.h:68
 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/gui/preferences_window.ui.h:73
+#: ../data/gui/preferences_window.ui.h:69
 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 "
@@ -2006,7 +2214,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/gui/preferences_window.ui.h:74
+#: ../data/gui/preferences_window.ui.h:70
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -2016,7 +2224,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/gui/preferences_window.ui.h:75
+#: ../data/gui/preferences_window.ui.h:71
 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 "
@@ -2026,7 +2234,7 @@ msgstr ""
 "cuenta que usando cifrado E2E, la parte remota tiene que aceptar al "
 "ingresar, o los mensajes no serán registrados."
 
-#: ../data/gui/preferences_window.ui.h:76
+#: ../data/gui/preferences_window.ui.h:72
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -2034,7 +2242,7 @@ msgstr ""
 "Si está marcado, Gajim mostrará una notificación cuando se reciba un nuevo "
 "correo vía GMail"
 
-#: ../data/gui/preferences_window.ui.h:77
+#: ../data/gui/preferences_window.ui.h:73
 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, "
@@ -2044,7 +2252,7 @@ msgstr ""
 "un contacto de MSN tendrá el icono de msn equivalente para su estado en "
 "línea, ausente, ocupado, etc...)"
 
-#: ../data/gui/preferences_window.ui.h:78
+#: ../data/gui/preferences_window.ui.h:74
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -2052,7 +2260,7 @@ msgstr ""
 "Si está habilitado, Gajim no preguntará un mensaje de estado. Será usado el "
 "mensaje por defecto especificado."
 
-#: ../data/gui/preferences_window.ui.h:79
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2060,45 +2268,45 @@ msgstr ""
 "Si no está deshabilitado, Gajim reemplazará emoticonos ascii ':)' por su "
 "equivalente en iconos gráficos estáticos o animados"
 
-#: ../data/gui/preferences_window.ui.h:80
+#: ../data/gui/preferences_window.ui.h:76
 msgid "Log _encrypted chat session"
 msgstr "R_egistrar conversación cifrada"
 
-#: ../data/gui/preferences_window.ui.h:81
+#: ../data/gui/preferences_window.ui.h:77
 msgid "Ma_ke message windows compact"
 msgstr "Hacer compacta la ventana de mensajes"
 
-#: ../data/gui/preferences_window.ui.h:82
+#: ../data/gui/preferences_window.ui.h:78
 msgid "Ma_nage..."
 msgstr "Gestio_nar..."
 
-#: ../data/gui/preferences_window.ui.h:83
+#: ../data/gui/preferences_window.ui.h:79
 #, fuzzy
 msgid "Never"
 msgstr "_Nunca"
 
-#: ../data/gui/preferences_window.ui.h:84
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Notifications"
 msgstr "Notificaciones"
 
-#: ../data/gui/preferences_window.ui.h:85
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Notify me about contacts that sign _in"
 msgstr "Notif_icarme de los contactos que se conecten"
 
-#: ../data/gui/preferences_window.ui.h:86
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Notify me about contacts that sign _out"
 msgstr "Notificar cuand un contacto: "
 
-#: ../data/gui/preferences_window.ui.h:87
+#: ../data/gui/preferences_window.ui.h:83
 #, fuzzy
 msgid "Notify me about it"
 msgstr "_Notificarme"
 
-#: ../data/gui/preferences_window.ui.h:88
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notify on new _GMail email"
 msgstr "Notificar de nuevos correos de _GMail"
 
-#: ../data/gui/preferences_window.ui.h:89
+#: ../data/gui/preferences_window.ui.h:85
 #, fuzzy
 msgid "Only when pending events"
 msgstr ""
@@ -2106,56 +2314,57 @@ msgstr ""
 "Sólamente cuando haya eventos pendientes\n"
 "Siempre"
 
-#: ../data/gui/preferences_window.ui.h:90
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Personal Events"
 msgstr "Eventos personales"
 
-#: ../data/gui/preferences_window.ui.h:91
+#: ../data/gui/preferences_window.ui.h:87
 msgid "Play _sounds"
 msgstr "Reproducir _sonidos"
 
-#: ../data/gui/preferences_window.ui.h:92
+#: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
 msgid "Pop it up"
 msgstr "_Emerger"
 
-#: ../data/gui/preferences_window.ui.h:93
+#: ../data/gui/preferences_window.ui.h:89
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../data/gui/preferences_window.ui.h:94
+#: ../data/gui/preferences_window.ui.h:90
 msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:96
+#: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
 msgid "STUN server:"
 msgstr "Servidor:"
 
-#: ../data/gui/preferences_window.ui.h:97
+#: ../data/gui/preferences_window.ui.h:93
+#, fuzzy
+msgid "Show notification area icon:"
+msgstr "Usar icono en el á_rea de notificación"
+
+#: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
 msgid "Show only in roster"
 msgstr "Sólo mostrar en la _lista de contactos"
 
-#: ../data/gui/preferences_window.ui.h:98
-msgid "Show systray:"
-msgstr "Mostrar systray:"
-
-#: ../data/gui/preferences_window.ui.h:99
+#: ../data/gui/preferences_window.ui.h:95
 msgid "Sign _in"
 msgstr "Cone_ctar"
 
-#: ../data/gui/preferences_window.ui.h:100
+#: ../data/gui/preferences_window.ui.h:96
 msgid "Sign _out"
 msgstr "_Desconectar"
 
-#: ../data/gui/preferences_window.ui.h:101
+#: ../data/gui/preferences_window.ui.h:97
 msgid "Single window for everything"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:102
+#: ../data/gui/preferences_window.ui.h:98
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2163,27 +2372,27 @@ msgstr ""
 "Algunos mensajes pueden incluir contenido enriquecido (formato, colores "
 "etc). Si está marcado, Gajim mostrará el mensaje en bruto."
 
-#: ../data/gui/preferences_window.ui.h:103
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sort contacts by status"
 msgstr "Ordenar contactos por estado"
 
-#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
 msgid "Status"
 msgstr "Estado"
 
-#: ../data/gui/preferences_window.ui.h:105
+#: ../data/gui/preferences_window.ui.h:101
 msgid "Status _iconset:"
 msgstr "Set de _iconos de estado:"
 
-#: ../data/gui/preferences_window.ui.h:106
+#: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Estilo"
 
-#: ../data/gui/preferences_window.ui.h:107
+#: ../data/gui/preferences_window.ui.h:103
 msgid "T_heme:"
 msgstr "Te_ma:"
 
-#: ../data/gui/preferences_window.ui.h:108
+#: ../data/gui/preferences_window.ui.h:104
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2195,7 +2404,7 @@ msgstr ""
 "$S será reemplazado por el anterior mensaje de estado\n"
 "$T será reemplazado por la activación del auto-ausente"
 
-#: ../data/gui/preferences_window.ui.h:111
+#: ../data/gui/preferences_window.ui.h:107
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2207,121 +2416,126 @@ msgstr ""
 "$S será reemplazado por el anterior mensaje de estado\n"
 "$T será reemplazado por la activación del auto-no disponible"
 
-#: ../data/gui/preferences_window.ui.h:114
+#: ../data/gui/preferences_window.ui.h:110
 msgid "Use _transports icons"
 msgstr "Usar iconos de _transporte"
 
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:111
+#, fuzzy
+msgid "Use default applications"
+msgstr "¿Usar siempre las aplicaciones por defecto de OS/X?"
+
+#: ../data/gui/preferences_window.ui.h:112
 msgid "Use system _default"
 msgstr "Usar pre_definido del sistema"
 
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:113
 msgid "Video framerate"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:117
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Video input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:118
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Video output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:119
+#: ../data/gui/preferences_window.ui.h:116
 msgid "Video size"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:120
+#: ../data/gui/preferences_window.ui.h:117
 msgid "When new event is received:"
 msgstr "Cuando se recibe un nuevo evento:"
 
-#: ../data/gui/preferences_window.ui.h:121
+#: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
 msgid "Your message:"
 msgstr "Mensaje de error: %s"
 
-#: ../data/gui/preferences_window.ui.h:122
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your nickname:"
 msgstr "Ant_es del alias:"
 
-#: ../data/gui/preferences_window.ui.h:123
+#: ../data/gui/preferences_window.ui.h:120
 msgid "_Away after:"
 msgstr "_Ausente tras:"
 
-#: ../data/gui/preferences_window.ui.h:124
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../data/gui/preferences_window.ui.h:125
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Display chat state notifications:"
 msgstr "_Mostrar notificaciones de estado de la conversación:"
 
-#: ../data/gui/preferences_window.ui.h:126
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Emoticons:"
 msgstr "_Emoticonos:"
 
-#: ../data/gui/preferences_window.ui.h:127
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_File manager:"
 msgstr "A_dministrador de archivos:"
 
-#: ../data/gui/preferences_window.ui.h:128
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_Highlight misspelled words"
 msgstr "_Resaltar errores ortográficos"
 
-#: ../data/gui/preferences_window.ui.h:129
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorar mensajes de contactos que no están en la lista de contactos"
 
-#: ../data/gui/preferences_window.ui.h:130
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignorar contenido enriquecido en mensajes entrantes"
 
-#: ../data/gui/preferences_window.ui.h:131
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Log status changes of contacts"
 msgstr "_Registrar cambios de estado de los contactos"
 
-#: ../data/gui/preferences_window.ui.h:132
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Mail client:"
 msgstr "_Cliente de correo:"
 
-#: ../data/gui/preferences_window.ui.h:133
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Not available after:"
 msgstr "_No disponible tras:"
 
-#: ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Reset to Default Colors"
 msgstr "_Restablecer colores por defecto"
 
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Send chat state notifications:"
 msgstr "Enviar notificaciones del estado de la conversación:"
 
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Status message:"
 msgstr "Men_saje de estado:"
 
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_URL highlight:"
 msgstr "Resaltado de _URL:"
 
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_Window behavior:"
 msgstr "_Comportamiento de la ventana:"
 
-#: ../data/gui/preferences_window.ui.h:140
+#: ../data/gui/preferences_window.ui.h:137
 msgid "in _group chats"
 msgstr "en _grupos de charla"
 
-#: ../data/gui/preferences_window.ui.h:141
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _roster"
 msgstr "en _roster"
 
-#: ../data/gui/preferences_window.ui.h:142
+#: ../data/gui/preferences_window.ui.h:139
 msgid "minutes"
 msgstr "minutos"
 
@@ -2374,7 +2588,7 @@ msgstr "ID de Jabber:"
 msgid "Order:"
 msgstr "Orden:"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3436
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
 msgid "Privacy List"
 msgstr "Lista de privacidad"
 
@@ -2585,8 +2799,8 @@ msgstr "Eliminar la cuenta de Gajim y del _servidor"
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5492 ../src/roster_window.py:5622
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
+#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
 msgid "_Remove"
 msgstr "_Eliminar"
 
@@ -2632,56 +2846,60 @@ msgid "Help online"
 msgstr "Ayuda online"
 
 #: ../data/gui/roster_window.ui.h:8
+msgid "P_lugins"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:9
 msgid "Profile, A_vatar"
 msgstr "Perfil, A_vatar"
 
-#: ../data/gui/roster_window.ui.h:9
+#: ../data/gui/roster_window.ui.h:10
 msgid "Show Only _Active Contacts"
 msgstr "Mostrar sólo contactos _activos"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
 msgid "Show Trans_ports"
 msgstr "Mostrar Trans_portes"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
 msgid "Show _Offline Contacts"
 msgstr "Mostrar contactos desconectados"
 
-#: ../data/gui/roster_window.ui.h:12 ../src/statusicon.py:326
+#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
 msgid "Show _Roster"
 msgstr "Mostrar _roster"
 
-#: ../data/gui/roster_window.ui.h:13
+#: ../data/gui/roster_window.ui.h:14
 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/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
 #: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Acciones"
 
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
 msgid "_Contents"
 msgstr "_Contenidos"
 
-#: ../data/gui/roster_window.ui.h:18 ../src/disco.py:1502
+#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../data/gui/roster_window.ui.h:19
+#: ../data/gui/roster_window.ui.h:20
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Help"
 msgstr "_Ayuda"
 
-#: ../data/gui/roster_window.ui.h:22
+#: ../data/gui/roster_window.ui.h:23
 msgid "_Send Single Message..."
 msgstr "E_nviar mensaje..."
 
-#: ../data/gui/roster_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:25
 msgid "_View"
 msgstr "_Ver"
 
@@ -2698,11 +2916,11 @@ msgid "_Add contact"
 msgstr "Añadir un _Contacto"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5634
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
 msgid "_Information"
 msgstr "_Información"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1353
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
 msgid "_Search"
 msgstr "_Buscar"
 
@@ -2722,10 +2940,6 @@ msgstr "Registrar en"
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../data/gui/single_message_window.ui.h:2
-msgid "From:"
-msgstr "De:"
-
 #: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Responder a este mensaje:"
@@ -2742,10 +2956,6 @@ msgstr "Enviar mensaje"
 msgid "Send message and close window"
 msgstr "Enviar mensaje y cerrar ventana"
 
-#: ../data/gui/single_message_window.ui.h:7
-msgid "Subject:"
-msgstr "Tema:"
-
 #: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "A:"
@@ -2955,25 +3165,35 @@ msgstr "Mensajero Gajim"
 msgid "Jabber IM Client"
 msgstr "Cliente de IM Jabber"
 
-#: ../src/adhoc_commands.py:314
+#: ../src/adhoc_commands.py:323
 msgid "Cancel confirmation"
 msgstr "Cancelar información"
 
-#: ../src/adhoc_commands.py:315
+#: ../src/adhoc_commands.py:324
 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:351 ../src/adhoc_commands.py:374
+#: ../src/adhoc_commands.py:370
+#, fuzzy
+msgid "Invalid Form"
+msgstr "Salón no válido"
+
+#: ../src/adhoc_commands.py:371
+#, fuzzy
+msgid "The form is not filled correctly."
+msgstr "El alias tiene caracteres no permitidos."
+
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
 msgid "Service sent malformed data"
 msgstr "El servicio envió información malformada"
 
-#: ../src/adhoc_commands.py:360
+#: ../src/adhoc_commands.py:399
 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:471
+#: ../src/adhoc_commands.py:513
 msgid "Service returned an error."
 msgstr "El servicio devolvió un error"
 
@@ -2998,7 +3218,7 @@ msgstr "Entero"
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:945
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
 msgid "Color"
 msgstr "Color"
 
@@ -3035,184 +3255,184 @@ msgstr[1] "Has recibido nuevas entradas (y %(count)d no mostradas):"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "English"
 msgstr "Inglés"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Belarusian"
 msgstr "Bieloruso"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Breton"
 msgstr "Bretón"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Czech"
 msgstr "Checo"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "German"
 msgstr "Alemán"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Greek"
 msgstr "Griego"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "British"
 msgstr "Británico"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Spanish"
 msgstr "Español"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Basque"
 msgstr "Euskera"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "French"
 msgstr "Francés"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Croatian"
 msgstr "Croata"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian (b)"
 msgstr "Noruego (b)"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Dutch"
 msgstr "Holandés"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian"
 msgstr "Noruego"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Polish"
 msgstr "Polaco"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Portuguese"
 msgstr "Portugués"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Brazilian Portuguese"
 msgstr "Portugués de Brasil"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Russian"
 msgstr "Ruso"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Serbian"
 msgstr "Serbio"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Chinese (Ch)"
 msgstr "Chino (Ch)"
 
-#: ../src/chat_control.py:479
+#: ../src/chat_control.py:496
 msgid "Spelling language"
 msgstr "Lenguaje del corrector"
 
 #. we are not connected
-#: ../src/chat_control.py:511 ../src/chat_control.py:720
+#: ../src/chat_control.py:528 ../src/chat_control.py:737
 msgid "A connection is not available"
 msgstr "No hay disponible una conexión"
 
-#: ../src/chat_control.py:512 ../src/chat_control.py:721
+#: ../src/chat_control.py:529 ../src/chat_control.py:738
 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:927
+#: ../src/chat_control.py:944
 msgid "Underline"
 msgstr "Subrayado"
 
-#: ../src/chat_control.py:928
+#: ../src/chat_control.py:945
 msgid "Strike"
 msgstr "Tachado"
 
-#: ../src/chat_control.py:951
+#: ../src/chat_control.py:968
 msgid "Font"
 msgstr "Fuente"
 
-#: ../src/chat_control.py:960
+#: ../src/chat_control.py:977
 msgid "Clear formating"
 msgstr "Limpiar formato"
 
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1055
 msgid "Really send file?"
 msgstr "¿Enviar fichero?"
 
-#: ../src/chat_control.py:1039
+#: ../src/chat_control.py:1056
 #, 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:1503 ../src/chat_control.py:1987
+#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
 msgid "GPG encryption enabled"
 msgstr "Cifrado GPG habilitado"
 
 #. Add to roster
-#: ../src/chat_control.py:1528 ../src/common/contacts.py:158
+#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
 #: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:245 ../src/dialogs.py:1064 ../src/dialogs.py:2078
-#: ../src/dialogs.py:2107 ../src/gui_interface.py:674
+#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
+#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
 #: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1610 ../src/roster_window.py:1612
-#: ../src/roster_window.py:1942 ../src/roster_window.py:3289
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
+#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
+#: ../src/roster_window.py:3382
 msgid "Not in Roster"
 msgstr "no está en el roster"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1575
 msgid "This contact does not support file transfer."
 msgstr "Este contacto no soporta transferencia de archivos"
 
-#: ../src/chat_control.py:1561
+#: ../src/chat_control.py:1578
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr "Necesitas conocer la ID de Jabber real para enviarle un archivo."
 
-#: ../src/chat_control.py:1656
+#: ../src/chat_control.py:1677
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:1869
 #, 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:1967 ../src/dialogs.py:4866
+#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
 msgid "No GPG key assigned"
 msgstr "Ninguna clave GPG asignada"
 
-#: ../src/chat_control.py:1968
+#: ../src/chat_control.py:1991
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3220,50 +3440,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:1977
+#: ../src/chat_control.py:2000
 msgid "GPG encryption disabled"
 msgstr "Cifrado GPG deshabilitado"
 
-#: ../src/chat_control.py:2003
+#: ../src/chat_control.py:2026
 msgid "Session WILL be logged"
 msgstr "La sesión SERÁ registrada"
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:2028
 msgid "Session WILL NOT be logged"
 msgstr "La NO SERÁ registrada"
 
 #. encryption %s active
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is"
 msgstr "es"
 
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is NOT"
 msgstr "NO es"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will"
 msgstr "será"
 
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will NOT"
 msgstr "no será"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2051
 msgid "and authenticated"
 msgstr "y autentificado"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2032
+#: ../src/chat_control.py:2055
 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:2039
+#: ../src/chat_control.py:2062
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3272,23 +3492,32 @@ msgstr ""
 "%(type)s cifrado %(status)s activo %(authenticated)s.\n"
 "Tu sesión %(logged)s guardada."
 
-#: ../src/chat_control.py:2182
+#: ../src/chat_control.py:2205
 msgid "Session negotiation cancelled"
 msgstr "La negociación de la sesión ha sido cancelada"
 
-#: ../src/chat_control.py:2191
+#: ../src/chat_control.py:2215
+msgid "This session WILL be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2217
+#, fuzzy
+msgid "This session WILL NOT be archived on server"
+msgstr "La NO SERÁ registrada"
+
+#: ../src/chat_control.py:2226
 msgid "This session is encrypted"
 msgstr "Esta sesión está cifrada"
 
-#: ../src/chat_control.py:2194
+#: ../src/chat_control.py:2229
 msgid " and WILL be logged"
 msgstr " y SERÁ registrada"
 
-#: ../src/chat_control.py:2196
+#: ../src/chat_control.py:2231
 msgid " and WILL NOT be logged"
 msgstr " y NO SERÁ registrada"
 
-#: ../src/chat_control.py:2201
+#: ../src/chat_control.py:2236
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3296,25 +3525,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:2203
+#: ../src/chat_control.py:2238
 msgid "E2E encryption disabled"
 msgstr "Cifrado E2E desactivado"
 
-#: ../src/chat_control.py:2241 ../src/chat_control.py:2254
+#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
 msgid "The following message was NOT encrypted"
 msgstr "El siguiente mensaje NO fue cifrado"
 
-#: ../src/chat_control.py:2247
+#: ../src/chat_control.py:2288
 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:2519
+#: ../src/chat_control.py:2566
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Acabas de recibir un nuevo mensaje de \"%s\""
 
-#: ../src/chat_control.py:2520
+#: ../src/chat_control.py:2567
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3322,15 +3551,13 @@ msgstr ""
 "Si cierras esta pestaña y tienes el regstro desactivado, este mensaje se "
 "perderá."
 
-#: ../src/chat_control.py:2663 ../src/common/connection_handlers.py:1635
-#: ../src/common/connection_handlers.py:1758
-#: ../src/common/connection_handlers.py:1960
-#: ../src/common/connection_handlers.py:2110 ../src/common/connection.py:452
+#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
 #: ../src/gajim.py:159 ../src/session.py:138
 msgid "Database Error"
 msgstr "Error en la base de datos"
 
-#: ../src/chat_control.py:2664
+#: ../src/chat_control.py:2714
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3339,7 +3566,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:2906
+#: ../src/chat_control.py:2962
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s está ahora %(status)s"
@@ -3353,28 +3580,28 @@ msgstr "creando base de datos de registros"
 msgid "creating cache database"
 msgstr "creando base de datos de registros"
 
-#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
-#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
-#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
-#: ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
 #, 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:275 ../src/common/check_paths.py:282
-#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
-#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
-#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:333
+#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
+#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
+#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
 msgid "Gajim will now exit"
 msgstr "Gajim se cerrará ahora"
 
-#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
+#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
 #, 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:342
+#: ../src/common/check_paths.py:351
 #, python-format
 msgid "creating %s directory"
 msgstr "creando directorio %s"
@@ -3438,9 +3665,9 @@ msgstr "Elige los grupos de conversación que quieres abandonar"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:801
-#: ../src/roster_window.py:1614 ../src/roster_window.py:1616
-#: ../src/roster_window.py:5251
+#: ../src/common/helpers.py:57 ../src/roster_window.py:815
+#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
+#: ../src/roster_window.py:5323
 msgid "Groupchats"
 msgstr "Grupos de charla"
 
@@ -3503,7 +3730,9 @@ msgstr ""
 "ausencia extendida"
 
 #: ../src/common/config.py:88
-msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+#, fuzzy
+msgid ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 "Cuándo mostrar el icono systray. Puede ser 'nunca', 'en eventos', 'siempre'."
 
@@ -3560,9 +3789,9 @@ msgstr ""
 "Lista (separada por espacios) de filas (cuentas y grupos) que están caídas."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:501
-#: ../src/common/optparser.py:290 ../src/common/optparser.py:486
-#: ../src/common/optparser.py:520 ../src/gui_interface.py:3370
+#: ../src/common/config.py:106 ../src/common/config.py:505
+#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
+#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
 msgid "default"
 msgstr "por defecto"
 
@@ -3787,7 +4016,8 @@ 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:197
-msgid "Notify of events in the system trayicon."
+#, fuzzy
+msgid "Notify of events in the notification area."
 msgstr "Notifica eventos en el área de notificación."
 
 #: ../src/common/config.py:203
@@ -3826,9 +4056,10 @@ msgstr ""
 "de charla."
 
 #: ../src/common/config.py:221
+#, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
+"setting is taken into account only if notification icon is used."
 msgstr ""
 "Si es True, cierra Gajim cuando el botón X del gestor de ventanas es "
 "pulsado. Esta preferencia sólo se activa si se usa el icono del área de "
@@ -4106,9 +4337,10 @@ msgstr ""
 "serán limpiadas."
 
 #: ../src/common/config.py:270
+#, fuzzy
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
-"systray icon."
+"notification icon."
 msgstr ""
 "Si es True, las ventanas de notificación del deminio notificador serán "
 "adjuntadas al área de notificación."
@@ -4305,11 +4537,15 @@ msgstr ""
 msgid "Message that is sent to contacts you want to add"
 msgstr "Por favor, rellena la información del contacto que quieres añadir"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:374
+msgid "Last time we syncronized with logs from server."
+msgstr ""
+
+#: ../src/common/config.py:436
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "¿Está OpenPGP activado para este contacto?"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4317,101 +4553,108 @@ msgstr ""
 "¿Debería Gajim iniciar automáticamente una sesión cifrada con este contacto "
 "cuando sea posible?"
 
-#: ../src/common/config.py:437 ../src/common/config.py:440
+#: ../src/common/config.py:438 ../src/common/config.py:441
 msgid "Language for which we want to check misspelled words"
 msgstr "Lenguaje en el que queremos comprobar errores ortográficos"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:447
 msgid "all or space separated status"
 msgstr "estado separado por espacios o all"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:448
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no' o 'both'"
 
-#: ../src/common/config.py:448 ../src/common/config.py:450
-#: ../src/common/config.py:451 ../src/common/config.py:454
-#: ../src/common/config.py:455
+#: ../src/common/config.py:449 ../src/common/config.py:451
+#: ../src/common/config.py:452 ../src/common/config.py:455
+#: ../src/common/config.py:456
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' o ''"
 
-#: ../src/common/config.py:461 ../src/common/pep.py:157
+#: ../src/common/config.py:460
+msgid ""
+"State whether plugins should be activated on exit (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
+msgstr ""
+
+#: ../src/common/config.py:465 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Durmiendo"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back soon"
 msgstr "Vuelvo pronto"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back in some minutes."
 msgstr "Vuelvo en unos minutos."
 
-#: ../src/common/config.py:463 ../src/common/pep.py:127
+#: ../src/common/config.py:467 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Comiendo"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:467
 msgid "I'm eating, so leave me a message."
 msgstr "Estoy comiendo, déjame un mensaje."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "Movie"
 msgstr "Película"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "I'm watching a movie."
 msgstr "Estoy viendo una película."
 
-#: ../src/common/config.py:465 ../src/common/pep.py:186
+#: ../src/common/config.py:469 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Trabajando"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:469
 msgid "I'm working."
 msgstr "Estoy trabajando."
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "I'm on the phone."
 msgstr "Estoy al teléfono."
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "Out"
 msgstr "Fuera"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "I'm out enjoying life."
 msgstr "Estoy fuera disfrutando la vida"
 
-#: ../src/common/config.py:478
+#: ../src/common/config.py:482
 msgid "I'm available."
 msgstr "Estoy disponible"
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:483
 msgid "I'm free for chat."
 msgstr "Estoy libre para hablar"
 
-#: ../src/common/config.py:480 ../src/config.py:1600
+#: ../src/common/config.py:484 ../src/config.py:1600
 msgid "Be right back."
 msgstr "Vuelvo pronto"
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:485
 msgid "I'm not available."
 msgstr "No estoy disponible."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:486
 msgid "Do not disturb."
 msgstr "No molestar."
 
-#: ../src/common/config.py:483 ../src/common/config.py:484
+#: ../src/common/config.py:487 ../src/common/config.py:488
 msgid "Bye!"
 msgstr "¡Adiós!"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:498
 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."
@@ -4420,182 +4663,94 @@ msgstr ""
 "palabras de muc_highlight_words, o cuando un mensaje de grupo de charla "
 "contiene tu alias."
 
-#: ../src/common/config.py:495
+#: ../src/common/config.py:499
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sonido a reproducir cuando llega cualquier mensaje MUC"
 
-#: ../src/common/config.py:504 ../src/common/optparser.py:304
+#: ../src/common/config.py:508 ../src/common/optparser.py:308
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:290
+#: ../src/common/config.py:512 ../src/common/optparser.py:294
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:512
+#: ../src/common/config.py:516
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:520
 msgid "marine"
 msgstr "marino"
 
-#: ../src/common/connection_handlers.py:84
+#: ../src/common/connection_handlers.py:94
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "No se puede cargar el módulo idle"
 
-#: ../src/common/connection_handlers.py:117
+#: ../src/common/connection_handlers.py:127
 #, 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:124
+#: ../src/common/connection_handlers.py:134
 msgid "Registration succeeded"
 msgstr "Registro realizado con éxito"
 
-#: ../src/common/connection_handlers.py:125
+#: ../src/common/connection_handlers.py:135
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registro con el agente %s realizado con éxito"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 msgid "Registration failed"
-msgstr "Falló el registro"
-
-#: ../src/common/connection_handlers.py:133
-#, python-format
-msgid ""
-"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
-msgstr ""
-"El registro con el agente %(agent)s falló con el error %(error)s: "
-"%(error_msg)s"
-
-#: ../src/common/connection_handlers.py:445
-#: ../src/common/connection_handlers.py:1633
-#: ../src/common/connection_handlers.py:1756
-#: ../src/common/connection_handlers.py:1957
-#: ../src/common/connection_handlers.py:2108 ../src/common/connection.py:449
-#: ../src/gajim.py:341
-msgid "Disk Write Error"
-msgstr "Error de escritura en disco"
-
-#: ../src/common/connection_handlers.py:678 ../src/common/connection.py:1472
-msgid "Invisibility not supported"
-msgstr "Invisibilidad no soportada"
-
-#: ../src/common/connection_handlers.py:679 ../src/common/connection.py:1473
-#, python-format
-msgid "Account %s doesn't support invisibility."
-msgstr "La cuenta %s no soporta invisibilidad."
-
-#: ../src/common/connection_handlers.py:1446 ../src/common/connection.py:253
-#: ../src/config.py:2091 ../src/config.py:2100 ../src/config.py:2168
-#: ../src/config.py:3560 ../src/dataforms_widget.py:597 ../src/dialogs.py:2931
-msgid "Invalid Jabber ID"
-msgstr "ID de Jabber no válida"
-
-#: ../src/common/connection_handlers.py:1447
-msgid "A message from a non-valid JID arrived, it has been ignored."
-msgstr "Ha llegado un mensaje de una JID no válida, ha sido ignorado."
-
-#: ../src/common/connection_handlers.py:1636
-#: ../src/common/connection_handlers.py:1759
-#: ../src/common/connection_handlers.py:1961
-#: ../src/common/connection_handlers.py:2111 ../src/common/connection.py:453
-#: ../src/gajim.py:160 ../src/session.py:139
-#, 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 ""
-"No se puede leer el archivo de base de datos (%s). Intenta repararlo (mira "
-"http://trac.gajim.org/wiki/DatabaseBackup) o elimínalo (se perderá todo el "
-"histórico)."
-
-#: ../src/common/connection_handlers.py:1805
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Alias no permitido: %s"
-
-#: ../src/common/connection_handlers.py:1902
-#: ../src/common/connection_handlers.py:1911
-#: ../src/common/connection_handlers.py:1918
-#: ../src/common/connection_handlers.py:1922
-#: ../src/common/connection_handlers.py:1926
-#: ../src/common/connection_handlers.py:1931 ../src/gui_interface.py:139
-msgid "Unable to join group chat"
-msgstr "No se pudo entrar al grupo de charla"
-
-#: ../src/common/connection_handlers.py:1903
-#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:1912
-#, python-format
-msgid "You are banned from group chat %s."
-msgstr "Estás baneado del grupo de charla %s."
-
-#: ../src/common/connection_handlers.py:1919
-#, python-format
-msgid "Group chat %s does not exist."
-msgstr "El grupo de charla %s no existe."
-
-#: ../src/common/connection_handlers.py:1923
-msgid "Group chat creation is restricted."
-msgstr "La creación de grupos de charla está restringida."
-
-#: ../src/common/connection_handlers.py:1927
-#, 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:1932
-#, 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:1976
-msgid "Room has been destroyed"
-msgstr "El salón ha sido destruido"
+msgstr "Falló el registro"
 
-#: ../src/common/connection_handlers.py:1984
+#: ../src/common/connection_handlers.py:143
 #, python-format
-msgid "You can join this room instead: %s"
-msgstr "Puedes unirte a este salón en su lugar: %s"
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
+"El registro con el agente %(agent)s falló con el error %(error)s: "
+"%(error_msg)s"
 
-#: ../src/common/connection_handlers.py:2020
-msgid "I would like to add you to my roster."
-msgstr "Me gustaría añadirte a mi lista de contactos"
+#: ../src/common/connection_handlers.py:466
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
+#: ../src/gajim.py:341
+msgid "Disk Write Error"
+msgstr "Error de escritura en disco"
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2041
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "estamos ahora suscritos a %s"
+#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
+msgid "Invisibility not supported"
+msgstr "Invisibilidad no soportada"
 
-#: ../src/common/connection_handlers.py:2043
+#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
 #, python-format
-msgid "unsubscribe request from %s"
-msgstr "petición de eliminación de suscripción de %s"
+msgid "Account %s doesn't support invisibility."
+msgstr "La cuenta %s no soporta invisibilidad."
 
-#: ../src/common/connection_handlers.py:2045
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "ya no estamos suscritos a %s"
+#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
+#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
+#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
+msgid "Invalid Jabber ID"
+msgstr "ID de Jabber no válida"
+
+#: ../src/common/connection_handlers.py:1405
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr "Ha llegado un mensaje de una JID no válida, ha sido ignorado."
 
-#: ../src/common/connection_handlers.py:2240
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
+#: ../src/gajim.py:160 ../src/session.py:139
 #, python-format
 msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
+"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 ""
-"La ID de Jabber %s no cumple la norma RFC. No será añadido a tu roster. Usa "
-"herramientas de gestión del roster como http://jru.jabberstudio.org/ para "
-"eliminarlo"
+"No se puede leer el archivo de base de datos (%s). Intenta repararlo (mira "
+"http://trac.gajim.org/wiki/DatabaseBackup) o elimínalo (se perderá todo el "
+"histórico)."
 
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
@@ -4725,27 +4880,27 @@ 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:254 ../src/dialogs.py:2932
+#: ../src/common/connection.py:256 ../src/dialogs.py:2948
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "No es posible enviar un mensaje a %s, esta JID no es válida."
 
-#: ../src/common/connection.py:276
+#: ../src/common/connection.py:278
 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:279
+#: ../src/common/connection.py:281
 #, 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:331
+#: ../src/common/connection.py:333
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Este mensaje está *cifrado* (Mira :JEP:`27`]"
 
-#: ../src/common/connection.py:439
+#: ../src/common/connection.py:441
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4754,80 +4909,80 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:807
+#: ../src/common/connection.py:809
 #, 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:808
+#: ../src/common/connection.py:810
 msgid "Reconnect manually."
 msgstr "Reconectar manualmente."
 
-#: ../src/common/connection.py:820
+#: ../src/common/connection.py:822
 #, 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:854
+#: ../src/common/connection.py:856
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "El servidor %s provee un formulario de registro diferente"
 
-#: ../src/common/connection.py:867
+#: ../src/common/connection.py:869
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Error SSL desconocido: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:882
+#: ../src/common/connection.py:884
 msgid "Invalid answer"
 msgstr "Respuesta no válida"
 
-#: ../src/common/connection.py:883
+#: ../src/common/connection.py:885
 #, 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:1165 ../src/common/connection.py:1294
-#: ../src/common/connection.py:1784
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
+#: ../src/common/connection.py:1792
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "No se puede conectar a \"%s\""
 
-#: ../src/common/connection.py:1166 ../src/gui_interface.py:755
+#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
 msgid "Check your connection or try again later."
 msgstr "Comprueba tu conexión o reinténtalo más tarde."
 
-#: ../src/common/connection.py:1171
+#: ../src/common/connection.py:1173
 #, python-format
 msgid "Server replied: %s"
 msgstr "El servidor respondió: %s"
 
-#: ../src/common/connection.py:1184
+#: ../src/common/connection.py:1186
 msgid "Connection to proxy failed"
 msgstr "Falló la conexión al proxy"
 
-#: ../src/common/connection.py:1215 ../src/common/connection.py:1274
+#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "No se puede conectar a la cuenta %s"
 
-#: ../src/common/connection.py:1216 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
 #, 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:1241
+#: ../src/common/connection.py:1243
 #, 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:1244
+#: ../src/common/connection.py:1246
 #, python-format
 msgid ""
 "\n"
@@ -4836,7 +4991,7 @@ msgstr ""
 "\n"
 "Error SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1248
 #, python-format
 msgid ""
 "\n"
@@ -4845,25 +5000,25 @@ msgstr ""
 "\n"
 "Error SSL desconocido: %d"
 
-#: ../src/common/connection.py:1295
+#: ../src/common/connection.py:1297
 msgid "Check your connection or try again later"
 msgstr "Comprueba tu conexión o inténtalo más tarde"
 
-#: ../src/common/connection.py:1324
+#: ../src/common/connection.py:1329
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falló la autentificación con \"%s\""
 
-#: ../src/common/connection.py:1326
+#: ../src/common/connection.py:1331
 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:1395
+#: ../src/common/connection.py:1400
 msgid "Error while removing privacy list"
 msgstr "Error eliminando la lista de privacidad"
 
-#: ../src/common/connection.py:1396
+#: ../src/common/connection.py:1401
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4872,25 +5027,25 @@ 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:1650
+#: ../src/common/connection.py:1658
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Contacto enviado: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1653
+#: ../src/common/connection.py:1661
 msgid "Sent contacts:"
 msgstr "Contactos enviados:"
 
-#: ../src/common/connection.py:1799 ../src/common/connection.py:1822
+#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
 msgid "Not fetched because of invisible status"
 msgstr "No conseguido debido al estado invisible"
 
-#: ../src/common/connection.py:2254
+#: ../src/common/connection.py:2262
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Falló el registro"
 
-#: ../src/common/connection.py:2255
+#: ../src/common/connection.py:2263
 #, fuzzy, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
@@ -4898,16 +5053,16 @@ msgstr ""
 "%(error_msg)s"
 
 #: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:674
+#: ../src/gui_interface.py:551
 msgid "Observers"
 msgstr "Observadores"
 
 #: ../src/common/contacts.py:139 ../src/common/contacts.py:366
 #: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1499 ../src/gui_interface.py:424
-#: ../src/roster_window.py:840 ../src/roster_window.py:1525
-#: ../src/roster_window.py:1606 ../src/roster_window.py:1608
-#: ../src/roster_window.py:1769
+#: ../src/disco.py:1517 ../src/roster_window.py:854
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
+#: ../src/roster_window.py:2466
 msgid "Transports"
 msgstr "Transportes"
 
@@ -5130,203 +5285,219 @@ msgstr "Final de semana"
 msgid "Weekend!"
 msgstr "¡Fin de semana!"
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:148
+msgid "Username must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:153
 msgid "Invalid character in username."
 msgstr "Caracter no válido en el nombre de usuario."
 
-#: ../src/common/helpers.py:156
-msgid "Server address required."
-msgstr "Se requiere la dirección del servidor."
+#: ../src/common/helpers.py:159
+msgid "Server must be between 1 and 1023 chars"
+msgstr ""
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 msgid "Invalid character in hostname."
 msgstr "Carácter no válido en el nombre del host."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:166
+msgid "Server address required."
+msgstr "Se requiere la dirección del servidor."
+
+#: ../src/common/helpers.py:170
+msgid "Resource must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:175
 msgid "Invalid character in resource."
 msgstr "Carácter no válido en el recurso."
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:215
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: ../src/common/helpers.py:211 ../src/tooltips.py:195
+#: ../src/common/helpers.py:217 ../src/tooltips.py:195
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:220
 msgid "_Not Available"
 msgstr "_No Disponible"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:225
 msgid "_Free for Chat"
 msgstr "_Libre para hablar"
 
-#: ../src/common/helpers.py:221 ../src/tooltips.py:191
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Free for Chat"
 msgstr "Libre para hablar"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:230
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "Pausada"
 
-#: ../src/common/helpers.py:226 ../src/tooltips.py:189
+#: ../src/common/helpers.py:232 ../src/tooltips.py:189
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Pausada"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:234
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:237
 msgid "A_way"
 msgstr "A_usente"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:242
 msgid "_Offline"
 msgstr "D_esconectado"
 
-#: ../src/common/helpers.py:238 ../src/tooltips.py:199
+#: ../src/common/helpers.py:244 ../src/tooltips.py:199
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:247
 msgid "_Invisible"
 msgstr "_Invisible"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:253
 msgid "?contact has status:Unknown"
 msgstr "Desconocido"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:255
 msgid "?contact has status:Has errors"
 msgstr "Tiene errores"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:260
 msgid "?Subscription we already have:None"
 msgstr "Ninguna"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:262
 msgid "To"
 msgstr "A"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
+msgid "From"
+msgstr "De"
+
+#: ../src/common/helpers.py:266
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:274
 msgid "?Ask (for Subscription):None"
 msgstr "Ninguna"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:276
 msgid "Subscribe"
 msgstr "_Añadir"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:285
 msgid "?Group Chat Contact Role:None"
 msgstr "Ninguno"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:288
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:290
 msgid "Moderator"
 msgstr "Moderador"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:293
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:295
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:298
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:300
 msgid "Visitor"
 msgstr "Visitante"
 
-#: ../src/common/helpers.py:300 ../src/tooltips.py:210
+#: ../src/common/helpers.py:306 ../src/tooltips.py:210
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Ninguno"
 
-#: ../src/common/helpers.py:302 ../src/tooltips.py:216
+#: ../src/common/helpers.py:308 ../src/tooltips.py:216
 msgid "Owner"
 msgstr "Propietario"
 
-#: ../src/common/helpers.py:304 ../src/tooltips.py:214
+#: ../src/common/helpers.py:310 ../src/tooltips.py:214
 msgid "Administrator"
 msgstr "Administrador"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:212
+#: ../src/common/helpers.py:312 ../src/tooltips.py:212
 msgid "Member"
 msgstr "Miembro"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:351
 msgid "is paying attention to the conversation"
 msgstr "está prestando atención a la conversación"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:353
 msgid "is doing something else"
 msgstr "está haciendo algo más"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:355
 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:352
+#: ../src/common/helpers.py:358
 msgid "paused composing a message"
 msgstr "ha parado de escribir"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:360
 msgid "has closed the chat window or tab"
 msgstr "ha cerrado la ventana de chat"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:619
+#: ../src/common/helpers.py:625
 #, python-format
 msgid "%s GiB"
 msgstr ""
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:622
+#: ../src/common/helpers.py:628
 #, python-format
 msgid "%s GB"
 msgstr ""
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:626
+#: ../src/common/helpers.py:632
 #, python-format
 msgid "%s MiB"
 msgstr ""
 
 #. MB means megabyte
-#: ../src/common/helpers.py:629
+#: ../src/common/helpers.py:635
 #, python-format
 msgid "%s MB"
 msgstr ""
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:633
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s KiB"
 msgstr ""
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:636
+#: ../src/common/helpers.py:642
 #, python-format
 msgid "%s KB"
 msgstr ""
 
 #. B means bytes
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:645
 #, python-format
 msgid "%s B"
 msgstr ""
@@ -5369,12 +5540,12 @@ msgstr "Gajim - %s"
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:111
+#: ../src/common/jingle_rtp.py:107
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Configuración del salón"
 
-#: ../src/common/jingle_rtp.py:112
+#: ../src/common/jingle_rtp.py:108
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5386,30 +5557,30 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:209
+#: ../src/common/jingle_rtp.py:205
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:210
+#: ../src/common/jingle_rtp.py:206
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Mensaje de error: %s"
 
-#: ../src/common/jingle_rtp.py:336
+#: ../src/common/jingle_rtp.py:335
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:339
+#: ../src/common/jingle_rtp.py:338
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:382
+#: ../src/common/jingle_rtp.py:381
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:390
+#: ../src/common/jingle_rtp.py:389
 msgid "video output"
 msgstr ""
 
@@ -5486,11 +5657,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "error: no se puede abrir %s para lectura"
 
-#: ../src/common/optparser.py:299 ../src/common/optparser.py:300
+#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:379
+#: ../src/common/optparser.py:383
 msgid "migrating logs database to indices"
 msgstr "migrando la base de datos de registros a los índices"
 
@@ -6163,18 +6334,18 @@ msgstr ""
 "cancelada."
 
 #. we're not english
-#: ../src/common/stanza_session.py:303
+#: ../src/common/stanza_session.py:423
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 "[Esto es parte de una sesión cifrada. Si ves este mensaje, algo fue mal.]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:178
+#: ../src/common/zeroconf/connection_zeroconf.py:181
 msgid "Avahi error"
 msgstr "Error de Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:179
+#: ../src/common/zeroconf/connection_zeroconf.py:182
 #, python-format
 msgid ""
 "%s\n"
@@ -6183,44 +6354,44 @@ msgstr ""
 "%s\n"
 "La mensajería de enlace local podría no funcionar correctamente."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:190
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 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:199
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Could not start local service"
 msgstr "No se pudo iniciar servicio local"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "No se pudo enlazar al puerto %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-#: ../src/common/zeroconf/connection_zeroconf.py:283
-#: ../src/common/zeroconf/connection_zeroconf.py:294
-#: ../src/common/zeroconf/connection_zeroconf.py:308
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:286
+#: ../src/common/zeroconf/connection_zeroconf.py:297
+#: ../src/common/zeroconf/connection_zeroconf.py:311
 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:282
-#: ../src/common/zeroconf/connection_zeroconf.py:293
-#: ../src/common/zeroconf/connection_zeroconf.py:307
+#: ../src/common/zeroconf/connection_zeroconf.py:285
+#: ../src/common/zeroconf/connection_zeroconf.py:296
+#: ../src/common/zeroconf/connection_zeroconf.py:310
 #, 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:325
+#: ../src/common/zeroconf/connection_zeroconf.py:328
 msgid "Your message could not be sent."
 msgstr "Tu mensaje no pudo ser enviado."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:335
+#: ../src/common/zeroconf/connection_zeroconf.py:338
 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:360
+#: ../src/common/zeroconf/connection_zeroconf.py:363
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6240,16 +6411,16 @@ msgstr "Mensajes por defecto"
 msgid "Enabled"
 msgstr "Activado"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3078
+#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
 msgid "Default"
 msgstr "Por defecto"
 
-#: ../src/config.py:739 ../src/dialogs.py:1395
+#: ../src/config.py:733 ../src/dialogs.py:1409
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "No está disponible el diccionario para el idioma %s"
 
-#: ../src/config.py:740
+#: ../src/config.py:734
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6267,9 +6438,9 @@ msgid "status message text"
 msgstr "texto del mensaje de estado"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2383 ../src/dialogs.py:2449
-#: ../src/dialogs.py:3215 ../src/disco.py:866 ../src/disco.py:1726
-#: ../src/disco.py:2030 ../src/history_window.py:90
+#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
+#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
+#: ../src/disco.py:2048 ../src/history_window.py:90
 msgid "Name"
 msgstr "Nombre"
 
@@ -6306,7 +6477,7 @@ msgstr ""
 "Todas las conversaciones y grupos de charla serán cerrados. ¿Deseas "
 "continuar?"
 
-#: ../src/config.py:1976 ../src/config.py:2509 ../src/config.py:2545
+#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
 msgid "You are currently connected to the server"
 msgstr "Debes estar conectado para navegar los servicios"
 
@@ -6344,135 +6515,135 @@ msgstr "El nombre de la cuenta no puede estar vacío."
 msgid "Account name cannot contain spaces."
 msgstr "El nombre de la cuenta no puede contener espacios."
 
-#: ../src/config.py:2072
+#: ../src/config.py:2074
 msgid "Rename Account"
 msgstr "Renombrar cuenta"
 
-#: ../src/config.py:2073
+#: ../src/config.py:2075
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Introduce un nuevo nombre para la cuenta %s"
 
-#: ../src/config.py:2101
+#: ../src/config.py:2103
 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:2318 ../src/config.py:3606
+#: ../src/config.py:2320 ../src/config.py:3623
 msgid "Invalid entry"
 msgstr "Entrada no válida"
 
-#: ../src/config.py:2319 ../src/config.py:3607
+#: ../src/config.py:2321 ../src/config.py:3624
 msgid "Custom port must be a port number."
 msgstr "El puerto personalizado debe ser un número de puerto"
 
-#: ../src/config.py:2340
+#: ../src/config.py:2342
 msgid "Failed to get secret keys"
 msgstr "Error obteniendo las claves secretas"
 
-#: ../src/config.py:2341
+#: ../src/config.py:2343
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Ha habido un problema recuperando tus claves secretas OpenPGP"
 
-#: ../src/config.py:2375
+#: ../src/config.py:2377
 msgid "OpenPGP Key Selection"
 msgstr "Selección de clave OpenPGP"
 
-#: ../src/config.py:2376
+#: ../src/config.py:2378
 msgid "Choose your OpenPGP key"
 msgstr "Elige tu clave OpenPGP"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2385
 msgid "No such account available"
 msgstr "No está disponible dicha cuenta"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2386
 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:2391 ../src/dialogs.py:2136 ../src/dialogs.py:2371
-#: ../src/dialogs.py:2557 ../src/disco.py:511 ../src/profile_window.py:339
+#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
+#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
 msgid "You are not connected to the server"
 msgstr "No estás conectado al servidor"
 
-#: ../src/config.py:2392
+#: ../src/config.py:2394
 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:2396
+#: ../src/config.py:2398
 msgid "Your server doesn't support Vcard"
 msgstr "Tu servidor no soporta vCard"
 
-#: ../src/config.py:2397
+#: ../src/config.py:2399
 msgid "Your server can't save your personal information."
 msgstr "Tu servidor no puede guardar tu información personal."
 
-#: ../src/config.py:2510 ../src/config.py:2546
+#: ../src/config.py:2512 ../src/config.py:2548
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Para cambiar el nombre de la cuenta, debes estar desconectado"
 
-#: ../src/config.py:2515
+#: ../src/config.py:2517
 msgid "Account Local already exists."
 msgstr "La cuenta local ya existe."
 
-#: ../src/config.py:2516
+#: ../src/config.py:2518
 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:2673
+#: ../src/config.py:2675
 #, python-format
 msgid "Edit %s"
 msgstr "Editar %s"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2677
 #, python-format
 msgid "Register to %s"
 msgstr "Registrar a %s"
 
 #. list at the beginning
-#: ../src/config.py:2711
+#: ../src/config.py:2713
 msgid "Ban List"
 msgstr "Lista de expulsión"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2714
 msgid "Member List"
 msgstr "Lista de miembros"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2714
 msgid "Owner List"
 msgstr "Lista de propietarios"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2715
 msgid "Administrator List"
 msgstr "Lista de administradores"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2763 ../src/disco.py:873 ../src/history_manager.py:201
+#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2773
+#: ../src/config.py:2789
 msgid "Reason"
 msgstr "Motivo"
 
-#: ../src/config.py:2780
+#: ../src/config.py:2796
 msgid "Nick"
 msgstr "Alias"
 
-#: ../src/config.py:2786
+#: ../src/config.py:2802
 msgid "Role"
 msgstr "Puesto"
 
-#: ../src/config.py:2813
+#: ../src/config.py:2829
 msgid "Banning..."
 msgstr "Expulsando..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2815
+#: ../src/config.py:2831
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6480,11 +6651,11 @@ msgstr ""
 "<b>¿A quién quieres expulsar?</b>\n"
 "\n"
 
-#: ../src/config.py:2817
+#: ../src/config.py:2833
 msgid "Adding Member..."
 msgstr "Añadiendo miembro..."
 
-#: ../src/config.py:2818
+#: ../src/config.py:2834
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6492,11 +6663,11 @@ msgstr ""
 "<b>¿A quién quieres hacer miembro?</b>\n"
 "\n"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2836
 msgid "Adding Owner..."
 msgstr "Añadiendo propietario..."
 
-#: ../src/config.py:2821
+#: ../src/config.py:2837
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6504,11 +6675,11 @@ msgstr ""
 "<b>¿A quién quieres hacer propietario?</b>\n"
 "\n"
 
-#: ../src/config.py:2823
+#: ../src/config.py:2839
 msgid "Adding Administrator..."
 msgstr "Añadiendo administrador..."
 
-#: ../src/config.py:2824
+#: ../src/config.py:2840
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6516,7 +6687,7 @@ msgstr ""
 "<b>¿A quién quieres hacer administrador?</b>\n"
 "\n"
 
-#: ../src/config.py:2825
+#: ../src/config.py:2841
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6533,83 +6704,83 @@ msgstr ""
 "usuario@dominio, dominio/ recurso, o una dirección conteniendo un "
 "subdominio)."
 
-#: ../src/config.py:2926
+#: ../src/config.py:2943
 #, python-format
 msgid "Removing %s account"
 msgstr "Eliminando la cuenta %s"
 
-#: ../src/config.py:2941
+#: ../src/config.py:2958
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Emoticonos desactivados"
 
-#: ../src/config.py:2942
+#: ../src/config.py:2959
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2955 ../src/gui_interface.py:1132
-#: ../src/gui_interface.py:1243
+#: ../src/config.py:2972 ../src/gui_interface.py:311
+#: ../src/gui_interface.py:1048
 msgid "Password Required"
 msgstr "Contraseña requerida"
 
-#: ../src/config.py:2956 ../src/gui_interface.py:1223
+#: ../src/config.py:2973 ../src/gui_interface.py:1028
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduce contraseña para la cuenta %s"
 
-#: ../src/config.py:2957 ../src/gui_interface.py:1243
+#: ../src/config.py:2974 ../src/gui_interface.py:1048
 msgid "Save password"
 msgstr "Guardar contraseña"
 
-#: ../src/config.py:2967
+#: ../src/config.py:2984
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "La cuenta \"%s\" está conectada al servidor"
 
-#: ../src/config.py:2968
+#: ../src/config.py:2985
 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:2982
+#: ../src/config.py:2999
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Falló la conexión al proxy"
 
-#: ../src/config.py:2983
+#: ../src/config.py:3000
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "¿Qué quieres hacer?"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3001
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Eliminar la _cuenta únicamente de Gajim"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3002
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3078
+#: ../src/config.py:3095
 msgid "?print_status:All"
 msgstr "Todos"
 
-#: ../src/config.py:3079
+#: ../src/config.py:3096
 msgid "Enter and leave only"
 msgstr "Entrar y salir sólamente"
 
-#: ../src/config.py:3080
+#: ../src/config.py:3097
 msgid "?print_status:None"
 msgstr "Ninguno"
 
-#: ../src/config.py:3150
+#: ../src/config.py:3167
 msgid "New Group Chat"
 msgstr "Nuevo grupo de charla"
 
-#: ../src/config.py:3183
+#: ../src/config.py:3200
 msgid "This bookmark has invalid data"
 msgstr "Este marcador tiene información no válida"
 
-#: ../src/config.py:3184
+#: ../src/config.py:3201
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6617,27 +6788,27 @@ msgstr ""
 "este marcador."
 
 #. invalid char
-#: ../src/config.py:3302 ../src/dialogs.py:1934
+#: ../src/config.py:3319 ../src/dialogs.py:1950
 msgid "Invalid nickname"
 msgstr "Alias no válido"
 
-#: ../src/config.py:3303 ../src/config.py:3317 ../src/config.py:3331
+#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
 msgid "Character not allowed"
 msgstr "Carácter no permitido"
 
-#: ../src/config.py:3316 ../src/config.py:3582
+#: ../src/config.py:3333 ../src/config.py:3599
 msgid "Invalid server"
 msgstr "Servidor no válido"
 
-#: ../src/config.py:3330
+#: ../src/config.py:3347
 msgid "Invalid room"
 msgstr "Salón no válido"
 
-#: ../src/config.py:3498
+#: ../src/config.py:3515
 msgid "Account has been added successfully"
 msgstr "La cuenta ha sido añadida con éxito"
 
-#: ../src/config.py:3499 ../src/config.py:3505
+#: ../src/config.py:3516 ../src/config.py:3522
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6648,32 +6819,32 @@ msgstr ""
 "Avanzado, o más tarde mediante el submenú Cuentas del menú Editar de la "
 "ventana principal."
 
-#: ../src/config.py:3504
+#: ../src/config.py:3521
 msgid "Your new account has been created successfully"
 msgstr "Tu nueva cuenta ha sido creada con éxito"
 
-#: ../src/config.py:3543
+#: ../src/config.py:3560
 msgid "Invalid username"
 msgstr "Nombre de usuario no válido"
 
-#: ../src/config.py:3545
+#: ../src/config.py:3562
 msgid "You must provide a username to configure this account."
 msgstr "Debes proporcionar un nombre para configurar esta cuenta."
 
-#: ../src/config.py:3583
+#: ../src/config.py:3600
 msgid "Please provide a server on which you want to register."
 msgstr "Por favor, especifica un servidor donde te quieras registrar."
 
-#: ../src/config.py:3639 ../src/gui_interface.py:1904
+#: ../src/config.py:3656 ../src/gui_interface.py:1693
 msgid "Certificate Already in File"
 msgstr "El certificado ya está en el archivo"
 
-#: ../src/config.py:3640 ../src/gui_interface.py:1905
+#: ../src/config.py:3657 ../src/gui_interface.py:1694
 #, 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:3717
+#: ../src/config.py:3734
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6688,7 +6859,7 @@ msgstr ""
 "Error SSL: %(error)s\n"
 "¿Aún quieres conectar a este servidor?"
 
-#: ../src/config.py:3723 ../src/gui_interface.py:1932
+#: ../src/config.py:3740 ../src/gui_interface.py:1721
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6699,63 +6870,72 @@ msgstr ""
 "Huella SHA1 del certificado:\n"
 "%s"
 
-#: ../src/config.py:3755 ../src/config.py:3789
+#: ../src/config.py:3772 ../src/config.py:3806
 msgid "An error occurred during account creation"
 msgstr "Ha ocurrido un error durante la creación de la cuenta"
 
-#: ../src/config.py:3854
+#: ../src/config.py:3871
 msgid "Account name is in use"
 msgstr "El nombre de la cuenta está en uso"
 
-#: ../src/config.py:3855
+#: ../src/config.py:3872
 msgid "You already have an account using this name."
 msgstr "Ya tienes una cuenta usando este nombre"
 
-#: ../src/config.py:4009
+#: ../src/config.py:3991
+msgid "PEP node was not removed"
+msgstr "El nodo PEP no fue eliminado"
+
+#: ../src/config.py:3992
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr "El nodo PEP %(node)s no se pudo eliminar: %(message)s"
+
+#: ../src/config.py:4036
 msgid "Active"
 msgstr "Activo"
 
-#: ../src/config.py:4017
+#: ../src/config.py:4044
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:4052
+#: ../src/config.py:4079
 msgid "First Message Received"
 msgstr "Primer mensaje recibido"
 
-#: ../src/config.py:4053
+#: ../src/config.py:4080
 msgid "Next Message Received Focused"
 msgstr "Primer mensaje recibido focalizado"
 
-#: ../src/config.py:4055
+#: ../src/config.py:4082
 msgid "Next Message Received Unfocused"
 msgstr "Primer mensaje recibido desfocalizado"
 
-#: ../src/config.py:4056
+#: ../src/config.py:4083
 msgid "Contact Connected"
 msgstr "Nombre de contacto"
 
-#: ../src/config.py:4057
+#: ../src/config.py:4084
 msgid "Contact Disconnected"
 msgstr "Contacto desconectado"
 
-#: ../src/config.py:4058
+#: ../src/config.py:4085
 msgid "Message Sent"
 msgstr "Mensaje enviado"
 
-#: ../src/config.py:4059
+#: ../src/config.py:4086
 msgid "Group Chat Message Highlight"
 msgstr "Resaltado de mensaje de grupo de charla"
 
-#: ../src/config.py:4060
+#: ../src/config.py:4087
 msgid "Group Chat Message Received"
 msgstr "Mensaje de grupo de charla recibido"
 
-#: ../src/config.py:4061
+#: ../src/config.py:4088
 msgid "GMail Email Received"
 msgstr "Correo de GMail recibido"
 
-#: ../src/conversation_textview.py:600
+#: ../src/conversation_textview.py:601
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6765,7 +6945,7 @@ msgstr ""
 "recibido por el extremo remoto. Si este icono permanece\n"
 "mucho tiempo, probablemente el mensaje se haya perdido."
 
-#: ../src/conversation_textview.py:619
+#: ../src/conversation_textview.py:620
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6773,44 +6953,44 @@ 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:739
+#: ../src/conversation_textview.py:740
 msgid "_Quote"
 msgstr "_Cita"
 
-#: ../src/conversation_textview.py:746
+#: ../src/conversation_textview.py:747
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Acciones para \"%s\""
 
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Read _Wikipedia Article"
 msgstr "Leer artículo de _Wikipedia"
 
-#: ../src/conversation_textview.py:763
+#: ../src/conversation_textview.py:765
 msgid "Look it up in _Dictionary"
 msgstr "Buscarlo en el _Diccionario"
 
-#: ../src/conversation_textview.py:780
+#: ../src/conversation_textview.py:782
 #, 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:793
+#: ../src/conversation_textview.py:795
 #, 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:796
+#: ../src/conversation_textview.py:798
 msgid "Web _Search for it"
 msgstr "_Buscarlo en la web"
 
-#: ../src/conversation_textview.py:802
+#: ../src/conversation_textview.py:804
 msgid "Open as _Link"
 msgstr "_Abrir como enlace"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1296
+#: ../src/conversation_textview.py:1298
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6818,188 +6998,193 @@ msgstr[0] "Ayer"
 msgstr[1] "Ayer"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1344 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
 
-#: ../src/dataforms_widget.py:544
+#: ../src/dataforms_widget.py:545
 #, fuzzy
 msgid "Unable to load image"
 msgstr "No se puede cargar el módulo idle"
 
-#: ../src/dataforms_widget.py:546
+#: ../src/dataforms_widget.py:547
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Invisibilidad no soportada"
 
-#: ../src/dataforms_widget.py:601
+#: ../src/dataforms_widget.py:562
+msgid "This field is required"
+msgstr ""
+
+#: ../src/dataforms_widget.py:607
 msgid "Jabber ID already in list"
 msgstr "La ID de Jabber ya está en la lista"
 
-#: ../src/dataforms_widget.py:602
+#: ../src/dataforms_widget.py:608
 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:613
+#: ../src/dataforms_widget.py:619
 msgid "new@jabber.id"
 msgstr "nuevo@jabber.id"
 
-#: ../src/dataforms_widget.py:616 ../src/dataforms_widget.py:618
+#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "nuevo%d@jabber.id"
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nombre del contacto : <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "ID de Jabber : <i>%s</i>"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:195
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:201
+#: ../src/dialogs.py:202
 msgid "In the group"
 msgstr "En el grupo"
 
-#: ../src/dialogs.py:292
+#: ../src/dialogs.py:293
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:297
+#: ../src/dialogs.py:298
 msgid "Contact name"
 msgstr "Nombre de contacto"
 
-#: ../src/dialogs.py:469
+#: ../src/dialogs.py:470
 msgid "Set Mood"
 msgstr "Definir estado de ánimo"
 
-#: ../src/dialogs.py:589
+#: ../src/dialogs.py:590
 #, python-format
 msgid "%s Status Message"
 msgstr "Mensaje de estado %s"
 
-#: ../src/dialogs.py:603
+#: ../src/dialogs.py:604
 msgid "Status Message"
 msgstr "Mensaje de estado"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:794
 msgid "Overwrite Status Message?"
 msgstr "¿Sobreescribir mensaje de estado?"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:795
 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:802
+#: ../src/dialogs.py:803
 msgid "Save as Preset Status Message"
 msgstr "Guardar como mensaje de estado predefinido"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:804
 msgid "Please type a name for this status message"
 msgstr "Escribe un nombre para este mensaje de estado"
 
-#: ../src/dialogs.py:831
+#: ../src/dialogs.py:832
 msgid "AIM Address:"
 msgstr "Dirección AIM:"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:833
 msgid "GG Number:"
 msgstr "Número GG:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:834
 msgid "ICQ Number:"
 msgstr "Número ICQ:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:835
 msgid "MSN Address:"
 msgstr "Dirección MSN:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:836
 msgid "Yahoo! Address:"
 msgstr "Dirección Yahoo!:"
 
-#: ../src/dialogs.py:872
+#: ../src/dialogs.py:873
 #, 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:875
+#: ../src/dialogs.py:876
 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:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
+#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
+#: ../src/dialogs.py:3464
 msgid "Invalid User ID"
 msgstr "ID de Usuario no válida"
 
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1052
 msgid "The user ID must not contain a resource."
 msgstr "Esta ID de usuario no contiene un recurso."
 
-#: ../src/dialogs.py:1051
+#: ../src/dialogs.py:1057
 msgid "You cannot add yourself to your roster."
 msgstr "No puedes añadirte a tí mismo a tu roster."
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1071
 msgid "Contact already in roster"
 msgstr "Contacto ya presente en el roster"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1072
 msgid "This contact is already listed in your roster."
 msgstr "Este contacto ya está listado en tu roster."
 
-#: ../src/dialogs.py:1112
+#: ../src/dialogs.py:1118
 msgid "User ID:"
 msgstr "ID de usuario:"
 
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1189
 msgid "A GTK+ jabber client"
 msgstr "Un cliente de Jabber en GTK"
 
-#: ../src/dialogs.py:1176
+#: ../src/dialogs.py:1190
 msgid "GTK+ Version:"
 msgstr "Versión de GTK+:"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1191
 msgid "PyGTK Version:"
 msgstr "Versión de PyGTK:"
 
-#: ../src/dialogs.py:1187
+#: ../src/dialogs.py:1201
 msgid "Current Developers:"
 msgstr "Desarrolladores actuales:"
 
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1203
 msgid "Past Developers:"
 msgstr "Desarrolladores anteriores:"
 
-#: ../src/dialogs.py:1195
+#: ../src/dialogs.py:1209
 msgid "THANKS:"
 msgstr "AGRADECIMIENTOS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1215
 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:1213
+#: ../src/dialogs.py:1227
 msgid "translator-credits"
 msgstr "Fran Alburquerque <frank@giingo.org>"
 
-#: ../src/dialogs.py:1396
+#: ../src/dialogs.py:1410
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7012,104 +7197,104 @@ msgstr ""
 "\n"
 "No se usará el resaltado de los errores de escritura"
 
-#: ../src/dialogs.py:1935 ../src/dialogs.py:2322
+#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
 msgid "The nickname has not allowed characters."
 msgstr "El alias tiene caracteres no permitidos."
 
-#: ../src/dialogs.py:2053
+#: ../src/dialogs.py:2069
 #, 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:2056
+#: ../src/dialogs.py:2072
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Petición de adición de %s"
 
-#: ../src/dialogs.py:2131 ../src/gui_interface.py:2672
+#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Ya estás en el salón %s"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2153
 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:2178
+#: ../src/dialogs.py:2194
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entrar a un grupo de charla con la cuenta %s"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2325
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Nombre de cuenta no válido"
 
-#: ../src/dialogs.py:2310
+#: ../src/dialogs.py:2326
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "La cuenta desde la que quieres entrar al salón"
 
-#: ../src/dialogs.py:2321
+#: ../src/dialogs.py:2337
 msgid "Invalid Nickname"
 msgstr "Alias no válido"
 
-#: ../src/dialogs.py:2326 ../src/dialogs.py:2332
-#: ../src/groupchat_control.py:1832
+#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
+#: ../src/groupchat_control.py:1847
 msgid "Invalid group chat Jabber ID"
 msgstr "ID de Jabber no válida para el grupo de charla"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2343
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr ""
 "La ID de Jabber para el grupo de charla tiene caracteres no permitidos."
 
-#: ../src/dialogs.py:2333 ../src/groupchat_control.py:1833
+#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
 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:2340
+#: ../src/dialogs.py:2356
 msgid "This is not a group chat"
 msgstr "Esto no es un grupo de charla"
 
-#: ../src/dialogs.py:2341
+#: ../src/dialogs.py:2357
 #, 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:2372
+#: ../src/dialogs.py:2388
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sin una conexión, no puedes sincronizar tus contactos."
 
-#: ../src/dialogs.py:2386
+#: ../src/dialogs.py:2402
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/dialogs.py:2421
+#: ../src/dialogs.py:2437
 msgid "This account is not connected to the server"
 msgstr "Esta cuentano está conectada al servidor"
 
-#: ../src/dialogs.py:2422
+#: ../src/dialogs.py:2438
 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:2446
+#: ../src/dialogs.py:2462
 msgid "Synchronise"
 msgstr "Sincronizar"
 
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2523
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar conversación con la cuenta %s"
 
-#: ../src/dialogs.py:2509
+#: ../src/dialogs.py:2525
 msgid "Start Chat"
 msgstr "Iniciar conversación"
 
-#: ../src/dialogs.py:2510
+#: ../src/dialogs.py:2526
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7118,168 +7303,168 @@ msgstr ""
 "enviar un mensaje de charla:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2536 ../src/dialogs.py:2917 ../src/dialogs.py:3129
+#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
 msgid "Connection not available"
 msgstr "Conexión no disponible"
 
-#: ../src/dialogs.py:2537 ../src/dialogs.py:2918 ../src/dialogs.py:3130
+#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, asegúrate de estar conectado con \"%s\"."
 
-#: ../src/dialogs.py:2546 ../src/dialogs.py:2549
+#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
 msgid "Invalid JID"
 msgstr "ID de Jabber no válida"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2565
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "No se puede analizar \"%s\"."
 
-#: ../src/dialogs.py:2558
+#: ../src/dialogs.py:2574
 msgid "Without a connection, you can not change your password."
 msgstr "Sin una conexión, no puedes cambiar tu contraseña."
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "Invalid password"
 msgstr "Contraseña no válida"
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "You must enter a password."
 msgstr "Debes introducir una contraseña."
 
-#: ../src/dialogs.py:2581
+#: ../src/dialogs.py:2597
 msgid "Passwords do not match"
 msgstr "Las contraseñas no coinciden"
 
-#: ../src/dialogs.py:2582
+#: ../src/dialogs.py:2598
 msgid "The passwords typed in both fields must be identical."
 msgstr "Las contraseñas escritas en ambos campos deben ser idénticas."
 
 #. default value
-#: ../src/dialogs.py:2619 ../src/notify.py:247 ../src/notify.py:473
+#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
 msgid "Contact Signed In"
 msgstr "Contacto conectado"
 
-#: ../src/dialogs.py:2621 ../src/notify.py:255 ../src/notify.py:475
+#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
 msgid "Contact Signed Out"
 msgstr "Contacto desconectado"
 
 #. chat message
-#: ../src/dialogs.py:2623 ../src/notify.py:277 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
 msgid "New Message"
 msgstr "Nuevo mensaje"
 
 #. single message
-#: ../src/dialogs.py:2623 ../src/notify.py:259 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
 msgid "New Single Message"
 msgstr "Nuevo mensaje"
 
 #. private message
-#: ../src/dialogs.py:2624 ../src/notify.py:265 ../src/notify.py:478
+#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
 msgid "New Private Message"
 msgstr "Nuevo mensaje privado"
 
-#: ../src/dialogs.py:2624 ../src/gui_interface.py:1358 ../src/notify.py:487
+#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
 msgid "New E-mail"
 msgstr "Nuevo correo-e"
 
-#: ../src/dialogs.py:2626 ../src/gui_interface.py:1420 ../src/notify.py:480
+#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
 msgid "File Transfer Request"
 msgstr "Petición de transferencia de archivo"
 
-#: ../src/dialogs.py:2628 ../src/gui_interface.py:1320
-#: ../src/gui_interface.py:1389 ../src/notify.py:482
+#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
+#: ../src/gui_interface.py:1186 ../src/notify.py:482
 msgid "File Transfer Error"
 msgstr "Error en la transferencia del archivo"
 
-#: ../src/dialogs.py:2630 ../src/gui_interface.py:1466
-#: ../src/gui_interface.py:1489 ../src/gui_interface.py:1506
+#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
+#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
 #: ../src/notify.py:484
 msgid "File Transfer Completed"
 msgstr "Transferencia del archivo finalizada"
 
-#: ../src/dialogs.py:2631 ../src/gui_interface.py:1469 ../src/notify.py:485
+#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
 msgid "File Transfer Stopped"
 msgstr "Transferencia del archivo detenida"
 
-#: ../src/dialogs.py:2633 ../src/gui_interface.py:1152 ../src/notify.py:489
+#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
 msgid "Groupchat Invitation"
 msgstr "Invitación a grupo de charla"
 
-#: ../src/dialogs.py:2635 ../src/notify.py:239 ../src/notify.py:491
+#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
 msgid "Contact Changed Status"
 msgstr "Contacto cambió su estado"
 
-#: ../src/dialogs.py:2836
+#: ../src/dialogs.py:2852
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Nuevo mensaje con la cuenta %s"
 
-#: ../src/dialogs.py:2838
+#: ../src/dialogs.py:2854
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Nuevo mensaje en la cuenta %s"
 
-#: ../src/dialogs.py:2840
+#: ../src/dialogs.py:2856
 msgid "Single Message"
 msgstr "Mensaje:"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2843
+#: ../src/dialogs.py:2859
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:2882
 #, python-format
 msgid "Received %s"
 msgstr "Recibido %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2889
+#: ../src/dialogs.py:2905
 #, 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:2968
+#: ../src/dialogs.py:2984
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:2985
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escribió:\n"
 
-#: ../src/dialogs.py:3028
+#: ../src/dialogs.py:3044
 #, python-format
 msgid "XML Console for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3046
 msgid "XML Console"
 msgstr "Consola XML"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "add"
 msgstr "Triste"
 
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "modify"
 msgstr "Modificar"
 
-#: ../src/dialogs.py:3160
+#: ../src/dialogs.py:3176
 #, fuzzy
 msgid "remove"
 msgstr "_Eliminar"
 
-#: ../src/dialogs.py:3188
+#: ../src/dialogs.py:3204
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7287,154 +7472,188 @@ msgid ""
 msgstr "<b>%s</b> querría <b>%s</b> algunos contactos de tu roster."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3204 ../src/dialogs.py:3250
+#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
 msgid "Add"
 msgstr "Dirección"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3206 ../src/dialogs.py:3281
+#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../src/dialogs.py:3212
+#: ../src/dialogs.py:3228
 msgid "Jabber ID"
 msgstr "ID de Jabber:"
 
-#: ../src/dialogs.py:3218
+#: ../src/dialogs.py:3234
 msgid "Groups"
 msgstr "Grupos"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3342
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s me sugirió añadirte en mi roster."
 
-#: ../src/dialogs.py:3340
+#: ../src/dialogs.py:3356
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "Añadir un _Contacto"
 
-#: ../src/dialogs.py:3377
+#: ../src/dialogs.py:3393
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Elimina contacto del roster"
 
-#: ../src/dialogs.py:3430
+#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#, python-format
+msgid "Archiving Preferences for %s"
+msgstr ""
+
+#: ../src/dialogs.py:3473
+#, fuzzy
+msgid "Invalid expire value"
+msgstr "Nombre de servidor no válido"
+
+#: ../src/dialogs.py:3474
+msgid "Expire must be a valid positive integer."
+msgstr ""
+
+#: ../src/dialogs.py:3521
+msgid "There is an error with the form"
+msgstr ""
+
+#: ../src/dialogs.py:3732
+#, fuzzy
+msgid "There is an error"
+msgstr "El servicio devolvió un error"
+
+#: ../src/dialogs.py:3796
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista de privacidad <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3434
+#: ../src/dialogs.py:3800
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista de privacidad para %s"
 
-#: ../src/dialogs.py:3490
+#: ../src/dialogs.py:3856
 #, 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:3495
+#: ../src/dialogs.py:3861
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Orden: %(order)s, acción: %(action)s"
 
-#: ../src/dialogs.py:3539
+#: ../src/dialogs.py:3905
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Editar una regla</b>"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:4016
 msgid "<b>Add a rule</b>"
 msgstr "<b>Añadir una regla</b>"
 
-#: ../src/dialogs.py:3750
+#: ../src/dialogs.py:4116
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listas de privacidad para %s"
 
-#: ../src/dialogs.py:3752
+#: ../src/dialogs.py:4118
 msgid "Privacy Lists"
 msgstr "Listas de privacidad"
 
-#: ../src/dialogs.py:3822
+#: ../src/dialogs.py:4188
 msgid "Invalid List Name"
 msgstr "Nombre de lista no válido"
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4189
 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:3855
+#: ../src/dialogs.py:4221
 msgid "You are invited to a groupchat"
 msgstr "Has sido invitado a un grupo de charla"
 
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4224
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact te ha invitado a entrar en una discusión"
 
-#: ../src/dialogs.py:3860
+#: ../src/dialogs.py:4226
 #, 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:3868
+#: ../src/dialogs.py:4234
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentario: %s"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4236
 msgid "Do you want to accept the invitation?"
 msgstr "¿Quieres aceptar la invitación?"
 
-#: ../src/dialogs.py:3932
+#: ../src/dialogs.py:4298
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:3942 ../src/dialogs.py:3985 ../src/dialogs.py:4041
+#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
+#: ../src/dialogs.py:4495
 msgid "All files"
 msgstr "Todos los archivos"
 
-#: ../src/dialogs.py:3947
+#: ../src/dialogs.py:4313
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:3975
+#: ../src/dialogs.py:4341
 msgid "Choose Sound"
 msgstr "Elegir sonido"
 
-#: ../src/dialogs.py:3990
+#: ../src/dialogs.py:4356
 msgid "Wav Sounds"
 msgstr "Sonidos Wav"
 
-#: ../src/dialogs.py:4028
+#: ../src/dialogs.py:4394
 msgid "Choose Image"
 msgstr "Elegir Imagen"
 
-#: ../src/dialogs.py:4046
+#: ../src/dialogs.py:4412
 msgid "Images"
 msgstr "Imágenes"
 
-#: ../src/dialogs.py:4113
+#: ../src/dialogs.py:4482
+#, fuzzy
+msgid "Choose Archive"
+msgstr "Elegir Imagen"
+
+#: ../src/dialogs.py:4500
+#, fuzzy
+msgid "Zip files"
+msgstr "Todos los archivos"
+
+#: ../src/dialogs.py:4525
 #, python-format
 msgid "When %s becomes:"
 msgstr "Cuando %s esté:"
 
-#: ../src/dialogs.py:4115
+#: ../src/dialogs.py:4527
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Añadiendo notificación especial para %s"
 
-#: ../src/dialogs.py:4190
+#: ../src/dialogs.py:4602
 msgid "Condition"
 msgstr "Condición"
 
-#: ../src/dialogs.py:4310
+#: ../src/dialogs.py:4722
 msgid "when I am "
 msgstr "cuando esté "
 
-#: ../src/dialogs.py:4786
+#: ../src/dialogs.py:5198
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7445,19 +7664,19 @@ msgstr ""
 "\n"
 "La cadena corta de autentificación de esta sesión es <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4789
+#: ../src/dialogs.py:5201
 msgid "You have already verified this contact's identity."
 msgstr "Ya verificaste la identidad de este contacto."
 
-#: ../src/dialogs.py:4795 ../src/dialogs.py:4879
+#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
 msgid "Contact's identity verified"
 msgstr "Identidad del contacto verificada"
 
-#: ../src/dialogs.py:4801
+#: ../src/dialogs.py:5213
 msgid "Verify again..."
 msgstr "Verificar de nuevo..."
 
-#: ../src/dialogs.py:4806
+#: ../src/dialogs.py:5218
 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 "
@@ -7467,19 +7686,19 @@ msgstr ""
 "persona esperada, necesitas verificar su identidad haciendo click en el "
 "botón inferior."
 
-#: ../src/dialogs.py:4809 ../src/dialogs.py:4860 ../src/dialogs.py:4873
+#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
 msgid "Contact's identity NOT verified"
 msgstr "La identidad del contacto NO fue verificada"
 
-#: ../src/dialogs.py:4814
+#: ../src/dialogs.py:5226
 msgid "Verify..."
 msgstr "Verificar..."
 
-#: ../src/dialogs.py:4825
+#: ../src/dialogs.py:5237
 msgid "Have you verified the contact's identity?"
 msgstr "¿Has verificado la identidad del contacto?"
 
-#: ../src/dialogs.py:4826
+#: ../src/dialogs.py:5238
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7494,22 +7713,22 @@ msgstr ""
 "\n"
 "La Cadena Corta de Autentificación (CCA) de esta sesión es <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4827
+#: ../src/dialogs.py:5239
 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:4861
+#: ../src/dialogs.py:5273
 #, 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:4867
+#: ../src/dialogs.py:5279
 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:4874
+#: ../src/dialogs.py:5286
 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."
@@ -7518,7 +7737,7 @@ msgstr ""
 "de modo que <b>no</b> será cifrado. Usa tu cliente GPG para otorgar "
 "confianza a esta clave."
 
-#: ../src/dialogs.py:4880
+#: ../src/dialogs.py:5292
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7526,19 +7745,19 @@ msgstr ""
 "La clave GPG se asignó a este contacto, y confías en esta clave, de modo que "
 "los mensajes serán cifrados."
 
-#: ../src/dialogs.py:4945
+#: ../src/dialogs.py:5357
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4947
+#: ../src/dialogs.py:5359
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4949
+#: ../src/dialogs.py:5361
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4953
+#: ../src/dialogs.py:5365
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7554,24 +7773,24 @@ msgstr "Others"
 msgid "Conference"
 msgstr "Conferencia"
 
-#: ../src/disco.py:512
+#: ../src/disco.py:513
 msgid "Without a connection, you can not browse available services"
 msgstr "Sin una conexión no puedes navegar los servicios disponibles"
 
-#: ../src/disco.py:589
+#: ../src/disco.py:600
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Gestión de servicios usando la cuenta %s"
 
-#: ../src/disco.py:591
+#: ../src/disco.py:602
 msgid "Service Discovery"
 msgstr "Gestión de servicios"
 
-#: ../src/disco.py:741
+#: ../src/disco.py:758
 msgid "The service could not be found"
 msgstr "El servicio no fue encontrado"
 
-#: ../src/disco.py:742
+#: ../src/disco.py:759
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7579,93 +7798,93 @@ 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:746 ../src/disco.py:1082
+#: ../src/disco.py:763 ../src/disco.py:1100
 msgid "The service is not browsable"
 msgstr "El servicio no es navegable"
 
-#: ../src/disco.py:747
+#: ../src/disco.py:764
 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:786 ../src/disco.py:796
+#: ../src/disco.py:804 ../src/disco.py:814
 msgid "Invalid Server Name"
 msgstr "Nombre de servidor no válido"
 
-#: ../src/disco.py:850
+#: ../src/disco.py:868
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Navegar por %(address)s usando la cuenta %(account)s"
 
-#: ../src/disco.py:894
+#: ../src/disco.py:912
 msgid "_Browse"
 msgstr "_Navegar"
 
-#: ../src/disco.py:1083
+#: ../src/disco.py:1101
 msgid "This service does not contain any items to browse."
 msgstr "Este servicio no contiene elementos para navegar."
 
-#: ../src/disco.py:1323
+#: ../src/disco.py:1341
 msgid "_Execute Command"
 msgstr "_Ejecutar comando"
 
-#: ../src/disco.py:1333 ../src/disco.py:1504
+#: ../src/disco.py:1351 ../src/disco.py:1522
 msgid "Re_gister"
 msgstr "_Suscribir"
 
-#: ../src/disco.py:1545
+#: ../src/disco.py:1563
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Escaneando %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1736
+#: ../src/disco.py:1754
 msgid "Users"
 msgstr "Usuarios"
 
 #. Description column
-#: ../src/disco.py:1744
+#: ../src/disco.py:1762
 msgid "Description"
 msgstr "Descripción"
 
 #. Id column
-#: ../src/disco.py:1752
+#: ../src/disco.py:1770
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1817 ../src/gui_interface.py:3182
+#: ../src/disco.py:1835 ../src/gui_interface.py:2995
 msgid "Bookmark already set"
 msgstr "Marcador ya definido"
 
-#: ../src/disco.py:1818 ../src/gui_interface.py:3183
+#: ../src/disco.py:1836 ../src/gui_interface.py:2996
 #, 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:1827 ../src/gui_interface.py:3197
+#: ../src/disco.py:1845 ../src/gui_interface.py:3010
 msgid "Bookmark has been added successfully"
 msgstr "Marcador añadido con éxito"
 
-#: ../src/disco.py:1828 ../src/gui_interface.py:3198
+#: ../src/disco.py:1846 ../src/gui_interface.py:3011
 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:2039
+#: ../src/disco.py:2057
 msgid "Subscribed"
 msgstr "Añadido"
 
-#: ../src/disco.py:2047
+#: ../src/disco.py:2065
 msgid "Node"
 msgstr "Nodo"
 
-#: ../src/disco.py:2111
+#: ../src/disco.py:2129
 msgid "New post"
 msgstr "Nuevo post"
 
-#: ../src/disco.py:2117
+#: ../src/disco.py:2135
 msgid "_Subscribe"
 msgstr "_Añadir"
 
-#: ../src/disco.py:2123
+#: ../src/disco.py:2141
 msgid "_Unsubscribe"
 msgstr "_Eliminar"
 
@@ -7838,17 +8057,19 @@ msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Transformar expresiones LaTeX entre $$ $$."
 
 #: ../src/features_window.py:95
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
-"in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
 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:96
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
+"You have to set 'use_latex' to True in the Advanced Configuration Editor."
 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."
@@ -8005,12 +8226,12 @@ msgstr "Descripción: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s quiere enviarte un archivo:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "No se puede sobreescribir el archivo existente \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -8018,22 +8239,22 @@ msgstr ""
 "Un archivo con este nombre ya existe y no tienes permisos para "
 "sobreescribirlo"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 msgid "This file already exists"
 msgstr "Este archivo ya existe"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 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:369 ../src/gtkgui_helpers.py:914
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "No se puede escribir en el directorio \"%s\""
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
 msgid "You do not have permission to create files in this directory."
 msgstr "No tienes permisos para crear archivos en este directorio."
 
@@ -8136,28 +8357,28 @@ msgstr ""
 "Otra instancia de Gajim parece estar ya en ejecución\n"
 "¿Ejecutar otra?"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
 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:80
+#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
 msgid "command"
 msgstr "comando"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "mostrar ayuda sobre un comando"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Muestra u oculta la ventana de la lista de contactos"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Levanta una venana con el siguiente evento pendiente"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8165,6 +8386,13 @@ msgstr ""
 "Muestra una lista de todos los contactos en el roster. Cada contacto aparece "
 "en una línea separada"
 
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
+#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
+#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
+#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
 #: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
 #: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
 #: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
@@ -8176,43 +8404,35 @@ msgstr ""
 msgid "account"
 msgstr "cuenta"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "mostrar sólo contactos de la cuenta especificada"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Muestra una lista de cuentas registradas"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
 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:109
+#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
 msgid "status"
 msgstr "estado"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106
 #, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"accoun't previous status"
+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:110 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
-msgid "message"
-msgstr "mensaje"
-
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "ensaje de estado"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8221,48 +8441,20 @@ msgstr ""
 "cambiar el estado de todas las cuentas que tienen la opción \"sync with "
 "global status\" activada"
 
-#: ../src/gajim-remote.py:117
-#, fuzzy
-msgid "Changes the priority of account or accounts"
-msgstr "Cambia el estado de una o varias cuentas"
-
-#: ../src/gajim-remote.py:119
-#, fuzzy
-msgid "priority"
-msgstr "Pr_ioridad:"
-
-#: ../src/gajim-remote.py:119
-#, fuzzy
-msgid "priority you want to give to the account"
-msgstr "Quiero _registrar una nueva cuenta de Jabber"
-
-#: ../src/gajim-remote.py:121
-#, fuzzy
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-msgstr ""
-"cambia el estado de la cuenta \"account\". Si no se especifica, prueba a "
-"cambiar el estado de todas las cuentas que tienen la opción \"sync with "
-"global status\" activada"
-
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
 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:129
+#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID del contacto con el que quieres conversar"
 
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
 #: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 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:134
-msgid "message content. The account must be specified or \"\""
-msgstr "contenido del mensaje. Se debe especificar la cuenta o \"\""
-
-#: ../src/gajim-remote.py:139
+#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
 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 "
@@ -8272,29 +8464,34 @@ 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-plugin.py:127 ../src/gajim-remote-plugin.py:140
 #: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "la JID del contacto que recibirá el mensaje"
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
+#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "contenido del mensaje"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "clave pgp"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 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:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
+#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
 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:152
+#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
 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 "
@@ -8304,109 +8501,284 @@ 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:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "tema"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "tema del mensaje"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
 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:168
+#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "La JID del salón que recibirá el mensaje"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Obtener información detallada de un contacto"
 
+#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
+#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
 #: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
 #: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID del contacto"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Obtener información detallada de una cuenta"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Nombre de la cuenta"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Enviar archivo a un contacto"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "file"
 msgstr "archivo"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Ruta del archivo"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
 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:196
+#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Lista todas las preferencias y sus valores"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Define el valor de 'entrada' a 'valor'."
 
-#: ../src/gajim-remote.py:202
-msgid "key=value"
-msgstr "entrada=valor"
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+msgid "key=value"
+msgstr "entrada=valor"
+
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+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-plugin.py:191 ../src/gajim-remote.py:207
+msgid "Deletes a preference item"
+msgstr "Elimina un elemento de preferencia"
+
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "key"
+msgstr "entrada"
+
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "name of the preference to be deleted"
+msgstr "nombre de la preferencia a eliminar"
+
+#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+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-plugin.py:202 ../src/gajim-remote.py:218
+msgid "Removes contact from roster"
+msgstr "Elimina contacto del roster"
+
+#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+msgid "Adds contact to roster"
+msgstr "Añade contacto al roster"
+
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+msgid "Adds new contact to this account"
+msgstr "Añade nuevo contacto a esta cuenta."
+
+#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+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-plugin.py:226
+#, fuzzy
+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-plugin.py:233 ../src/gajim-remote.py:249
+msgid "Returns number of unread messages"
+msgstr "Devuelve el número de mensajes sin leer"
+
+#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+msgid "Opens 'Start Chat' dialog"
+msgstr "Abre el diálogo de iniciar conversación"
+
+#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+msgid "Starts chat, using this account"
+msgstr "Iniciar conversación usando esta cuenta"
+
+#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+msgid "Sends custom XML"
+msgstr "Envía XML personalizado"
+
+#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+msgid "XML to send"
+msgstr "XML a enviar"
+
+#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+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-plugin.py:252 ../src/gajim-remote.py:277
+msgid "Handle a xmpp:/ uri"
+msgstr "Manejar una uri xmpp:/"
+
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
+msgid "uri"
+msgstr "uri"
+
+#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+msgid "Join a MUC room"
+msgstr "Entrar en un salón MUC"
+
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+msgid "room"
+msgstr "salón"
+
+#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+msgid "nick"
+msgstr "alias"
+
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+msgid "password"
+msgstr "contraseña"
+
+#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+msgid "Check if Gajim is running"
+msgstr "Comprueba si Gajim se encuentra en ejecución"
+
+#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
+#: ../src/gajim-remote.py:300
+msgid "Shows or hides the ipython window"
+msgstr "Muestra u oculta la ventana ipython"
+
+#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+msgid "Missing argument \"contact_jid\""
+msgstr "No se encuentra el argumento \"contact_jid\""
+
+#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#, python-format
+msgid ""
+"'%s' is not in your roster.\n"
+"Please specify account for sending the message."
+msgstr ""
+"'%s' no está en tu lista de contactos.\n"
+"Por favor, especifica una cuenta para enviar el mensaje."
+
+#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+msgid "You have no active account"
+msgstr "No tienes cuentas activas"
+
+#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+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-plugin.py:412
+#, python-format
+msgid ""
+"Usage: %s %s %s \n"
+"\t %s"
+msgstr ""
+"Modo de uso: %s %s %s \n"
+"\t %s"
+
+#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+msgid "Arguments:"
+msgstr "Argumentos"
+
+#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#, python-format
+msgid "%s not found"
+msgstr "%s no encontrado"
 
-#: ../src/gajim-remote.py:202
-msgid "'key' is the name of the preference, 'value' is the value to set it to"
+#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
+#, python-format
+msgid ""
+"Usage: %s command [arguments]\n"
+"Command is one of:\n"
 msgstr ""
-"'entrada' es el nombre de la preferencia, 'valor' es el valor a definir"
+"Modo de uso: %s comando [argumentos]\n"
+"Comando es uno de:\n"
 
-#: ../src/gajim-remote.py:207
-msgid "Deletes a preference item"
-msgstr "Elimina un elemento de preferencia"
+#: ../src/gajim-remote-plugin.py:496
+#, fuzzy, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Demasiados argumentos. \n"
+"Escribe \"%(basename)s help %(command)s\" para más información"
 
-#: ../src/gajim-remote.py:209
-msgid "key"
-msgstr "entrada"
+#: ../src/gajim-remote-plugin.py:500
+#, fuzzy, python-format
+msgid ""
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"No se especificó el argumento \"%(arg)s\". \n"
+"Escribe \"%(basename)s help %(command)s\" para más información"
 
-#: ../src/gajim-remote.py:209
-msgid "name of the preference to be deleted"
-msgstr "nombre de la preferencia a eliminar"
+#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
+msgid "Wrong uri"
+msgstr "Uri incorrecta"
 
-#: ../src/gajim-remote.py:213
-msgid "Writes the current state of Gajim preferences to the .config file"
+#: ../src/gajim-remote.py:109
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
 msgstr ""
-"Escribe el estado actual de la preferencias de Gajim al archivo de "
-"configuración"
+"uno de: desconectado, en línea, libre para hablar, ausente, no disponible, "
+"ocupado, invisible"
 
-#: ../src/gajim-remote.py:218
-msgid "Removes contact from roster"
-msgstr "Elimina contacto del roster"
+#: ../src/gajim-remote.py:117
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Cambia el estado de una o varias cuentas"
 
-#: ../src/gajim-remote.py:227
-msgid "Adds contact to roster"
-msgstr "Añade contacto al roster"
+#: ../src/gajim-remote.py:119
+#, fuzzy
+msgid "priority"
+msgstr "Pr_ioridad:"
 
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "jid"
+#: ../src/gajim-remote.py:119
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Quiero _registrar una nueva cuenta de Jabber"
 
-#: ../src/gajim-remote.py:230
-msgid "Adds new contact to this account"
-msgstr "Añade nuevo contacto a esta cuenta."
+#: ../src/gajim-remote.py:121
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"cambia el estado de la cuenta \"account\". Si no se especifica, prueba a "
+"cambiar el estado de todas las cuentas que tienen la opción \"sync with "
+"global status\" activada"
 
-#: ../src/gajim-remote.py:235
-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:134
+msgid "message content. The account must be specified or \"\""
+msgstr "contenido del mensaje. Se debe especificar la cuenta o \"\""
 
 #: ../src/gajim-remote.py:242
 msgid ""
@@ -8415,34 +8787,6 @@ msgstr ""
 "Devuelve el mensaje de estado actual (el global si no se especifica una "
 "cuenta)"
 
-#: ../src/gajim-remote.py:249
-msgid "Returns number of unread messages"
-msgstr "Devuelve el número de mensajes sin leer"
-
-#: ../src/gajim-remote.py:253
-msgid "Opens 'Start Chat' dialog"
-msgstr "Abre el diálogo de iniciar conversación"
-
-#: ../src/gajim-remote.py:255
-msgid "Starts chat, using this account"
-msgstr "Iniciar conversación usando esta cuenta"
-
-#: ../src/gajim-remote.py:259
-msgid "Sends custom XML"
-msgstr "Envía XML personalizado"
-
-#: ../src/gajim-remote.py:261
-msgid "XML to send"
-msgstr "XML a enviar"
-
-#: ../src/gajim-remote.py:262
-msgid ""
-"Account in which the xml will be sent; if not specified, xml will be sent to "
-"all accounts"
-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:268
 #, fuzzy
 msgid "Change the avatar"
@@ -8462,14 +8806,6 @@ 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:277
-msgid "Handle a xmpp:/ uri"
-msgstr "Manejar una uri xmpp:/"
-
-#: ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "uri"
-
 #: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr "URI a manejar"
@@ -8482,30 +8818,14 @@ msgstr "La cuenta que quieres manejar"
 msgid "Message content"
 msgstr "Contenido del mensaje"
 
-#: ../src/gajim-remote.py:286
-msgid "Join a MUC room"
-msgstr "Entrar en un salón MUC"
-
-#: ../src/gajim-remote.py:288
-msgid "room"
-msgstr "salón"
-
 #: ../src/gajim-remote.py:288
 msgid "Room JID"
 msgstr "JID del salón"
 
-#: ../src/gajim-remote.py:289
-msgid "nick"
-msgstr "alias"
-
 #: ../src/gajim-remote.py:289
 msgid "Nickname to use"
 msgstr "Alias a usar"
 
-#: ../src/gajim-remote.py:290
-msgid "password"
-msgstr "contraseña"
-
 #: ../src/gajim-remote.py:290
 msgid "Password to enter the room"
 msgstr "Contraseña para entrar al salón"
@@ -8514,35 +8834,6 @@ msgstr "Contraseña para entrar al salón"
 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:296
-msgid "Check if Gajim is running"
-msgstr "Comprueba si Gajim se encuentra en ejecución"
-
-#: ../src/gajim-remote.py:300
-msgid "Shows or hides the ipython window"
-msgstr "Muestra u oculta la ventana ipython"
-
-#: ../src/gajim-remote.py:327
-msgid "Missing argument \"contact_jid\""
-msgstr "No se encuentra el argumento \"contact_jid\""
-
-#: ../src/gajim-remote.py:348
-#, python-format
-msgid ""
-"'%s' is not in your roster.\n"
-"Please specify account for sending the message."
-msgstr ""
-"'%s' no está en tu lista de contactos.\n"
-"Por favor, especifica una cuenta para enviar el mensaje."
-
-#: ../src/gajim-remote.py:351
-msgid "You have no active account"
-msgstr "No tienes cuentas activas"
-
-#: ../src/gajim-remote.py:404
-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:431
 #, python-format
 msgid ""
@@ -8552,24 +8843,6 @@ msgstr ""
 "Uso: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:435
-msgid "Arguments:"
-msgstr "Argumentos"
-
-#: ../src/gajim-remote.py:439
-#, python-format
-msgid "%s not found"
-msgstr "%s no encontrado"
-
-#: ../src/gajim-remote.py:445
-#, python-format
-msgid ""
-"Usage: %s command [arguments]\n"
-"Command is one of:\n"
-msgstr ""
-"Modo de uso: %s comando [argumentos]\n"
-"Comando es uno de:\n"
-
 #: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
@@ -8592,10 +8865,6 @@ msgstr ""
 msgid "No uri given"
 msgstr ""
 
-#: ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Uri incorrecta"
-
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Tema"
@@ -8621,180 +8890,178 @@ msgstr "No puedes eliminar el tema actual"
 msgid "Please first choose another for your current theme."
 msgstr "Por favor, primero elige otro distinto como tema actual."
 
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:170
 msgid "Sending private message failed"
 msgstr "Falló el envío del mensaje privado"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:171
+#: ../src/groupchat_control.py:172
 #, python-format
 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:450
+#: ../src/groupchat_control.py:455
 msgid "Insert Nickname"
 msgstr "Insertar alias"
 
-#: ../src/groupchat_control.py:631
+#: ../src/groupchat_control.py:636
 msgid "Conversation with "
 msgstr "Conversación con "
 
-#: ../src/groupchat_control.py:633
+#: ../src/groupchat_control.py:638
 msgid "Continued conversation"
 msgstr "Conversación continuada"
 
-#. Can be a message (see handle_event_gc_config_change in
-#. gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1272 ../src/gui_interface.py:1080
+#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Cualquier ocupante puede ver tu JID completo"
 
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1286
 msgid "Room logging is enabled"
 msgstr "Registro del salón activado"
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1288
 msgid "A new room has been created"
 msgstr "Se ha creado un nuevo salón"
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1291
 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:1287
+#: ../src/groupchat_control.py:1297
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s ha sido expulsado por %(reason)s"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1300
 #, 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:1300
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s ha sido expulsado: %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1312
 #, 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:1314 ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
 #, python-format
 msgid "You are now known as %s"
 msgstr "Eres ahora conocido como %s"
 
-#: ../src/groupchat_control.py:1330 ../src/gui_interface.py:919
+#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s ahora es conocido como %(new_nick)s"
 
-#: ../src/groupchat_control.py:1372 ../src/groupchat_control.py:1377
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1392
 #, 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:1374
+#: ../src/groupchat_control.py:1383
 msgid "affiliation changed"
 msgstr "cambió la afiliación"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1388
 msgid "room configuration changed to members-only"
 msgstr "la configuración del salón cambió a sólo miembros"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1394
 msgid "system shutdown"
 msgstr "apagado del sistema"
 
-#: ../src/groupchat_control.py:1470
+#: ../src/groupchat_control.py:1477
 #, 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:1474
+#: ../src/groupchat_control.py:1481
 #, 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:1489
+#: ../src/groupchat_control.py:1496
 #, 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:1493
+#: ../src/groupchat_control.py:1500
 #, 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:1522
+#: ../src/groupchat_control.py:1530
 #, python-format
 msgid "%s has left"
 msgstr "%s ha salido"
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1535
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s ha entrado en el grupo de charla"
 
-#: ../src/groupchat_control.py:1529 ../src/gui_interface.py:946
+#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
 #: ../src/history_window.py:447 ../src/notify.py:234
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s está ahora %(status)s"
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1774
 #, 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:1761
+#: ../src/groupchat_control.py:1776
 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:1765 ../src/gui_interface.py:1216
-#: ../src/gui_interface.py:1992 ../src/gui_interface.py:2029
-#: ../src/gui_interface.py:2064 ../src/message_window.py:224
-#: ../src/roster_window.py:2739 ../src/roster_window.py:3399
-#: ../src/roster_window.py:4123
+#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
+#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
+#: ../src/gui_interface.py:1853 ../src/message_window.py:224
+#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
+#: ../src/roster_window.py:4195
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_No preguntarme otra vez"
 
-#: ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:1814
 msgid "Changing Subject"
 msgstr "Cambiando el tema"
 
-#: ../src/groupchat_control.py:1800
+#: ../src/groupchat_control.py:1815
 msgid "Please specify the new subject:"
 msgstr "Especifica el nuevo tema:"
 
-#: ../src/groupchat_control.py:1807
+#: ../src/groupchat_control.py:1822
 msgid "Changing Nickname"
 msgstr "Cambiando alias"
 
-#: ../src/groupchat_control.py:1808
+#: ../src/groupchat_control.py:1823
 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:1839
+#: ../src/groupchat_control.py:1854
 #, python-format
 msgid "Destroying %s"
 msgstr "Destruyendo %s"
 
-#: ../src/groupchat_control.py:1840
+#: ../src/groupchat_control.py:1855
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8802,22 +9069,22 @@ msgstr ""
 "Vas a destruir definitivamente este salón.\n"
 "Puedes especificar una razón abajo:"
 
-#: ../src/groupchat_control.py:1842
+#: ../src/groupchat_control.py:1857
 msgid "You may also enter an alternate venue:"
 msgstr "También puedes introducir un lugar alternativo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2028
+#: ../src/groupchat_control.py:2046
 #, python-format
 msgid "Kicking %s"
 msgstr "Expulsando a %s"
 
-#: ../src/groupchat_control.py:2029 ../src/groupchat_control.py:2356
+#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
 msgid "You may specify a reason below:"
 msgstr "Debes especificar un motivo debajo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2355
+#: ../src/groupchat_control.py:2373
 #, python-format
 msgid "Banning %s"
 msgstr "Expulsando a %s"
@@ -8843,57 +9110,66 @@ msgid "Details"
 msgstr "Detalles"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
+#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Error: no se puede abrir %s para lectura"
 
-#: ../src/gtkgui_helpers.py:400
+#: ../src/gtkgui_helpers.py:404
 msgid "Error reading file:"
 msgstr "Error leyendo el archivo:"
 
-#: ../src/gtkgui_helpers.py:403
+#: ../src/gtkgui_helpers.py:407
 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:444
+#: ../src/gtkgui_helpers.py:448
 #, 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:818
+#: ../src/gtkgui_helpers.py:822
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim no es el cliente por defecto de Jabber"
 
-#: ../src/gtkgui_helpers.py:819
+#: ../src/gtkgui_helpers.py:823
 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:820
+#: ../src/gtkgui_helpers.py:824
 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:887
+#: ../src/gtkgui_helpers.py:891
 msgid "Extension not supported"
 msgstr "Extensión no soportada"
 
-#: ../src/gtkgui_helpers.py:888
+#: ../src/gtkgui_helpers.py:892
 #, 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:924
+#: ../src/gtkgui_helpers.py:928
 msgid "Save Image as..."
 msgstr "Guardar imagen como..."
 
-#: ../src/gui_interface.py:140
+#. we are banned
+#. group chat does not exist
+#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
+#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
+#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
+#: ../src/gui_interface.py:348
+msgid "Unable to join group chat"
+msgstr "No se pudo entrar al grupo de charla"
+
+#: ../src/gui_interface.py:138
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8904,58 +9180,92 @@ msgstr ""
 "ocupante.\n"
 "Especifica otro alias abajo:"
 
-#: ../src/gui_interface.py:143
+#: ../src/gui_interface.py:141
 msgid "Always use this nickname when there is a conflict"
 msgstr "Usar este alias siempre que exista un conflicto"
 
-#: ../src/gui_interface.py:159
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "¿Aceptas esta petición?"
 
-#: ../src/gui_interface.py:161
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "¿Aceptas esta petición en la cuenta %s?"
 
-#: ../src/gui_interface.py:164
+#: ../src/gui_interface.py:163
 #, 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/gui_interface.py:213 ../src/notify.py:493
+#: ../src/gui_interface.py:209 ../src/notify.py:493
 msgid "Connection Failed"
 msgstr "Falló la conexión"
 
-#: ../src/gui_interface.py:606 ../src/gui_interface.py:610
+#: ../src/gui_interface.py:312
+#, 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/gui_interface.py:324
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/gui_interface.py:333
+#, python-format
+msgid "You are banned from group chat %s."
+msgstr "Estás baneado del grupo de charla %s."
+
+#: ../src/gui_interface.py:338
+#, python-format
+msgid "Group chat %s does not exist."
+msgstr "El grupo de charla %s no existe."
+
+#: ../src/gui_interface.py:341
+msgid "Group chat creation is restricted."
+msgstr "La creación de grupos de charla está restringida."
+
+#: ../src/gui_interface.py:344
+#, 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/gui_interface.py:349
+#, 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."
+
+#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Error %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:621 ../src/gui_interface.py:636
+#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "error mientras se enviaba %(message)s ( %(error)s )"
 
-#: ../src/gui_interface.py:663 ../src/notify.py:495
+#: ../src/gui_interface.py:540 ../src/notify.py:495
 msgid "Subscription request"
 msgstr "Petición de adición"
 
-#: ../src/gui_interface.py:688
+#: ../src/gui_interface.py:565
 msgid "Authorization accepted"
 msgstr "Autorización aceptada"
 
-#: ../src/gui_interface.py:689
+#: ../src/gui_interface.py:566
 #, 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/gui_interface.py:702
+#: ../src/gui_interface.py:579
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "El contacto \"%s\" eliminó su subscripción de tí"
 
-#: ../src/gui_interface.py:703
+#: ../src/gui_interface.py:580
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8963,59 +9273,54 @@ msgstr ""
 "Siempre le verás desconectado.\n"
 "¿Le quieres eliminar de tu lista de contactos?"
 
-#: ../src/gui_interface.py:727 ../src/notify.py:497
+#: ../src/gui_interface.py:604 ../src/notify.py:497
 msgid "Unsubscribed"
 msgstr "Eliminado"
 
-#: ../src/gui_interface.py:754
+#: ../src/gui_interface.py:631
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "No se ha podido establecer contacto con \"%s\""
 
-#: ../src/gui_interface.py:1015
+#: ../src/gui_interface.py:859
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s ha cambiado el asunto a %(subject)s"
 
-#: ../src/gui_interface.py:1083
+#: ../src/gui_interface.py:926
 msgid "Room now shows unavailable member"
 msgstr "El salón ahora muestra miembros no disponibles"
 
-#: ../src/gui_interface.py:1085
+#: ../src/gui_interface.py:928
 msgid "room now does not show unavailable members"
 msgstr "el salón ahora no muestra miembros no disponibles"
 
-#: ../src/gui_interface.py:1087
+#: ../src/gui_interface.py:930
 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/gui_interface.py:1091
+#: ../src/gui_interface.py:934
 msgid "Room logging is now enabled"
 msgstr "Ha sido activado el registro del salón"
 
-#: ../src/gui_interface.py:1093
+#: ../src/gui_interface.py:936
 msgid "Room logging is now disabled"
 msgstr "El salón está ahora deshabilitado"
 
-#: ../src/gui_interface.py:1095
+#: ../src/gui_interface.py:938
 msgid "Room is now non-anonymous"
 msgstr "El salón es ahora no-anónimo"
 
-#: ../src/gui_interface.py:1098
+#: ../src/gui_interface.py:941
 msgid "Room is now semi-anonymous"
 msgstr "El salón es ahora semi-anónimo"
 
-#: ../src/gui_interface.py:1101
+#: ../src/gui_interface.py:944
 msgid "Room is now fully-anonymous"
 msgstr "El salón es ahora completamente anónimo"
 
-#: ../src/gui_interface.py:1133
-#, 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/gui_interface.py:1180
+#: ../src/gui_interface.py:985
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -9023,24 +9328,24 @@ 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/gui_interface.py:1182 ../src/gui_interface.py:1189
+#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Estás actualmente conectado sin tu clave GPG"
 
-#: ../src/gui_interface.py:1184
+#: ../src/gui_interface.py:989
 msgid "Your passphrase is incorrect"
 msgstr "Contraseña incorrecta"
 
-#: ../src/gui_interface.py:1188
+#: ../src/gui_interface.py:993
 #, fuzzy
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Contraseña incorrecta"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid "GPG key not trusted"
 msgstr "GPG no confiable"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
@@ -9048,7 +9353,7 @@ msgstr ""
 "No se confía en la clave GPG usada para cifrar esta conversación. ¿Realmente "
 "quieres cifrar este mensaje?"
 
-#: ../src/gui_interface.py:1226
+#: ../src/gui_interface.py:1031
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not                 correctly started "
@@ -9058,19 +9363,19 @@ msgstr ""
 "(probablemente la variable del entorno no esté \t\t\t\tcorrectamente "
 "definida)"
 
-#: ../src/gui_interface.py:1330
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Correo nuevo en %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1332
+#: ../src/gui_interface.py:1133
 #, 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/gui_interface.py:1345
+#: ../src/gui_interface.py:1146
 #, python-format
 msgid ""
 "\n"
@@ -9085,42 +9390,42 @@ msgstr ""
 "Asunto: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1418
+#: ../src/gui_interface.py:1215
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quiere enviarte un archivo."
 
-#: ../src/gui_interface.py:1455 ../src/roster_window.py:1856
+#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
 msgid "Remote contact stopped transfer"
 msgstr "El contacto remoto detuvo la transferencia"
 
-#: ../src/gui_interface.py:1458 ../src/roster_window.py:1858
+#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
 msgid "Error opening file"
 msgstr "Error abriendo el archivo:"
 
-#: ../src/gui_interface.py:1490
+#: ../src/gui_interface.py:1287
 #, 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/gui_interface.py:1494
+#: ../src/gui_interface.py:1291
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Transferencia del archivo %(filename)s de %(name)s detenida."
 
-#: ../src/gui_interface.py:1507
+#: ../src/gui_interface.py:1304
 #, 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/gui_interface.py:1511
+#: ../src/gui_interface.py:1308
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Transferencia de %(filename)s a %(name)s detenida."
 
-#: ../src/gui_interface.py:1623
+#: ../src/gui_interface.py:1426
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -9129,36 +9434,36 @@ msgstr ""
 "No se puede descifrar el mensaje de %s\n"
 "Es posible que haya sido manipulado."
 
-#: ../src/gui_interface.py:1630
+#: ../src/gui_interface.py:1433
 msgid "Unable to decrypt message"
 msgstr "No se puede descifrar el mensaje"
 
-#: ../src/gui_interface.py:1702
+#: ../src/gui_interface.py:1505
 msgid "Username Conflict"
 msgstr "Conflicto con nombre de usuario"
 
-#: ../src/gui_interface.py:1703
+#: ../src/gui_interface.py:1506
 msgid "Please type a new username for your local account"
 msgstr "Por favor, escribe un nuevo nombre de usuario para tu cuenta local"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1519
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gui_interface.py:1729
+#: ../src/gui_interface.py:1532
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gui_interface.py:1740
+#: ../src/gui_interface.py:1543
 msgid "Error."
 msgstr "Error."
 
-#: ../src/gui_interface.py:1768
+#: ../src/gui_interface.py:1556
 msgid "Resource Conflict"
 msgstr "Conflicto en el recurso"
 
-#: ../src/gui_interface.py:1769
+#: ../src/gui_interface.py:1557
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -9167,21 +9472,21 @@ msgstr ""
 "nuevo"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1816
+#: ../src/gui_interface.py:1604
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s quiere enviarte un archivo."
 
-#: ../src/gui_interface.py:1819
+#: ../src/gui_interface.py:1607
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Petición de transferencia de archivo"
 
-#: ../src/gui_interface.py:1927
+#: ../src/gui_interface.py:1716
 msgid "Error verifying SSL certificate"
 msgstr "Error verificando el certificado SSL"
 
-#: ../src/gui_interface.py:1928
+#: ../src/gui_interface.py:1717
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9192,15 +9497,15 @@ msgstr ""
 "%(error)s\n"
 "¿Aún quieres conectarte a este servidor?"
 
-#: ../src/gui_interface.py:1936
+#: ../src/gui_interface.py:1725
 msgid "Ignore this error for this certificate."
 msgstr "Ignorar este error para este certificado"
 
-#: ../src/gui_interface.py:1956
+#: ../src/gui_interface.py:1745
 msgid "SSL certificate error"
 msgstr "Error del certificado SSL"
 
-#: ../src/gui_interface.py:1957
+#: ../src/gui_interface.py:1746
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9217,12 +9522,12 @@ msgstr ""
 "\n"
 "¿Aún quieres conectar y actualizar la huella del certificado?"
 
-#: ../src/gui_interface.py:1987 ../src/gui_interface.py:2024
-#: ../src/gui_interface.py:2060
+#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
+#: ../src/gui_interface.py:1849
 msgid "Insecure connection"
 msgstr "Conexión no segura"
 
-#: ../src/gui_interface.py:1988
+#: ../src/gui_interface.py:1777
 #, fuzzy
 msgid ""
 "You are about to connect to the server with an insecure connection. This "
@@ -9232,12 +9537,12 @@ 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/gui_interface.py:1991 ../src/gui_interface.py:2028
-#: ../src/gui_interface.py:2063
+#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
+#: ../src/gui_interface.py:1852
 msgid "Yes, I really want to connect insecurely"
 msgstr "Sí, quiero conectarme de forma no segura"
 
-#: ../src/gui_interface.py:2025
+#: ../src/gui_interface.py:1814
 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?"
@@ -9245,7 +9550,7 @@ 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/gui_interface.py:2061
+#: ../src/gui_interface.py:1850
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9255,11 +9560,11 @@ msgstr ""
 "querer hacer esto?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2624 ../src/gui_interface.py:2647
+#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
 msgid "Emoticons disabled"
 msgstr "Emoticonos desactivados"
 
-#: ../src/gui_interface.py:2625
+#: ../src/gui_interface.py:2423
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -9267,7 +9572,7 @@ msgstr ""
 "No se pudo encontrar tu tema de emoticonos configurado, los emoticonos han "
 "sido desactivados."
 
-#: ../src/gui_interface.py:2648
+#: ../src/gui_interface.py:2446
 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 "
@@ -9277,41 +9582,41 @@ msgstr ""
 "actualizar el formato del archivo emoticons.py. Mira http://trac.gajim.org/"
 "wiki/Emoticons para más detalles."
 
-#: ../src/gui_interface.py:2679 ../src/roster_window.py:3560
+#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
 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/gui_interface.py:3058
+#: ../src/gui_interface.py:2871
 msgid "Could not save your settings and preferences"
 msgstr "No se pueden guardar las preferencias"
 
-#: ../src/gui_interface.py:3592
+#: ../src/gui_interface.py:3411
 msgid "Passphrase Required"
 msgstr "Contraseña requerida"
 
-#: ../src/gui_interface.py:3593
+#: ../src/gui_interface.py:3412
 #, 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/gui_interface.py:3607
+#: ../src/gui_interface.py:3426
 msgid "GPG key expired"
 msgstr "La clave GPG expiró"
 
-#: ../src/gui_interface.py:3608
+#: ../src/gui_interface.py:3427
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Tu clave GPG ha expirado, te conectarás a %s sin OpenPGP"
 
 #. ask again
-#: ../src/gui_interface.py:3617
+#: ../src/gui_interface.py:3436
 msgid "Wrong Passphrase"
 msgstr "Contraseña equivocada"
 
-#: ../src/gui_interface.py:3618
+#: ../src/gui_interface.py:3437
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Por favor, vuelve a escribir tu contraseña GPG o presiona Cancelar."
 
@@ -9349,6 +9654,11 @@ msgstr "Alias"
 msgid "Message"
 msgstr "Mensaje"
 
+#. holds subject
+#: ../src/history_manager.py:188 ../src/history_manager.py:219
+msgid "Subject"
+msgstr "Tema"
+
 #: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -9447,19 +9757,19 @@ msgstr "Estás a punto de cerrar varias pestañas"
 msgid "Do you really want to close them all?"
 msgstr "¿Realmente quieres cerrarlas todas?"
 
-#: ../src/message_window.py:484
+#: ../src/message_window.py:485
 msgid "Chats"
 msgstr "Charlas"
 
-#: ../src/message_window.py:486
+#: ../src/message_window.py:487
 msgid "Group Chats"
 msgstr "Grupos de charla"
 
-#: ../src/message_window.py:488
+#: ../src/message_window.py:489
 msgid "Private Chats"
 msgstr "Conversaciones privadas"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:495
 msgid "Messages"
 msgstr "Mensajes"
 
@@ -9515,56 +9825,56 @@ msgstr "Nuevo mensaje de %(nickname)s"
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../src/profile_window.py:57
+#: ../src/profile_window.py:58
 msgid "Retrieving profile..."
 msgstr "Recuperando perfil..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2935
+#: ../src/profile_window.py:111 ../src/roster_window.py:3001
 msgid "File is empty"
 msgstr "El archivo está vacío"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2938
+#: ../src/profile_window.py:114 ../src/roster_window.py:3004
 msgid "File does not exist"
 msgstr "El archivo no existe"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2940 ../src/roster_window.py:2951
+#: ../src/profile_window.py:128 ../src/profile_window.py:144
+#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
 msgid "Could not load image"
 msgstr "No se pudo cargar la imagen"
 
-#: ../src/profile_window.py:214
+#: ../src/profile_window.py:215
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Información"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:216
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Formato: AAAA-MM-DD"
 
-#: ../src/profile_window.py:269
+#: ../src/profile_window.py:270
 msgid "Information received"
 msgstr "Información recibida"
 
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:341
 msgid "Without a connection you can not publish your contact information."
 msgstr "Sin una conexión no puedes publicar tu información de contacto."
 
-#: ../src/profile_window.py:353
+#: ../src/profile_window.py:354
 msgid "Sending profile..."
 msgstr "Enviando perfil..."
 
-#: ../src/profile_window.py:368
+#: ../src/profile_window.py:369
 msgid "Information NOT published"
 msgstr "Información NO publicada"
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:376
 msgid "vCard publication failed"
 msgstr "falló la publicación de la vCard"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:377
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9572,51 +9882,51 @@ msgstr ""
 "Ocurrió un error mientras se publicaba tu información personal, inténtalo de "
 "nuevo más tarde."
 
-#: ../src/roster_window.py:256 ../src/roster_window.py:1012
+#: ../src/roster_window.py:262 ../src/roster_window.py:1026
 msgid "Merged accounts"
 msgstr "Cuentas combinadas"
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1942
 msgid "Authorization has been sent"
 msgstr "La autorización ha sido enviada"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1943
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ahora \"%s\" podrá saber tu estado."
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1966
 msgid "Subscription request has been sent"
 msgstr "La petición de subscripción ha sido enviada"
 
-#: ../src/roster_window.py:1944
+#: ../src/roster_window.py:1967
 #, 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:1958
+#: ../src/roster_window.py:1981
 msgid "Authorization has been removed"
 msgstr "La autorización ha sido eliminada"
 
-#: ../src/roster_window.py:1959
+#: ../src/roster_window.py:1982
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ahora \"%s\" siempre te verá desconectado."
 
-#: ../src/roster_window.py:1986
+#: ../src/roster_window.py:2009
 msgid "GPG is not usable"
 msgstr "GPG no es usable"
 
-#: ../src/roster_window.py:1987
+#: ../src/roster_window.py:2010
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Te conectarás a %s sin OpenPGP"
 
-#: ../src/roster_window.py:2199 ../src/roster_window.py:3496
+#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
 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:2200 ../src/roster_window.py:3497
+#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9624,38 +9934,38 @@ 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:2226
+#: ../src/roster_window.py:2249
 msgid "desync'ed"
 msgstr "desincronizado"
 
-#: ../src/roster_window.py:2288
+#: ../src/roster_window.py:2311
 msgid "Really quit Gajim?"
 msgstr "¿Cerrar realmente Gajim?"
 
-#: ../src/roster_window.py:2289
+#: ../src/roster_window.py:2312
 msgid "Are you sure you want to quit Gajim?"
 msgstr "¿Estás seguro de que quieres cerrar Gajim?"
 
-#: ../src/roster_window.py:2290
+#: ../src/roster_window.py:2313
 msgid "Always close Gajim"
 msgstr "Siempre cerrar Gajim"
 
-#: ../src/roster_window.py:2373
+#: ../src/roster_window.py:2396
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Cancela la transferencia"
 
-#: ../src/roster_window.py:2374
+#: ../src/roster_window.py:2397
 msgid ""
-"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2405 ../src/roster_window.py:2653
+#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
 msgid "You have unread messages"
 msgstr "Tienes mensajes sin leer"
 
-#: ../src/roster_window.py:2406
+#: ../src/roster_window.py:2429
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9663,27 +9973,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:2654
+#: ../src/roster_window.py:2720
 msgid "You must read them before removing this transport."
 msgstr "Debes leerlos antes de eliminar este transporte."
 
-#: ../src/roster_window.py:2657
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "El transporte \"%s\" será eliminado"
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2724
 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:2661
+#: ../src/roster_window.py:2727
 msgid "Transports will be removed"
 msgstr "Los transportes serán eliminados"
 
-#: ../src/roster_window.py:2666
+#: ../src/roster_window.py:2732
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9691,68 +10001,68 @@ msgid ""
 msgstr ""
 "Ya no podrás enviar y recibir mensajes a contactos de estos transportes: %s"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2800
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Vas a crear un metacontacto. ¿Estás seguro de continuar?"
 
-#: ../src/roster_window.py:2736
+#: ../src/roster_window.py:2802
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2827
+#: ../src/roster_window.py:2893
 msgid "Rename Contact"
 msgstr "Renombrar contacto"
 
-#: ../src/roster_window.py:2828
+#: ../src/roster_window.py:2894
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Introduce un nuevo alias para el contacto %s"
 
-#: ../src/roster_window.py:2835
+#: ../src/roster_window.py:2901
 msgid "Rename Group"
 msgstr "Renombrar grupo"
 
-#: ../src/roster_window.py:2836
+#: ../src/roster_window.py:2902
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Introduce un nuevo nombre para el grupo %s"
 
-#: ../src/roster_window.py:2881
+#: ../src/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Eliminar grupo"
 
-#: ../src/roster_window.py:2882
+#: ../src/roster_window.py:2948
 #, 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:2883
+#: ../src/roster_window.py:2949
 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:2922
+#: ../src/roster_window.py:2988
 msgid "Assign OpenPGP Key"
 msgstr "Asignar clave OpenPGP"
 
-#: ../src/roster_window.py:2923
+#: ../src/roster_window.py:2989
 msgid "Select a key to apply to the contact"
 msgstr "Selecciona una clave para ser aplicada al contacto"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3372
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "El contacto \"%s\" será eliminado de tu roster"
 
-#: ../src/roster_window.py:3308
+#: ../src/roster_window.py:3374
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr "Vas a eliminar a \"%(name)s\" (%(jid)s) de tu roster.\n"
 
-#: ../src/roster_window.py:3313
+#: ../src/roster_window.py:3379
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9761,11 +10071,11 @@ msgstr ""
 "resultante y el/ella siempre te verán desconectado."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3319
+#: ../src/roster_window.py:3385
 msgid "Do you want to continue?"
 msgstr "¿Quieres continuar?"
 
-#: ../src/roster_window.py:3323
+#: ../src/roster_window.py:3389
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9773,16 +10083,16 @@ msgstr ""
 "Eliminando este contacto también se está eliminando la autorización. Este "
 "contacto siempre te verá desconectado."
 
-#: ../src/roster_window.py:3326
+#: ../src/roster_window.py:3392
 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:3330
+#: ../src/roster_window.py:3396
 msgid "Contacts will be removed from your roster"
 msgstr "Los contactos serán eliminados de tu roster"
 
-#: ../src/roster_window.py:3335
+#: ../src/roster_window.py:3401
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9792,32 +10102,32 @@ msgstr ""
 "también estás eliminando las autorizaciones resultantes y ellos siempre te "
 "verán desconectado."
 
-#: ../src/roster_window.py:3393
+#: ../src/roster_window.py:3459
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want  to continue?"
 msgstr "Vas a crear un metacontacto. ¿Estás seguro de continuar?"
 
-#: ../src/roster_window.py:3395
+#: ../src/roster_window.py:3461
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he or she will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3414
+#: ../src/roster_window.py:3480
 msgid "No account available"
 msgstr "Cuenta no disponible"
 
-#: ../src/roster_window.py:3415
+#: ../src/roster_window.py:3481
 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:4023
+#: ../src/roster_window.py:4095
 msgid "Metacontacts storage not supported by your server"
 msgstr "Tu servidor no soporta almacenamiento de metacontactos"
 
-#: ../src/roster_window.py:4025
+#: ../src/roster_window.py:4097
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9825,12 +10135,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:4117
+#: ../src/roster_window.py:4189
 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:4119
+#: ../src/roster_window.py:4191
 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 "
@@ -9840,23 +10150,23 @@ msgstr ""
 "Generalmente se usan cuando la misma persona tiene varias cuentas de Jabber "
 "o cuentas de transportes."
 
-#: ../src/roster_window.py:4234
+#: ../src/roster_window.py:4306
 msgid "Invalid file URI:"
 msgstr "URI de archivo no válido:"
 
-#: ../src/roster_window.py:4246
+#: ../src/roster_window.py:4318
 #, 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:4361
+#: ../src/roster_window.py:4433
 #, python-format
 msgid "Send %s to %s"
 msgstr "Enviar %s a %s"
 
-#: ../src/roster_window.py:4367
+#: ../src/roster_window.py:4439
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Hacer %s y %s metacontactos"
@@ -9866,144 +10176,144 @@ msgstr "Hacer %s y %s metacontactos"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4816 ../src/roster_window.py:4889
-#: ../src/roster_window.py:4898 ../src/statusicon.py:246
-#: ../src/statusicon.py:293 ../src/statusicon.py:299
+#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
+#: ../src/roster_window.py:4970 ../src/statusicon.py:263
+#: ../src/statusicon.py:310 ../src/statusicon.py:316
 #, python-format
 msgid "using account %s"
 msgstr "usando la cuenta %s"
 
 #. add
-#: ../src/roster_window.py:4905
+#: ../src/roster_window.py:4977
 #, python-format
 msgid "to %s account"
 msgstr "a la cuenta %s"
 
 #. disco
-#: ../src/roster_window.py:4910
+#: ../src/roster_window.py:4982
 #, python-format
 msgid "using %s account"
 msgstr "usando la cuenta %s"
 
-#: ../src/roster_window.py:4948 ../src/statusicon.py:309
+#: ../src/roster_window.py:5020 ../src/statusicon.py:326
 msgid "_Manage Bookmarks..."
 msgstr "Gestionar _marcadores..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4968
+#: ../src/roster_window.py:5040
 #, python-format
 msgid "of account %s"
 msgstr "de la cuenta %s"
 
-#: ../src/roster_window.py:5009
+#: ../src/roster_window.py:5081
 #, python-format
 msgid "for account %s"
 msgstr "para la cuenta %s"
 
-#: ../src/roster_window.py:5069 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
 msgid "_Change Status Message"
 msgstr "_Cambiar mensaje de estado"
 
-#: ../src/roster_window.py:5102
+#: ../src/roster_window.py:5174
 msgid "Publish Tune"
 msgstr "Hora de publicación"
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5176
 #, fuzzy
 msgid "Publish Location"
 msgstr "Hora de publicación"
 
-#: ../src/roster_window.py:5107
+#: ../src/roster_window.py:5179
 msgid "Configure Services..."
 msgstr "Configurar servicios..."
 
-#: ../src/roster_window.py:5252
+#: ../src/roster_window.py:5324
 msgid "_Maximize All"
 msgstr "_Maximizar todo"
 
-#: ../src/roster_window.py:5262 ../src/roster_window.py:5436
+#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
 msgid "Send Group M_essage"
 msgstr "Enviar mensaje a grupo"
 
-#: ../src/roster_window.py:5270
+#: ../src/roster_window.py:5342
 msgid "To all users"
 msgstr "A todos los usuarios"
 
-#: ../src/roster_window.py:5274
+#: ../src/roster_window.py:5346
 msgid "To all online users"
 msgstr "A todos los usuarios en línea"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5456
+#: ../src/roster_window.py:5528
 msgid "_Manage Contacts"
 msgstr "_Gestionar contactos"
 
 #. Edit Groups
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5537
 msgid "Edit _Groups"
 msgstr "Editar grupos"
 
 #. Send single message
-#: ../src/roster_window.py:5520
+#: ../src/roster_window.py:5592
 msgid "Send Single Message"
 msgstr "Enviar mensaje"
 
 #. Execute Command
-#: ../src/roster_window.py:5567
+#: ../src/roster_window.py:5639
 msgid "Execute Command..."
 msgstr "Ejecutar comando..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5577
+#: ../src/roster_window.py:5649
 msgid "_Manage Transport"
 msgstr "_Gestionar transporte"
 
 #. Modify Transport
-#: ../src/roster_window.py:5586
+#: ../src/roster_window.py:5658
 msgid "_Modify Transport"
 msgstr "_Modificar transporte"
 
 #. Rename
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5668
 msgid "_Rename"
 msgstr "Renombrar"
 
-#: ../src/roster_window.py:5656
+#: ../src/roster_window.py:5728
 msgid "_Maximize"
 msgstr "_Maximizar"
 
-#: ../src/roster_window.py:5665
+#: ../src/roster_window.py:5737
 #, fuzzy
 msgid "_Reconnect"
 msgstr "_Desconectar"
 
-#: ../src/roster_window.py:5672
+#: ../src/roster_window.py:5744
 msgid "_Disconnect"
 msgstr "_Desconectar"
 
 #. History manager
-#: ../src/roster_window.py:5754
+#: ../src/roster_window.py:5833
 msgid "History Manager"
 msgstr "Histórico"
 
-#: ../src/roster_window.py:5765
+#: ../src/roster_window.py:5844
 msgid "_Join New Group Chat"
 msgstr "_Entrar en nuevo grupo de charla"
 
-#: ../src/roster_window.py:5938
+#: ../src/roster_window.py:6019
 msgid "Change Status Message..."
 msgstr "Cambiar mensaje de estado..."
 
-#: ../src/search_window.py:94
+#: ../src/search_window.py:105
 msgid "Waiting for results"
 msgstr "Esperando resultados"
 
-#: ../src/search_window.py:132 ../src/search_window.py:210
+#: ../src/search_window.py:143 ../src/search_window.py:220
 msgid "Error in received dataform"
 msgstr "Error en la información recibida del formulario"
 
 #. No result
-#: ../src/search_window.py:166 ../src/search_window.py:202
+#: ../src/search_window.py:177 ../src/search_window.py:212
 msgid "No result"
 msgstr "Sin resultados"
 
@@ -10016,14 +10326,15 @@ msgstr "Error de escritura en disco"
 msgid "Subject: %s"
 msgstr "Tema: %s"
 
-#: ../src/session.py:433 ../src/session.py:468
+#: ../src/session.py:447 ../src/session.py:491
 msgid "Confirm these session options"
 msgstr "Confirma estas opciones de la sesión"
 
-#: ../src/session.py:435
+#: ../src/session.py:448
 #, fuzzy, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
+"The remote client wants '\n"
+"                            'to negotiate an session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -10035,7 +10346,7 @@ msgstr ""
 "\n"
 "\t¿Son aceptables estas opciones?"
 
-#: ../src/session.py:469
+#: ../src/session.py:492
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10050,16 +10361,16 @@ msgstr ""
 "\n"
 "¿Continuar con la sesión?"
 
-#: ../src/statusicon.py:210
+#: ../src/statusicon.py:227
 msgid "_Change Status Message..."
 msgstr "_Cambiar mensaje de estado..."
 
-#: ../src/statusicon.py:322
+#: ../src/statusicon.py:339
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "en _roster"
 
-#: ../src/statusicon.py:333
+#: ../src/statusicon.py:350
 msgid "Hide this menu"
 msgstr "Oculta este menú"
 
@@ -10198,32 +10509,32 @@ msgstr ""
 "Este servicio podría no responder con información detallada.\n"
 "Posiblemente es antiguo o está roto"
 
-#: ../src/vcard.py:251
+#: ../src/vcard.py:265
 msgid "?Client:Unknown"
 msgstr "Desconocido"
 
-#: ../src/vcard.py:253
+#: ../src/vcard.py:267
 msgid "?OS:Unknown"
 msgstr "Desconocido"
 
-#: ../src/vcard.py:274
+#: ../src/vcard.py:288
 msgid "?Time:Unknown"
 msgstr "Desconocida"
 
-#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
+#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
 #, python-format
 msgid "since %s"
 msgstr "desde %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:345
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:349
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Afiliación:</b>"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:357
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10231,7 +10542,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:345
+#: ../src/vcard.py:359
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10239,14 +10550,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:347
+#: ../src/vcard.py:361
 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:349
+#: ../src/vcard.py:363
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10254,27 +10565,68 @@ msgstr ""
 "No estás interesado en la presencia del contacto y el/ella tampoco lo está "
 "en el tuyuo"
 
-#: ../src/vcard.py:356
+#: ../src/vcard.py:370
 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:358
+#: ../src/vcard.py:372
 msgid "There is no pending subscription request."
 msgstr "No hay ninguna suscripción pendiente."
 
-#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
+#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
 msgid " resource with priority "
 msgstr " recurso con prioridad "
 
-#~ msgid "_Available"
-#~ msgstr "En líne_a"
+#~ msgid "_Disable showing event in systray"
+#~ msgstr "_Deshabilitar mostrar eventos en el systray"
+
+#~ msgid "_Show event in systray"
+#~ msgstr "_Mostrar evento en systray"
 
-#~ msgid "PEP node was not removed"
-#~ msgstr "El nodo PEP no fue eliminado"
+#, fuzzy
+#~ msgid "Always use GNOME default applications"
+#~ msgstr "¿Usar siempre las aplicaciones por defecto de OS/X?"
+
+#, fuzzy
+#~ msgid "Always use Xfce default applications"
+#~ msgstr "¿Usar siempre las aplicaciones por defecto de OS/X?"
+
+#, fuzzy
+#~ msgid "Autodetect on every Gajim startup"
+#~ msgstr "C_onectar al inicio de Gajim"
+
+#~ msgid "Show systray:"
+#~ msgstr "Mostrar systray:"
+
+#~ msgid "Nickname not allowed: %s"
+#~ msgstr "Alias no permitido: %s"
+
+#~ msgid "Room has been destroyed"
+#~ msgstr "El salón ha sido destruido"
 
-#~ msgid "PEP node %(node)s was not removed: %(message)s"
-#~ msgstr "El nodo PEP %(node)s no se pudo eliminar: %(message)s"
+#~ msgid "You can join this room instead: %s"
+#~ msgstr "Puedes unirte a este salón en su lugar: %s"
+
+#~ msgid "I would like to add you to my roster."
+#~ msgstr "Me gustaría añadirte a mi lista de contactos"
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "estamos ahora suscritos a %s"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "petición de eliminación de suscripción de %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "ya no estamos suscritos a %s"
+
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "La ID de Jabber %s no cumple la norma RFC. No será añadido a tu roster. "
+#~ "Usa herramientas de gestión del roster como http://jru.jabberstudio.org/ "
+#~ "para eliminarlo"
 
 #~ msgid "Account Modification"
 #~ msgstr "Modificar cuenta"
@@ -10375,40 +10727,9 @@ msgstr " recurso con prioridad "
 #~ msgid "gtk-delete"
 #~ msgstr "gtk-delete"
 
-#~ msgid "Add this contact to roster (Ctrl+D)"
-#~ msgstr "Añade éste contacto al roster (Ctrl+D)"
-
-#~ msgid "Bookmark this room (Ctrl+B)"
-#~ msgstr "Añadir este salón a marcadores (Ctrl+B)"
-
-#~ msgid "Browse the chat history (Ctrl+H)"
-#~ msgstr "Navegar en el histórico de la conversación (Ctrl+H)"
-
-#~ msgid "Change the room's subject (Alt+T)"
-#~ msgstr "Cambiar el tema del salón (Alt+T)"
-
-#~ msgid "Change your nickname (Ctrl+N)"
-#~ msgstr "Cambiar tu _alias (Ctrl+N)"
-
-#~ msgid "Invite contacts to the conversation (Ctrl+G)"
-#~ msgstr "Invitar contactos a esta conversación (Ctrl+G)"
-
 #~ msgid "Send a file (Ctrl+F)"
 #~ msgstr "Enviar un archivo (Ctrl+F)"
 
-#~ msgid "Show a list of emoticons (Alt+M)"
-#~ msgstr "Mostrar una lista de emoticonos (Alt+M)"
-
-#~ msgid "Show a list of formattings"
-#~ msgstr "Mostrar una lista de formateos"
-
-#, fuzzy
-#~ msgid "Show a menu of advanced functions (Alt+D)"
-#~ msgstr "Muestra un menú de funciones avanzadas (Alt+A)"
-
-#~ msgid "Show the contact's profile (Ctrl+I)"
-#~ msgstr "Muestra el perfil del contacto (Ctrl+I)"
-
 #~ msgid ""
 #~ "All chat states\n"
 #~ "Composing only\n"
@@ -10464,9 +10785,6 @@ msgstr " recurso con prioridad "
 #~ "de\n"
 #~ "a"
 
-#~ msgid "_Preferences"
-#~ msgstr "_Preferencias"
-
 #~ msgid "_Quit"
 #~ msgstr "_Salir"
 
@@ -10950,9 +11268,6 @@ msgstr " recurso con prioridad "
 #~ msgid "The auto not available status message"
 #~ msgstr "El mensaje de estado de no auto-no disponible"
 
-#~ msgid "Use t_rayicon (aka. notification area icon)"
-#~ msgstr "Usar icono en el á_rea de notificación"
-
 #~ msgid ""
 #~ "When a new event (message, file transfer request etc..) is received, the "
 #~ "following methods may be used to inform you about it. Please note that "
@@ -11081,13 +11396,6 @@ msgstr " recurso con prioridad "
 #~ msgstr ""
 #~ "Soporte de manejo de sesión no disponible (falta el módulo gnome.ui)"
 
-#~ msgid ""
-#~ "Usage: %s %s %s \n"
-#~ "\t %s"
-#~ msgstr ""
-#~ "Modo de uso: %s %s %s \n"
-#~ "\t %s"
-
 #~ msgid "Private Chat"
 #~ msgstr "Conversación privada"
 
@@ -11203,9 +11511,6 @@ msgstr " recurso con prioridad "
 #~ msgid "eo"
 #~ msgstr "esperanto"
 
-#~ msgid "es"
-#~ msgstr "español"
-
 #~ msgid "eu"
 #~ msgstr "euskera"
 
diff --git a/po/eu.po b/po/eu.po
index d3c4df34343e37cf78ac0629d5b44d5568a94452..3937c8824e6040bd3f49b4ca081048fc7b90c0a4 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -4,11 +4,15 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2005.
 #
 # Urtzi  <>, 2009.
+#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 11:28+0200\n"
+"POT-Creation-Date: 2010-10-01 20:39+0200\n"
 "PO-Revision-Date: 2009-08-19 23:50+0200\n"
 "Last-Translator: Urtzi  <>\n"
 "Language-Team: Basque <urtzi@altza.net>\n"
@@ -28,7 +32,7 @@ msgstr "Txat Taldean _Sartu"
 msgid "_Add Contact..."
 msgstr "_Kontaktua Gehitu..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:17
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
 msgid "_Discover Services"
 msgstr "_Zerbitzuak Aurkitu"
 
@@ -50,7 +54,7 @@ msgstr "_Ireki Gmail posta"
 msgid "_Personal Events"
 msgstr "Informazio Pertsonala "
 
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:23
+#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
 #, fuzzy
 msgid "_Start Chat..."
 msgstr "Elkarrizketa  _Hasi"
@@ -85,76 +89,72 @@ msgid "<b>Please select a server</b>"
 msgstr ""
 
 #: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid "@"
-msgstr ""
-
-#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
 msgstr ""
 
-#: ../data/gui/account_creation_wizard_window.ui.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:10
 #, fuzzy
 msgid "Anon_ymous authentication"
 msgstr "Erabili autentifikazioa"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Connect when I press Finish"
 msgstr "Konektatu bukatu sakatzen dudanean."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Kontu Sortzailearen Wizard-a"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 #, fuzzy
 msgid "I already have an account I want to _use"
 msgstr "Dagoeneko badut kontu bat erabiltzeko"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I want to _register for a new account"
 msgstr "Kontu berri bat _erregistratu nahi dut"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:16
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 #: ../data/gui/accounts_window.ui.h:28
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Hautatua badago, Gajim-ek kontu honen pasahitza gogoraraziko du"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:17
+#: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Moldatu..."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:18
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
 #: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2263 ../src/config.py:2342
-#: ../src/config.py:2355 ../src/config.py:3596 ../src/config.py:3671
-#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513
-#: ../src/dialogs.py:526 ../src/roster_window.py:2890
-#: ../src/roster_window.py:2896 ../src/roster_window.py:2901
+#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
+#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
+#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
+#: ../src/dialogs.py:527 ../src/roster_window.py:2956
+#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
 msgid "None"
 msgstr "Ezer ez"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:19
+#: ../data/gui/account_creation_wizard_window.ui.h:18
 #, fuzzy
 msgid "Prox_y:"
 msgstr "Proxy:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #: ../data/gui/accounts_window.ui.h:48
 msgid "Save pass_word"
 msgstr "Gorde pasa_hitza"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:21
+#: ../data/gui/account_creation_wizard_window.ui.h:20
 msgid "Set my profile when I connect"
 msgstr "Ezarri nire profila konektatzen naizenean"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:22
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Use custom hostname/port"
 msgstr "Erabili bezeroaren hostname/portua"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:23
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -162,35 +162,35 @@ msgstr ""
 "Kontu bat behar duzu\n"
 "Jabber sarera konektatzeko"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-#: ../data/gui/roster_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:16
 msgid "_Advanced"
 msgstr "A_urreratua"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:25
 msgid "_Finish"
 msgstr "_Bukatu"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:27
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 #, fuzzy
 msgid "_Hostname:"
 msgstr "Hostname: "
 
-#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #: ../data/gui/accounts_window.ui.h:62
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:28
 #: ../data/gui/accounts_window.ui.h:64
 msgid "_Password:"
 msgstr "_Pasahitza:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:29
 msgid "_Port:"
 msgstr "_Portua:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:31
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Server:"
 msgstr "_Zerbitzaria"
 
@@ -302,17 +302,17 @@ msgstr "Lehen Izena:"
 #. No configured account
 #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
 #: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592
-#: ../src/notify.py:608
+#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
+#: ../src/notify.py:616
 msgid "Gajim"
 msgstr "Gajim"
 
 #. FIXME: Ugly workaround.
 #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
 #. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:61
-#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121
-#: ../src/roster_window.py:2832 ../src/roster_window.py:5379
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
+#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
 msgid "General"
 msgstr "Orokorra"
 
@@ -372,7 +372,7 @@ msgstr "Zuri buzuzko informazioa zerbitzarian gordea izango da"
 
 #: ../data/gui/accounts_window.ui.h:35
 #: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:830
+#: ../src/dialogs.py:831
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -386,7 +386,7 @@ msgid "Mer_ge accounts"
 msgstr "_Batu kontuak"
 
 #: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2356
+#: ../src/config.py:2358
 msgid "No key selected"
 msgstr "Ez da koderik aukeratu"
 
@@ -413,7 +413,7 @@ msgid "Priority will change automatically according to your status."
 msgstr "Lehentasuna automatikoki ezarriko da zure egoeraren arabera."
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5329
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
 msgid "Re_name"
 msgstr "_Berrizenpetu"
 
@@ -653,42 +653,47 @@ msgstr "Eguneko Mezuak Ezabatu"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
 #, fuzzy
+msgid "Edit Archi_ving Preferences"
+msgstr "_Hobespenak"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#, fuzzy
 msgid "Edit _Privacy Lists..."
 msgstr "_Debekatze Zerrenda"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 #, fuzzy
 msgid "Sends a message to users currently connected to this server"
 msgstr ""
 "Bidali mezu bat zerbitzari honetara orain konektatuta dauden kontaktuei"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 #, fuzzy
 msgid "Set MOTD..."
 msgstr "Ezarri MOTD"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Ezarri Eguneko Mezua"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Show _XML Console"
 msgstr "_XML Konsola Ikusarazi"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "MOTD Gaurkotu"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "Eguneko Mezua Gaurkotu"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:11
 msgid "_Administrator"
 msgstr "_Administratzailea"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:11
+#: ../data/gui/advanced_menuitem_menu.ui.h:12
 #, fuzzy
 msgid "_Send Server Message..."
 msgstr "_Bidali Zerbitzarira Mezua"
@@ -723,7 +728,7 @@ msgid "All statuses"
 msgstr "Egoera Guztiak"
 
 #: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:233
+#: ../src/common/commands.py:106 ../src/common/helpers.py:239
 #: ../src/tooltips.py:193
 msgid "Away"
 msgstr "Kanpoan"
@@ -776,7 +781,7 @@ msgid "Have "
 msgstr "daukadanean"
 
 #: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:249
 msgid "Invisible"
 msgstr "Ikusezin"
 
@@ -785,7 +790,7 @@ msgid "Launch a command"
 msgstr "Abiarazi agindua"
 
 #: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:216 ../src/tooltips.py:197
+#: ../src/common/helpers.py:222 ../src/tooltips.py:197
 msgid "Not Available"
 msgstr "Ez Erabilgarri"
 
@@ -829,12 +834,13 @@ msgid "_Disable existing sound for this event"
 msgstr "_Ezindu esistitzen den soinua gertaera hontarako "
 
 #: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in roster"
+#, fuzzy
+msgid "_Disable showing event in notification area"
 msgstr "_Ezindu gertaeran zerrendan ikustea"
 
 #: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in systray"
-msgstr "_Ezindu gertaerak systray-en ikustea"
+msgid "_Disable showing event in roster"
+msgstr "_Ezindu gertaeran zerrendan ikustea"
 
 #: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
@@ -845,12 +851,13 @@ msgid "_Open chat window with user"
 msgstr "_Ireki elkarrizketa leihoa erabiltzailearekin"
 
 #: ../data/gui/advanced_notifications_window.ui.h:35
-msgid "_Show event in roster"
+#, fuzzy
+msgid "_Show event in notification area"
 msgstr "_Ikusarazi gertaera zerrendan"
 
 #: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in systray"
-msgstr "Iku_si gertaerak systray-ean"
+msgid "_Show event in roster"
+msgstr "_Ikusarazi gertaera zerrendan"
 
 #: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
@@ -878,6 +885,45 @@ msgstr "Taldea"
 msgid "when I'm in"
 msgstr "Nagoenean"
 
+#: ../data/gui/archiving_preferences_window.ui.h:1
+msgid "<i>Method Auto</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "<i>Method Local</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:3
+msgid "<i>Method Manual</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:4
+#, fuzzy
+msgid "Auto"
+msgstr "Automatikoki sartu"
+
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Concede"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "Forbid"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:7
+#, fuzzy
+msgid "No"
+msgstr "Ezer ez"
+
+#: ../data/gui/archiving_preferences_window.ui.h:8
+#, fuzzy
+msgid "Prefer"
+msgstr "Hobespenak"
+
+#: ../data/gui/archiving_preferences_window.ui.h:9
+msgid "Yes"
+msgstr ""
+
 #: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Sarrera:"
@@ -905,8 +951,8 @@ msgstr "Kontaktua"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5348
-#: ../src/roster_window.py:5476 ../src/roster_window.py:5609
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
+#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
 msgid "_Unblock"
 msgstr ""
 
@@ -1000,7 +1046,7 @@ msgid "_Start Chat"
 msgstr "Elkarrizketa  _Hasi"
 
 #. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4184
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
 msgid "#"
 msgstr "#"
 
@@ -1048,13 +1094,55 @@ msgstr ""
 msgid "9"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:13
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Zerrendara kontaktua sartu"
+
 #: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
+msgid "Browse the chat history (Ctrl+H)"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:15
+#, fuzzy
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "arreta jartzen ari da elkarrizketara"
+
+#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+#, fuzzy
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Sakatu emoticon bat ezartzeko (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
+#, fuzzy
+msgid "Show a list of formattings"
+msgstr "Sakatu emoticon bat ezartzeko (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Sakatu emoticon bat ezartzeko (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:19
+#, fuzzy
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr "Zerrendara kontaktua sartu"
+
+#: ../data/gui/chat_control.ui.h:20
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:21
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
 #: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Bidali"
 
-#: ../data/gui/chat_control.ui.h:15 ../data/gui/groupchat_control.ui.h:3
+#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
 msgid "label"
 msgstr ""
 
@@ -1108,8 +1196,8 @@ msgstr "Editatu _Taldeak"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5284
-#: ../src/roster_window.py:5444
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
+#: ../src/roster_window.py:5516
 msgid "In_vite to"
 msgstr "Honera gonbidatu"
 
@@ -1123,8 +1211,8 @@ msgstr "Kontaktua"
 msgid "Remo_ve"
 msgstr "_Ezabatu"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5294
-#: ../src/roster_window.py:5533
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
+#: ../src/roster_window.py:5605
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Sends custom XML"
@@ -1160,8 +1248,8 @@ msgid "_Allow him/her to see my status"
 msgstr "Baimendu nire egoera ikustea"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5482 ../src/roster_window.py:5612
+#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
+#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
 msgid "_Block"
 msgstr ""
 
@@ -1171,8 +1259,8 @@ msgstr "Debekatu nire egoera ikustea"
 
 #: ../data/gui/contact_context_menu.ui.h:20
 #: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:21
-#: ../src/roster_window.py:5683
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
+#: ../src/roster_window.py:5755
 msgid "_History"
 msgstr "_Historiala"
 
@@ -1316,7 +1404,7 @@ msgstr "<b>Elkarrizketako Egoeren Koloreak</b>"
 msgid "Account row"
 msgstr "Kontua"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:925
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
 msgid "Bold"
 msgstr "Negrita"
 
@@ -1354,7 +1442,7 @@ msgstr "Taldea"
 msgid "Inactive"
 msgstr "Inaktiboa"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:926
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
 msgid "Italic"
 msgstr "Etzana"
 
@@ -1405,7 +1493,7 @@ msgstr "Aldatu _Gaia"
 msgid "Configure _Room..."
 msgstr "Gela Konfigu_ratu"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1782
+#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
 #, fuzzy
 msgid "_Bookmark"
 msgstr "_Talde Agendan Sartu Gela hau"
@@ -1469,19 +1557,33 @@ msgstr "_Bidali Mezu Pribatu bat"
 msgid "_Voice"
 msgstr "_Ahotsa"
 
+#: ../data/gui/groupchat_control.ui.h:1
+#, fuzzy
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "_Talde Agendan Sartu Gela hau"
+
+#: ../data/gui/groupchat_control.ui.h:3
+msgid "Change the room's subject (Alt+T)"
+msgstr ""
+
+#: ../data/gui/groupchat_control.ui.h:4
+#, fuzzy
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Aldatu _Izengoitia"
+
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Mezu berria sortu"
 
-#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
-msgid "From"
-msgstr "-etik"
+#: ../data/gui/groups_post_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:2
+msgid "From:"
+msgstr "Norena:"
 
-#. holds subject
-#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
-#: ../src/history_manager.py:219
-msgid "Subject"
-msgstr "Gaia"
+#: ../data/gui/groups_post_window.ui.h:3
+#: ../data/gui/single_message_window.ui.h:7
+msgid "Subject:"
+msgstr "Gaia:"
 
 #: ../data/gui/history_manager.ui.h:1
 #, fuzzy
@@ -1504,8 +1606,8 @@ msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Gajim Historialeko Log Administratzailea"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3208
-#: ../src/dialogs.py:3305
+#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
+#: ../src/dialogs.py:3321
 msgid "Delete"
 msgstr "Ezabatu"
 
@@ -1559,12 +1661,75 @@ msgstr "Bilatu"
 msgid "_Log conversation history"
 msgstr "Elkarrizketaren _historiala"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
+msgid "approve"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:2
+msgid "body"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:3
+msgid "concede"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:4
+msgid "expire"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:5
+msgid "false"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:6
+msgid "forbid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:7
+#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+msgid "jid"
+msgstr "jid"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:8
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
+#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
+msgid "message"
+msgstr "mezua"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
+msgid "oppose"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
+#, fuzzy
+msgid "otr"
+msgstr "_Host-a"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:11
+msgid "prefer"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:12
+msgid "require"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:13
+msgid "save"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:14
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
 msgid "Bro_wse Rooms"
 msgstr "_Bilatu"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2180
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
 msgid "Join Group Chat"
 msgstr "Txat Taldean Sartu"
 
@@ -1602,8 +1767,8 @@ msgstr "Zerbitzaria:"
 msgid "_Bookmark this room"
 msgstr "_Talde Agendan Sartu Gela hau"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1341
-#: ../src/disco.py:1786
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../src/disco.py:1804
 msgid "_Join"
 msgstr "_Sartu"
 
@@ -1713,6 +1878,75 @@ msgstr "_Izena"
 msgid "Passphrase"
 msgstr "Pasa-esaldia"
 
+#: ../data/gui/plugins_window.ui.h:1
+msgid "&lt;empty&gt;"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:2
+msgid "<empty>"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:3
+#, fuzzy
+msgid "Authors:"
+msgstr "_Autorizatu"
+
+#: ../data/gui/plugins_window.ui.h:4
+#, fuzzy
+msgid "Available"
+msgstr "_Libre"
+
+#: ../data/gui/plugins_window.ui.h:5
+#, fuzzy
+msgid "Configure"
+msgstr "_Jarraitu"
+
+#: ../data/gui/plugins_window.ui.h:6
+#, fuzzy
+msgid "Descrition:"
+msgstr "Deskribapena: %s"
+
+#: ../data/gui/plugins_window.ui.h:7
+#, fuzzy
+msgid "Homepage:"
+msgstr "Web Pertsonala:"
+
+#: ../data/gui/plugins_window.ui.h:8
+msgid "Install"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:9
+#, fuzzy
+msgid "Installed"
+msgstr "Stalled"
+
+#: ../data/gui/plugins_window.ui.h:10
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:11
+msgid "Plugins"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:12
+msgid "Uninstall"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:13
+#, fuzzy
+msgid "Version:"
+msgstr "GTK+ Bertsioa:"
+
+#: ../data/gui/plugins_window.ui.h:14
+msgid "button"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:15
+msgid "homepage url"
+msgstr ""
+
 #: ../data/gui/popup_notification_window.ui.h:1
 #, fuzzy
 msgid "Event Type"
@@ -1850,125 +2084,108 @@ msgid "Always"
 msgstr "Kanpoan"
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Always use GNOME default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:32
-msgid "Always use KDE default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:33
-msgid "Always use Xfce default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Eskatu egoera mezua, nagoenean:"
 
-#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
 msgid "Audio / Video"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:33
 msgid "Audio input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Audio output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:38
-#, fuzzy
-msgid "Autodetect on every Gajim startup"
-msgstr "K_onektatu Gajim irikitzean"
-
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:35
 #, fuzzy
 msgid "Chat message:"
 msgstr "Egoera mezua:"
 
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:36
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:37
 #, fuzzy
 msgid "Composing only"
 msgstr "Sortzen"
 
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:38
 msgid "Configure color and font of the interface"
 msgstr "Interfazeko kolorea eta letra konfiguratu"
 
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Egoera mezua:"
 
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Kontaturen izena"
 
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:41
 #, fuzzy
 msgid "Custom"
 msgstr "<b>Bezeroak</b>"
 
-#: ../data/gui/preferences_window.ui.h:46
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Detached roster with chat grouped by account"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Detached roster with detached chats"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:45
 msgid "Detached roster with single chat"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
-#: ../src/config.py:671
+#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
+#: ../src/config.py:665
 msgid "Disabled"
 msgstr "Ezindu"
 
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:47
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Kontaktuen a_batereak erakutsi zerrendan"
 
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:48
 msgid "Display _extra email details"
 msgstr "Erakutsarazi epostaren g_ehigarrizko xehetasunak"
 
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:49
 #, fuzzy
 msgid "Display _location of contacts in roster"
 msgstr "Kontaktuen a_batereak erakutsi zerrendan"
 
-#: ../data/gui/preferences_window.ui.h:54
+#: ../data/gui/preferences_window.ui.h:50
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Kontaktuen a_batereak erakutsi zerrendan"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display a_vatars of contacts in roster"
 msgstr "Kontaktuen a_batereak erakutsi zerrendan"
 
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:52
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Kontaktuen a_batereak erakutsi zerrendan"
 
-#: ../data/gui/preferences_window.ui.h:57
+#: ../data/gui/preferences_window.ui.h:53
 msgid "Display status _messages of contacts in roster"
 msgstr "Erakuts arazi kontaktuen egoera _mezua zerrendan"
 
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:54
 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 "
@@ -1978,7 +2195,7 @@ msgstr ""
 "may have with a contact. Here you can specify which chatstates you want to "
 "display in chat windows."
 
-#: ../data/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:55
 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 "
@@ -1988,7 +2205,7 @@ msgstr ""
 "may have with a contact. Here you can specify which chatstates you want to "
 "send to the other party."
 
-#: ../data/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:56
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1996,19 +2213,19 @@ msgstr ""
 "Deskonektatu diren kontaktuez Gajim-ek jakinaraziko dizu popup bidez "
 "pantailako beheko eskubiko aldean"
 
-#: ../data/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:58
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "Ezkutatu botoiak txat taldeko leihoan."
 
-#: ../data/gui/preferences_window.ui.h:63
+#: ../data/gui/preferences_window.ui.h:59
 #, 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/gui/preferences_window.ui.h:64
+#: ../data/gui/preferences_window.ui.h:60
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -2016,18 +2233,18 @@ msgstr ""
 "Aukeratu baduzu, Gajim-ek e-postako mezu berrien bidaltzailearen informazioa "
 "ere jarriko du."
 
-#: ../data/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:61
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:66
+#: ../data/gui/preferences_window.ui.h:62
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -2035,7 +2252,7 @@ msgstr ""
 "Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen abatereak "
 "azalaraziko ditu"
 
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -2043,7 +2260,7 @@ msgstr ""
 "Hautatua badago, Gajim-ek egoera mezua zerrendan erakutsaraziko du izenen "
 "azpian eta txat taldeetan"
 
-#: ../data/gui/preferences_window.ui.h:69
+#: ../data/gui/preferences_window.ui.h:65
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -2051,7 +2268,7 @@ msgstr ""
 "Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen abatereak "
 "azalaraziko ditu"
 
-#: ../data/gui/preferences_window.ui.h:70
+#: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the location of contacts in the roster window"
@@ -2059,7 +2276,7 @@ msgstr ""
 "Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen abatereak "
 "azalaraziko ditu"
 
-#: ../data/gui/preferences_window.ui.h:71
+#: ../data/gui/preferences_window.ui.h:67
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -2067,7 +2284,7 @@ msgstr ""
 "Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen abatereak "
 "azalaraziko ditu"
 
-#: ../data/gui/preferences_window.ui.h:72
+#: ../data/gui/preferences_window.ui.h:68
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -2075,14 +2292,14 @@ msgstr ""
 "Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen abatereak "
 "azalaraziko ditu"
 
-#: ../data/gui/preferences_window.ui.h:73
+#: ../data/gui/preferences_window.ui.h:69
 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/gui/preferences_window.ui.h:74
+#: ../data/gui/preferences_window.ui.h:70
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -2092,14 +2309,14 @@ msgstr ""
 "Bakarrik hautatu aukera hau zerrendan ez duzun norbaitek zirikatzen bazaitu. "
 "Kontu handiz erabili, zerrendan ez dagoen edonoren mezuak blokeatzen ditu"
 
-#: ../data/gui/preferences_window.ui.h:75
+#: ../data/gui/preferences_window.ui.h:71
 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/gui/preferences_window.ui.h:76
+#: ../data/gui/preferences_window.ui.h:72
 #, fuzzy
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
@@ -2108,7 +2325,7 @@ msgstr ""
 "Aukeratu baduzu, Gajim-ek e-postako mezu berrien bidaltzailearen informazioa "
 "ere jarriko du."
 
-#: ../data/gui/preferences_window.ui.h:77
+#: ../data/gui/preferences_window.ui.h:73
 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, "
@@ -2118,13 +2335,13 @@ msgstr ""
 "ditu (Adibidez: MSN bada, protokolo honek erabiltzen dituen berezko ikurrak "
 "jarriko dira)"
 
-#: ../data/gui/preferences_window.ui.h:78
+#: ../data/gui/preferences_window.ui.h:74
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:79
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2132,104 +2349,104 @@ msgstr ""
 "Ez badago ezeztatuta, Gajim-ek  ´:)´ ascii hauek bere irudi grafiko estatiko "
 "edo animatura eraldatuko ditu"
 
-#: ../data/gui/preferences_window.ui.h:80
+#: ../data/gui/preferences_window.ui.h:76
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:81
+#: ../data/gui/preferences_window.ui.h:77
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "M_ezu leiho bat"
 
-#: ../data/gui/preferences_window.ui.h:82
+#: ../data/gui/preferences_window.ui.h:78
 msgid "Ma_nage..."
 msgstr "Mo_ldatu..."
 
-#: ../data/gui/preferences_window.ui.h:83
+#: ../data/gui/preferences_window.ui.h:79
 #, fuzzy
 msgid "Never"
 msgstr "_Inoiz"
 
-#: ../data/gui/preferences_window.ui.h:84
+#: ../data/gui/preferences_window.ui.h:80
 #, fuzzy
 msgid "Notifications"
 msgstr "Kontu Eraldaketa"
 
-#: ../data/gui/preferences_window.ui.h:85
+#: ../data/gui/preferences_window.ui.h:81
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Jakinarazi kontaktuek hau egitean: "
 
-#: ../data/gui/preferences_window.ui.h:86
+#: ../data/gui/preferences_window.ui.h:82
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Jakinarazi kontaktuek hau egitean: "
 
-#: ../data/gui/preferences_window.ui.h:87
+#: ../data/gui/preferences_window.ui.h:83
 #, fuzzy
 msgid "Notify me about it"
 msgstr "_Jakinarazi horri buruz"
 
-#: ../data/gui/preferences_window.ui.h:88
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notify on new _GMail email"
 msgstr "_Gmail-eko E-posta berri batez jakinarazi"
 
-#: ../data/gui/preferences_window.ui.h:89
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Only when pending events"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:90
+#: ../data/gui/preferences_window.ui.h:86
 #, fuzzy
 msgid "Personal Events"
 msgstr "Informazio Pertsonala "
 
-#: ../data/gui/preferences_window.ui.h:91
+#: ../data/gui/preferences_window.ui.h:87
 msgid "Play _sounds"
 msgstr "Soinuak _entzun"
 
-#: ../data/gui/preferences_window.ui.h:92
+#: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
 msgid "Pop it up"
 msgstr "_Agertarazi"
 
-#: ../data/gui/preferences_window.ui.h:93
+#: ../data/gui/preferences_window.ui.h:89
 msgid "Preferences"
 msgstr "Hobespenak"
 
-#: ../data/gui/preferences_window.ui.h:94
+#: ../data/gui/preferences_window.ui.h:90
 msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:96
+#: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
 msgid "STUN server:"
 msgstr "Zerbitzaria:"
 
-#: ../data/gui/preferences_window.ui.h:97
+#: ../data/gui/preferences_window.ui.h:93
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Ikusi _zerrendan bakarrik"
+msgid "Show notification area icon:"
+msgstr "E_rabili ikonifikazioa (aka. notification area)"
 
-#: ../data/gui/preferences_window.ui.h:98
+#: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
-msgid "Show systray:"
-msgstr "Iku_si gertaerak systray-ean"
+msgid "Show only in roster"
+msgstr "Ikusi _zerrendan bakarrik"
 
-#: ../data/gui/preferences_window.ui.h:99
+#: ../data/gui/preferences_window.ui.h:95
 msgid "Sign _in"
 msgstr "_Konektatuta"
 
-#: ../data/gui/preferences_window.ui.h:100
+#: ../data/gui/preferences_window.ui.h:96
 msgid "Sign _out"
 msgstr "_Deskonektatuta"
 
-#: ../data/gui/preferences_window.ui.h:101
+#: ../data/gui/preferences_window.ui.h:97
 msgid "Single window for everything"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:102
+#: ../data/gui/preferences_window.ui.h:98
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2237,30 +2454,30 @@ msgstr ""
 "Mezu batzuk gehiegizko edukia izan dezakete(koloreak, tamaina...). Hautatua "
 "badago, Gajim-ek testua modu sinple batean erakutsiko du. "
 
-#: ../data/gui/preferences_window.ui.h:103
+#: ../data/gui/preferences_window.ui.h:99
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "_Sailkatu kontaktuak egoeraren bidez"
 
-#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
 msgid "Status"
 msgstr "Egoera"
 
-#: ../data/gui/preferences_window.ui.h:105
+#: ../data/gui/preferences_window.ui.h:101
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "Berezko egoera _ikurra:"
 
-#: ../data/gui/preferences_window.ui.h:106
+#: ../data/gui/preferences_window.ui.h:102
 #, fuzzy
 msgid "Style"
 msgstr "Stalled"
 
-#: ../data/gui/preferences_window.ui.h:107
+#: ../data/gui/preferences_window.ui.h:103
 msgid "T_heme:"
 msgstr "G_aia:"
 
-#: ../data/gui/preferences_window.ui.h:108
+#: ../data/gui/preferences_window.ui.h:104
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2268,7 +2485,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:111
+#: ../data/gui/preferences_window.ui.h:107
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2276,131 +2493,135 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:114
+#: ../data/gui/preferences_window.ui.h:110
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Erabili _transporteen ikurrak"
 
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:111
+msgid "Use default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:112
 msgid "Use system _default"
 msgstr "_Sistemaren berezkoa erabili"
 
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:113
 msgid "Video framerate"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:117
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Video input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:118
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Video output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:119
+#: ../data/gui/preferences_window.ui.h:116
 msgid "Video size"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:120
+#: ../data/gui/preferences_window.ui.h:117
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Ekintza berri bat jasotzean."
 
-#: ../data/gui/preferences_window.ui.h:121
+#: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
 msgid "Your message:"
 msgstr "Errore mezua: %s"
 
-#: ../data/gui/preferences_window.ui.h:122
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your nickname:"
 msgstr "Izengoitia baino l_ehen:"
 
-#: ../data/gui/preferences_window.ui.h:123
+#: ../data/gui/preferences_window.ui.h:120
 #, fuzzy
 msgid "_Away after:"
 msgstr "Automatikoki _Kanpoan ondoren:"
 
-#: ../data/gui/preferences_window.ui.h:124
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Bilatu:"
 
-#: ../data/gui/preferences_window.ui.h:125
+#: ../data/gui/preferences_window.ui.h:122
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "Txat-eko egoeren jakinarazteak aza_l arazi:"
 
-#: ../data/gui/preferences_window.ui.h:126
+#: ../data/gui/preferences_window.ui.h:123
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Emoticonoak:"
 
-#: ../data/gui/preferences_window.ui.h:127
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_File manager:"
 msgstr "_Fitxero administratzaile:"
 
-#: ../data/gui/preferences_window.ui.h:128
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_Highlight misspelled words"
 msgstr "_Highlight misspelled words"
 
-#: ../data/gui/preferences_window.ui.h:129
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Zerrendan ez dauden kontaktuen gertaerak baztertu"
 
-#: ../data/gui/preferences_window.ui.h:130
+#: ../data/gui/preferences_window.ui.h:127
 #, fuzzy
 msgid "_Ignore rich content in incoming messages"
 msgstr "Ez kasu egin gehiegizko edukiari sarrera mezuetan"
 
-#: ../data/gui/preferences_window.ui.h:131
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Log status changes of contacts"
 msgstr "Kontaktuen egoera aldaketak gorde"
 
-#: ../data/gui/preferences_window.ui.h:132
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Mail client:"
 msgstr "_Email bezeroa"
 
-#: ../data/gui/preferences_window.ui.h:133
+#: ../data/gui/preferences_window.ui.h:130
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Automatikoki _Ez Erabilgarri ondoren:"
 
-#: ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Open..."
 msgstr "_Ireki..."
 
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Reset to Default Colors"
 msgstr "Be_rezko Koloreak Ezarri"
 
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:133
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "Txat-eko egoeren jakinarazteak aza_l arazi:"
 
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Status message:"
 msgstr "Egoera mezua:"
 
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:140
+#: ../data/gui/preferences_window.ui.h:137
 #, fuzzy
 msgid "in _group chats"
 msgstr "Txat Taldean _Sartu"
 
-#: ../data/gui/preferences_window.ui.h:141
+#: ../data/gui/preferences_window.ui.h:138
 #, fuzzy
 msgid "in _roster"
 msgstr "Ez dago zerrendan"
 
-#: ../data/gui/preferences_window.ui.h:142
+#: ../data/gui/preferences_window.ui.h:139
 msgid "minutes"
 msgstr "minutu"
 
@@ -2453,7 +2674,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Ordena:"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3436
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
 msgid "Privacy List"
 msgstr "Debekatze Zerrenda"
 
@@ -2688,8 +2909,8 @@ msgstr "Ezabatu kontua Gajim-etik eta baita _zerbitzaritik"
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5492 ../src/roster_window.py:5622
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
+#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
 msgid "_Remove"
 msgstr "_Ezabatu"
 
@@ -2735,59 +2956,63 @@ msgid "Help online"
 msgstr "Online laguntza"
 
 #: ../data/gui/roster_window.ui.h:8
+msgid "P_lugins"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:9
 msgid "Profile, A_vatar"
 msgstr "Profila, A_batarea"
 
-#: ../data/gui/roster_window.ui.h:9
+#: ../data/gui/roster_window.ui.h:10
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "Ikusi _Deskonektatutako Kontaktuak"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
 msgid "Show Trans_ports"
 msgstr "Trans_porteak Erakutsi"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
 msgid "Show _Offline Contacts"
 msgstr "Ikusi _Deskonektatutako Kontaktuak"
 
-#: ../data/gui/roster_window.ui.h:12 ../src/statusicon.py:326
+#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
 msgid "Show _Roster"
 msgstr "Ikusi _Zerrenda"
 
-#: ../data/gui/roster_window.ui.h:13
+#: ../data/gui/roster_window.ui.h:14
 #, 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/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
 #: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Aukerak"
 
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
 msgid "_Contents"
 msgstr "_Edukiak"
 
-#: ../data/gui/roster_window.ui.h:18 ../src/disco.py:1502
+#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
 msgid "_Edit"
 msgstr "_Editatu"
 
-#: ../data/gui/roster_window.ui.h:19
+#: ../data/gui/roster_window.ui.h:20
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Help"
 msgstr "_Laguntza"
 
-#: ../data/gui/roster_window.ui.h:22
+#: ../data/gui/roster_window.ui.h:23
 #, fuzzy
 msgid "_Send Single Message..."
 msgstr "Bidali _Mezu Bakarra..."
 
-#: ../data/gui/roster_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:25
 msgid "_View"
 msgstr "_Ikusi"
 
@@ -2806,12 +3031,12 @@ msgid "_Add contact"
 msgstr "Kontaktua _Sartu"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5634
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
 #, fuzzy
 msgid "_Information"
 msgstr "Kontaktuaren Informazioa"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1353
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
 msgid "_Search"
 msgstr "_Bilatu"
 
@@ -2831,10 +3056,6 @@ msgstr "Erregistratu honetara"
 msgid "_Cancel"
 msgstr "_kantzelatu"
 
-#: ../data/gui/single_message_window.ui.h:2
-msgid "From:"
-msgstr "Norena:"
-
 #: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Erantzun mezu honi"
@@ -2851,10 +3072,6 @@ msgstr "Bidali mezua"
 msgid "Send message and close window"
 msgstr "Bidali mezua eta itxi leihoa"
 
-#: ../data/gui/single_message_window.ui.h:7
-msgid "Subject:"
-msgstr "Gaia:"
-
 #: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Norentzat:"
@@ -3075,26 +3292,36 @@ msgstr "Gajim Behealako Mezularitza"
 msgid "Jabber IM Client"
 msgstr "IM Jabber Bezeroa"
 
-#: ../src/adhoc_commands.py:314
+#: ../src/adhoc_commands.py:323
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Kontaktuaren Informazioa"
 
-#: ../src/adhoc_commands.py:315
+#: ../src/adhoc_commands.py:324
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:351 ../src/adhoc_commands.py:374
+#: ../src/adhoc_commands.py:370
+#, fuzzy
+msgid "Invalid Form"
+msgstr "Sarrera baliogabea"
+
+#: ../src/adhoc_commands.py:371
+#, fuzzy
+msgid "The form is not filled correctly."
+msgstr "ID Jabber gelak ez du onartzen karaktererik."
+
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:360
+#: ../src/adhoc_commands.py:399
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:471
+#: ../src/adhoc_commands.py:513
 msgid "Service returned an error."
 msgstr ""
 
@@ -3122,7 +3349,7 @@ msgstr "Taldean"
 msgid "Text"
 msgstr ""
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:945
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
 msgid "Color"
 msgstr ""
 
@@ -3159,241 +3386,241 @@ msgstr[1] "Sarrera berri bat jaso duzu:"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "English"
 msgstr "Ingelesa"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Belarusian"
 msgstr "Bulgariera"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Bulgarian"
 msgstr "Bulgariera"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Breton"
 msgstr "Briton"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Czech"
 msgstr "Czech"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "German"
 msgstr "Alemaniera"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Greek"
 msgstr "Greziera"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "British"
 msgstr "Briton"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Esperanto"
 msgstr "Esperantoa"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Spanish"
 msgstr "Gaztelania"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Basque"
 msgstr "Basc"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "French"
 msgstr "Frantsesa"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Croatian"
 msgstr "Kroaziera"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Italian"
 msgstr "Italiera"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Norwegian (b)"
 msgstr "Norvegian b"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Dutch"
 msgstr "Alemana"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Norwegian"
 msgstr "Norbegiera"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Polish"
 msgstr "Polakoa"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Portuguese"
 msgstr "Portugesa"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Brazilian Portuguese"
 msgstr "Brasileko Portugesa"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Russian"
 msgstr "Rusiera"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Serbian"
 msgstr "Alemaniera"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Slovak"
 msgstr "Eslovakoa"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Swedish"
 msgstr "Swedish"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Chinese (Ch)"
 msgstr "Txinera (Ch)"
 
-#: ../src/chat_control.py:479
+#: ../src/chat_control.py:496
 msgid "Spelling language"
 msgstr "Ortografia hizkuntza"
 
 #. we are not connected
-#: ../src/chat_control.py:511 ../src/chat_control.py:720
+#: ../src/chat_control.py:528 ../src/chat_control.py:737
 msgid "A connection is not available"
 msgstr "Konexioa ez dago erabilgarri"
 
-#: ../src/chat_control.py:512 ../src/chat_control.py:721
+#: ../src/chat_control.py:529 ../src/chat_control.py:738
 msgid "Your message can not be sent until you are connected."
 msgstr "Zure mezua ezin da bidali konektatu harte"
 
-#: ../src/chat_control.py:927
+#: ../src/chat_control.py:944
 #, fuzzy
 msgid "Underline"
 msgstr "bederatzi"
 
-#: ../src/chat_control.py:928
+#: ../src/chat_control.py:945
 #, fuzzy
 msgid "Strike"
 msgstr "Izengoitia"
 
-#: ../src/chat_control.py:951
+#: ../src/chat_control.py:968
 #, fuzzy
 msgid "Font"
 msgstr "_Mota:"
 
-#: ../src/chat_control.py:960
+#: ../src/chat_control.py:977
 #, fuzzy
 msgid "Clear formating"
 msgstr "Kontaktuaren Informazioa"
 
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1055
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:1039
+#: ../src/chat_control.py:1056
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1503 ../src/chat_control.py:1987
+#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Enkriptazioa aktibatuta"
 
 #. Add to roster
-#: ../src/chat_control.py:1528 ../src/common/contacts.py:158
+#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
 #: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:245 ../src/dialogs.py:1064 ../src/dialogs.py:2078
-#: ../src/dialogs.py:2107 ../src/gui_interface.py:674
+#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
+#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
 #: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1610 ../src/roster_window.py:1612
-#: ../src/roster_window.py:1942 ../src/roster_window.py:3289
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
+#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
+#: ../src/roster_window.py:3382
 msgid "Not in Roster"
 msgstr "Ez dago zerrendan"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1575
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Fitxategi tranferentzia aktiboen, bukatutakoen eta gelditutakoen lista"
 
-#: ../src/chat_control.py:1561
+#: ../src/chat_control.py:1578
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1656
+#: ../src/chat_control.py:1677
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:1869
 #, 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:1967 ../src/dialogs.py:4866
+#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1968
+#: ../src/chat_control.py:1991
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1977
+#: ../src/chat_control.py:2000
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Enkriptazioa desaktibatuta"
 
-#: ../src/chat_control.py:2003
+#: ../src/chat_control.py:2026
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:2028
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2051
 #, fuzzy
 msgid "and authenticated"
 msgstr "Erabili autentifikazioa"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2032
+#: ../src/chat_control.py:2055
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Erabili autentifikazioa"
@@ -3401,58 +3628,66 @@ 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:2039
+#: ../src/chat_control.py:2062
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2182
+#: ../src/chat_control.py:2205
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2191
+#: ../src/chat_control.py:2215
+msgid "This session WILL be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2217
+msgid "This session WILL NOT be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2226
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Mezu hau enkriptatua dago]"
 
-#: ../src/chat_control.py:2194
+#: ../src/chat_control.py:2229
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2196
+#: ../src/chat_control.py:2231
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2201
+#: ../src/chat_control.py:2236
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2203
+#: ../src/chat_control.py:2238
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Enkriptazioa desaktibatuta"
 
-#: ../src/chat_control.py:2241 ../src/chat_control.py:2254
+#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Mezu hau enkriptatua dago]"
 
-#: ../src/chat_control.py:2247
+#: ../src/chat_control.py:2288
 #, 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:2519
+#: ../src/chat_control.py:2566
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "\"%s\" -tik mezu berri bat jaso duzu"
 
-#: ../src/chat_control.py:2520
+#: ../src/chat_control.py:2567
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3460,22 +3695,20 @@ msgstr ""
 "Leiho hau isten baduzu eta ez baduzu historiala aktibatua mezu hau galduko "
 "duzu."
 
-#: ../src/chat_control.py:2663 ../src/common/connection_handlers.py:1635
-#: ../src/common/connection_handlers.py:1758
-#: ../src/common/connection_handlers.py:1960
-#: ../src/common/connection_handlers.py:2110 ../src/common/connection.py:452
+#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
 #: ../src/gajim.py:159 ../src/session.py:138
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2664
+#: ../src/chat_control.py:2714
 #, 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:2906
+#: ../src/chat_control.py:2962
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s orain dago %(status)s"
@@ -3489,28 +3722,28 @@ msgstr "logs-en datu basea sortzen"
 msgid "creating cache database"
 msgstr "logs-en datu basea sortzen"
 
-#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
-#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
-#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
-#: ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
 #, 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:275 ../src/common/check_paths.py:282
-#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
-#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
-#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:333
+#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
+#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
+#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
 msgid "Gajim will now exit"
 msgstr "Gajim orain badago"
 
-#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
+#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
 #, 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:342
+#: ../src/common/check_paths.py:351
 #, python-format
 msgid "creating %s directory"
 msgstr "%s direktorioa sortzen"
@@ -3582,9 +3815,9 @@ msgstr ""
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:801
-#: ../src/roster_window.py:1614 ../src/roster_window.py:1616
-#: ../src/roster_window.py:5251
+#: ../src/common/helpers.py:57 ../src/roster_window.py:815
+#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
+#: ../src/roster_window.py:5323
 #, fuzzy
 msgid "Groupchats"
 msgstr "Txat Taldeak"
@@ -3647,7 +3880,8 @@ msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
 #: ../src/common/config.py:88
-msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgid ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
 #: ../src/common/config.py:93
@@ -3702,9 +3936,9 @@ msgstr ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:501
-#: ../src/common/optparser.py:290 ../src/common/optparser.py:486
-#: ../src/common/optparser.py:520 ../src/gui_interface.py:3370
+#: ../src/common/config.py:106 ../src/common/config.py:505
+#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
+#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
 #, fuzzy
 msgid "default"
 msgstr "Berezkoa"
@@ -3920,7 +4154,8 @@ 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:197
-msgid "Notify of events in the system trayicon."
+#, fuzzy
+msgid "Notify of events in the notification area."
 msgstr "Jakin arazi gertaerak system trayicon-ean."
 
 #: ../src/common/config.py:203
@@ -3954,9 +4189,10 @@ msgstr ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 
 #: ../src/common/config.py:221
+#, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
+"setting is taken into account only if notification icon is used."
 msgstr ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -4222,7 +4458,7 @@ msgstr ""
 #: ../src/common/config.py:270
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
-"systray icon."
+"notification icon."
 msgstr ""
 
 #: ../src/common/config.py:271
@@ -4393,111 +4629,122 @@ msgstr ""
 msgid "Message that is sent to contacts you want to add"
 msgstr "Mesedez bete sartu nahi duzun kontaktuaren informazioa"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:374
+msgid "Last time we syncronized with logs from server."
+msgstr ""
+
+#: ../src/common/config.py:436
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "OpenPGP aktibatu al dago kontu honetarako?"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:437 ../src/common/config.py:440
+#: ../src/common/config.py:438 ../src/common/config.py:441
 msgid "Language for which we want to check misspelled words"
 msgstr "Zuzentzeko erabili nahi dugun hizkuntza"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:447
 msgid "all or space separated status"
 msgstr "dena edo espazio egoera banandua"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:448
 msgid "'yes', 'no', or 'both'"
 msgstr "'bai', 'ez', edo 'biak'"
 
-#: ../src/common/config.py:448 ../src/common/config.py:450
-#: ../src/common/config.py:451 ../src/common/config.py:454
-#: ../src/common/config.py:455
+#: ../src/common/config.py:449 ../src/common/config.py:451
+#: ../src/common/config.py:452 ../src/common/config.py:455
+#: ../src/common/config.py:456
 msgid "'yes', 'no' or ''"
 msgstr "'bai', 'ez' edo ''"
 
-#: ../src/common/config.py:461 ../src/common/pep.py:157
+#: ../src/common/config.py:460
+msgid ""
+"State whether plugins should be activated on exit (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
+msgstr ""
+
+#: ../src/common/config.py:465 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Lotan"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back soon"
 msgstr "Laster etorriko naiz"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back in some minutes."
 msgstr "Minutu batzuk barru berriro hemen."
 
-#: ../src/common/config.py:463 ../src/common/pep.py:127
+#: ../src/common/config.py:467 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Jaten"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:467
 msgid "I'm eating, so leave me a message."
 msgstr "Jaten ari naiz, utzi mezu bat beraz."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "Movie"
 msgstr "Filmea"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "I'm watching a movie."
 msgstr "Filma bat ikustean ari naiz."
 
-#: ../src/common/config.py:465 ../src/common/pep.py:186
+#: ../src/common/config.py:469 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Lanean"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:469
 msgid "I'm working."
 msgstr "Lanean ari naiz."
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "Phone"
 msgstr "Telefonoa"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "I'm on the phone."
 msgstr "Telefonoan nago."
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "Out"
 msgstr "kanpoan"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "I'm out enjoying life."
 msgstr "Kanpoan naiz bizitza disfrutatzen."
 
-#: ../src/common/config.py:478
+#: ../src/common/config.py:482
 msgid "I'm available."
 msgstr "Libre."
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:483
 msgid "I'm free for chat."
 msgstr "Libre Hitz Egiteko."
 
-#: ../src/common/config.py:480 ../src/config.py:1600
+#: ../src/common/config.py:484 ../src/config.py:1600
 msgid "Be right back."
 msgstr "Be right back."
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:485
 msgid "I'm not available."
 msgstr "Ez Erabilgarri."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:486
 msgid "Do not disturb."
 msgstr "Ez nahasi."
 
-#: ../src/common/config.py:483 ../src/common/config.py:484
+#: ../src/common/config.py:487 ../src/common/config.py:488
 msgid "Bye!"
 msgstr "Agur!"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:498
 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."
@@ -4505,90 +4752,86 @@ 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:495
+#: ../src/common/config.py:499
 msgid "Sound to play when any MUC message arrives."
 msgstr "Soinu bat ezarri MUC-eko edozein mezu iristean."
 
-#: ../src/common/config.py:504 ../src/common/optparser.py:304
+#: ../src/common/config.py:508 ../src/common/optparser.py:308
 msgid "green"
 msgstr "berdea"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:290
+#: ../src/common/config.py:512 ../src/common/optparser.py:294
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:512
+#: ../src/common/config.py:516
 msgid "human"
 msgstr "gizakia"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:520
 msgid "marine"
 msgstr "arrantzale"
 
-#: ../src/common/connection_handlers.py:84
+#: ../src/common/connection_handlers.py:94
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Ez izan da idle modulua kargatu"
 
-#: ../src/common/connection_handlers.py:117
+#: ../src/common/connection_handlers.py:127
 #, 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:124
+#: ../src/common/connection_handlers.py:134
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "vCard argitarapena egina"
 
-#: ../src/common/connection_handlers.py:125
+#: ../src/common/connection_handlers.py:135
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 #, fuzzy
 msgid "Registration failed"
 msgstr "Konexioak huts egin du"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:445
-#: ../src/common/connection_handlers.py:1633
-#: ../src/common/connection_handlers.py:1756
-#: ../src/common/connection_handlers.py:1957
-#: ../src/common/connection_handlers.py:2108 ../src/common/connection.py:449
+#: ../src/common/connection_handlers.py:466
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
 #: ../src/gajim.py:341
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:678 ../src/common/connection.py:1472
+#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Gehigarriak ez eskuragarri"
 
-#: ../src/common/connection_handlers.py:679 ../src/common/connection.py:1473
+#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1446 ../src/common/connection.py:253
-#: ../src/config.py:2091 ../src/config.py:2100 ../src/config.py:2168
-#: ../src/config.py:3560 ../src/dataforms_widget.py:597 ../src/dialogs.py:2931
+#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
+#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
+#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID baliogabea"
 
-#: ../src/common/connection_handlers.py:1447
+#: ../src/common/connection_handlers.py:1405
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1636
-#: ../src/common/connection_handlers.py:1759
-#: ../src/common/connection_handlers.py:1961
-#: ../src/common/connection_handlers.py:2111 ../src/common/connection.py:453
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
 #: ../src/gajim.py:160 ../src/session.py:139
 #, python-format
 msgid ""
@@ -4596,90 +4839,6 @@ msgid ""
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1805
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Baimenik gabeko izengoitia: %s"
-
-#: ../src/common/connection_handlers.py:1902
-#: ../src/common/connection_handlers.py:1911
-#: ../src/common/connection_handlers.py:1918
-#: ../src/common/connection_handlers.py:1922
-#: ../src/common/connection_handlers.py:1926
-#: ../src/common/connection_handlers.py:1931 ../src/gui_interface.py:139
-msgid "Unable to join group chat"
-msgstr "Ezin da gela honetara sartu"
-
-#: ../src/common/connection_handlers.py:1903
-#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:1912
-#, fuzzy, python-format
-msgid "You are banned from group chat %s."
-msgstr "Gela honetan ukatua izan zara."
-
-#: ../src/common/connection_handlers.py:1919
-#, fuzzy, python-format
-msgid "Group chat %s does not exist."
-msgstr "Honako gela honek ez du existitzen."
-
-#: ../src/common/connection_handlers.py:1923
-msgid "Group chat creation is restricted."
-msgstr "Gela sortzea mugatua dago."
-
-#: ../src/common/connection_handlers.py:1927
-#, 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:1932
-#, 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:1976
-#, fuzzy
-msgid "Room has been destroyed"
-msgstr "Autorizazioa ezabatua izan da."
-
-#: ../src/common/connection_handlers.py:1984
-#, python-format
-msgid "You can join this room instead: %s"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:2020
-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:2041
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "%s -ra harpidetuak gaude orain"
-
-#: ../src/common/connection_handlers.py:2043
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "Harpidetza kentzekoa eskaera %s -tik"
-
-#: ../src/common/connection_handlers.py:2045
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "%s -ren harpidetzatik kenduta gaude"
-
-#: ../src/common/connection_handlers.py:2240
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr ""
@@ -4810,28 +4969,28 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:254 ../src/dialogs.py:2932
+#: ../src/common/connection.py:256 ../src/dialogs.py:2948
 #, 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:276
+#: ../src/common/connection.py:278
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:281
 #, 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:331
+#: ../src/common/connection.py:333
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Mezu hau *enkriptatua\" dago (Ikusi: JEP:`27`]"
 
-#: ../src/common/connection.py:439
+#: ../src/common/connection.py:441
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4840,150 +4999,150 @@ msgstr ""
 "Gaia: %s\n"
 "%s"
 
-#: ../src/common/connection.py:807
+#: ../src/common/connection.py:809
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "\"%s\" kontuarekin konexioa galdu da"
 
-#: ../src/common/connection.py:808
+#: ../src/common/connection.py:810
 msgid "Reconnect manually."
 msgstr "Manualki konektatu berriro."
 
-#: ../src/common/connection.py:820
+#: ../src/common/connection.py:822
 #, 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:854
+#: ../src/common/connection.py:856
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:867
+#: ../src/common/connection.py:869
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "D-Bus bertsioa aurkitugabea: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:882
+#: ../src/common/connection.py:884
 msgid "Invalid answer"
 msgstr "Erantzun baliogabea"
 
-#: ../src/common/connection.py:883
+#: ../src/common/connection.py:885
 #, 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:1165 ../src/common/connection.py:1294
-#: ../src/common/connection.py:1784
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
+#: ../src/common/connection.py:1792
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Ezin izan da konektatu \"%s\" -rekin"
 
-#: ../src/common/connection.py:1166 ../src/gui_interface.py:755
+#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
 msgid "Check your connection or try again later."
 msgstr "Begiratu zure konexioa edo saiatu berriro beranduago."
 
-#: ../src/common/connection.py:1171
+#: ../src/common/connection.py:1173
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "%s gordea"
 
-#: ../src/common/connection.py:1184
+#: ../src/common/connection.py:1186
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Konexioak huts egin du"
 
-#: ../src/common/connection.py:1215 ../src/common/connection.py:1274
+#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Ezin izan da konektatu \"%s\" -rekin"
 
-#: ../src/common/connection.py:1216 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "\"%s\" kontuarekin konexioa galdu da"
 
-#: ../src/common/connection.py:1241
+#: ../src/common/connection.py:1243
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1244
+#: ../src/common/connection.py:1246
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1248
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "D-Bus bertsioa aurkitugabea: %s"
 
-#: ../src/common/connection.py:1295
+#: ../src/common/connection.py:1297
 msgid "Check your connection or try again later"
 msgstr "Begira ezazu zure konexioa edo saiatu berriro"
 
-#: ../src/common/connection.py:1324
+#: ../src/common/connection.py:1329
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "\"%s\" -rekin autentifikazioak huts egin du"
 
-#: ../src/common/connection.py:1326
+#: ../src/common/connection.py:1331
 msgid "Please check your login and password for correctness."
 msgstr "Mesedez begira ezazu zure izena eta pasahitza xehetasun handiz."
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1400
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "Errorea zerbitzarian sartzean.%s"
 
-#: ../src/common/connection.py:1396
+#: ../src/common/connection.py:1401
 #, 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:1650
+#: ../src/common/connection.py:1658
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1653
+#: ../src/common/connection.py:1661
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Kontaktua"
 
-#: ../src/common/connection.py:1799 ../src/common/connection.py:1822
+#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
 msgid "Not fetched because of invisible status"
 msgstr "Ez bidali ikusezin egoerarengatik"
 
-#: ../src/common/connection.py:2254
+#: ../src/common/connection.py:2262
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Konexioak huts egin du"
 
-#: ../src/common/connection.py:2255
+#: ../src/common/connection.py:2263
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
 #: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:674
+#: ../src/gui_interface.py:551
 msgid "Observers"
 msgstr "Begiratzaileak"
 
 #: ../src/common/contacts.py:139 ../src/common/contacts.py:366
 #: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1499 ../src/gui_interface.py:424
-#: ../src/roster_window.py:840 ../src/roster_window.py:1525
-#: ../src/roster_window.py:1606 ../src/roster_window.py:1608
-#: ../src/roster_window.py:1769
+#: ../src/disco.py:1517 ../src/roster_window.py:854
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
+#: ../src/roster_window.py:2466
 msgid "Transports"
 msgstr "Transportea"
 
@@ -5215,203 +5374,219 @@ msgstr "Aste bukaera"
 msgid "Weekend!"
 msgstr "Asteburua!"
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:148
+msgid "Username must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:153
 msgid "Invalid character in username."
 msgstr "Baliogabeko karakterea izenean."
 
-#: ../src/common/helpers.py:156
-msgid "Server address required."
-msgstr "Zerbitzariaren helbidea behar da."
+#: ../src/common/helpers.py:159
+msgid "Server must be between 1 and 1023 chars"
+msgstr ""
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 msgid "Invalid character in hostname."
 msgstr "Baliogabeko karakterea hostname -ean."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:166
+msgid "Server address required."
+msgstr "Zerbitzariaren helbidea behar da."
+
+#: ../src/common/helpers.py:170
+msgid "Resource must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:175
 msgid "Invalid character in resource."
 msgstr "Invalid character in resource."
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:215
 msgid "_Busy"
 msgstr "Lan_petuta"
 
-#: ../src/common/helpers.py:211 ../src/tooltips.py:195
+#: ../src/common/helpers.py:217 ../src/tooltips.py:195
 msgid "Busy"
 msgstr "Lanpetuta"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:220
 msgid "_Not Available"
 msgstr "Ez E_rabilgarri"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:225
 msgid "_Free for Chat"
 msgstr "Libre _Hitz Egiteko"
 
-#: ../src/common/helpers.py:221 ../src/tooltips.py:191
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Free for Chat"
 msgstr "Libre Hitz Egiteko"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:230
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "Gelditua"
 
-#: ../src/common/helpers.py:226 ../src/tooltips.py:189
+#: ../src/common/helpers.py:232 ../src/tooltips.py:189
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Gelditua"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:234
 msgid "Connecting"
 msgstr "Konektatzen"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:237
 msgid "A_way"
 msgstr "_Kanpoan"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:242
 msgid "_Offline"
 msgstr "_Deskonektatuta"
 
-#: ../src/common/helpers.py:238 ../src/tooltips.py:199
+#: ../src/common/helpers.py:244 ../src/tooltips.py:199
 msgid "Offline"
 msgstr "Deskonektatuta"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:247
 msgid "_Invisible"
 msgstr "Ikuse_zin"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:253
 msgid "?contact has status:Unknown"
 msgstr "Ezin da jakin"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:255
 msgid "?contact has status:Has errors"
 msgstr "Errorea du"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:260
 msgid "?Subscription we already have:None"
 msgstr "Inork ez"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:262
 msgid "To"
 msgstr "Norentzat"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
+msgid "From"
+msgstr "-etik"
+
+#: ../src/common/helpers.py:266
 msgid "Both"
 msgstr "Biak"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:274
 msgid "?Ask (for Subscription):None"
 msgstr "Inork ez"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:276
 msgid "Subscribe"
 msgstr "Harpidetu"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:285
 msgid "?Group Chat Contact Role:None"
 msgstr "Inor ez"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:288
 msgid "Moderators"
 msgstr "Moderatzaileak"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:290
 msgid "Moderator"
 msgstr "Moderatzailea"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:293
 msgid "Participants"
 msgstr "Partaideak"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:295
 msgid "Participant"
 msgstr "Partaidea"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:298
 msgid "Visitors"
 msgstr "Bisitariak"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:300
 msgid "Visitor"
 msgstr "Bisitaria"
 
-#: ../src/common/helpers.py:300 ../src/tooltips.py:210
+#: ../src/common/helpers.py:306 ../src/tooltips.py:210
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Inor ez"
 
-#: ../src/common/helpers.py:302 ../src/tooltips.py:216
+#: ../src/common/helpers.py:308 ../src/tooltips.py:216
 msgid "Owner"
 msgstr "Jabea"
 
-#: ../src/common/helpers.py:304 ../src/tooltips.py:214
+#: ../src/common/helpers.py:310 ../src/tooltips.py:214
 msgid "Administrator"
 msgstr "Administratzailea"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:212
+#: ../src/common/helpers.py:312 ../src/tooltips.py:212
 msgid "Member"
 msgstr "Partaidea"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:351
 msgid "is paying attention to the conversation"
 msgstr "arreta jartzen ari da elkarrizketara"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:353
 msgid "is doing something else"
 msgstr "beste zerbait egiten ari da"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:355
 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:352
+#: ../src/common/helpers.py:358
 msgid "paused composing a message"
 msgstr "mezuaren sorrera gelditua"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:360
 msgid "has closed the chat window or tab"
 msgstr "tab edo lehioa itxi egin du"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:619
+#: ../src/common/helpers.py:625
 #, python-format
 msgid "%s GiB"
 msgstr "%s Gib"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:622
+#: ../src/common/helpers.py:628
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:626
+#: ../src/common/helpers.py:632
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:629
+#: ../src/common/helpers.py:635
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:633
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:636
+#: ../src/common/helpers.py:642
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:645
 #, python-format
 msgid "%s B"
 msgstr "%s B"
@@ -5454,12 +5629,12 @@ msgstr "Gajim - %s"
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:111
+#: ../src/common/jingle_rtp.py:107
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Gelaren Konfigurazioa"
 
-#: ../src/common/jingle_rtp.py:112
+#: ../src/common/jingle_rtp.py:108
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5471,30 +5646,30 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:209
+#: ../src/common/jingle_rtp.py:205
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:210
+#: ../src/common/jingle_rtp.py:206
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Errore mezua: %s"
 
-#: ../src/common/jingle_rtp.py:336
+#: ../src/common/jingle_rtp.py:335
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:339
+#: ../src/common/jingle_rtp.py:338
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:382
+#: ../src/common/jingle_rtp.py:381
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:390
+#: ../src/common/jingle_rtp.py:389
 msgid "video output"
 msgstr ""
 
@@ -5571,11 +5746,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "errorea: ezin da %s ireki irakurtzeko"
 
-#: ../src/common/optparser.py:299 ../src/common/optparser.py:300
+#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:379
+#: ../src/common/optparser.py:383
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "migrating logs database to indeces"
@@ -6314,17 +6489,17 @@ msgstr ""
 "bertan behera utziko da."
 
 #. we're not english
-#: ../src/common/stanza_session.py:303
+#: ../src/common/stanza_session.py:423
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:178
+#: ../src/common/zeroconf/connection_zeroconf.py:181
 msgid "Avahi error"
 msgstr "Avahi error"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:179
+#: ../src/common/zeroconf/connection_zeroconf.py:182
 #, python-format
 msgid ""
 "%s\n"
@@ -6333,46 +6508,46 @@ msgstr ""
 "%s\n"
 "Link-local messaging might not work properly."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:190
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Mesedez begiratu Avahi  instalatuta dagoen."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:199
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Could not start local service"
 msgstr "Ezin izan da zerbitzu lokalak hasi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Unable to bind to port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-#: ../src/common/zeroconf/connection_zeroconf.py:283
-#: ../src/common/zeroconf/connection_zeroconf.py:294
-#: ../src/common/zeroconf/connection_zeroconf.py:308
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:286
+#: ../src/common/zeroconf/connection_zeroconf.py:297
+#: ../src/common/zeroconf/connection_zeroconf.py:311
 msgid "Please check if avahi-daemon is running."
 msgstr "Mesedez begiratu avahi-daemon martxan dagoen."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:282
-#: ../src/common/zeroconf/connection_zeroconf.py:293
-#: ../src/common/zeroconf/connection_zeroconf.py:307
+#: ../src/common/zeroconf/connection_zeroconf.py:285
+#: ../src/common/zeroconf/connection_zeroconf.py:296
+#: ../src/common/zeroconf/connection_zeroconf.py:310
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Ezin izan da \"%s\" -ren egoera aldatu"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:325
+#: ../src/common/zeroconf/connection_zeroconf.py:328
 #, 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:335
+#: ../src/common/zeroconf/connection_zeroconf.py:338
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontaktua deskonektatua dago. Zure mezua ezin izan da bidali. "
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:363
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "Host-era konexioa ezin izan da ezarri. Denbora joan da."
@@ -6393,16 +6568,16 @@ msgstr "Berezko Egoera Mezuak"
 msgid "Enabled"
 msgstr "Aktibatu"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3078
+#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
 msgid "Default"
 msgstr "Berezkoa"
 
-#: ../src/config.py:739 ../src/dialogs.py:1395
+#: ../src/config.py:733 ../src/dialogs.py:1409
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "%s hizkuntzarako hiztegia ez dago erabilgarri"
 
-#: ../src/config.py:740
+#: ../src/config.py:734
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6420,9 +6595,9 @@ msgid "status message text"
 msgstr "egoera mezuaren testua"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2383 ../src/dialogs.py:2449
-#: ../src/dialogs.py:3215 ../src/disco.py:866 ../src/disco.py:1726
-#: ../src/disco.py:2030 ../src/history_window.py:90
+#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
+#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
+#: ../src/disco.py:2048 ../src/history_window.py:90
 msgid "Name"
 msgstr "Izena"
 
@@ -6458,7 +6633,7 @@ msgstr "Txat-a %s kontuan ireki duzu"
 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:1976 ../src/config.py:2509 ../src/config.py:2545
+#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
 msgid "You are currently connected to the server"
 msgstr "Zerbitzarira konektatu zaude dagoeneko"
 
@@ -6496,136 +6671,136 @@ msgstr "Kontu izena ezin da hustu."
 msgid "Account name cannot contain spaces."
 msgstr "Kontuko izenak ezin du espaziorik izan."
 
-#: ../src/config.py:2072
+#: ../src/config.py:2074
 #, fuzzy
 msgid "Rename Account"
 msgstr "Kontuak moldatu"
 
-#: ../src/config.py:2073
+#: ../src/config.py:2075
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Sartu %s taldearentzat izen berri bat"
 
-#: ../src/config.py:2101
+#: ../src/config.py:2103
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "\"izena@zerbitzaria\" Jabber ID-a horrela izan behar da."
 
-#: ../src/config.py:2318 ../src/config.py:3606
+#: ../src/config.py:2320 ../src/config.py:3623
 msgid "Invalid entry"
 msgstr "Sarrera baliogabea"
 
-#: ../src/config.py:2319 ../src/config.py:3607
+#: ../src/config.py:2321 ../src/config.py:3624
 msgid "Custom port must be a port number."
 msgstr "Bezeroaren portua portu zenbaki bat izan behar da."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2342
 msgid "Failed to get secret keys"
 msgstr "Kode sekretua lortzeko huts egitea"
 
-#: ../src/config.py:2341
+#: ../src/config.py:2343
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Problema bat egon da zure OpenPGP-ko kode sekretua lortzeko."
 
-#: ../src/config.py:2375
+#: ../src/config.py:2377
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Giltzaren Aukera"
 
-#: ../src/config.py:2376
+#: ../src/config.py:2378
 msgid "Choose your OpenPGP key"
 msgstr "Aukeratu zure OpenPGP kodea"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2385
 msgid "No such account available"
 msgstr "Horrelako konturik ez erabilgarri"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2386
 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:2391 ../src/dialogs.py:2136 ../src/dialogs.py:2371
-#: ../src/dialogs.py:2557 ../src/disco.py:511 ../src/profile_window.py:339
+#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
+#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
 msgid "You are not connected to the server"
 msgstr "Ez zaude zerbitzarira konektatuta"
 
-#: ../src/config.py:2392
+#: ../src/config.py:2394
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Konektatzen ez bazara, ezin duzu zure informazio pertsonala aldatu."
 
-#: ../src/config.py:2396
+#: ../src/config.py:2398
 msgid "Your server doesn't support Vcard"
 msgstr "Zure zerbitzariak ez du Vcard-ik onartzen"
 
-#: ../src/config.py:2397
+#: ../src/config.py:2399
 msgid "Your server can't save your personal information."
 msgstr "Zerbitzariak ezin du zure informazio pertsonala gorde"
 
-#: ../src/config.py:2510 ../src/config.py:2546
+#: ../src/config.py:2512 ../src/config.py:2548
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Kontuko izena aldatzeko deskonektatuta egon behar zara."
 
-#: ../src/config.py:2515
+#: ../src/config.py:2517
 msgid "Account Local already exists."
 msgstr "Kontu izena jadanik badago"
 
-#: ../src/config.py:2516
+#: ../src/config.py:2518
 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:2673
+#: ../src/config.py:2675
 #, python-format
 msgid "Edit %s"
 msgstr "Editatu %s"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2677
 #, python-format
 msgid "Register to %s"
 msgstr "%s -ra erregistratua"
 
 #. list at the beginning
-#: ../src/config.py:2711
+#: ../src/config.py:2713
 msgid "Ban List"
 msgstr "Debekatutako Zerrenda"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2714
 msgid "Member List"
 msgstr "Partaide Zerrenda"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2714
 msgid "Owner List"
 msgstr "Jabe Zerrenda"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2715
 msgid "Administrator List"
 msgstr "Administratzaile Zerrenda"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2763 ../src/disco.py:873 ../src/history_manager.py:201
+#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2773
+#: ../src/config.py:2789
 msgid "Reason"
 msgstr "Arrazoia"
 
-#: ../src/config.py:2780
+#: ../src/config.py:2796
 msgid "Nick"
 msgstr "Izengoitia"
 
-#: ../src/config.py:2786
+#: ../src/config.py:2802
 msgid "Role"
 msgstr "Eginkizuna"
 
-#: ../src/config.py:2813
+#: ../src/config.py:2829
 msgid "Banning..."
 msgstr "Debekatzen..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2815
+#: ../src/config.py:2831
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6633,11 +6808,11 @@ msgstr ""
 "<b>Zein nahi duzu debekatu?</b>\n"
 "\n"
 
-#: ../src/config.py:2817
+#: ../src/config.py:2833
 msgid "Adding Member..."
 msgstr "Kidea ezartzen..."
 
-#: ../src/config.py:2818
+#: ../src/config.py:2834
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6645,11 +6820,11 @@ msgstr ""
 "<b>Zein nahi duzu kide egitea?</b>\n"
 "\n"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2836
 msgid "Adding Owner..."
 msgstr "Jabea ezartzen..."
 
-#: ../src/config.py:2821
+#: ../src/config.py:2837
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -6658,11 +6833,11 @@ msgstr ""
 "<b>Zein nahi duzu jabe egitea?</b>\n"
 "\n"
 
-#: ../src/config.py:2823
+#: ../src/config.py:2839
 msgid "Adding Administrator..."
 msgstr "Administratzailea ezartzen..."
 
-#: ../src/config.py:2824
+#: ../src/config.py:2840
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6670,7 +6845,7 @@ msgstr ""
 "<b>Zein nahi duzu administratzaile egitea?</b>\n"
 "\n"
 
-#: ../src/config.py:2825
+#: ../src/config.py:2841
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6687,84 +6862,84 @@ msgstr ""
 "4. zerbitzaria (the domain itself matches, as does any user@domain,\n"
 "domain/resource, or address containing a subdomain."
 
-#: ../src/config.py:2926
+#: ../src/config.py:2943
 #, python-format
 msgid "Removing %s account"
 msgstr "%s kontua ezabatzen"
 
-#: ../src/config.py:2941
+#: ../src/config.py:2958
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Enkriptazioa desaktibatuta"
 
-#: ../src/config.py:2942
+#: ../src/config.py:2959
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2955 ../src/gui_interface.py:1132
-#: ../src/gui_interface.py:1243
+#: ../src/config.py:2972 ../src/gui_interface.py:311
+#: ../src/gui_interface.py:1048
 msgid "Password Required"
 msgstr "Pasahitza behar da"
 
-#: ../src/config.py:2956 ../src/gui_interface.py:1223
+#: ../src/config.py:2973 ../src/gui_interface.py:1028
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "%s kontuaren pasahitza sartu"
 
-#: ../src/config.py:2957 ../src/gui_interface.py:1243
+#: ../src/config.py:2974 ../src/gui_interface.py:1048
 msgid "Save password"
 msgstr "Gorde pasahitza"
 
-#: ../src/config.py:2967
+#: ../src/config.py:2984
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "\"%s\"  kontua zerbitzarira konektatu da"
 
-#: ../src/config.py:2968
+#: ../src/config.py:2985
 msgid "If you remove it, the connection will be lost."
 msgstr "Hau ezabatzen baduzu, konexioa galdu egingo da."
 
-#: ../src/config.py:2982
+#: ../src/config.py:2999
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Konexioak huts egin du"
 
-#: ../src/config.py:2983
+#: ../src/config.py:3000
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Zer nahi duzu egitea?"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3001
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Ezabatu k_ontua Gajim-etik bakarrik"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3002
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3078
+#: ../src/config.py:3095
 msgid "?print_status:All"
 msgstr "Denak"
 
-#: ../src/config.py:3079
+#: ../src/config.py:3096
 msgid "Enter and leave only"
 msgstr "Sarrerak eta irteerak bakarrik"
 
-#: ../src/config.py:3080
+#: ../src/config.py:3097
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Denak"
 
-#: ../src/config.py:3150
+#: ../src/config.py:3167
 msgid "New Group Chat"
 msgstr "Txat Taldea Berria"
 
-#: ../src/config.py:3183
+#: ../src/config.py:3200
 msgid "This bookmark has invalid data"
 msgstr "Talde agenda honek datu-banku baliogabea du"
 
-#: ../src/config.py:3184
+#: ../src/config.py:3201
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6772,31 +6947,31 @@ msgstr ""
 "talde agenda hau ezabatzeaz"
 
 #. invalid char
-#: ../src/config.py:3302 ../src/dialogs.py:1934
+#: ../src/config.py:3319 ../src/dialogs.py:1950
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Baliogabeko izena"
 
-#: ../src/config.py:3303 ../src/config.py:3317 ../src/config.py:3331
+#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Baimenik gabeko izengoitia: %s"
 
-#: ../src/config.py:3316 ../src/config.py:3582
+#: ../src/config.py:3333 ../src/config.py:3599
 #, fuzzy
 msgid "Invalid server"
 msgstr "Baliogabeko izena"
 
-#: ../src/config.py:3330
+#: ../src/config.py:3347
 #, fuzzy
 msgid "Invalid room"
 msgstr "Sarrera baliogabea"
 
-#: ../src/config.py:3498
+#: ../src/config.py:3515
 msgid "Account has been added successfully"
 msgstr "Kontua egoki sartua izan da"
 
-#: ../src/config.py:3499 ../src/config.py:3505
+#: ../src/config.py:3516 ../src/config.py:3522
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6804,34 +6979,34 @@ msgid ""
 "window."
 msgstr "Kontuko aukera aurreratuak ezarri ditzakezu Aurreratu botoila sakatuz."
 
-#: ../src/config.py:3504
+#: ../src/config.py:3521
 msgid "Your new account has been created successfully"
 msgstr "Zure kontu berria egoki sortua izan da."
 
-#: ../src/config.py:3543
+#: ../src/config.py:3560
 msgid "Invalid username"
 msgstr "Baliogabeko izena"
 
-#: ../src/config.py:3545
+#: ../src/config.py:3562
 msgid "You must provide a username to configure this account."
 msgstr "Izen bat sartu behar duzu kontu bat sortzeko."
 
-#: ../src/config.py:3583
+#: ../src/config.py:3600
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Mesedez zehaztu ezazu erabili nahi duzun izengoiti berria:"
 
-#: ../src/config.py:3639 ../src/gui_interface.py:1904
+#: ../src/config.py:3656 ../src/gui_interface.py:1693
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Kontaktua jadanik badago zerrendan"
 
-#: ../src/config.py:3640 ../src/gui_interface.py:1905
+#: ../src/config.py:3657 ../src/gui_interface.py:1694
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3717
+#: ../src/config.py:3734
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6841,7 +7016,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3723 ../src/gui_interface.py:1932
+#: ../src/config.py:3740 ../src/gui_interface.py:1721
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6849,118 +7024,127 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3755 ../src/config.py:3789
+#: ../src/config.py:3772 ../src/config.py:3806
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Errore bat gertatu da kontua sortzen zen bitartean"
 
-#: ../src/config.py:3854
+#: ../src/config.py:3871
 msgid "Account name is in use"
 msgstr "Kontu izena erabiltzen ari da"
 
-#: ../src/config.py:3855
+#: ../src/config.py:3872
 msgid "You already have an account using this name."
 msgstr "Jadanik baduzu kontu izen hau erabilgarri."
 
-#: ../src/config.py:4009
+#: ../src/config.py:3991
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/config.py:3992
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#: ../src/config.py:4036
 msgid "Active"
 msgstr "Aktibatuta"
 
-#: ../src/config.py:4017
+#: ../src/config.py:4044
 msgid "Event"
 msgstr "Gertaera"
 
-#: ../src/config.py:4052
+#: ../src/config.py:4079
 msgid "First Message Received"
 msgstr "Lehen Mezu Jasoa"
 
-#: ../src/config.py:4053
+#: ../src/config.py:4080
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Jasotako Hurrengo Mezua"
 
-#: ../src/config.py:4055
+#: ../src/config.py:4082
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Jasotako Hurrengo Mezua"
 
-#: ../src/config.py:4056
+#: ../src/config.py:4083
 msgid "Contact Connected"
 msgstr "Kontaktua Konektatuta"
 
-#: ../src/config.py:4057
+#: ../src/config.py:4084
 msgid "Contact Disconnected"
 msgstr "Kontaktua Deskonektatuta"
 
-#: ../src/config.py:4058
+#: ../src/config.py:4085
 msgid "Message Sent"
 msgstr "Mezua Bidaltzean"
 
-#: ../src/config.py:4059
+#: ../src/config.py:4086
 msgid "Group Chat Message Highlight"
 msgstr "Txat Taldeko Mezu Nabarmendua"
 
-#: ../src/config.py:4060
+#: ../src/config.py:4087
 msgid "Group Chat Message Received"
 msgstr "Txat Taldeko Mezua Jasotzean"
 
-#: ../src/config.py:4061
+#: ../src/config.py:4088
 msgid "GMail Email Received"
 msgstr "GMail posta jasoa"
 
-#: ../src/conversation_textview.py:600
+#: ../src/conversation_textview.py:601
 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:619
+#: ../src/conversation_textview.py:620
 #, 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:739
+#: ../src/conversation_textview.py:740
 #, fuzzy
 msgid "_Quote"
 msgstr "At_era"
 
-#: ../src/conversation_textview.py:746
+#: ../src/conversation_textview.py:747
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr " \"%s\" -rako _aukerak"
 
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Read _Wikipedia Article"
 msgstr "Irakurri _Wikipedia Artikuloa"
 
-#: ../src/conversation_textview.py:763
+#: ../src/conversation_textview.py:765
 msgid "Look it up in _Dictionary"
 msgstr "Bila Ezazu _Hiztegian"
 
-#: ../src/conversation_textview.py:780
+#: ../src/conversation_textview.py:782
 #, 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:793
+#: ../src/conversation_textview.py:795
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL bilatzailea ez da aurkizten \"%s\" -an"
 
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 msgid "Web _Search for it"
 msgstr "Web _Bilaketa "
 
-#: ../src/conversation_textview.py:802
+#: ../src/conversation_textview.py:804
 msgid "Open as _Link"
 msgstr "Ireki _lotura bezala"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1296
+#: ../src/conversation_textview.py:1298
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6968,86 +7152,90 @@ msgstr[0] "Atzo"
 msgstr[1] "Atzo"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1344 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Gaia: %s\n"
 
-#: ../src/dataforms_widget.py:544
+#: ../src/dataforms_widget.py:545
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Ez izan da idle modulua kargatu"
 
-#: ../src/dataforms_widget.py:546
+#: ../src/dataforms_widget.py:547
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Gehigarriak ez eskuragarri"
 
-#: ../src/dataforms_widget.py:601
+#: ../src/dataforms_widget.py:562
+msgid "This field is required"
+msgstr ""
+
+#: ../src/dataforms_widget.py:607
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "IM Jabber Bezeroa"
 
-#: ../src/dataforms_widget.py:602
+#: ../src/dataforms_widget.py:608
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:613
+#: ../src/dataforms_widget.py:619
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:616 ../src/dataforms_widget.py:618
+#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktuaren izena: <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:195
 msgid "Group"
 msgstr "Taldea"
 
-#: ../src/dialogs.py:201
+#: ../src/dialogs.py:202
 msgid "In the group"
 msgstr "Taldean"
 
-#: ../src/dialogs.py:292
+#: ../src/dialogs.py:293
 msgid "KeyID"
 msgstr "ID kodea"
 
-#: ../src/dialogs.py:297
+#: ../src/dialogs.py:298
 msgid "Contact name"
 msgstr "Kontaturen izena"
 
-#: ../src/dialogs.py:469
+#: ../src/dialogs.py:470
 #, fuzzy
 msgid "Set Mood"
 msgstr "Ezarri MOTD"
 
-#: ../src/dialogs.py:589
+#: ../src/dialogs.py:590
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Egoera Mezua"
 
-#: ../src/dialogs.py:603
+#: ../src/dialogs.py:604
 msgid "Status Message"
 msgstr "Egoera Mezua"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:794
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Egoera Mezua"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:795
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
@@ -7055,106 +7243,107 @@ msgstr ""
 "Izen hau jadanik zure kontaktu batengatik erabilita dago. Mesedez aukeratu "
 "beste izen bat."
 
-#: ../src/dialogs.py:802
+#: ../src/dialogs.py:803
 msgid "Save as Preset Status Message"
 msgstr "Aurrez Ezarritako Mezua Jarri"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:804
 msgid "Please type a name for this status message"
 msgstr "Mesedez ezarri izen bat egoera mezu honetarako"
 
-#: ../src/dialogs.py:831
+#: ../src/dialogs.py:832
 msgid "AIM Address:"
 msgstr "AIM Hebidea:"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:833
 msgid "GG Number:"
 msgstr "GG zenbakia:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:834
 msgid "ICQ Number:"
 msgstr "ICQ zanbakia:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:835
 msgid "MSN Address:"
 msgstr "MSN Helbidea:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:836
 msgid "Yahoo! Address:"
 msgstr "Yahoo! Helbide:"
 
-#: ../src/dialogs.py:872
+#: ../src/dialogs.py:873
 #, 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:875
+#: ../src/dialogs.py:876
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Mesedez bete sartu nahi duzun kontaktuaren informazioa"
 
-#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
+#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
+#: ../src/dialogs.py:3464
 msgid "Invalid User ID"
 msgstr "Bezero ID Baliogabea"
 
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1052
 msgid "The user ID must not contain a resource."
 msgstr "ID erabiltzaileak ez du baliabiderik eraman behar."
 
-#: ../src/dialogs.py:1051
+#: ../src/dialogs.py:1057
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Nire zerrendara gehitu nahi zaitut."
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1071
 msgid "Contact already in roster"
 msgstr "Kontaktua jadanik badago zerrendan"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1072
 msgid "This contact is already listed in your roster."
 msgstr "Kontaktu hau zure zerrendan dago ezarria jadanik."
 
-#: ../src/dialogs.py:1112
+#: ../src/dialogs.py:1118
 msgid "User ID:"
 msgstr "Erabiltzailearen ID:"
 
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1189
 msgid "A GTK+ jabber client"
 msgstr "GTK+ jabber bezeroa"
 
-#: ../src/dialogs.py:1176
+#: ../src/dialogs.py:1190
 msgid "GTK+ Version:"
 msgstr "GTK+ Bertsioa:"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1191
 msgid "PyGTK Version:"
 msgstr "PyGTK Bertsioa:"
 
-#: ../src/dialogs.py:1187
+#: ../src/dialogs.py:1201
 msgid "Current Developers:"
 msgstr "Egungo diseinatzaileak: "
 
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1203
 msgid "Past Developers:"
 msgstr "Aurre diseinatzaileak: "
 
-#: ../src/dialogs.py:1195
+#: ../src/dialogs.py:1209
 msgid "THANKS:"
 msgstr "ESKERRAK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1215
 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:1213
+#: ../src/dialogs.py:1227
 msgid "translator-credits"
 msgstr "Urtzi Alfaro <urtzi@altza.net>"
 
-#: ../src/dialogs.py:1396
+#: ../src/dialogs.py:1410
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7165,108 +7354,108 @@ msgstr ""
 "%s hiztegia instalatu behar duzu zuzentzailea erabiltzeko, edota beste "
 "hizkuntz bat aukeratu speller_language aukera erabiliz."
 
-#: ../src/dialogs.py:1935 ../src/dialogs.py:2322
+#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr "ID Jabber gelak ez du onartzen karaktererik."
 
-#: ../src/dialogs.py:2053
+#: ../src/dialogs.py:2069
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Harpidetza baimena %s kontutik %s kontura"
 
-#: ../src/dialogs.py:2056
+#: ../src/dialogs.py:2072
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Harpidetza baimena %s kontutik"
 
-#: ../src/dialogs.py:2131 ../src/gui_interface.py:2672
+#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "%s gelan zaude dagoeneko"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2153
 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:2178
+#: ../src/dialogs.py:2194
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Txat Taldera Sartu %s kontuarekin"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2325
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Kontu izen baliogabea"
 
-#: ../src/dialogs.py:2310
+#: ../src/dialogs.py:2326
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr ""
 "Kontu bat sortu behar duzu norbaitekin txateatzeko aukera izan baino lehen."
 
-#: ../src/dialogs.py:2321
+#: ../src/dialogs.py:2337
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Baliogabeko izena"
 
-#: ../src/dialogs.py:2326 ../src/dialogs.py:2332
-#: ../src/groupchat_control.py:1832
+#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
+#: ../src/groupchat_control.py:1847
 msgid "Invalid group chat Jabber ID"
 msgstr "Jabber ID gela baliogabea"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2343
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "ID Jabber gelak ez du onartzen karaktererik."
 
-#: ../src/dialogs.py:2333 ../src/groupchat_control.py:1833
+#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "ID Jabber gelak ez du onartzen karaktererik."
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2356
 msgid "This is not a group chat"
 msgstr "Hau ez da txat talde bat"
 
-#: ../src/dialogs.py:2341
+#: ../src/dialogs.py:2357
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s ez da txat gela baten izena."
 
-#: ../src/dialogs.py:2372
+#: ../src/dialogs.py:2388
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Konexiorik gabe, ezin duzu zure pasahitza aldatu."
 
-#: ../src/dialogs.py:2386
+#: ../src/dialogs.py:2402
 msgid "Server"
 msgstr "Zerbitzaria"
 
-#: ../src/dialogs.py:2421
+#: ../src/dialogs.py:2437
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "\"%s\"  kontua zerbitzarira konektatu da"
 
-#: ../src/dialogs.py:2422
+#: ../src/dialogs.py:2438
 #, 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:2446
+#: ../src/dialogs.py:2462
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2523
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Elkarrizketa Hasi %s kontuarekin"
 
-#: ../src/dialogs.py:2509
+#: ../src/dialogs.py:2525
 msgid "Start Chat"
 msgstr "Elkarrizketa Hasi"
 
-#: ../src/dialogs.py:2510
+#: ../src/dialogs.py:2526
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7275,168 +7464,168 @@ msgstr ""
 "kontaktuaren Jabber ID-a edota izengoitia:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2536 ../src/dialogs.py:2917 ../src/dialogs.py:3129
+#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
 msgid "Connection not available"
 msgstr "Konexioa ez erablgarri"
 
-#: ../src/dialogs.py:2537 ../src/dialogs.py:2918 ../src/dialogs.py:3130
+#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Mesedez begiratu \"%s\" -rekin konektatuta zauden."
 
-#: ../src/dialogs.py:2546 ../src/dialogs.py:2549
+#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
 msgid "Invalid JID"
 msgstr "JID Baliogabea"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2565
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Unable to parse \"%s\"."
 
-#: ../src/dialogs.py:2558
+#: ../src/dialogs.py:2574
 msgid "Without a connection, you can not change your password."
 msgstr "Konexiorik gabe, ezin duzu zure pasahitza aldatu."
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "Invalid password"
 msgstr "Pasahitz baliogabea"
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "You must enter a password."
 msgstr "Pasahitza sartu behar duzu."
 
-#: ../src/dialogs.py:2581
+#: ../src/dialogs.py:2597
 msgid "Passwords do not match"
 msgstr "Pasahitzak desberdinak dira"
 
-#: ../src/dialogs.py:2582
+#: ../src/dialogs.py:2598
 msgid "The passwords typed in both fields must be identical."
 msgstr "Bi lekuetan pasahitza berdina izan behar du."
 
 #. default value
-#: ../src/dialogs.py:2619 ../src/notify.py:247 ../src/notify.py:473
+#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
 msgid "Contact Signed In"
 msgstr "Kontaktua konektatuta"
 
-#: ../src/dialogs.py:2621 ../src/notify.py:255 ../src/notify.py:475
+#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
 msgid "Contact Signed Out"
 msgstr "Kontaktua deskonektatuta"
 
 #. chat message
-#: ../src/dialogs.py:2623 ../src/notify.py:277 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
 msgid "New Message"
 msgstr "Mezu Berria Bat"
 
 #. single message
-#: ../src/dialogs.py:2623 ../src/notify.py:259 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
 msgid "New Single Message"
 msgstr "Mezu Berri Bat"
 
 #. private message
-#: ../src/dialogs.py:2624 ../src/notify.py:265 ../src/notify.py:478
+#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
 msgid "New Private Message"
 msgstr "Mezu Pribatu Berri Bat"
 
-#: ../src/dialogs.py:2624 ../src/gui_interface.py:1358 ../src/notify.py:487
+#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
 msgid "New E-mail"
 msgstr "E-Posta Berria"
 
-#: ../src/dialogs.py:2626 ../src/gui_interface.py:1420 ../src/notify.py:480
+#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
 msgid "File Transfer Request"
 msgstr "Fitxeroa Transferitzeko Baimena"
 
-#: ../src/dialogs.py:2628 ../src/gui_interface.py:1320
-#: ../src/gui_interface.py:1389 ../src/notify.py:482
+#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
+#: ../src/gui_interface.py:1186 ../src/notify.py:482
 msgid "File Transfer Error"
 msgstr "Fitxero Transferitze Errorea"
 
-#: ../src/dialogs.py:2630 ../src/gui_interface.py:1466
-#: ../src/gui_interface.py:1489 ../src/gui_interface.py:1506
+#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
+#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
 #: ../src/notify.py:484
 msgid "File Transfer Completed"
 msgstr "Fitxero Transferitzea Egina"
 
-#: ../src/dialogs.py:2631 ../src/gui_interface.py:1469 ../src/notify.py:485
+#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
 msgid "File Transfer Stopped"
 msgstr "Fitxero Transferentzia Gelditua"
 
-#: ../src/dialogs.py:2633 ../src/gui_interface.py:1152 ../src/notify.py:489
+#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
 msgid "Groupchat Invitation"
 msgstr "Txat Taldeko Gonbidapena"
 
-#: ../src/dialogs.py:2635 ../src/notify.py:239 ../src/notify.py:491
+#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
 msgid "Contact Changed Status"
 msgstr "Kontaktu Egoera Aldaketa"
 
-#: ../src/dialogs.py:2836
+#: ../src/dialogs.py:2852
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Mezu Bakarra %s Kontua erabiliz"
 
-#: ../src/dialogs.py:2838
+#: ../src/dialogs.py:2854
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Mezu Bakarra %s Kontuan"
 
-#: ../src/dialogs.py:2840
+#: ../src/dialogs.py:2856
 msgid "Single Message"
 msgstr "Mezu Bakarra"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2843
+#: ../src/dialogs.py:2859
 #, python-format
 msgid "Send %s"
 msgstr "Bidali %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:2882
 #, python-format
 msgid "Received %s"
 msgstr "Jasoa %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2889
+#: ../src/dialogs.py:2905
 #, 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:2968
+#: ../src/dialogs.py:2984
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:2985
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s idatzia:\n"
 
-#: ../src/dialogs.py:3028
+#: ../src/dialogs.py:3044
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsola %s-rena"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3046
 msgid "XML Console"
 msgstr " XML Konsola"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "add"
 msgstr "Stalled"
 
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "modify"
 msgstr "_Eraldatu"
 
-#: ../src/dialogs.py:3160
+#: ../src/dialogs.py:3176
 #, fuzzy
 msgid "remove"
 msgstr "_Ezabatu"
 
-#: ../src/dialogs.py:3188
+#: ../src/dialogs.py:3204
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7444,159 +7633,192 @@ msgid ""
 msgstr "Nire kontaktu zerrendara nahi zaitut sartu."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3204 ../src/dialogs.py:3250
+#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
 msgid "Add"
 msgstr "Gehitu"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3206 ../src/dialogs.py:3281
+#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
 #, fuzzy
 msgid "Modify"
 msgstr "_Eraldatu"
 
-#: ../src/dialogs.py:3212
+#: ../src/dialogs.py:3228
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:3218
+#: ../src/dialogs.py:3234
 #, fuzzy
 msgid "Groups"
 msgstr "Taldea"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3342
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Nire zerrendara gehitu nahi zaitut."
 
-#: ../src/dialogs.py:3340
+#: ../src/dialogs.py:3356
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "Kontaktua _Sartu"
 
-#: ../src/dialogs.py:3377
+#: ../src/dialogs.py:3393
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Zerrendatik kontaktua ezabatu"
 
-#: ../src/dialogs.py:3430
+#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#, python-format
+msgid "Archiving Preferences for %s"
+msgstr ""
+
+#: ../src/dialogs.py:3473
+#, fuzzy
+msgid "Invalid expire value"
+msgstr "Baliogabeko izena"
+
+#: ../src/dialogs.py:3474
+msgid "Expire must be a valid positive integer."
+msgstr ""
+
+#: ../src/dialogs.py:3521
+msgid "There is an error with the form"
+msgstr ""
+
+#: ../src/dialogs.py:3732
+msgid "There is an error"
+msgstr ""
+
+#: ../src/dialogs.py:3796
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Debekatze Zerrenda <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3434
+#: ../src/dialogs.py:3800
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Debekatze Zerrenda %s-entzat"
 
-#: ../src/dialogs.py:3490
+#: ../src/dialogs.py:3856
 #, 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:3495
+#: ../src/dialogs.py:3861
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Agindu: %s, ekintza: %s"
 
-#: ../src/dialogs.py:3539
+#: ../src/dialogs.py:3905
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Arau bat editatu</b>"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:4016
 msgid "<b>Add a rule</b>"
 msgstr "<b>Ezarri Araua</b>"
 
-#: ../src/dialogs.py:3750
+#: ../src/dialogs.py:4116
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Debekatze Zerrenda %s-entzat"
 
-#: ../src/dialogs.py:3752
+#: ../src/dialogs.py:4118
 msgid "Privacy Lists"
 msgstr "Debekatze Zerrenda"
 
-#: ../src/dialogs.py:3822
+#: ../src/dialogs.py:4188
 msgid "Invalid List Name"
 msgstr "Baliogabeko izen zerrenda"
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4189
 msgid "You must enter a name to create a privacy list."
 msgstr "Izen bat sartu beharra duzu debekatze zerrenda bat egiteko."
 
-#: ../src/dialogs.py:3855
+#: ../src/dialogs.py:4221
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Gela honetan ukatua izan zara."
 
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4224
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "%(contact_jid)s -ek %(room_jid)s gelara gonbidatu zaitu"
 
-#: ../src/dialogs.py:3860
+#: ../src/dialogs.py:4226
 #, 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:3868
+#: ../src/dialogs.py:4234
 #, python-format
 msgid "Comment: %s"
 msgstr "Azalpenak: %s"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4236
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3932
+#: ../src/dialogs.py:4298
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:3942 ../src/dialogs.py:3985 ../src/dialogs.py:4041
+#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
+#: ../src/dialogs.py:4495
 msgid "All files"
 msgstr "Fitxategi guztiak"
 
-#: ../src/dialogs.py:3947
+#: ../src/dialogs.py:4313
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:3975
+#: ../src/dialogs.py:4341
 msgid "Choose Sound"
 msgstr "Aukeratu Soinua"
 
-#: ../src/dialogs.py:3990
+#: ../src/dialogs.py:4356
 msgid "Wav Sounds"
 msgstr "Wav Soinuak"
 
-#: ../src/dialogs.py:4028
+#: ../src/dialogs.py:4394
 msgid "Choose Image"
 msgstr "Aukeratu Irudia"
 
-#: ../src/dialogs.py:4046
+#: ../src/dialogs.py:4412
 msgid "Images"
 msgstr "Irudiak"
 
-#: ../src/dialogs.py:4113
+#: ../src/dialogs.py:4482
+#, fuzzy
+msgid "Choose Archive"
+msgstr "Aukeratu Irudia"
+
+#: ../src/dialogs.py:4500
+#, fuzzy
+msgid "Zip files"
+msgstr "Fitxategi guztiak"
+
+#: ../src/dialogs.py:4525
 #, python-format
 msgid "When %s becomes:"
 msgstr "%s bihurtzen denean:"
 
-#: ../src/dialogs.py:4115
+#: ../src/dialogs.py:4527
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Jakinarazketa Berezia Gehitzen %s-entzat"
 
-#: ../src/dialogs.py:4190
+#: ../src/dialogs.py:4602
 msgid "Condition"
 msgstr "Condition"
 
-#: ../src/dialogs.py:4310
+#: ../src/dialogs.py:4722
 msgid "when I am "
 msgstr "nagoenean"
 
-#: ../src/dialogs.py:4786
+#: ../src/dialogs.py:5198
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7604,38 +7826,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4789
+#: ../src/dialogs.py:5201
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4795 ../src/dialogs.py:4879
+#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4801
+#: ../src/dialogs.py:5213
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4806
+#: ../src/dialogs.py:5218
 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:4809 ../src/dialogs.py:4860 ../src/dialogs.py:4873
+#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4814
+#: ../src/dialogs.py:5226
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4825
+#: ../src/dialogs.py:5237
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4826
+#: ../src/dialogs.py:5238
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7645,44 +7867,44 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4827
+#: ../src/dialogs.py:5239
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4861
+#: ../src/dialogs.py:5273
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4867
+#: ../src/dialogs.py:5279
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4874
+#: ../src/dialogs.py:5286
 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:4880
+#: ../src/dialogs.py:5292
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:4945
+#: ../src/dialogs.py:5357
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4947
+#: ../src/dialogs.py:5359
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4949
+#: ../src/dialogs.py:5361
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4953
+#: ../src/dialogs.py:5365
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7698,24 +7920,24 @@ msgstr "Besteak"
 msgid "Conference"
 msgstr "Solasaldiak"
 
-#: ../src/disco.py:512
+#: ../src/disco.py:513
 msgid "Without a connection, you can not browse available services"
 msgstr "Konektatu gabe ezin duzu zerbitzari erabilgarriak bilatu"
 
-#: ../src/disco.py:589
+#: ../src/disco.py:600
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Zerbitzaria Aurkitua %s kontua erabiliz"
 
-#: ../src/disco.py:591
+#: ../src/disco.py:602
 msgid "Service Discovery"
 msgstr "Zerbitzua Aurkitua"
 
-#: ../src/disco.py:741
+#: ../src/disco.py:758
 msgid "The service could not be found"
 msgstr "Zerbitzua ezin izan da aurkitu"
 
-#: ../src/disco.py:742
+#: ../src/disco.py:759
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7723,97 +7945,97 @@ msgstr ""
 "Ez dago zerbitzurik zuk sartu duzun helbidean edo ez du erantzuten. Begiratu "
 "helbidea eta saiatu berriro."
 
-#: ../src/disco.py:746 ../src/disco.py:1082
+#: ../src/disco.py:763 ../src/disco.py:1100
 msgid "The service is not browsable"
 msgstr "Zerbitzua erabilezina"
 
-#: ../src/disco.py:747
+#: ../src/disco.py:764
 msgid "This type of service does not contain any items to browse."
 msgstr "Zerbitzari honek ez du menurik begiratzeko."
 
-#: ../src/disco.py:786 ../src/disco.py:796
+#: ../src/disco.py:804 ../src/disco.py:814
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Baliogabeko izena"
 
-#: ../src/disco.py:850
+#: ../src/disco.py:868
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Begiratzen %s  %s kontua erabiliz"
 
-#: ../src/disco.py:894
+#: ../src/disco.py:912
 msgid "_Browse"
 msgstr "_Bilatu"
 
-#: ../src/disco.py:1083
+#: ../src/disco.py:1101
 msgid "This service does not contain any items to browse."
 msgstr "Zerbitzari honek ez du begiratzeko menurik."
 
-#: ../src/disco.py:1323
+#: ../src/disco.py:1341
 #, fuzzy
 msgid "_Execute Command"
 msgstr "_Komandoa Exekutatu..."
 
-#: ../src/disco.py:1333 ../src/disco.py:1504
+#: ../src/disco.py:1351 ../src/disco.py:1522
 msgid "Re_gister"
 msgstr "Erre_gistratu"
 
-#: ../src/disco.py:1545
+#: ../src/disco.py:1563
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Eskaneatzen  %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1736
+#: ../src/disco.py:1754
 msgid "Users"
 msgstr "Erabiltzaileak"
 
 #. Description column
-#: ../src/disco.py:1744
+#: ../src/disco.py:1762
 msgid "Description"
 msgstr "Deskribapena"
 
 #. Id column
-#: ../src/disco.py:1752
+#: ../src/disco.py:1770
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1817 ../src/gui_interface.py:3182
+#: ../src/disco.py:1835 ../src/gui_interface.py:2995
 msgid "Bookmark already set"
 msgstr "Talde agenda ezarria"
 
-#: ../src/disco.py:1818 ../src/gui_interface.py:3183
+#: ../src/disco.py:1836 ../src/gui_interface.py:2996
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "\"%s\" gela zure talde agendan dago jadanik."
 
-#: ../src/disco.py:1827 ../src/gui_interface.py:3197
+#: ../src/disco.py:1845 ../src/gui_interface.py:3010
 msgid "Bookmark has been added successfully"
 msgstr "Talde agenda egoki sortu da"
 
-#: ../src/disco.py:1828 ../src/gui_interface.py:3198
+#: ../src/disco.py:1846 ../src/gui_interface.py:3011
 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:2039
+#: ../src/disco.py:2057
 msgid "Subscribed"
 msgstr "Harpidetu"
 
-#: ../src/disco.py:2047
+#: ../src/disco.py:2065
 #, fuzzy
 msgid "Node"
 msgstr "Ezer ez"
 
-#: ../src/disco.py:2111
+#: ../src/disco.py:2129
 msgid "New post"
 msgstr "Mezu berria"
 
-#: ../src/disco.py:2117
+#: ../src/disco.py:2135
 msgid "_Subscribe"
 msgstr "_Harpidetu"
 
-#: ../src/disco.py:2123
+#: ../src/disco.py:2141
 msgid "_Unsubscribe"
 msgstr "Harpidetza ezabat_u"
 
@@ -7989,14 +8211,14 @@ msgstr ""
 
 #: ../src/features_window.py:95
 msgid ""
-"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
-"in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 
 #: ../src/features_window.py:96
 msgid ""
-"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
+"You have to set 'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 
 #: ../src/features_window.py:97
@@ -8155,34 +8377,34 @@ msgstr "Deskribapena: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s fitxero bat bidali nahi dizu:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Ezin izan da gainarazi \"%s\" fitxeroa"
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
 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:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 msgid "This file already exists"
 msgstr "Fitxero hau jadanik badago"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 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:369 ../src/gtkgui_helpers.py:914
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "\"%s\" kokapena ez da idazgarria"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
 msgid "You do not have permission to create files in this directory."
 msgstr "Ez duzu baimenik kokapen honetan fitxerorik sortzeko."
 
@@ -8286,29 +8508,29 @@ msgstr ""
 "Beste Gajim prozesu bat abiarazita dagoela dirudi\n"
 "Abiarazi dena den?"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
 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:80
+#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
 msgid "command"
 msgstr "command"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "show help on command"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Erakutsi edo ezkutatu zerrenda leihoa"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Agertarazi leiho bat hurrengo irakurri gabeko gertaerarekin"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
 #, fuzzy
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
@@ -8317,6 +8539,13 @@ msgstr ""
 "Zerrendan inprimatu kontaktu guztien lista. Kontaktu horiek hainbat lerrotan "
 "agertuko dira."
 
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
+#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
+#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
+#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
 #: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
 #: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
 #: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
@@ -8328,41 +8557,33 @@ msgstr ""
 msgid "account"
 msgstr "kontua"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "Ikusi emandako kontaktuak bakarrik"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Inprimatu erregistratutako kontuen lista"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
 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:109
+#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
 msgid "status"
 msgstr "egoera"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106
 #, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"accoun't previous status"
+msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "hauetako bat: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
-msgid "message"
-msgstr "mezua"
-
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "egoera mezua"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8371,48 +8592,20 @@ msgstr ""
 "\"Sinkronizatu egoera globalarekin\" aukera hautatua duten kontu guztien "
 "egoera aldatzen"
 
-#: ../src/gajim-remote.py:117
-#, fuzzy
-msgid "Changes the priority of account or accounts"
-msgstr "Aldatu kontaktuaren edo kontaktuen egoera"
-
-#: ../src/gajim-remote.py:119
-#, fuzzy
-msgid "priority"
-msgstr "Lehentas_una:"
-
-#: ../src/gajim-remote.py:119
-#, fuzzy
-msgid "priority you want to give to the account"
-msgstr "Kontu berri bat _erregistratu nahi dut"
-
-#: ../src/gajim-remote.py:121
-#, fuzzy
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-msgstr ""
-"\"kontua\" kontuaren egoera aldatu. Ez badago zehaztua, saiatu "
-"\"Sinkronizatu egoera globalarekin\" aukera hautatua duten kontu guztien "
-"egoera aldatzen"
-
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
 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:129
+#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "Txateatu nahi duzun pertsonaren JID-a"
 
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
 #: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 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:134
-msgid "message content. The account must be specified or \"\""
-msgstr ""
-
-#: ../src/gajim-remote.py:139
+#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
 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 "
@@ -8422,29 +8615,34 @@ msgstr ""
 "kontua dira aukerazkoak. `Kontua` bakarrik zehaztu nahi baduzu, `OpenPGP "
 "koderik` gabe, bakarrik `OpenPGP kodea` -entzat zehaztu."
 
+#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
 #: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "Mezua jaso dugun kontuaren JID-a"
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
+#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "mezuaren edukia"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "pgp giltza"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 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:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
+#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "hautatua badago, mezua kontu hau erabiliz bidaliko da"
 
-#: ../src/gajim-remote.py:152
+#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
 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 "
@@ -8454,141 +8652,292 @@ msgstr ""
 "kontua dira aukerazkoak. `Kontua` bakarrik zehaztu nahi baduzu, `OpenPGP "
 "koderik` gabe, bakarrik `OpenPGP kodea` -entzat zehaztu."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "gaia"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "mezuaren gaia"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "Mezua jaso dugun kontuaren JID-a"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Kontaktu baten informazioa lortu"
 
+#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
+#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
 #: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
 #: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "Kontaktuaren JID-a"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Kontaktu baten informazioa lortu"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Kontuaren izena"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Fitxero bat bidali kontaktu bati"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "file"
 msgstr "fitxeroa"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Fitxeroaren tokia"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "Hautatua badago, fitxero hau kontu hau erabiliz bidaliko da"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Erakutsi preferentzia eta balio guztiak"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sets value of 'key' to 'value'."
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "key=value"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 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:207
+#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Preferentziako aukera ezabatu"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
 msgid "key"
 msgstr "giltza"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "preferentziaren izena borratzeko"
 
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
 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:218
-msgid "Removes contact from roster"
-msgstr "Zerrendatik kontaktua ezabatu"
+#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
+msgid "Removes contact from roster"
+msgstr "Zerrendatik kontaktua ezabatu"
+
+#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+msgid "Adds contact to roster"
+msgstr "Zerrendara kontaktua sartu"
+
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+msgid "Adds new contact to this account"
+msgstr "Sartu kontaktu berria kontu honetara"
+
+#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+msgid "Returns current status (the global one unless account is specified)"
+msgstr "Oraingo egoera itzuli (Globala, ez badago kontu bat aukeratuta)"
+
+#: ../src/gajim-remote-plugin.py:226
+#, fuzzy
+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-plugin.py:233 ../src/gajim-remote.py:249
+#, fuzzy
+msgid "Returns number of unread messages"
+msgstr "Irakurri gabeko mezuen kontaketa itzuli"
+
+#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+msgid "Opens 'Start Chat' dialog"
+msgstr "Ireki  'Txat-a Hasi' leiho"
+
+#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+msgid "Starts chat, using this account"
+msgstr "Elkarrizketa hasi, kontu hau rabiliz"
+
+#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+msgid "Sends custom XML"
+msgstr "Sends custom XML"
+
+#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+msgid "XML to send"
+msgstr " XML bidaltzeko"
+
+#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+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-plugin.py:252 ../src/gajim-remote.py:277
+msgid "Handle a xmpp:/ uri"
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
+msgid "uri"
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#, fuzzy
+msgid "Join a MUC room"
+msgstr "_Gela Berri Sartu"
+
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+#, fuzzy
+msgid "room"
+msgstr "-etik"
+
+#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+#, fuzzy
+msgid "nick"
+msgstr "Izengoitia"
+
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+#, fuzzy
+msgid "password"
+msgstr "Pasahitza:"
+
+#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#, fuzzy
+msgid "Check if Gajim is running"
+msgstr "Mesedez begiratu avahi-daemon martxan dagoen."
+
+#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
+#: ../src/gajim-remote.py:300
+#, fuzzy
+msgid "Shows or hides the ipython window"
+msgstr "Erakutsi edo ezkutatu zerrenda leihoa"
+
+#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+msgid "Missing argument \"contact_jid\""
+msgstr "Galdutako argumentua  \"contact_jid\""
+
+#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#, python-format
+msgid ""
+"'%s' is not in your roster.\n"
+"Please specify account for sending the message."
+msgstr ""
+"'%s'  ez dago zure zerrendan.\n"
+"Kontua zehaztu mezua bidaltzeko."
+
+#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+msgid "You have no active account"
+msgstr "Ez duzu aktibatutako konturik"
+
+#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+msgid "It seems Gajim is not running. So you can't use gajim-remote."
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:412
+#, python-format
+msgid ""
+"Usage: %s %s %s \n"
+"\t %s"
+msgstr ""
+"Usage: %s %s %s \n"
+"\t %s"
 
-#: ../src/gajim-remote.py:227
-msgid "Adds contact to roster"
-msgstr "Zerrendara kontaktua sartu"
+#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+msgid "Arguments:"
+msgstr "Argumentuak:"
 
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "jid"
+#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#, python-format
+msgid "%s not found"
+msgstr "%s ez da aurkitu"
 
-#: ../src/gajim-remote.py:230
-msgid "Adds new contact to this account"
-msgstr "Sartu kontaktu berria kontu honetara"
+#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
+#, python-format
+msgid ""
+"Usage: %s command [arguments]\n"
+"Command is one of:\n"
+msgstr ""
+"Usage: %s command [arguments]\n"
+"Command is one of:\n"
 
-#: ../src/gajim-remote.py:235
-msgid "Returns current status (the global one unless account is specified)"
-msgstr "Oraingo egoera itzuli (Globala, ez badago kontu bat aukeratuta)"
+#: ../src/gajim-remote-plugin.py:496
+#, fuzzy, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote-plugin.py:500
+#, fuzzy, python-format
 msgid ""
-"Returns current status message (the global one unless account is specified)"
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
 msgstr ""
-"Oraingo egoera mezua itzuli (Globala aukeratu ez badago kontu bat aukeratuta)"
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
 
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
 #, fuzzy
-msgid "Returns number of unread messages"
-msgstr "Irakurri gabeko mezuen kontaketa itzuli"
+msgid "Wrong uri"
+msgstr "Host okerra"
 
-#: ../src/gajim-remote.py:253
-msgid "Opens 'Start Chat' dialog"
-msgstr "Ireki  'Txat-a Hasi' leiho"
+#: ../src/gajim-remote.py:109
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
+msgstr "hauetako bat: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:255
-msgid "Starts chat, using this account"
-msgstr "Elkarrizketa hasi, kontu hau rabiliz"
+#: ../src/gajim-remote.py:117
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Aldatu kontaktuaren edo kontaktuen egoera"
 
-#: ../src/gajim-remote.py:259
-msgid "Sends custom XML"
-msgstr "Sends custom XML"
+#: ../src/gajim-remote.py:119
+#, fuzzy
+msgid "priority"
+msgstr "Lehentas_una:"
 
-#: ../src/gajim-remote.py:261
-msgid "XML to send"
-msgstr " XML bidaltzeko"
+#: ../src/gajim-remote.py:119
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Kontu berri bat _erregistratu nahi dut"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:121
+#, fuzzy
 msgid ""
-"Account in which the xml will be sent; if not specified, xml will be sent to "
-"all accounts"
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
 msgstr ""
-"Xml-a bidaliko den kontua ez badako zehaztuta, kontu guztietara bidaliko da"
+"\"kontua\" kontuaren egoera aldatu. Ez badago zehaztua, saiatu "
+"\"Sinkronizatu egoera globalarekin\" aukera hautatua duten kontu guztien "
+"egoera aldatzen"
+
+#: ../src/gajim-remote.py:134
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:242
+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:268
 #, fuzzy
@@ -8608,14 +8957,6 @@ msgid ""
 msgstr ""
 "Xml-a bidaliko den kontua ez badako zehaztuta, kontu guztietara bidaliko da"
 
-#: ../src/gajim-remote.py:277
-msgid "Handle a xmpp:/ uri"
-msgstr ""
-
-#: ../src/gajim-remote.py:279
-msgid "uri"
-msgstr ""
-
 #: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr ""
@@ -8629,36 +8970,16 @@ msgstr ""
 msgid "Message content"
 msgstr "mezuaren edukia"
 
-#: ../src/gajim-remote.py:286
-#, fuzzy
-msgid "Join a MUC room"
-msgstr "_Gela Berri Sartu"
-
-#: ../src/gajim-remote.py:288
-#, fuzzy
-msgid "room"
-msgstr "-etik"
-
 #: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "Room JID"
 msgstr "Gela:"
 
-#: ../src/gajim-remote.py:289
-#, fuzzy
-msgid "nick"
-msgstr "Izengoitia"
-
 #: ../src/gajim-remote.py:289
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Izengoitia aurkitugabea: %s"
 
-#: ../src/gajim-remote.py:290
-#, fuzzy
-msgid "password"
-msgstr "Pasahitza:"
-
 #: ../src/gajim-remote.py:290
 #, fuzzy
 msgid "Password to enter the room"
@@ -8668,37 +8989,6 @@ msgstr "Pasahitzak desberdinak dira"
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:296
-#, fuzzy
-msgid "Check if Gajim is running"
-msgstr "Mesedez begiratu avahi-daemon martxan dagoen."
-
-#: ../src/gajim-remote.py:300
-#, fuzzy
-msgid "Shows or hides the ipython window"
-msgstr "Erakutsi edo ezkutatu zerrenda leihoa"
-
-#: ../src/gajim-remote.py:327
-msgid "Missing argument \"contact_jid\""
-msgstr "Galdutako argumentua  \"contact_jid\""
-
-#: ../src/gajim-remote.py:348
-#, python-format
-msgid ""
-"'%s' is not in your roster.\n"
-"Please specify account for sending the message."
-msgstr ""
-"'%s'  ez dago zure zerrendan.\n"
-"Kontua zehaztu mezua bidaltzeko."
-
-#: ../src/gajim-remote.py:351
-msgid "You have no active account"
-msgstr "Ez duzu aktibatutako konturik"
-
-#: ../src/gajim-remote.py:404
-msgid "It seems Gajim is not running. So you can't use gajim-remote."
-msgstr ""
-
 #: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
@@ -8706,24 +8996,6 @@ msgid ""
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:435
-msgid "Arguments:"
-msgstr "Argumentuak:"
-
-#: ../src/gajim-remote.py:439
-#, python-format
-msgid "%s not found"
-msgstr "%s ez da aurkitu"
-
-#: ../src/gajim-remote.py:445
-#, python-format
-msgid ""
-"Usage: %s command [arguments]\n"
-"Command is one of:\n"
-msgstr ""
-"Usage: %s command [arguments]\n"
-"Command is one of:\n"
-
 #: ../src/gajim-remote.py:514
 #, fuzzy, python-format
 msgid ""
@@ -8746,11 +9018,6 @@ msgstr ""
 msgid "No uri given"
 msgstr ""
 
-#: ../src/gajim-remote.py:540
-#, fuzzy
-msgid "Wrong uri"
-msgstr "Host okerra"
-
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Gaia"
@@ -8777,202 +9044,200 @@ msgstr "Ezin duzu zure berezko gaia ezabatu"
 msgid "Please first choose another for your current theme."
 msgstr "Please first choose another for your current theme."
 
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:170
 msgid "Sending private message failed"
 msgstr "Mezu pribatua bidaltzeak huts egin du"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:171
+#: ../src/groupchat_control.py:172
 #, 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:450
+#: ../src/groupchat_control.py:455
 msgid "Insert Nickname"
 msgstr "Sartu Izengoitia"
 
-#: ../src/groupchat_control.py:631
+#: ../src/groupchat_control.py:636
 #, fuzzy
 msgid "Conversation with "
 msgstr "Elkarrizketaren Historiala"
 
-#: ../src/groupchat_control.py:633
+#: ../src/groupchat_control.py:638
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Konektatu"
 
-#. Can be a message (see handle_event_gc_config_change in
-#. gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1272 ../src/gui_interface.py:1080
+#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1286
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1288
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Zure kontu berria egoki sortua izan da."
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1291
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1287
+#: ../src/groupchat_control.py:1297
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s botata izan da%(reason)s -engatik: "
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1300
 #, 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:1300
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s debekatu da %(reason)s -engatik:"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1312
 #, 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:1314 ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
 #, python-format
 msgid "You are now known as %s"
 msgstr "Orain %s bezala ezaguna zara"
 
-#: ../src/groupchat_control.py:1330 ../src/gui_interface.py:919
+#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s orain %s bezala ezaguna da"
 
-#: ../src/groupchat_control.py:1372 ../src/groupchat_control.py:1377
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1392
 #, 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:1374
+#: ../src/groupchat_control.py:1383
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Afizioak: "
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1388
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1394
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1470
+#: ../src/groupchat_control.py:1477
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1474
+#: ../src/groupchat_control.py:1481
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1489
+#: ../src/groupchat_control.py:1496
 #, 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:1493
+#: ../src/groupchat_control.py:1500
 #, 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:1522
+#: ../src/groupchat_control.py:1530
 #, python-format
 msgid "%s has left"
 msgstr "%s deskonektatu da"
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1535
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s gelan sartu da"
 
-#: ../src/groupchat_control.py:1529 ../src/gui_interface.py:946
+#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
 #: ../src/history_window.py:447 ../src/notify.py:234
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s orain dago %(status)s"
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1774
 #, 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:1761
+#: ../src/groupchat_control.py:1776
 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:1765 ../src/gui_interface.py:1216
-#: ../src/gui_interface.py:1992 ../src/gui_interface.py:2029
-#: ../src/gui_interface.py:2064 ../src/message_window.py:224
-#: ../src/roster_window.py:2739 ../src/roster_window.py:3399
-#: ../src/roster_window.py:4123
+#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
+#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
+#: ../src/gui_interface.py:1853 ../src/message_window.py:224
+#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
+#: ../src/roster_window.py:4195
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "E_z galdetu berriro  "
 
-#: ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:1814
 msgid "Changing Subject"
 msgstr "Gaia Aldatu"
 
-#: ../src/groupchat_control.py:1800
+#: ../src/groupchat_control.py:1815
 msgid "Please specify the new subject:"
 msgstr "Gai berria zehaztu:"
 
-#: ../src/groupchat_control.py:1807
+#: ../src/groupchat_control.py:1822
 msgid "Changing Nickname"
 msgstr "Izengoitia Aldatu"
 
-#: ../src/groupchat_control.py:1808
+#: ../src/groupchat_control.py:1823
 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:1839
+#: ../src/groupchat_control.py:1854
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Deskribapena: %s"
 
-#: ../src/groupchat_control.py:1840
+#: ../src/groupchat_control.py:1855
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1842
+#: ../src/groupchat_control.py:1857
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2028
+#: ../src/groupchat_control.py:2046
 #, python-format
 msgid "Kicking %s"
 msgstr "Botatzen %s"
 
-#: ../src/groupchat_control.py:2029 ../src/groupchat_control.py:2356
+#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
 msgid "You may specify a reason below:"
 msgstr "Arrazoia zehaztu behar duzu behean:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2355
+#: ../src/groupchat_control.py:2373
 #, python-format
 msgid "Banning %s"
 msgstr "Debekatzen %s"
@@ -8998,55 +9263,64 @@ msgid "Details"
 msgstr "Zehaztapenak"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
+#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Errorea: ezin da %s ireki irakurtzeko"
 
-#: ../src/gtkgui_helpers.py:400
+#: ../src/gtkgui_helpers.py:404
 msgid "Error reading file:"
 msgstr "Errorea fitxeroa irakurtzean:"
 
-#: ../src/gtkgui_helpers.py:403
+#: ../src/gtkgui_helpers.py:407
 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:444
+#: ../src/gtkgui_helpers.py:448
 #, 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:818
+#: ../src/gtkgui_helpers.py:822
 msgid "Gajim is not the default Jabber client"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:819
+#: ../src/gtkgui_helpers.py:823
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:820
+#: ../src/gtkgui_helpers.py:824
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:887
+#: ../src/gtkgui_helpers.py:891
 msgid "Extension not supported"
 msgstr "Gehigarriak ez eskuragarri"
 
-#: ../src/gtkgui_helpers.py:888
+#: ../src/gtkgui_helpers.py:892
 #, 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:924
+#: ../src/gtkgui_helpers.py:928
 msgid "Save Image as..."
 msgstr "Gorde Irudia Bezala..."
 
-#: ../src/gui_interface.py:140
+#. we are banned
+#. group chat does not exist
+#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
+#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
+#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
+#: ../src/gui_interface.py:348
+msgid "Unable to join group chat"
+msgstr "Ezin da gela honetara sartu"
+
+#: ../src/gui_interface.py:138
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9056,165 +9330,194 @@ msgstr ""
 "Zuk aukeratutako izengoitia erregistratuta dago jadanik.\n"
 "Mesedez ezarri beste izengoiti bat:"
 
-#: ../src/gui_interface.py:143
+#: ../src/gui_interface.py:141
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:159
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Baimen hau onartzen al duzu?"
 
-#: ../src/gui_interface.py:161
+#: ../src/gui_interface.py:160
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Baimen hau onartzen al duzu?"
 
-#: ../src/gui_interface.py:164
+#: ../src/gui_interface.py:163
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) Autorizazioa %s(id: %s)-entzat"
 
-#: ../src/gui_interface.py:213 ../src/notify.py:493
+#: ../src/gui_interface.py:209 ../src/notify.py:493
 msgid "Connection Failed"
 msgstr "Konexioak huts egin du"
 
-#: ../src/gui_interface.py:606 ../src/gui_interface.py:610
+#: ../src/gui_interface.py:312
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Pasahitza behar da gela honetan sartzeko."
+
+#: ../src/gui_interface.py:324
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/gui_interface.py:333
+#, fuzzy, python-format
+msgid "You are banned from group chat %s."
+msgstr "Gela honetan ukatua izan zara."
+
+#: ../src/gui_interface.py:338
+#, fuzzy, python-format
+msgid "Group chat %s does not exist."
+msgstr "Honako gela honek ez du existitzen."
+
+#: ../src/gui_interface.py:341
+msgid "Group chat creation is restricted."
+msgstr "Gela sortzea mugatua dago."
+
+#: ../src/gui_interface.py:344
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Erregistratutako izengoitia erabilia izan behar da."
+
+#: ../src/gui_interface.py:349
+#, fuzzy, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Ez zaude kideen zerrendan."
+
+#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:621 ../src/gui_interface.py:636
+#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "errorea bidaltzen zen bitartean %s ( %s )"
 
-#: ../src/gui_interface.py:663 ../src/notify.py:495
+#: ../src/gui_interface.py:540 ../src/notify.py:495
 #, fuzzy
 msgid "Subscription request"
 msgstr "Harpidetza Eskaria"
 
-#: ../src/gui_interface.py:688
+#: ../src/gui_interface.py:565
 msgid "Authorization accepted"
 msgstr "Autorizazioa baimendua"
 
-#: ../src/gui_interface.py:689
+#: ../src/gui_interface.py:566
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "\"%s\" kontaktuak baimendu dizu bere egoera ikusteko."
 
-#: ../src/gui_interface.py:702
+#: ../src/gui_interface.py:579
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "\"%s\" kontaktuak harpidetza ezabatu dizu"
 
-#: ../src/gui_interface.py:703
+#: ../src/gui_interface.py:580
 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/gui_interface.py:727 ../src/notify.py:497
+#: ../src/gui_interface.py:604 ../src/notify.py:497
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "Harpidetza ezabat_u"
 
-#: ../src/gui_interface.py:754
+#: ../src/gui_interface.py:631
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "\"%s\" ezin izan da kontaktuan jarri"
 
-#: ../src/gui_interface.py:1015
+#: ../src/gui_interface.py:859
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1083
+#: ../src/gui_interface.py:926
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gui_interface.py:1085
+#: ../src/gui_interface.py:928
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gui_interface.py:1087
+#: ../src/gui_interface.py:930
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:1091
+#: ../src/gui_interface.py:934
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1093
+#: ../src/gui_interface.py:936
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1095
+#: ../src/gui_interface.py:938
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1098
+#: ../src/gui_interface.py:941
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1101
+#: ../src/gui_interface.py:944
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1133
-#, fuzzy, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Pasahitza behar da gela honetan sartzeko."
-
-#: ../src/gui_interface.py:1180
+#: ../src/gui_interface.py:985
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gui_interface.py:1182 ../src/gui_interface.py:1189
+#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Zure OpenPGP koderik gabe konektatu zara."
 
-#: ../src/gui_interface.py:1184
+#: ../src/gui_interface.py:989
 msgid "Your passphrase is incorrect"
 msgstr "Zure pasa-esaldia ez da egokia"
 
-#: ../src/gui_interface.py:1188
+#: ../src/gui_interface.py:993
 #, fuzzy
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Zure pasa-esaldia ez da egokia"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid "GPG key not trusted"
 msgstr ""
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
 msgstr ""
 
-#: ../src/gui_interface.py:1226
+#: ../src/gui_interface.py:1031
 msgid ""
 "Gnome Keyring is installed but not                 correctly started "
 "(environment variable probably not                 correctly set)"
 msgstr ""
 
-#: ../src/gui_interface.py:1330
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "E-posta Berria %(gmail_mail_address)s -en"
 
-#: ../src/gui_interface.py:1332
+#: ../src/gui_interface.py:1133
 #, 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/gui_interface.py:1345
+#: ../src/gui_interface.py:1146
 #, python-format
 msgid ""
 "\n"
@@ -9224,104 +9527,104 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1418
+#: ../src/gui_interface.py:1215
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s fitxero bat bidali nahi dizu"
 
-#: ../src/gui_interface.py:1455 ../src/roster_window.py:1856
+#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Zerrendatik kontaktua ezabatu"
 
-#: ../src/gui_interface.py:1458 ../src/roster_window.py:1858
+#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
 #, fuzzy
 msgid "Error opening file"
 msgstr "Errorea fitxeroa irakurtzean:"
 
-#: ../src/gui_interface.py:1490
+#: ../src/gui_interface.py:1287
 #, 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/gui_interface.py:1494
+#: ../src/gui_interface.py:1291
 #, 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/gui_interface.py:1507
+#: ../src/gui_interface.py:1304
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Jadanik bidalia izan da %(filename)s   %(name)s -ri."
 
 #. ft stopped
-#: ../src/gui_interface.py:1511
+#: ../src/gui_interface.py:1308
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Fitxero transferentzia %(filename)s -rena %(name)s -entzat gelditua."
 
-#: ../src/gui_interface.py:1623
+#: ../src/gui_interface.py:1426
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gui_interface.py:1630
+#: ../src/gui_interface.py:1433
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Mezu _guztietan"
 
-#: ../src/gui_interface.py:1702
+#: ../src/gui_interface.py:1505
 msgid "Username Conflict"
 msgstr "Erabiltze izenarekin gatazka"
 
-#: ../src/gui_interface.py:1703
+#: ../src/gui_interface.py:1506
 msgid "Please type a new username for your local account"
 msgstr "Mesedez ezarri erabiltzaile izen berri bat kontu lokalerako"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1519
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gui_interface.py:1729
+#: ../src/gui_interface.py:1532
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gui_interface.py:1740
+#: ../src/gui_interface.py:1543
 msgid "Error."
 msgstr ""
 
-#: ../src/gui_interface.py:1768
+#: ../src/gui_interface.py:1556
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Erabiltze izenarekin gatazka"
 
-#: ../src/gui_interface.py:1769
+#: ../src/gui_interface.py:1557
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1816
+#: ../src/gui_interface.py:1604
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s fitxero bat bidali nahi dizu"
 
-#: ../src/gui_interface.py:1819
+#: ../src/gui_interface.py:1607
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Fitxeroa Transferitzeko Baimena"
 
-#: ../src/gui_interface.py:1927
+#: ../src/gui_interface.py:1716
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1928
+#: ../src/gui_interface.py:1717
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9329,15 +9632,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1936
+#: ../src/gui_interface.py:1725
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1956
+#: ../src/gui_interface.py:1745
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gui_interface.py:1957
+#: ../src/gui_interface.py:1746
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9348,13 +9651,13 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gui_interface.py:1987 ../src/gui_interface.py:2024
-#: ../src/gui_interface.py:2060
+#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
+#: ../src/gui_interface.py:1849
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Konektatu"
 
-#: ../src/gui_interface.py:1988
+#: ../src/gui_interface.py:1777
 #, fuzzy
 msgid ""
 "You are about to connect to the server with an insecure connection. This "
@@ -9362,18 +9665,18 @@ msgid ""
 "want to do that?"
 msgstr "Metakontaktu bat sortuko duzu. Jarraitu nahi al duzu?"
 
-#: ../src/gui_interface.py:1991 ../src/gui_interface.py:2028
-#: ../src/gui_interface.py:2063
+#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
+#: ../src/gui_interface.py:1852
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gui_interface.py:2025
+#: ../src/gui_interface.py:1814
 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/gui_interface.py:2061
+#: ../src/gui_interface.py:1850
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9381,58 +9684,58 @@ msgid ""
 msgstr "Metakontaktu bat sortuko duzu. Jarraitu nahi al duzu?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2624 ../src/gui_interface.py:2647
+#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Enkriptazioa desaktibatuta"
 
-#: ../src/gui_interface.py:2625
+#: ../src/gui_interface.py:2423
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2648
+#: ../src/gui_interface.py:2446
 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/gui_interface.py:2679 ../src/roster_window.py:3560
+#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
 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/gui_interface.py:3058
+#: ../src/gui_interface.py:2871
 msgid "Could not save your settings and preferences"
 msgstr "Ezin izan dira zure aldaketak eta hobespenak gorde"
 
-#: ../src/gui_interface.py:3592
+#: ../src/gui_interface.py:3411
 msgid "Passphrase Required"
 msgstr "Pasa-esaldia Behar da"
 
-#: ../src/gui_interface.py:3593
+#: ../src/gui_interface.py:3412
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Sartu GPG kodearen pasa-esaldia %s konturako."
 
-#: ../src/gui_interface.py:3607
+#: ../src/gui_interface.py:3426
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gui_interface.py:3608
+#: ../src/gui_interface.py:3427
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "%s konektatu behar zara OpenPGP-rik gabe."
 
 #. ask again
-#: ../src/gui_interface.py:3617
+#: ../src/gui_interface.py:3436
 msgid "Wrong Passphrase"
 msgstr "Pasa-esaldi okerra"
 
-#: ../src/gui_interface.py:3618
+#: ../src/gui_interface.py:3437
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Mesedez berridatzi zure GPG pasa-esaldia edo kantzelatu."
 
@@ -9471,6 +9774,11 @@ msgstr "Izengoitia"
 msgid "Message"
 msgstr "Mezua"
 
+#. holds subject
+#: ../src/history_manager.py:188 ../src/history_manager.py:219
+msgid "Subject"
+msgstr "Gaia"
+
 #: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -9570,19 +9878,19 @@ msgstr "Ez zaude zerbitzarira konektatuta"
 msgid "Do you really want to close them all?"
 msgstr "Ziur al zaude hautaturiko mezua ezabatu nahi duzula?"
 
-#: ../src/message_window.py:484
+#: ../src/message_window.py:485
 msgid "Chats"
 msgstr "Txat-ak"
 
-#: ../src/message_window.py:486
+#: ../src/message_window.py:487
 msgid "Group Chats"
 msgstr "Txat Taldeak"
 
-#: ../src/message_window.py:488
+#: ../src/message_window.py:489
 msgid "Private Chats"
 msgstr "Txat Pribatuak"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:495
 msgid "Messages"
 msgstr "Mezuak"
 
@@ -9639,58 +9947,58 @@ msgstr "Mezu Berria %(nickname)s -etik"
 msgid "Ignore"
 msgstr "bederatzi"
 
-#: ../src/profile_window.py:57
+#: ../src/profile_window.py:58
 msgid "Retrieving profile..."
 msgstr "Profila jasotzen..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2935
+#: ../src/profile_window.py:111 ../src/roster_window.py:3001
 #, fuzzy
 msgid "File is empty"
 msgstr "Fitxeroaren tokia"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2938
+#: ../src/profile_window.py:114 ../src/roster_window.py:3004
 #, fuzzy
 msgid "File does not exist"
 msgstr "Honako gela honek ez du existitzen."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2940 ../src/roster_window.py:2951
+#: ../src/profile_window.py:128 ../src/profile_window.py:144
+#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
 msgid "Could not load image"
 msgstr "Ezin izan da irudia kargatu"
 
-#: ../src/profile_window.py:214
+#: ../src/profile_window.py:215
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Kontaktuaren Informazioa"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:216
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Formatua: YYYY-MM-DD"
 
-#: ../src/profile_window.py:269
+#: ../src/profile_window.py:270
 msgid "Information received"
 msgstr "Informazioa jasoa"
 
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:341
 msgid "Without a connection you can not publish your contact information."
 msgstr "Konexiorik gabe ezin duzu zure kontaktuaren informazioa ezarri."
 
-#: ../src/profile_window.py:353
+#: ../src/profile_window.py:354
 msgid "Sending profile..."
 msgstr "Profila bidaltzen..."
 
-#: ../src/profile_window.py:368
+#: ../src/profile_window.py:369
 msgid "Information NOT published"
 msgstr "Informazio EZ argitaratua"
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:376
 msgid "vCard publication failed"
 msgstr "vCard argitarapenak hust egin du"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:377
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9698,51 +10006,51 @@ msgstr ""
 "Errore bat agertu da zure informazio pertsonala argitaratzen zen bitartean, "
 "saiatu berriro beranduago."
 
-#: ../src/roster_window.py:256 ../src/roster_window.py:1012
+#: ../src/roster_window.py:262 ../src/roster_window.py:1026
 msgid "Merged accounts"
 msgstr "Batu kontuak"
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1942
 msgid "Authorization has been sent"
 msgstr "Autorizazioa bidalia izan da"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1943
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Orain \"%s\"-ak jakingo du zure egoera."
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1966
 msgid "Subscription request has been sent"
 msgstr "Harpidetza eskaria bidalia izan da"
 
-#: ../src/roster_window.py:1944
+#: ../src/roster_window.py:1967
 #, 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:1958
+#: ../src/roster_window.py:1981
 msgid "Authorization has been removed"
 msgstr "Autorizazioa ezabatua izan da."
 
-#: ../src/roster_window.py:1959
+#: ../src/roster_window.py:1982
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Orain \"%s\" deskonektatuta ikusiko zaitu beti."
 
-#: ../src/roster_window.py:1986
+#: ../src/roster_window.py:2009
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:1987
+#: ../src/roster_window.py:2010
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "%s konektatu behar zara OpenPGP-rik gabe."
 
-#: ../src/roster_window.py:2199 ../src/roster_window.py:3496
+#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
 msgid "You are participating in one or more group chats"
 msgstr "Txat talde bat baino gehiegotan parte hartzen ari zara."
 
-#: ../src/roster_window.py:2200 ../src/roster_window.py:3497
+#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9750,55 +10058,55 @@ msgstr ""
 "Zure egoera ikusezinera pasatzen baduzu deskonektatu egingo zara txat talde "
 "honetatik. Ziur al zaude ikusezin jarri nahi duzula?"
 
-#: ../src/roster_window.py:2226
+#: ../src/roster_window.py:2249
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2288
+#: ../src/roster_window.py:2311
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2289
+#: ../src/roster_window.py:2312
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Ziur al zaude \"%s\" gelatik atera nahi duzula?"
 
-#: ../src/roster_window.py:2290
+#: ../src/roster_window.py:2313
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2373
+#: ../src/roster_window.py:2396
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Fitxategi transferentzia kantzelatu"
 
-#: ../src/roster_window.py:2374
+#: ../src/roster_window.py:2397
 msgid ""
-"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2405 ../src/roster_window.py:2653
+#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
 msgid "You have unread messages"
 msgstr "Irakurri gabeko mezu bat duzu"
 
-#: ../src/roster_window.py:2406
+#: ../src/roster_window.py:2429
 #, 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:2654
+#: ../src/roster_window.py:2720
 msgid "You must read them before removing this transport."
 msgstr "Irakurri behar dituzu transporte hau ezabatu baino lehen."
 
-#: ../src/roster_window.py:2657
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "\"%s\" transportea ezabatu da"
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2724
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -9807,11 +10115,11 @@ msgstr ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
 
-#: ../src/roster_window.py:2661
+#: ../src/roster_window.py:2727
 msgid "Transports will be removed"
 msgstr "Transporteak ezabatuko dira"
 
-#: ../src/roster_window.py:2666
+#: ../src/roster_window.py:2732
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9820,69 +10128,69 @@ msgstr ""
 "Ezin izango duzu transporte hauetako kontaktuen mezuak jaso ezta bidali ere: "
 "%s"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2800
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Metakontaktu bat sortuko duzu. Jarraitu nahi al duzu?"
 
-#: ../src/roster_window.py:2736
+#: ../src/roster_window.py:2802
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2827
+#: ../src/roster_window.py:2893
 msgid "Rename Contact"
 msgstr "Berridatzi Kontaktua"
 
-#: ../src/roster_window.py:2828
+#: ../src/roster_window.py:2894
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Sartu %s kontaktuarentzat nick berri bat"
 
-#: ../src/roster_window.py:2835
+#: ../src/roster_window.py:2901
 msgid "Rename Group"
 msgstr "Berrrizenpetu Taldea"
 
-#: ../src/roster_window.py:2836
+#: ../src/roster_window.py:2902
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Sartu %s taldearentzat izen berri bat"
 
-#: ../src/roster_window.py:2881
+#: ../src/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Ezabatu Taldea"
 
-#: ../src/roster_window.py:2882
+#: ../src/roster_window.py:2948
 #, 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:2883
+#: ../src/roster_window.py:2949
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Zerrendatik talde honetako kontaktu guztiak ere ezabatu"
 
-#: ../src/roster_window.py:2922
+#: ../src/roster_window.py:2988
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP Kodea Izendatu"
 
-#: ../src/roster_window.py:2923
+#: ../src/roster_window.py:2989
 msgid "Select a key to apply to the contact"
 msgstr "Kode bat aukeratu kontuari ezartzeko"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3372
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "\"%s\" kontaktua ezabatua izango da zure zerrendatik"
 
-#: ../src/roster_window.py:3308
+#: ../src/roster_window.py:3374
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3313
+#: ../src/roster_window.py:3379
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9891,12 +10199,12 @@ msgstr ""
 "deskonektatuta ikusiko zaitu beti."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3319
+#: ../src/roster_window.py:3385
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Zer nahi duzu egitea?"
 
-#: ../src/roster_window.py:3323
+#: ../src/roster_window.py:3389
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9904,16 +10212,16 @@ msgstr ""
 "Kontaktua ezabatuz bere autorizazioa ere borratzen duzu. Beraz,  kontaktuak "
 "deskonektatuta ikusiko zaitu beti."
 
-#: ../src/roster_window.py:3326
+#: ../src/roster_window.py:3392
 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:3330
+#: ../src/roster_window.py:3396
 msgid "Contacts will be removed from your roster"
 msgstr "Kontaktuak ezabatuak izango dira zure zerrendatik"
 
-#: ../src/roster_window.py:3335
+#: ../src/roster_window.py:3401
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9923,33 +10231,33 @@ msgstr ""
 " bere autorizazioa ere ezabatzen duzu. Beraz, kontaktuak deskonektatuta "
 "ikusiko zaitu beti."
 
-#: ../src/roster_window.py:3393
+#: ../src/roster_window.py:3459
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want  to continue?"
 msgstr "Metakontaktu bat sortuko duzu. Jarraitu nahi al duzu?"
 
-#: ../src/roster_window.py:3395
+#: ../src/roster_window.py:3461
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he or she will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3414
+#: ../src/roster_window.py:3480
 msgid "No account available"
 msgstr "Ez dago konturik erabilgarri"
 
-#: ../src/roster_window.py:3415
+#: ../src/roster_window.py:3481
 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:4023
+#: ../src/roster_window.py:4095
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metacontacts storage not supported by your server"
 
-#: ../src/roster_window.py:4025
+#: ../src/roster_window.py:4097
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9958,12 +10266,12 @@ msgstr ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be save on next reconnection."
 
-#: ../src/roster_window.py:4117
+#: ../src/roster_window.py:4189
 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:4119
+#: ../src/roster_window.py:4191
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -9974,24 +10282,24 @@ msgstr ""
 "kontaktuak jabber kontu bat baino gehiago duenean edo transporteetan "
 "harpidetuta dagonean erabiltzen da. "
 
-#: ../src/roster_window.py:4234
+#: ../src/roster_window.py:4306
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Fitxero Baliogabea"
 
-#: ../src/roster_window.py:4246
+#: ../src/roster_window.py:4318
 #, 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:4361
+#: ../src/roster_window.py:4433
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Bidali %s"
 
-#: ../src/roster_window.py:4367
+#: ../src/roster_window.py:4439
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Egin %s eta %s metacontacts"
@@ -10001,151 +10309,151 @@ msgstr "Egin %s eta %s metacontacts"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4816 ../src/roster_window.py:4889
-#: ../src/roster_window.py:4898 ../src/statusicon.py:246
-#: ../src/statusicon.py:293 ../src/statusicon.py:299
+#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
+#: ../src/roster_window.py:4970 ../src/statusicon.py:263
+#: ../src/statusicon.py:310 ../src/statusicon.py:316
 #, python-format
 msgid "using account %s"
 msgstr "%s kontua erabiliz "
 
 #. add
-#: ../src/roster_window.py:4905
+#: ../src/roster_window.py:4977
 #, python-format
 msgid "to %s account"
 msgstr "%s kontura"
 
 #. disco
-#: ../src/roster_window.py:4910
+#: ../src/roster_window.py:4982
 #, python-format
 msgid "using %s account"
 msgstr "%s kontua erabiliz"
 
-#: ../src/roster_window.py:4948 ../src/statusicon.py:309
+#: ../src/roster_window.py:5020 ../src/statusicon.py:326
 msgid "_Manage Bookmarks..."
 msgstr "Talde Agenda _Moldatu..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4968
+#: ../src/roster_window.py:5040
 #, python-format
 msgid "of account %s"
 msgstr "%s kontukoa"
 
-#: ../src/roster_window.py:5009
+#: ../src/roster_window.py:5081
 #, python-format
 msgid "for account %s"
 msgstr "%s konturako"
 
-#: ../src/roster_window.py:5069 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
 msgid "_Change Status Message"
 msgstr "_Egoera Mezua aldatu"
 
-#: ../src/roster_window.py:5102
+#: ../src/roster_window.py:5174
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Argitaratu"
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5176
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Argitaratu"
 
-#: ../src/roster_window.py:5107
+#: ../src/roster_window.py:5179
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Zerbitzuak Aurkitu..."
 
-#: ../src/roster_window.py:5252
+#: ../src/roster_window.py:5324
 msgid "_Maximize All"
 msgstr ""
 
-#: ../src/roster_window.py:5262 ../src/roster_window.py:5436
+#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
 msgid "Send Group M_essage"
 msgstr "_Bidali Taldeari Mezua"
 
-#: ../src/roster_window.py:5270
+#: ../src/roster_window.py:5342
 msgid "To all users"
 msgstr "Kontaktu guztiei"
 
-#: ../src/roster_window.py:5274
+#: ../src/roster_window.py:5346
 msgid "To all online users"
 msgstr "Konektatutako kontaktu guztiei"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5456
+#: ../src/roster_window.py:5528
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Berridatzi Kontaktua"
 
 #. Edit Groups
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5537
 msgid "Edit _Groups"
 msgstr "Editatu _Taldeak"
 
 #. Send single message
-#: ../src/roster_window.py:5520
+#: ../src/roster_window.py:5592
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Bidali Mezu Bakarra"
 
 #. Execute Command
-#: ../src/roster_window.py:5567
+#: ../src/roster_window.py:5639
 msgid "Execute Command..."
 msgstr "Komandoa Exekutatu..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5577
+#: ../src/roster_window.py:5649
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transportea"
 
 #. Modify Transport
-#: ../src/roster_window.py:5586
+#: ../src/roster_window.py:5658
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Trans_porteak Erakutsi"
 
 #. Rename
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5668
 msgid "_Rename"
 msgstr "_Berrrizenpetu"
 
-#: ../src/roster_window.py:5656
+#: ../src/roster_window.py:5728
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5665
+#: ../src/roster_window.py:5737
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Kontaktua Deskonektatuta"
 
-#: ../src/roster_window.py:5672
+#: ../src/roster_window.py:5744
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Kontaktua Deskonektatuta"
 
 #. History manager
-#: ../src/roster_window.py:5754
+#: ../src/roster_window.py:5833
 msgid "History Manager"
 msgstr "Historial Administratzailea"
 
-#: ../src/roster_window.py:5765
+#: ../src/roster_window.py:5844
 msgid "_Join New Group Chat"
 msgstr "T_xat Talde Berrian Sartu"
 
-#: ../src/roster_window.py:5938
+#: ../src/roster_window.py:6019
 msgid "Change Status Message..."
 msgstr "Egoera Mezua Aldatu..."
 
-#: ../src/search_window.py:94
+#: ../src/search_window.py:105
 msgid "Waiting for results"
 msgstr ""
 
-#: ../src/search_window.py:132 ../src/search_window.py:210
+#: ../src/search_window.py:143 ../src/search_window.py:220
 msgid "Error in received dataform"
 msgstr ""
 
 #. No result
-#: ../src/search_window.py:166 ../src/search_window.py:202
+#: ../src/search_window.py:177 ../src/search_window.py:212
 msgid "No result"
 msgstr ""
 
@@ -10158,21 +10466,22 @@ msgstr ""
 msgid "Subject: %s"
 msgstr "Gaia: %s"
 
-#: ../src/session.py:433 ../src/session.py:468
+#: ../src/session.py:447 ../src/session.py:491
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:435
+#: ../src/session.py:448
 #, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
+"The remote client wants '\n"
+"                            'to negotiate an session with these features:\n"
 "\n"
 "%s\n"
 "\n"
 "Are these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:469
+#: ../src/session.py:492
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10182,16 +10491,16 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/statusicon.py:210
+#: ../src/statusicon.py:227
 msgid "_Change Status Message..."
 msgstr "_Egoera Mezua Aldatu..."
 
-#: ../src/statusicon.py:322
+#: ../src/statusicon.py:339
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Ez dago zerrendan"
 
-#: ../src/statusicon.py:333
+#: ../src/statusicon.py:350
 msgid "Hide this menu"
 msgstr "Ezkutatu Menua"
 
@@ -10332,34 +10641,34 @@ msgstr ""
 "Zerbitzu honek ezin izan du erantzun.\n"
 "Seguraski ez du erantzun espero bezala edo ez dabil."
 
-#: ../src/vcard.py:251
+#: ../src/vcard.py:265
 msgid "?Client:Unknown"
 msgstr "Aurkitu gabea"
 
-#: ../src/vcard.py:253
+#: ../src/vcard.py:267
 msgid "?OS:Unknown"
 msgstr "Aurkitu gabea"
 
-#: ../src/vcard.py:274
+#: ../src/vcard.py:288
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "Aurkitu gabea"
 
-#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
+#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
 #, python-format
 msgid "since %s"
 msgstr "noiztik %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:345
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:349
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Aplikazioak</b>"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:357
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10367,7 +10676,7 @@ msgstr ""
 "Kontu hau zure egoera informazioan interesatuta dago , baina zu ez zaude "
 "haren egoera informazioan interesatuta"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:359
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10375,33 +10684,70 @@ msgstr ""
 "Kontaktuaren egoera informazioan interesatuta zaude, baina berak ez du zugan "
 "interesik"
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:361
 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:349
+#: ../src/vcard.py:363
 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:356
+#: ../src/vcard.py:370
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Zure harpidetza eskariaren erantzunaren zain zaude kontaktuaren aldetik"
 
-#: ../src/vcard.py:358
+#: ../src/vcard.py:372
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
+#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
 msgid " resource with priority "
 msgstr "baliabidea lehentasunarekin: "
 
-#~ msgid "_Available"
-#~ msgstr "_Libre"
+#~ msgid "_Disable showing event in systray"
+#~ msgstr "_Ezindu gertaerak systray-en ikustea"
+
+#~ msgid "_Show event in systray"
+#~ msgstr "Iku_si gertaerak systray-ean"
+
+#, fuzzy
+#~ msgid "Autodetect on every Gajim startup"
+#~ msgstr "K_onektatu Gajim irikitzean"
+
+#, fuzzy
+#~ msgid "Show systray:"
+#~ msgstr "Iku_si gertaerak systray-ean"
+
+#~ msgid "Nickname not allowed: %s"
+#~ msgstr "Baimenik gabeko izengoitia: %s"
+
+#, fuzzy
+#~ msgid "Room has been destroyed"
+#~ msgstr "Autorizazioa ezabatua izan da."
+
+#~ msgid "I would like to add you to my roster."
+#~ msgstr "Nire zerrendara gehitu nahi zaitut."
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "%s -ra harpidetuak gaude orain"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "Harpidetza kentzekoa eskaera %s -tik"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "%s -ren harpidetzatik kenduta gaude"
+
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
 
 #~ msgid "Account Modification"
 #~ msgstr "Kontu Eraldaketa"
@@ -10496,34 +10842,6 @@ msgstr "baliabidea lehentasunarekin: "
 #~ msgid "gtk-delete"
 #~ msgstr "Ezabatu"
 
-#, fuzzy
-#~ msgid "Add this contact to roster (Ctrl+D)"
-#~ msgstr "Zerrendara kontaktua sartu"
-
-#, fuzzy
-#~ msgid "Bookmark this room (Ctrl+B)"
-#~ msgstr "_Talde Agendan Sartu Gela hau"
-
-#, fuzzy
-#~ msgid "Change your nickname (Ctrl+N)"
-#~ msgstr "Aldatu _Izengoitia"
-
-#, fuzzy
-#~ msgid "Invite contacts to the conversation (Ctrl+G)"
-#~ msgstr "arreta jartzen ari da elkarrizketara"
-
-#, fuzzy
-#~ msgid "Show a list of emoticons (Alt+M)"
-#~ msgstr "Sakatu emoticon bat ezartzeko (Alt+M)"
-
-#, fuzzy
-#~ msgid "Show a list of formattings"
-#~ msgstr "Sakatu emoticon bat ezartzeko (Alt+M)"
-
-#, fuzzy
-#~ msgid "Show a menu of advanced functions (Alt+D)"
-#~ msgstr "Sakatu emoticon bat ezartzeko (Alt+M)"
-
 #~ msgid ""
 #~ "All chat states\n"
 #~ "Composing only\n"
@@ -10562,9 +10880,6 @@ msgstr "baliabidea lehentasunarekin: "
 #~ msgid "gtk-cancel"
 #~ msgstr "Ezabatu"
 
-#~ msgid "_Preferences"
-#~ msgstr "_Hobespenak"
-
 #~ msgid "_Quit"
 #~ msgstr "At_era"
 
@@ -10979,9 +11294,6 @@ msgstr "baliabidea lehentasunarekin: "
 #~ msgid "The auto not available status message"
 #~ msgstr "Automatikoki ez erabilgarriko egoera mezua"
 
-#~ msgid "Use t_rayicon (aka. notification area icon)"
-#~ msgstr "E_rabili ikonifikazioa (aka. notification area)"
-
 #~ msgid ""
 #~ "When a new event (message, file transfer request etc..) is received, the "
 #~ "following methods may be used to inform you about it. Please note that "
@@ -11110,13 +11422,6 @@ msgstr "baliabidea lehentasunarekin: "
 #~ msgid "Session Management support not available (missing gnome.ui module)"
 #~ msgstr "Session Management support not available (missing gnome.ui module)"
 
-#~ msgid ""
-#~ "Usage: %s %s %s \n"
-#~ "\t %s"
-#~ msgstr ""
-#~ "Usage: %s %s %s \n"
-#~ "\t %s"
-
 #~ msgid "Private Chat"
 #~ msgstr "Txat Pribatua"
 
diff --git a/po/fr.po b/po/fr.po
index 009f8905ae4150d6b2ecb7da92709f0b9b5819f7..88e9e3da8183f7dbb8a96e056c18f70813de4276 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,11 +4,15 @@
 #
 # See: http://live.gnome.org/GnomeFr/Traduire for translation guidelines
 #
+#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.12 svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 11:28+0200\n"
+"POT-Creation-Date: 2010-10-01 20:39+0200\n"
 "PO-Revision-Date: 2009-11-15 15:50+0100\n"
 "Last-Translator: Florent Le Coz <louizatakk@fedoraproject.org>\n"
 "Language-Team: <>\n"
@@ -31,7 +35,7 @@ msgstr "_Rejoindre un _salon de discussion..."
 msgid "_Add Contact..."
 msgstr "_Ajouter un contact..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:17
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
 msgid "_Discover Services"
 msgstr "_Découvrir les services"
 
@@ -51,7 +55,7 @@ msgstr "_Accéder au compte Gmail"
 msgid "_Personal Events"
 msgstr "Évènements P_ersonnels"
 
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:23
+#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
 msgid "_Start Chat..."
 msgstr "Commencer une _discussion..."
 
@@ -83,10 +87,6 @@ msgid "<b>Please select a server</b>"
 msgstr "<b>Veuillez choisir un serveur</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid "@"
-msgstr "@"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
@@ -94,65 +94,65 @@ msgstr ""
 "Ajouter ce certificat à la liste des certificats de confiance.\n"
 "Empreinte digitale SHA1 du certificat :\n"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:10
 msgid "Anon_ymous authentication"
 msgstr "Authentification anon_yme"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Connect when I press Finish"
 msgstr "Se connecter quand je clique sur Finir"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim : Assistant de création de compte"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "I already have an account I want to _use"
 msgstr "J'ai déjà un compte que je veux _utiliser"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I want to _register for a new account"
 msgstr "Je veux _créer un nouveau compte"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:16
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 #: ../data/gui/accounts_window.ui.h:28
 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/gui/account_creation_wizard_window.ui.h:17
+#: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Gérer..."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:18
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
 #: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2263 ../src/config.py:2342
-#: ../src/config.py:2355 ../src/config.py:3596 ../src/config.py:3671
-#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513
-#: ../src/dialogs.py:526 ../src/roster_window.py:2890
-#: ../src/roster_window.py:2896 ../src/roster_window.py:2901
+#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
+#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
+#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
+#: ../src/dialogs.py:527 ../src/roster_window.py:2956
+#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
 msgid "None"
 msgstr "Aucun"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:19
+#: ../data/gui/account_creation_wizard_window.ui.h:18
 msgid "Prox_y:"
 msgstr "Prox_y :"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #: ../data/gui/accounts_window.ui.h:48
 msgid "Save pass_word"
 msgstr "Sauver le mot de _passe"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:21
+#: ../data/gui/account_creation_wizard_window.ui.h:20
 msgid "Set my profile when I connect"
 msgstr "Définir mon profil quand je me connecte"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:22
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Use custom hostname/port"
 msgstr "Utiliser un nom d'hôte/port personnalisé"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:23
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -160,34 +160,34 @@ msgstr ""
 "Vous devez avoir un compte pour vous connecter\n"
 "au réseau Jabber."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-#: ../data/gui/roster_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:16
 msgid "_Advanced"
 msgstr "_Avancées"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:25
 msgid "_Finish"
 msgstr "_Finir"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:27
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Hostname:"
 msgstr "Nom d'_Hôte :"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #: ../data/gui/accounts_window.ui.h:62
 msgid "_Jabber ID:"
 msgstr "Identifiant _Jabber : "
 
-#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:28
 #: ../data/gui/accounts_window.ui.h:64
 msgid "_Password:"
 msgstr "Mot de _passe : "
 
-#: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:29
 msgid "_Port:"
 msgstr "_Port :"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:31
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Server:"
 msgstr "_Serveur :"
 
@@ -296,17 +296,17 @@ msgstr "Prénom :"
 #. No configured account
 #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
 #: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592
-#: ../src/notify.py:608
+#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
+#: ../src/notify.py:616
 msgid "Gajim"
 msgstr "Gajim"
 
 #. FIXME: Ugly workaround.
 #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
 #. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:61
-#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121
-#: ../src/roster_window.py:2832 ../src/roster_window.py:5379
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
+#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
 msgid "General"
 msgstr "Général"
 
@@ -367,7 +367,7 @@ msgstr "Les informations vous concernant, stockées sur le serveur"
 
 #: ../data/gui/accounts_window.ui.h:35
 #: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:830
+#: ../src/dialogs.py:831
 msgid "Jabber ID:"
 msgstr "Identifiant Jabber :"
 
@@ -381,7 +381,7 @@ msgid "Mer_ge accounts"
 msgstr "_Regrouper les comptes"
 
 #: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2356
+#: ../src/config.py:2358
 msgid "No key selected"
 msgstr "Pas de clé sélectionnée"
 
@@ -408,7 +408,7 @@ msgid "Priority will change automatically according to your status."
 msgstr "La priorité va changer automatiquement selon votre état."
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5329
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
 msgid "Re_name"
 msgstr "Re_nommer"
 
@@ -635,38 +635,43 @@ msgid "Deletes Message of the Day"
 msgstr "Supprime le message du jour"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
+#, fuzzy
+msgid "Edit Archi_ving Preferences"
+msgstr "_Préférences"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Edit _Privacy Lists..."
 msgstr "Éditer les Listes _privées..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sends a message to users currently connected to this server"
 msgstr "Envoie un message aux utilisateurs actuellement connectés à ce serveur"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Set MOTD..."
 msgstr "Définir MOTD..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Mets un message du jour"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Show _XML Console"
 msgstr "Montrer la console _XML"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "Update MOTD..."
 msgstr "Mettre à jour MOTD..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "Mets à jour le message du jour"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:11
 msgid "_Administrator"
 msgstr "_Administrateur"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:11
+#: ../data/gui/advanced_menuitem_menu.ui.h:12
 msgid "_Send Server Message..."
 msgstr "_Envoyer un message au serveur..."
 
@@ -700,7 +705,7 @@ msgid "All statuses"
 msgstr "Tous les états"
 
 #: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:233
+#: ../src/common/commands.py:106 ../src/common/helpers.py:239
 #: ../src/tooltips.py:193
 msgid "Away"
 msgstr "Absent(e)"
@@ -751,7 +756,7 @@ msgid "Have "
 msgstr "Ai"
 
 #: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:249
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -760,7 +765,7 @@ msgid "Launch a command"
 msgstr "Lancer une commande"
 
 #: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:216 ../src/tooltips.py:197
+#: ../src/common/helpers.py:222 ../src/tooltips.py:197
 msgid "Not Available"
 msgstr "Non disponible"
 
@@ -805,12 +810,13 @@ msgid "_Disable existing sound for this event"
 msgstr "_Désactiver le son existant pour cet événement"
 
 #: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in roster"
+#, fuzzy
+msgid "_Disable showing event in notification area"
 msgstr "_Désactiver l'affichage des événements dans la liste de contacts"
 
 #: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in systray"
-msgstr "_Désactiver l'affichage des événements dans la zone de notification."
+msgid "_Disable showing event in roster"
+msgstr "_Désactiver l'affichage des événements dans la liste de contacts"
 
 #: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
@@ -821,12 +827,13 @@ msgid "_Open chat window with user"
 msgstr "_Ouvrir une fenêtre de conversation"
 
 #: ../data/gui/advanced_notifications_window.ui.h:35
-msgid "_Show event in roster"
+#, fuzzy
+msgid "_Show event in notification area"
 msgstr "Ne le montrer que dans la _liste"
 
 #: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in systray"
-msgstr "L'afficher dans la zone de notifications"
+msgid "_Show event in roster"
+msgstr "Ne le montrer que dans la _liste"
 
 #: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
@@ -854,6 +861,45 @@ msgstr "Groupes"
 msgid "when I'm in"
 msgstr "lorsque je suis là"
 
+#: ../data/gui/archiving_preferences_window.ui.h:1
+msgid "<i>Method Auto</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "<i>Method Local</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:3
+msgid "<i>Method Manual</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:4
+#, fuzzy
+msgid "Auto"
+msgstr "Rejoindre automatiquement"
+
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Concede"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "Forbid"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:7
+#, fuzzy
+msgid "No"
+msgstr "Aucun"
+
+#: ../data/gui/archiving_preferences_window.ui.h:8
+#, fuzzy
+msgid "Prefer"
+msgstr "Préférences"
+
+#: ../data/gui/archiving_preferences_window.ui.h:9
+msgid "Yes"
+msgstr ""
+
 #: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Article :"
@@ -880,8 +926,8 @@ msgstr "Contacts Bloqués"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5348
-#: ../src/roster_window.py:5476 ../src/roster_window.py:5609
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
+#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
 msgid "_Unblock"
 msgstr "_Débloquer"
 
@@ -969,7 +1015,7 @@ msgid "_Start Chat"
 msgstr "Commencer une _discussion"
 
 #. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4184
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
 msgid "#"
 msgstr "#"
 
@@ -1017,13 +1063,49 @@ msgstr "8"
 msgid "9"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:13
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Ajouter le contact à la liste de contacts (Ctrl+D)"
+
 #: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Parcourir l'historique des conversations (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:15
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Inviter des contacts dans la conversation (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Afficher une liste des émoticônes (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
+msgid "Show a list of formattings"
+msgstr "Afficher une liste de styles"
+
+#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Affiche un menu de fonctions avancées (Alt+A)"
+
+#: ../data/gui/chat_control.ui.h:19
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr "Afficher le profil du contact (Ctrl+I)"
+
+#: ../data/gui/chat_control.ui.h:20
+msgid "Toggle audio session"
+msgstr "Démarrer/arrêter une session audio"
+
+#: ../data/gui/chat_control.ui.h:21
+msgid "Toggle video session"
+msgstr "Démarrer/arrêter une session vidéo"
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
 #: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "En_voyer"
 
-#: ../data/gui/chat_control.ui.h:15 ../data/gui/groupchat_control.ui.h:3
+#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
 msgid "label"
 msgstr ""
 
@@ -1073,8 +1155,8 @@ msgstr "Éditer les _groupes..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5284
-#: ../src/roster_window.py:5444
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
+#: ../src/roster_window.py:5516
 msgid "In_vite to"
 msgstr "In_viter à"
 
@@ -1086,8 +1168,8 @@ msgstr "Inviter des _Contacts"
 msgid "Remo_ve"
 msgstr "Suppri_mer"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5294
-#: ../src/roster_window.py:5533
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
+#: ../src/roster_window.py:5605
 msgid "Send Cus_tom Status"
 msgstr "Envoyer un Statut Personnalisé"
 
@@ -1120,8 +1202,8 @@ msgid "_Allow him/her to see my status"
 msgstr "L'autoriser à voir mon état"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5482 ../src/roster_window.py:5612
+#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
+#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
 msgid "_Block"
 msgstr "_Bloquer"
 
@@ -1131,8 +1213,8 @@ msgstr "Interdire de voir mon état"
 
 #: ../data/gui/contact_context_menu.ui.h:20
 #: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:21
-#: ../src/roster_window.py:5683
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
+#: ../src/roster_window.py:5755
 msgid "_History"
 msgstr "_Historique"
 
@@ -1269,7 +1351,7 @@ msgstr "<b>Couleurs des Onglets</b>"
 msgid "Account row"
 msgstr "Compte"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:925
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
 msgid "Bold"
 msgstr "Gras"
 
@@ -1307,7 +1389,7 @@ msgstr "Groupe"
 msgid "Inactive"
 msgstr "Inactif"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:926
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
 msgid "Italic"
 msgstr "Italique"
 
@@ -1356,7 +1438,7 @@ msgstr "Changer le _Sujet..."
 msgid "Configure _Room..."
 msgstr "Configurer le _Salon..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1782
+#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
 msgid "_Bookmark"
 msgstr "_Marque-pages"
 
@@ -1416,19 +1498,31 @@ msgstr "_Envoyer un message privé"
 msgid "_Voice"
 msgstr "_S'exprimer"
 
+#: ../data/gui/groupchat_control.ui.h:1
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Enregistrer ce salon dans les marque-pages (Ctrl+B)"
+
+#: ../data/gui/groupchat_control.ui.h:3
+msgid "Change the room's subject (Alt+T)"
+msgstr "Changer le sujet du salon (Alt+T)"
+
+#: ../data/gui/groupchat_control.ui.h:4
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Changer votre surnom (Ctrl+N)"
+
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Rédiger un article"
 
-#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
-msgid "From"
-msgstr "De"
+#: ../data/gui/groups_post_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:2
+msgid "From:"
+msgstr "De :"
 
-#. holds subject
-#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
-#: ../src/history_manager.py:219
-msgid "Subject"
-msgstr "Sujet"
+#: ../data/gui/groups_post_window.ui.h:3
+#: ../data/gui/single_message_window.ui.h:7
+msgid "Subject:"
+msgstr "Sujet :"
 
 #: ../data/gui/history_manager.ui.h:1
 msgid ""
@@ -1446,8 +1540,8 @@ msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Bienvenue dans le Gestionnaire d'Archives Gajim</b></big>"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3208
-#: ../src/dialogs.py:3305
+#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
+#: ../src/dialogs.py:3321
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -1507,12 +1601,75 @@ msgstr "Chercher :"
 msgid "_Log conversation history"
 msgstr "_Historique de conversation"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
+msgid "approve"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:2
+msgid "body"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:3
+msgid "concede"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:4
+msgid "expire"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:5
+msgid "false"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:6
+msgid "forbid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:7
+#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+msgid "jid"
+msgstr "identifiant Jabber"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:8
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
+#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
+msgid "message"
+msgstr "message"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
+msgid "oppose"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
+#, fuzzy
+msgid "otr"
+msgstr "Bouillant(e)"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:11
+msgid "prefer"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:12
+msgid "require"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:13
+msgid "save"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:14
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
 msgid "Bro_wse Rooms"
 msgstr "_Parcourir"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2180
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
 msgid "Join Group Chat"
 msgstr "Rejoindre un salon de discussion"
 
@@ -1550,8 +1707,8 @@ msgstr "Serveur :"
 msgid "_Bookmark this room"
 msgstr "Enregistrer ce salon dans les marque-pages"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1341
-#: ../src/disco.py:1786
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../src/disco.py:1804
 msgid "_Join"
 msgstr "Re_joindre"
 
@@ -1655,6 +1812,75 @@ msgstr "_Nom :"
 msgid "Passphrase"
 msgstr "Mot de passe"
 
+#: ../data/gui/plugins_window.ui.h:1
+msgid "&lt;empty&gt;"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:2
+msgid "<empty>"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:3
+#, fuzzy
+msgid "Authors:"
+msgstr "Au_toriser"
+
+#: ../data/gui/plugins_window.ui.h:4
+#, fuzzy
+msgid "Available"
+msgstr "_Disponible"
+
+#: ../data/gui/plugins_window.ui.h:5
+#, fuzzy
+msgid "Configure"
+msgstr "_Configurer"
+
+#: ../data/gui/plugins_window.ui.h:6
+#, fuzzy
+msgid "Descrition:"
+msgstr "Description :"
+
+#: ../data/gui/plugins_window.ui.h:7
+#, fuzzy
+msgid "Homepage:"
+msgstr "<b>Site perso :</b>"
+
+#: ../data/gui/plugins_window.ui.h:8
+msgid "Install"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:9
+#, fuzzy
+msgid "Installed"
+msgstr "Calé"
+
+#: ../data/gui/plugins_window.ui.h:10
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:11
+msgid "Plugins"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:12
+msgid "Uninstall"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:13
+#, fuzzy
+msgid "Version:"
+msgstr "Version de GTK+ :"
+
+#: ../data/gui/plugins_window.ui.h:14
+msgid "button"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:15
+msgid "homepage url"
+msgstr ""
+
 #: ../data/gui/popup_notification_window.ui.h:1
 #, fuzzy
 msgid "Event Type"
@@ -1783,121 +2009,101 @@ msgid "Always"
 msgstr "Absent(e)"
 
 #: ../data/gui/preferences_window.ui.h:31
-#, fuzzy
-msgid "Always use GNOME default applications"
-msgstr "Toujours utiliser les applications OS/X par défaut."
-
-#: ../data/gui/preferences_window.ui.h:32
-#, fuzzy
-msgid "Always use KDE default applications"
-msgstr "Toujours utiliser les applications OS/X par défaut."
-
-#: ../data/gui/preferences_window.ui.h:33
-#, fuzzy
-msgid "Always use Xfce default applications"
-msgstr "Toujours utiliser les applications OS/X par défaut."
-
-#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Demander le message d'état lorsque je me : "
 
-#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
 msgid "Audio / Video"
 msgstr "Audio / Vidéo"
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:33
 msgid "Audio input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Audio output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:38
-#, fuzzy
-msgid "Autodetect on every Gajim startup"
-msgstr "C_onnexion au démarrage"
-
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:35
 msgid "Chat message:"
 msgstr "Message de conversation :"
 
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:36
 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/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:37
 #, fuzzy
 msgid "Composing only"
 msgstr "En train d'écrire"
 
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:38
 msgid "Configure color and font of the interface"
 msgstr "Paramétrer la couleur et la police de texte de l'interface"
 
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:39
 msgid "Contact's message:"
 msgstr "Le message du contact :"
 
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:40
 msgid "Contact's nickname:"
 msgstr "Le pseudo du contact :"
 
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:41
 msgid "Custom"
 msgstr "Personnalisé"
 
-#: ../data/gui/preferences_window.ui.h:46
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Detached roster with chat grouped by account"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Detached roster with detached chats"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:45
 msgid "Detached roster with single chat"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
-#: ../src/config.py:671
+#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
+#: ../src/config.py:665
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:47
 msgid "Display _activity of contacts in roster"
 msgstr "Afficher l'_activité des contacts dans la liste des contacts"
 
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:48
 msgid "Display _extra email details"
 msgstr "Afficher des informations détaillées de courriels"
 
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:49
 #, fuzzy
 msgid "Display _location of contacts in roster"
 msgstr "Afficher l'humeur des contacts dans la liste des contacts"
 
-#: ../data/gui/preferences_window.ui.h:54
+#: ../data/gui/preferences_window.ui.h:50
 msgid "Display _tunes of contacts in roster"
 msgstr "Afficher ce que mes contacts écoutent"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display a_vatars of contacts in roster"
 msgstr "Afficher l'a_vatar des contacts dans la liste des contacts"
 
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display m_ood of contacts in roster"
 msgstr "Afficher l'humeur des contacts dans la liste des contacts"
 
-#: ../data/gui/preferences_window.ui.h:57
+#: ../data/gui/preferences_window.ui.h:53
 msgid "Display status _messages of contacts in roster"
 msgstr "Afficher les _messages d'état des contacts dans la liste des contacts"
 
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:54
 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 "
@@ -1907,7 +2113,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/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:55
 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 "
@@ -1917,7 +2123,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/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:56
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1925,11 +2131,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/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:58
 msgid "Hide all buttons in chat windows"
 msgstr "Cacher tous les boutons dans les fenêtres de conversations"
 
-#: ../data/gui/preferences_window.ui.h:63
+#: ../data/gui/preferences_window.ui.h:59
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1937,7 +2143,7 @@ msgstr ""
 "Si cette case est cochée, Gajim autorisera les autres à détecter le système "
 "d'exploitation que vous utilisez"
 
-#: ../data/gui/preferences_window.ui.h:64
+#: ../data/gui/preferences_window.ui.h:60
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1945,14 +2151,14 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera également des informations à "
 "propos de l'expéditeur des nouveaux courriels"
 
-#: ../data/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:61
 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/gui/preferences_window.ui.h:66
+#: ../data/gui/preferences_window.ui.h:62
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1960,7 +2166,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/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1968,7 +2174,7 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
 "fenêtre principale et les salons"
 
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1976,14 +2182,14 @@ 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/gui/preferences_window.ui.h:69
+#: ../data/gui/preferences_window.ui.h:65
 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/gui/preferences_window.ui.h:70
+#: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the location of contacts in the roster window"
@@ -1991,21 +2197,21 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera l'humeur de chaque contact dans "
 "votre roster"
 
-#: ../data/gui/preferences_window.ui.h:71
+#: ../data/gui/preferences_window.ui.h:67
 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/gui/preferences_window.ui.h:72
+#: ../data/gui/preferences_window.ui.h:68
 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/gui/preferences_window.ui.h:73
+#: ../data/gui/preferences_window.ui.h:69
 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 "
@@ -2016,7 +2222,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/gui/preferences_window.ui.h:74
+#: ../data/gui/preferences_window.ui.h:70
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -2026,7 +2232,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/gui/preferences_window.ui.h:75
+#: ../data/gui/preferences_window.ui.h:71
 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 "
@@ -2036,7 +2242,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/gui/preferences_window.ui.h:76
+#: ../data/gui/preferences_window.ui.h:72
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -2044,7 +2250,7 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera une notification quand un nouveau "
 "courriel GMail est reçu"
 
-#: ../data/gui/preferences_window.ui.h:77
+#: ../data/gui/preferences_window.ui.h:73
 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, "
@@ -2054,7 +2260,7 @@ msgstr ""
 "protocoles. (Par ex. un contact MSN aura les icônes de MSN pour les états "
 "disponible, absent(e), occupé(e), etc.)"
 
-#: ../data/gui/preferences_window.ui.h:78
+#: ../data/gui/preferences_window.ui.h:74
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -2062,7 +2268,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/gui/preferences_window.ui.h:79
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2070,45 +2276,45 @@ 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/gui/preferences_window.ui.h:80
+#: ../data/gui/preferences_window.ui.h:76
 msgid "Log _encrypted chat session"
 msgstr "Archiver les conversations _chiffrées"
 
-#: ../data/gui/preferences_window.ui.h:81
+#: ../data/gui/preferences_window.ui.h:77
 msgid "Ma_ke message windows compact"
 msgstr "Rendre les fenêtres de conversation _compactes"
 
-#: ../data/gui/preferences_window.ui.h:82
+#: ../data/gui/preferences_window.ui.h:78
 msgid "Ma_nage..."
 msgstr "_Gérer..."
 
-#: ../data/gui/preferences_window.ui.h:83
+#: ../data/gui/preferences_window.ui.h:79
 #, fuzzy
 msgid "Never"
 msgstr "Serveur"
 
-#: ../data/gui/preferences_window.ui.h:84
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Notifications"
 msgstr "Notifications"
 
-#: ../data/gui/preferences_window.ui.h:85
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Notify me about contacts that sign _in"
 msgstr "Me signaler les contacts qui se _connectent"
 
-#: ../data/gui/preferences_window.ui.h:86
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Notify me about contacts that sign _out"
 msgstr "Me signaler les contacts qui se _déconnectent"
 
-#: ../data/gui/preferences_window.ui.h:87
+#: ../data/gui/preferences_window.ui.h:83
 #, fuzzy
 msgid "Notify me about it"
 msgstr "Me signaler les contacts qui se _déconnectent"
 
-#: ../data/gui/preferences_window.ui.h:88
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notify on new _GMail email"
 msgstr "M'avertir lors de l'arrivée d'un courrier électronique _Gmail"
 
-#: ../data/gui/preferences_window.ui.h:89
+#: ../data/gui/preferences_window.ui.h:85
 #, fuzzy
 msgid "Only when pending events"
 msgstr ""
@@ -2116,55 +2322,56 @@ msgstr ""
 "Seulement lorsqu'il y a des évènements en attente\n"
 "Toujours"
 
-#: ../data/gui/preferences_window.ui.h:90
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Personal Events"
 msgstr "Événements Personnels"
 
-#: ../data/gui/preferences_window.ui.h:91
+#: ../data/gui/preferences_window.ui.h:87
 msgid "Play _sounds"
 msgstr "_Jouer les sons"
 
-#: ../data/gui/preferences_window.ui.h:92
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Pop it up"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:93
+#: ../data/gui/preferences_window.ui.h:89
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../data/gui/preferences_window.ui.h:94
+#: ../data/gui/preferences_window.ui.h:90
 msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:96
+#: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
 msgid "STUN server:"
 msgstr "Serveur :"
 
-#: ../data/gui/preferences_window.ui.h:97
+#: ../data/gui/preferences_window.ui.h:93
+#, fuzzy
+msgid "Show notification area icon:"
+msgstr "Notification-daemon"
+
+#: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
 msgid "Show only in roster"
 msgstr "Ne le montrer que dans la _liste"
 
-#: ../data/gui/preferences_window.ui.h:98
-msgid "Show systray:"
-msgstr "Afficher l'icône de notifications :"
-
-#: ../data/gui/preferences_window.ui.h:99
+#: ../data/gui/preferences_window.ui.h:95
 msgid "Sign _in"
 msgstr "_connecte"
 
-#: ../data/gui/preferences_window.ui.h:100
+#: ../data/gui/preferences_window.ui.h:96
 msgid "Sign _out"
 msgstr "_déconnecte"
 
-#: ../data/gui/preferences_window.ui.h:101
+#: ../data/gui/preferences_window.ui.h:97
 msgid "Single window for everything"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:102
+#: ../data/gui/preferences_window.ui.h:98
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2172,27 +2379,27 @@ msgstr ""
 "Certains messages peuvent contenir du texte complexe (formatage, couleurs, "
 "etc.). Si activé, Gajim l'affichera seulement en tant que texte non formaté. "
 
-#: ../data/gui/preferences_window.ui.h:103
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sort contacts by status"
 msgstr "Trier les contacts par état"
 
-#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
 msgid "Status"
 msgstr "État"
 
-#: ../data/gui/preferences_window.ui.h:105
+#: ../data/gui/preferences_window.ui.h:101
 msgid "Status _iconset:"
 msgstr "_Icônes d'état :"
 
-#: ../data/gui/preferences_window.ui.h:106
+#: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Style"
 
-#: ../data/gui/preferences_window.ui.h:107
+#: ../data/gui/preferences_window.ui.h:103
 msgid "T_heme:"
 msgstr "T_hème :"
 
-#: ../data/gui/preferences_window.ui.h:108
+#: ../data/gui/preferences_window.ui.h:104
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2204,7 +2411,7 @@ msgstr ""
 "$S sera remplacé par l'ancien message de statut\n"
 "$T sera remplacé par le temps d'absence"
 
-#: ../data/gui/preferences_window.ui.h:111
+#: ../data/gui/preferences_window.ui.h:107
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2216,119 +2423,124 @@ msgstr ""
 "$S sera remplacé par l'ancien message de statut\n"
 "$T sera remplacé par le temps de non-activité"
 
-#: ../data/gui/preferences_window.ui.h:114
+#: ../data/gui/preferences_window.ui.h:110
 msgid "Use _transports icons"
 msgstr "Utiliser les icônes des passere_lles"
 
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:111
+#, fuzzy
+msgid "Use default applications"
+msgstr "Toujours utiliser les applications OS/X par défaut."
+
+#: ../data/gui/preferences_window.ui.h:112
 msgid "Use system _default"
 msgstr "Utiliser la valeur par _défaut"
 
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:113
 msgid "Video framerate"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:117
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Video input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:118
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Video output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:119
+#: ../data/gui/preferences_window.ui.h:116
 msgid "Video size"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:120
+#: ../data/gui/preferences_window.ui.h:117
 msgid "When new event is received:"
 msgstr "Quand un nouvel événement est reçu :"
 
-#: ../data/gui/preferences_window.ui.h:121
+#: ../data/gui/preferences_window.ui.h:118
 msgid "Your message:"
 msgstr "Votre message :"
 
-#: ../data/gui/preferences_window.ui.h:122
+#: ../data/gui/preferences_window.ui.h:119
 msgid "Your nickname:"
 msgstr "Votre pseudo :"
 
-#: ../data/gui/preferences_window.ui.h:123
+#: ../data/gui/preferences_window.ui.h:120
 msgid "_Away after:"
 msgstr "Passer _Absent(e) après :"
 
-#: ../data/gui/preferences_window.ui.h:124
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Navigateur :"
 
-#: ../data/gui/preferences_window.ui.h:125
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Display chat state notifications:"
 msgstr "_Afficher les notifications d'état :"
 
-#: ../data/gui/preferences_window.ui.h:126
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Emoticons:"
 msgstr "É_moticônes :"
 
-#: ../data/gui/preferences_window.ui.h:127
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_File manager:"
 msgstr "Gestionnaire de _fichiers :"
 
-#: ../data/gui/preferences_window.ui.h:128
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_Highlight misspelled words"
 msgstr "_Souligner les fautes d'orthographe"
 
-#: ../data/gui/preferences_window.ui.h:129
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorer les messages des contacts qui ne sont pas dans votre liste"
 
-#: ../data/gui/preferences_window.ui.h:130
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignorer le formatage complexe du texte dans les messages entrants"
 
-#: ../data/gui/preferences_window.ui.h:131
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Log status changes of contacts"
 msgstr "Inscrire dans l'_historique les changements d'état des contacts"
 
-#: ../data/gui/preferences_window.ui.h:132
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Mail client:"
 msgstr "Logiciel de courriel :"
 
-#: ../data/gui/preferences_window.ui.h:133
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Not available after:"
 msgstr "Passer _indisponible après :"
 
-#: ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Open..."
 msgstr "_Ouvrir..."
 
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Reset to Default Colors"
 msgstr "Utilise_r les couleurs par défaut"
 
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Send chat state notifications:"
 msgstr "_Envoyer les notifications d'état :"
 
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Status message:"
 msgstr "Message d'état :"
 
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_URL highlight:"
 msgstr "Mise à valeur des _URL :"
 
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_Window behavior:"
 msgstr "Comportement de la _fenêtre :"
 
-#: ../data/gui/preferences_window.ui.h:140
+#: ../data/gui/preferences_window.ui.h:137
 msgid "in _group chats"
 msgstr "dans les _salons de discussion"
 
-#: ../data/gui/preferences_window.ui.h:141
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _roster"
 msgstr "dans le _roster"
 
-#: ../data/gui/preferences_window.ui.h:142
+#: ../data/gui/preferences_window.ui.h:139
 msgid "minutes"
 msgstr "minutes"
 
@@ -2380,7 +2592,7 @@ msgstr "Identifiant Jabber :"
 msgid "Order:"
 msgstr "Ordre :"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3436
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
 msgid "Privacy List"
 msgstr "Liste privée"
 
@@ -2591,8 +2803,8 @@ msgstr "Supprimer le compte de Gajim et du _serveur"
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5492 ../src/roster_window.py:5622
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
+#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
 msgid "_Remove"
 msgstr "_Supprimer"
 
@@ -2638,56 +2850,60 @@ msgid "Help online"
 msgstr "Aide en ligne"
 
 #: ../data/gui/roster_window.ui.h:8
+msgid "P_lugins"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:9
 msgid "Profile, A_vatar"
 msgstr "Profil et _avatar"
 
-#: ../data/gui/roster_window.ui.h:9
+#: ../data/gui/roster_window.ui.h:10
 msgid "Show Only _Active Contacts"
 msgstr "Afficher seulement les contacts _Actifs"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
 msgid "Show Trans_ports"
 msgstr "Afficher les Passerelles"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
 msgid "Show _Offline Contacts"
 msgstr "Afficher les Contacts _déconnectés"
 
-#: ../data/gui/roster_window.ui.h:12 ../src/statusicon.py:326
+#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
 msgid "Show _Roster"
 msgstr "Montrer la _liste de contacts"
 
-#: ../data/gui/roster_window.ui.h:13
+#: ../data/gui/roster_window.ui.h:14
 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/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
 #: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "Act_ions"
 
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
 msgid "_Contents"
 msgstr "_Sommaire"
 
-#: ../data/gui/roster_window.ui.h:18 ../src/disco.py:1502
+#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
 msgid "_Edit"
 msgstr "É_dition"
 
-#: ../data/gui/roster_window.ui.h:19
+#: ../data/gui/roster_window.ui.h:20
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Help"
 msgstr "Aid_e"
 
-#: ../data/gui/roster_window.ui.h:22
+#: ../data/gui/roster_window.ui.h:23
 msgid "_Send Single Message..."
 msgstr "Envoyer un _message simple..."
 
-#: ../data/gui/roster_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:25
 msgid "_View"
 msgstr "_Affichage"
 
@@ -2704,11 +2920,11 @@ msgid "_Add contact"
 msgstr "_Ajouter un contact"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5634
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
 msgid "_Information"
 msgstr "Information"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1353
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
 msgid "_Search"
 msgstr "_Rechercher"
 
@@ -2728,10 +2944,6 @@ msgstr "S'enregistrer à"
 msgid "_Cancel"
 msgstr "_Annuler"
 
-#: ../data/gui/single_message_window.ui.h:2
-msgid "From:"
-msgstr "De :"
-
 #: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Répondre à ce message"
@@ -2748,10 +2960,6 @@ msgstr "Envoyer le message"
 msgid "Send message and close window"
 msgstr "Envoyer un message et fermer la fenêtre"
 
-#: ../data/gui/single_message_window.ui.h:7
-msgid "Subject:"
-msgstr "Sujet :"
-
 #: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "À :"
@@ -2961,27 +3169,37 @@ msgstr "Messagerie instantanée Gajim"
 msgid "Jabber IM Client"
 msgstr "Client de Messagerie Instantanée Jabber"
 
-#: ../src/adhoc_commands.py:314
+#: ../src/adhoc_commands.py:323
 msgid "Cancel confirmation"
 msgstr "Annuler la confirmation"
 
-#: ../src/adhoc_commands.py:315
+#: ../src/adhoc_commands.py:324
 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:351 ../src/adhoc_commands.py:374
+#: ../src/adhoc_commands.py:370
+#, fuzzy
+msgid "Invalid Form"
+msgstr "Salon invalide"
+
+#: ../src/adhoc_commands.py:371
+#, fuzzy
+msgid "The form is not filled correctly."
+msgstr "Le pseudonyme contient des caractères non autorisés."
+
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
 msgid "Service sent malformed data"
 msgstr "Le service a envoyé des données mal-formées"
 
-#: ../src/adhoc_commands.py:360
+#: ../src/adhoc_commands.py:399
 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:471
+#: ../src/adhoc_commands.py:513
 msgid "Service returned an error."
 msgstr "Le service a renvoyé une erreur."
 
@@ -3006,7 +3224,7 @@ msgstr "Entier"
 msgid "Text"
 msgstr "Texte"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:945
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
 msgid "Color"
 msgstr "Couleur"
 
@@ -3043,188 +3261,188 @@ msgstr[1] "Vous avez reçu de nouvelles entrées (et %(count)d non-affichées) :
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "English"
 msgstr "Anglais"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Belarusian"
 msgstr "Biélorusse"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Bulgarian"
 msgstr "Bulgare"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Breton"
 msgstr "Breton"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Czech"
 msgstr "Tchèque"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "German"
 msgstr "Allemand"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Greek"
 msgstr "Grec"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "British"
 msgstr "Anglais (Britannique)"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Basque"
 msgstr "Basque"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "French"
 msgstr "Français"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Croatian"
 msgstr "Croate"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Italian"
 msgstr "Italien"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian (b)"
 msgstr "Norvégien"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Dutch"
 msgstr "Hollandais"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian"
 msgstr "Norvégien"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Polish"
 msgstr "Polonais"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Portuguese"
 msgstr "Portugais"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Brazilian Portuguese"
 msgstr "Portugais brésilien"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Russian"
 msgstr "Russe"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Serbian"
 msgstr "Serbe"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Slovak"
 msgstr "Slovaque"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Swedish"
 msgstr "Suédois"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Chinese (Ch)"
 msgstr "Chinois"
 
-#: ../src/chat_control.py:479
+#: ../src/chat_control.py:496
 msgid "Spelling language"
 msgstr "Langue du correcteur orthographique"
 
 #. we are not connected
-#: ../src/chat_control.py:511 ../src/chat_control.py:720
+#: ../src/chat_control.py:528 ../src/chat_control.py:737
 msgid "A connection is not available"
 msgstr "Aucune connexion disponible"
 
-#: ../src/chat_control.py:512 ../src/chat_control.py:721
+#: ../src/chat_control.py:529 ../src/chat_control.py:738
 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:927
+#: ../src/chat_control.py:944
 msgid "Underline"
 msgstr "Souligné"
 
-#: ../src/chat_control.py:928
+#: ../src/chat_control.py:945
 msgid "Strike"
 msgstr "Barré"
 
-#: ../src/chat_control.py:951
+#: ../src/chat_control.py:968
 msgid "Font"
 msgstr "Police"
 
-#: ../src/chat_control.py:960
+#: ../src/chat_control.py:977
 msgid "Clear formating"
 msgstr "Style par défaut"
 
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1055
 msgid "Really send file?"
 msgstr "Êtes vous sûr de vouloir envoyer le fichier ?"
 
-#: ../src/chat_control.py:1039
+#: ../src/chat_control.py:1056
 #, 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:1503 ../src/chat_control.py:1987
+#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
 msgid "GPG encryption enabled"
 msgstr "Chiffrement GPG activé"
 
 #. Add to roster
-#: ../src/chat_control.py:1528 ../src/common/contacts.py:158
+#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
 #: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:245 ../src/dialogs.py:1064 ../src/dialogs.py:2078
-#: ../src/dialogs.py:2107 ../src/gui_interface.py:674
+#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
+#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
 #: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1610 ../src/roster_window.py:1612
-#: ../src/roster_window.py:1942 ../src/roster_window.py:3289
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
+#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
+#: ../src/roster_window.py:3382
 msgid "Not in Roster"
 msgstr "Absent de la liste"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1575
 msgid "This contact does not support file transfer."
 msgstr "Ce contact ne prend pas en charge les transferts de fichier."
 
-#: ../src/chat_control.py:1561
+#: ../src/chat_control.py:1578
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 "Vous avez besoin de connaître le vrai JID du contact pour lui envoyer un "
 "fichier."
 
-#: ../src/chat_control.py:1656
+#: ../src/chat_control.py:1677
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "État %(type)s : %(state)s, raison : %(reason)s"
 
-#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:1869
 #, 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:1967 ../src/dialogs.py:4866
+#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
 msgid "No GPG key assigned"
 msgstr "Aucune clef GPG assignée"
 
-#: ../src/chat_control.py:1968
+#: ../src/chat_control.py:1991
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3232,50 +3450,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:1977
+#: ../src/chat_control.py:2000
 msgid "GPG encryption disabled"
 msgstr "Chiffrement GPG désactivé"
 
-#: ../src/chat_control.py:2003
+#: ../src/chat_control.py:2026
 msgid "Session WILL be logged"
 msgstr "La session SERA archivée"
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:2028
 msgid "Session WILL NOT be logged"
 msgstr "La session ne sera PAS archivée"
 
 #. encryption %s active
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is"
 msgstr "est"
 
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is NOT"
 msgstr "N'est PAS"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will"
 msgstr "sera"
 
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will NOT"
 msgstr "NE sera PAS"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2051
 msgid "and authenticated"
 msgstr "et authentifiée"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2032
+#: ../src/chat_control.py:2055
 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:2039
+#: ../src/chat_control.py:2062
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3284,23 +3502,32 @@ msgstr ""
 "Chiffrement %(type)s %(status)s actif %(authenticated)s.\n"
 "Votre discussion %(logged)s archivée."
 
-#: ../src/chat_control.py:2182
+#: ../src/chat_control.py:2205
 msgid "Session negotiation cancelled"
 msgstr "Négociation annulée"
 
-#: ../src/chat_control.py:2191
+#: ../src/chat_control.py:2215
+msgid "This session WILL be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2217
+#, fuzzy
+msgid "This session WILL NOT be archived on server"
+msgstr "La session ne sera PAS archivée"
+
+#: ../src/chat_control.py:2226
 msgid "This session is encrypted"
 msgstr "Cette session est chiffrée"
 
-#: ../src/chat_control.py:2194
+#: ../src/chat_control.py:2229
 msgid " and WILL be logged"
 msgstr " et SERA archivée"
 
-#: ../src/chat_control.py:2196
+#: ../src/chat_control.py:2231
 msgid " and WILL NOT be logged"
 msgstr " et NE SERA PAS archivée"
 
-#: ../src/chat_control.py:2201
+#: ../src/chat_control.py:2236
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3308,25 +3535,25 @@ msgstr ""
 "Identité du contact non vérifiée. Cliquez sur le bouton bouclier pour plus "
 "de détails."
 
-#: ../src/chat_control.py:2203
+#: ../src/chat_control.py:2238
 msgid "E2E encryption disabled"
 msgstr "Chiffrement E2E désactivé"
 
-#: ../src/chat_control.py:2241 ../src/chat_control.py:2254
+#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
 msgid "The following message was NOT encrypted"
 msgstr "Le message suivant n'a PAS été chiffré"
 
-#: ../src/chat_control.py:2247
+#: ../src/chat_control.py:2288
 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:2519
+#: ../src/chat_control.py:2566
 #, 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:2520
+#: ../src/chat_control.py:2567
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3334,15 +3561,13 @@ msgstr ""
 "Si vous fermez cette fenêtre et que l'historique n'est pas activé, ce "
 "message sera perdu."
 
-#: ../src/chat_control.py:2663 ../src/common/connection_handlers.py:1635
-#: ../src/common/connection_handlers.py:1758
-#: ../src/common/connection_handlers.py:1960
-#: ../src/common/connection_handlers.py:2110 ../src/common/connection.py:452
+#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
 #: ../src/gajim.py:159 ../src/session.py:138
 msgid "Database Error"
 msgstr "Erreur de base de données"
 
-#: ../src/chat_control.py:2664
+#: ../src/chat_control.py:2714
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3351,7 +3576,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:2906
+#: ../src/chat_control.py:2962
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s est maintenant %(status)s"
@@ -3365,28 +3590,28 @@ msgstr "création de la base de donnée de l'historique"
 msgid "creating cache database"
 msgstr "création de la base de donnée de l'historique"
 
-#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
-#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
-#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
-#: ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
 #, 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:275 ../src/common/check_paths.py:282
-#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
-#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
-#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:333
+#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
+#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
+#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
 msgid "Gajim will now exit"
 msgstr "Gajim va maintenant s'arrêter"
 
-#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
+#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
 #, 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:342
+#: ../src/common/check_paths.py:351
 #, python-format
 msgid "creating %s directory"
 msgstr "crée le répertoire %s"
@@ -3450,9 +3675,9 @@ msgstr "Choisissez les groupes de discussion que vous voulez quitter"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:801
-#: ../src/roster_window.py:1614 ../src/roster_window.py:1616
-#: ../src/roster_window.py:5251
+#: ../src/common/helpers.py:57 ../src/roster_window.py:815
+#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
+#: ../src/roster_window.py:5323
 msgid "Groupchats"
 msgstr "Salons de discussion"
 
@@ -3514,7 +3739,9 @@ msgstr ""
 "$S sera remplacé par the message de statut, $T par le temps d'auto-idle"
 
 #: ../src/common/config.py:88
-msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+#, fuzzy
+msgid ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 "Quand afficher l'icône dans la zone de notifications. Peut être « never "
 "» (jamais), « on_event » (lorsqu'il y a un évènement en attente) ou « always "
@@ -3568,9 +3795,9 @@ msgstr ""
 "repliés."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:501
-#: ../src/common/optparser.py:290 ../src/common/optparser.py:486
-#: ../src/common/optparser.py:520 ../src/gui_interface.py:3370
+#: ../src/common/config.py:106 ../src/common/config.py:505
+#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
+#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
 msgid "default"
 msgstr "Par défaut"
 
@@ -3806,7 +4033,8 @@ 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:197
-msgid "Notify of events in the system trayicon."
+#, fuzzy
+msgid "Notify of events in the notification area."
 msgstr "M'alerter à l'aide de l'icône dans la zone de notifications."
 
 #: ../src/common/config.py:203
@@ -3846,9 +4074,10 @@ msgstr ""
 "surbrillance dans les salons."
 
 #: ../src/common/config.py:221
+#, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
+"setting is taken into account only if notification icon is used."
 msgstr ""
 "Si vrai, quitte Gajim quand on clique sur le bouton X du gestionnaire de "
 "fenêtre. Cette option n'est prise en compte que si l'icône dans la barre de "
@@ -4139,9 +4368,10 @@ msgstr ""
 "plus vieilles sont effacées."
 
 #: ../src/common/config.py:270
+#, fuzzy
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
-"systray icon."
+"notification icon."
 msgstr ""
 "Si Activé, les fenêtres de notification du notification-daemon seront "
 "attachées à l'icône du Tray."
@@ -4349,11 +4579,15 @@ msgstr ""
 msgid "Message that is sent to contacts you want to add"
 msgstr "Remplissez les informations sur le contact à ajouter"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:374
+msgid "Last time we syncronized with logs from server."
+msgstr ""
+
+#: ../src/common/config.py:436
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Est-ce que OpenPGP est activé pour ce contact ?"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4361,101 +4595,108 @@ msgstr ""
 "Gajim doit-il commencer automatiquement une discussion chiffrée avec ce "
 "contact quand cela est possible ?"
 
-#: ../src/common/config.py:437 ../src/common/config.py:440
+#: ../src/common/config.py:438 ../src/common/config.py:441
 msgid "Language for which we want to check misspelled words"
 msgstr "Langue dans laquelle faire la vérification orthographique"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:447
 msgid "all or space separated status"
 msgstr "tous ou par état (séparé par des espaces)"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:448
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no' ou 'both'"
 
-#: ../src/common/config.py:448 ../src/common/config.py:450
-#: ../src/common/config.py:451 ../src/common/config.py:454
-#: ../src/common/config.py:455
+#: ../src/common/config.py:449 ../src/common/config.py:451
+#: ../src/common/config.py:452 ../src/common/config.py:455
+#: ../src/common/config.py:456
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' ou ''"
 
-#: ../src/common/config.py:461 ../src/common/pep.py:157
+#: ../src/common/config.py:460
+msgid ""
+"State whether plugins should be activated on exit (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
+msgstr ""
+
+#: ../src/common/config.py:465 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Dort"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back soon"
 msgstr "Bientôt de retour"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back in some minutes."
 msgstr "De retour dans quelques minutes."
 
-#: ../src/common/config.py:463 ../src/common/pep.py:127
+#: ../src/common/config.py:467 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Mange"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:467
 msgid "I'm eating, so leave me a message."
 msgstr "Je mange, donc laissez moi un message."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "I'm watching a movie."
 msgstr "Je regarde un film."
 
-#: ../src/common/config.py:465 ../src/common/pep.py:186
+#: ../src/common/config.py:469 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Travaille"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:469
 msgid "I'm working."
 msgstr "Je travaille."
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "Phone"
 msgstr "Téléphone"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "I'm on the phone."
 msgstr "Je suis au téléphone."
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "Out"
 msgstr "Dehors"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "I'm out enjoying life."
 msgstr "Je suis sorti profiter de la vie."
 
-#: ../src/common/config.py:478
+#: ../src/common/config.py:482
 msgid "I'm available."
 msgstr "Disponible"
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:483
 msgid "I'm free for chat."
 msgstr "Disponible pour discuter"
 
-#: ../src/common/config.py:480 ../src/config.py:1600
+#: ../src/common/config.py:484 ../src/config.py:1600
 msgid "Be right back."
 msgstr "Revient de suite."
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:485
 msgid "I'm not available."
 msgstr "Non disponible"
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:486
 msgid "Do not disturb."
 msgstr "Ne pas déranger."
 
-#: ../src/common/config.py:483 ../src/common/config.py:484
+#: ../src/common/config.py:487 ../src/common/config.py:488
 msgid "Bye!"
 msgstr "Au revoir !"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:498
 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."
@@ -4463,184 +4704,96 @@ 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:495
+#: ../src/common/config.py:499
 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:504 ../src/common/optparser.py:304
+#: ../src/common/config.py:508 ../src/common/optparser.py:308
 msgid "green"
 msgstr "vert"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:290
+#: ../src/common/config.py:512 ../src/common/optparser.py:294
 msgid "grocery"
 msgstr "épicerie"
 
-#: ../src/common/config.py:512
+#: ../src/common/config.py:516
 msgid "human"
 msgstr "Humain"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:520
 msgid "marine"
 msgstr "Marine"
 
-#: ../src/common/connection_handlers.py:84
+#: ../src/common/connection_handlers.py:94
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Impossible de charger le module d'inactivité"
 
-#: ../src/common/connection_handlers.py:117
+#: ../src/common/connection_handlers.py:127
 #, 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:124
+#: ../src/common/connection_handlers.py:134
 msgid "Registration succeeded"
 msgstr "L'inscription a réussi"
 
-#: ../src/common/connection_handlers.py:125
-#, python-format
-msgid "Registration with agent %s succeeded"
-msgstr "Enregistrement avec l'agent %s réussi"
-
-#: ../src/common/connection_handlers.py:133
-msgid "Registration failed"
-msgstr "L'inscription a échoué"
-
-#: ../src/common/connection_handlers.py:133
-#, python-format
-msgid ""
-"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
-msgstr ""
-"L'enregistrement avec l'agent %(agent)s a échoué avec l'erreur %(error)s : "
-"%(error_msg)s"
-
-#: ../src/common/connection_handlers.py:445
-#: ../src/common/connection_handlers.py:1633
-#: ../src/common/connection_handlers.py:1756
-#: ../src/common/connection_handlers.py:1957
-#: ../src/common/connection_handlers.py:2108 ../src/common/connection.py:449
-#: ../src/gajim.py:341
-msgid "Disk Write Error"
-msgstr "Erreur d'Écriture du disque"
-
-#: ../src/common/connection_handlers.py:678 ../src/common/connection.py:1472
-msgid "Invisibility not supported"
-msgstr "Invisibilité non-supportée"
-
-#: ../src/common/connection_handlers.py:679 ../src/common/connection.py:1473
-#, python-format
-msgid "Account %s doesn't support invisibility."
-msgstr "Le compte %s ne supporte pas l'invisibilité."
-
-#: ../src/common/connection_handlers.py:1446 ../src/common/connection.py:253
-#: ../src/config.py:2091 ../src/config.py:2100 ../src/config.py:2168
-#: ../src/config.py:3560 ../src/dataforms_widget.py:597 ../src/dialogs.py:2931
-msgid "Invalid Jabber ID"
-msgstr "Identifiant Jabber invalide"
-
-#: ../src/common/connection_handlers.py:1447
-msgid "A message from a non-valid JID arrived, it has been ignored."
-msgstr "Un message d'un JID invalide a été reçu, il a été ignoré."
-
-#: ../src/common/connection_handlers.py:1636
-#: ../src/common/connection_handlers.py:1759
-#: ../src/common/connection_handlers.py:1961
-#: ../src/common/connection_handlers.py:2111 ../src/common/connection.py:453
-#: ../src/gajim.py:160 ../src/session.py:139
-#, 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 ""
-"Le fichier de base de données (%s) ne peut être lu. Essayez de le réparer "
-"(voir http://trac.gajim.org/wiki/DatabaseBackup) ou supprimez le (toutes les "
-"archives seront perdues)."
-
-#: ../src/common/connection_handlers.py:1805
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Surnom invalide : %s"
-
-#: ../src/common/connection_handlers.py:1902
-#: ../src/common/connection_handlers.py:1911
-#: ../src/common/connection_handlers.py:1918
-#: ../src/common/connection_handlers.py:1922
-#: ../src/common/connection_handlers.py:1926
-#: ../src/common/connection_handlers.py:1931 ../src/gui_interface.py:139
-msgid "Unable to join group chat"
-msgstr "Impossible de rejoindre le salon"
-
-#: ../src/common/connection_handlers.py:1903
-#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr "Le nombre maximal d'utilisateurs pour %s a été atteint"
-
-#: ../src/common/connection_handlers.py:1912
-#, python-format
-msgid "You are banned from group chat %s."
-msgstr "Vous êtes banni du salon %s."
-
-#: ../src/common/connection_handlers.py:1919
-#, python-format
-msgid "Group chat %s does not exist."
-msgstr "Le salon %s n'existe pas."
-
-#: ../src/common/connection_handlers.py:1923
-msgid "Group chat creation is restricted."
-msgstr "La création de salon est réservée aux administrateurs."
-
-#: ../src/common/connection_handlers.py:1927
-#, 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:1932
-#, 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:1976
-msgid "Room has been destroyed"
-msgstr "Le salon de discussion a été détruit"
-
-#: ../src/common/connection_handlers.py:1984
+#: ../src/common/connection_handlers.py:135
 #, python-format
-msgid "You can join this room instead: %s"
-msgstr "Vous pouvez rejoindre le salon %s à la place"
+msgid "Registration with agent %s succeeded"
+msgstr "Enregistrement avec l'agent %s réussi"
 
-#: ../src/common/connection_handlers.py:2020
-msgid "I would like to add you to my roster."
-msgstr "Je souhaiterais vous ajouter à ma liste de contacts."
+#: ../src/common/connection_handlers.py:143
+msgid "Registration failed"
+msgstr "L'inscription a échoué"
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2041
+#: ../src/common/connection_handlers.py:143
 #, python-format
-msgid "we are now subscribed to %s"
-msgstr "nous sommes maintenant inscrits chez %s"
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
+"L'enregistrement avec l'agent %(agent)s a échoué avec l'erreur %(error)s : "
+"%(error_msg)s"
 
-#: ../src/common/connection_handlers.py:2043
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "Requête de désinscription de la part de %s"
+#: ../src/common/connection_handlers.py:466
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
+#: ../src/gajim.py:341
+msgid "Disk Write Error"
+msgstr "Erreur d'Écriture du disque"
+
+#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
+msgid "Invisibility not supported"
+msgstr "Invisibilité non-supportée"
 
-#: ../src/common/connection_handlers.py:2045
+#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
 #, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "nous ne sommes plus dans la liste de %s"
+msgid "Account %s doesn't support invisibility."
+msgstr "Le compte %s ne supporte pas l'invisibilité."
+
+#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
+#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
+#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
+msgid "Invalid Jabber ID"
+msgstr "Identifiant Jabber invalide"
+
+#: ../src/common/connection_handlers.py:1405
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr "Un message d'un JID invalide a été reçu, il a été ignoré."
 
-#: ../src/common/connection_handlers.py:2240
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
+#: ../src/gajim.py:160 ../src/session.py:139
 #, python-format
 msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
+"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 ""
-"L'identifiant Jabber %s ne respecte pas la norme RFC. Il ne sera pas ajouté "
-"à votre liste de contacts. Utilisez un outil de gestion de liste de contact "
-"tel que http://jru.jabberstudio.org pour le supprimer"
+"Le fichier de base de données (%s) ne peut être lu. Essayez de le réparer "
+"(voir http://trac.gajim.org/wiki/DatabaseBackup) ou supprimez le (toutes les "
+"archives seront perdues)."
 
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
@@ -4770,17 +4923,17 @@ msgstr "L'utilisation de la clé n'inclut pas la signature d'un certificat"
 msgid "Application verification failure"
 msgstr "Echec de la vérification de l'application"
 
-#: ../src/common/connection.py:254 ../src/dialogs.py:2932
+#: ../src/common/connection.py:256 ../src/dialogs.py:2948
 #, 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 message à %s, ce JID n'est pas valide."
 
-#: ../src/common/connection.py:276
+#: ../src/common/connection.py:278
 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:279
+#: ../src/common/connection.py:281
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr ""
@@ -4788,11 +4941,11 @@ msgstr ""
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:331
+#: ../src/common/connection.py:333
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Ce message est *chiffré* (Voir : XEP:`27`]"
 
-#: ../src/common/connection.py:439
+#: ../src/common/connection.py:441
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4801,81 +4954,81 @@ msgstr ""
 "Sujet : %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:807
+#: ../src/common/connection.py:809
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "La connexion du compte \"%s\" a été perdue"
 
-#: ../src/common/connection.py:808
+#: ../src/common/connection.py:810
 msgid "Reconnect manually."
 msgstr "Reconnecter manuellement."
 
-#: ../src/common/connection.py:820
+#: ../src/common/connection.py:822
 #, 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:854
+#: ../src/common/connection.py:856
 #, 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:867
+#: ../src/common/connection.py:869
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Erreur SSL inconnue : %d"
 
 #. wrong answer
-#: ../src/common/connection.py:882
+#: ../src/common/connection.py:884
 msgid "Invalid answer"
 msgstr "Réponse non valide"
 
-#: ../src/common/connection.py:883
+#: ../src/common/connection.py:885
 #, 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:1165 ../src/common/connection.py:1294
-#: ../src/common/connection.py:1784
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
+#: ../src/common/connection.py:1792
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Impossible de se connecter à \"%s\""
 
-#: ../src/common/connection.py:1166 ../src/gui_interface.py:755
+#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
 msgid "Check your connection or try again later."
 msgstr "Vérifiez votre connexion ou réessayez plus tard."
 
-#: ../src/common/connection.py:1171
+#: ../src/common/connection.py:1173
 #, python-format
 msgid "Server replied: %s"
 msgstr "le serveur a répondu : %s"
 
-#: ../src/common/connection.py:1184
+#: ../src/common/connection.py:1186
 msgid "Connection to proxy failed"
 msgstr "La connexion au proxy a échoué"
 
-#: ../src/common/connection.py:1215 ../src/common/connection.py:1274
+#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Impossible de se connecter au compte %s"
 
-#: ../src/common/connection.py:1216 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
 #, 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:1241
+#: ../src/common/connection.py:1243
 #, 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:1244
+#: ../src/common/connection.py:1246
 #, python-format
 msgid ""
 "\n"
@@ -4884,7 +5037,7 @@ msgstr ""
 "\n"
 "Erreur SSL : <b>%s</b>"
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1248
 #, python-format
 msgid ""
 "\n"
@@ -4893,24 +5046,24 @@ msgstr ""
 "\n"
 "Erreur SSL inconnue : %d"
 
-#: ../src/common/connection.py:1295
+#: ../src/common/connection.py:1297
 msgid "Check your connection or try again later"
 msgstr "Vérifiez votre connexion ou réessayer plus tard"
 
-#: ../src/common/connection.py:1324
+#: ../src/common/connection.py:1329
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Echec de l'authentification avec \"%s\""
 
-#: ../src/common/connection.py:1326
+#: ../src/common/connection.py:1331
 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:1395
+#: ../src/common/connection.py:1400
 msgid "Error while removing privacy list"
 msgstr "Une erreur s'est produite pendant la suppression de la liste privée"
 
-#: ../src/common/connection.py:1396
+#: ../src/common/connection.py:1401
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4919,39 +5072,39 @@ 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:1650
+#: ../src/common/connection.py:1658
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Contact envoyé : « %s » (%s)"
 
-#: ../src/common/connection.py:1653
+#: ../src/common/connection.py:1661
 msgid "Sent contacts:"
 msgstr "Contacts envoyés :"
 
-#: ../src/common/connection.py:1799 ../src/common/connection.py:1822
+#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
 msgid "Not fetched because of invisible status"
 msgstr "Non récupéré à cause du statut invisible"
 
-#: ../src/common/connection.py:2254
+#: ../src/common/connection.py:2262
 msgid "Unregister failed"
 msgstr "La désinscription a échoué"
 
-#: ../src/common/connection.py:2255
+#: ../src/common/connection.py:2263
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr "Le désabonnement du server %(server)s a échoué : %(error)s"
 
 #: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:674
+#: ../src/gui_interface.py:551
 msgid "Observers"
 msgstr "Observateurs"
 
 #: ../src/common/contacts.py:139 ../src/common/contacts.py:366
 #: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1499 ../src/gui_interface.py:424
-#: ../src/roster_window.py:840 ../src/roster_window.py:1525
-#: ../src/roster_window.py:1606 ../src/roster_window.py:1608
-#: ../src/roster_window.py:1769
+#: ../src/disco.py:1517 ../src/roster_window.py:854
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
+#: ../src/roster_window.py:2466
 msgid "Transports"
 msgstr "Passerelles"
 
@@ -5178,203 +5331,219 @@ msgstr "Fin de la semaine"
 msgid "Weekend!"
 msgstr "Fin de semaine !"
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:148
+msgid "Username must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:153
 msgid "Invalid character in username."
 msgstr "Caractère non valide dans le nom d'utilisateur."
 
-#: ../src/common/helpers.py:156
-msgid "Server address required."
-msgstr "Adresse du serveur requise."
+#: ../src/common/helpers.py:159
+msgid "Server must be between 1 and 1023 chars"
+msgstr ""
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 msgid "Invalid character in hostname."
 msgstr "Caractère non valide dans le nom d'hôte."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:166
+msgid "Server address required."
+msgstr "Adresse du serveur requise."
+
+#: ../src/common/helpers.py:170
+msgid "Resource must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:175
 msgid "Invalid character in resource."
 msgstr "Caractère non valide dans la ressource."
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:215
 msgid "_Busy"
 msgstr "O_ccupé(e)"
 
-#: ../src/common/helpers.py:211 ../src/tooltips.py:195
+#: ../src/common/helpers.py:217 ../src/tooltips.py:195
 msgid "Busy"
 msgstr "Occupé(e)"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:220
 msgid "_Not Available"
 msgstr "_Non disponible"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:225
 msgid "_Free for Chat"
 msgstr "Dis_ponible pour discuter"
 
-#: ../src/common/helpers.py:221 ../src/tooltips.py:191
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Free for Chat"
 msgstr "Disponible pour discuter"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:230
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?transfer status:En pause"
 
-#: ../src/common/helpers.py:226 ../src/tooltips.py:189
+#: ../src/common/helpers.py:232 ../src/tooltips.py:189
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?transfer status:En pause"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:234
 msgid "Connecting"
 msgstr "Connexion"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:237
 msgid "A_way"
 msgstr "_Absent(e)"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:242
 msgid "_Offline"
 msgstr "Déc_onnecté(e)"
 
-#: ../src/common/helpers.py:238 ../src/tooltips.py:199
+#: ../src/common/helpers.py:244 ../src/tooltips.py:199
 msgid "Offline"
 msgstr "Déconnecté(e)"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:247
 msgid "_Invisible"
 msgstr "_Invisible"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:253
 msgid "?contact has status:Unknown"
 msgstr "Inconnu"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:255
 msgid "?contact has status:Has errors"
 msgstr "en erreur"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:260
 msgid "?Subscription we already have:None"
 msgstr "Aucune"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:262
 msgid "To"
 msgstr "À"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
+msgid "From"
+msgstr "De"
+
+#: ../src/common/helpers.py:266
 msgid "Both"
 msgstr "Les deux"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:274
 msgid "?Ask (for Subscription):None"
 msgstr "Aucune"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:276
 msgid "Subscribe"
 msgstr "S'inscrire"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:285
 msgid "?Group Chat Contact Role:None"
 msgstr "Aucun"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:288
 msgid "Moderators"
 msgstr "Modérateurs"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:290
 msgid "Moderator"
 msgstr "Modérateur"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:293
 msgid "Participants"
 msgstr "Participants"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:295
 msgid "Participant"
 msgstr "Participant"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:298
 msgid "Visitors"
 msgstr "Visiteurs"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:300
 msgid "Visitor"
 msgstr "Visiteur"
 
-#: ../src/common/helpers.py:300 ../src/tooltips.py:210
+#: ../src/common/helpers.py:306 ../src/tooltips.py:210
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Aucune"
 
-#: ../src/common/helpers.py:302 ../src/tooltips.py:216
+#: ../src/common/helpers.py:308 ../src/tooltips.py:216
 msgid "Owner"
 msgstr "Propriétaire"
 
-#: ../src/common/helpers.py:304 ../src/tooltips.py:214
+#: ../src/common/helpers.py:310 ../src/tooltips.py:214
 msgid "Administrator"
 msgstr "Administrateur"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:212
+#: ../src/common/helpers.py:312 ../src/tooltips.py:212
 msgid "Member"
 msgstr "Membre"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:351
 msgid "is paying attention to the conversation"
 msgstr "prête attention à la conversation"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:353
 msgid "is doing something else"
 msgstr "fait quelque chose d'autre"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:355
 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:352
+#: ../src/common/helpers.py:358
 msgid "paused composing a message"
 msgstr "a arrêté d'écrire un message"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:360
 msgid "has closed the chat window or tab"
 msgstr "a fermé la fenêtre ou l'onglet de discussion"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:619
+#: ../src/common/helpers.py:625
 #, python-format
 msgid "%s GiB"
 msgstr "%s Gio"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:622
+#: ../src/common/helpers.py:628
 #, python-format
 msgid "%s GB"
 msgstr "%s Go"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:626
+#: ../src/common/helpers.py:632
 #, python-format
 msgid "%s MiB"
 msgstr "%s Mio"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:629
+#: ../src/common/helpers.py:635
 #, python-format
 msgid "%s MB"
 msgstr "%s Mo"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:633
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s KiB"
 msgstr "%s Kio"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:636
+#: ../src/common/helpers.py:642
 #, python-format
 msgid "%s KB"
 msgstr "%s Ko"
 
 #. B means bytes
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:645
 #, python-format
 msgid "%s B"
 msgstr "%s o"
@@ -5417,12 +5586,12 @@ msgstr "Gajim - %s"
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:111
+#: ../src/common/jingle_rtp.py:107
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Configuration du salon de discussion"
 
-#: ../src/common/jingle_rtp.py:112
+#: ../src/common/jingle_rtp.py:108
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5434,30 +5603,30 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:209
+#: ../src/common/jingle_rtp.py:205
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:210
+#: ../src/common/jingle_rtp.py:206
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Message d'erreur : %s"
 
-#: ../src/common/jingle_rtp.py:336
+#: ../src/common/jingle_rtp.py:335
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:339
+#: ../src/common/jingle_rtp.py:338
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:382
+#: ../src/common/jingle_rtp.py:381
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:390
+#: ../src/common/jingle_rtp.py:389
 msgid "video output"
 msgstr ""
 
@@ -5535,11 +5704,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "erreur : impossible d'ouvrir %s en lecture"
 
-#: ../src/common/optparser.py:299 ../src/common/optparser.py:300
+#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:379
+#: ../src/common/optparser.py:383
 msgid "migrating logs database to indices"
 msgstr "migration de la base de données de l'historique vers des index"
 
@@ -6212,7 +6381,7 @@ msgstr ""
 "transfert de fichiers sera annulé."
 
 #. we're not english
-#: ../src/common/stanza_session.py:303
+#: ../src/common/stanza_session.py:423
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6220,11 +6389,11 @@ msgstr ""
 "[Ceci fait partie d'une session chiffrée. Si vous voyez ce message, un "
 "problème a eu lieu.]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:178
+#: ../src/common/zeroconf/connection_zeroconf.py:181
 msgid "Avahi error"
 msgstr "Erreur d'Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:179
+#: ../src/common/zeroconf/connection_zeroconf.py:182
 #, python-format
 msgid ""
 "%s\n"
@@ -6233,44 +6402,44 @@ msgstr ""
 "%s\n"
 "La messagerie en « link-local » pourrait ne pas fonctionner correctement."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:190
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 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:199
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Could not start local service"
 msgstr "Impossible de lancer le service local"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Impossible de débloquer le port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-#: ../src/common/zeroconf/connection_zeroconf.py:283
-#: ../src/common/zeroconf/connection_zeroconf.py:294
-#: ../src/common/zeroconf/connection_zeroconf.py:308
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:286
+#: ../src/common/zeroconf/connection_zeroconf.py:297
+#: ../src/common/zeroconf/connection_zeroconf.py:311
 msgid "Please check if avahi-daemon is running."
 msgstr "Vérifiez si avahi-daemon est actif."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:282
-#: ../src/common/zeroconf/connection_zeroconf.py:293
-#: ../src/common/zeroconf/connection_zeroconf.py:307
+#: ../src/common/zeroconf/connection_zeroconf.py:285
+#: ../src/common/zeroconf/connection_zeroconf.py:296
+#: ../src/common/zeroconf/connection_zeroconf.py:310
 #, 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:325
+#: ../src/common/zeroconf/connection_zeroconf.py:328
 msgid "Your message could not be sent."
 msgstr "Votre message n'a pas pu être envoyé."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:335
+#: ../src/common/zeroconf/connection_zeroconf.py:338
 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:360
+#: ../src/common/zeroconf/connection_zeroconf.py:363
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6291,16 +6460,16 @@ msgstr "Message par défaut"
 msgid "Enabled"
 msgstr "Activé"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3078
+#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
 msgid "Default"
 msgstr "Par défaut"
 
-#: ../src/config.py:739 ../src/dialogs.py:1395
+#: ../src/config.py:733 ../src/dialogs.py:1409
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Le dictionnaire pour la langue %s est indisponible"
 
-#: ../src/config.py:740
+#: ../src/config.py:734
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6318,9 +6487,9 @@ msgid "status message text"
 msgstr "texte du message d'état :"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2383 ../src/dialogs.py:2449
-#: ../src/dialogs.py:3215 ../src/disco.py:866 ../src/disco.py:1726
-#: ../src/disco.py:2030 ../src/history_window.py:90
+#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
+#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
+#: ../src/disco.py:2048 ../src/history_window.py:90
 msgid "Name"
 msgstr "Nom"
 
@@ -6357,7 +6526,7 @@ msgstr ""
 "Toutes les fenêtres de conversation et de salons de discussion seront "
 "fermées. Voulez-vous continuer ?"
 
-#: ../src/config.py:1976 ../src/config.py:2509 ../src/config.py:2545
+#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
 msgid "You are currently connected to the server"
 msgstr "Vous êtes actuellement connecté au serveur"
 
@@ -6392,132 +6561,132 @@ msgstr "Le nom du compte ne peut pas être vide."
 msgid "Account name cannot contain spaces."
 msgstr "Le nom du compte ne peut pas contenir d'espaces."
 
-#: ../src/config.py:2072
+#: ../src/config.py:2074
 msgid "Rename Account"
 msgstr "Renommer le compte"
 
-#: ../src/config.py:2073
+#: ../src/config.py:2075
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Entrez un nouveau nom pour le compte %s"
 
-#: ../src/config.py:2101
+#: ../src/config.py:2103
 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:2318 ../src/config.py:3606
+#: ../src/config.py:2320 ../src/config.py:3623
 msgid "Invalid entry"
 msgstr "Entrée invalide"
 
-#: ../src/config.py:2319 ../src/config.py:3607
+#: ../src/config.py:2321 ../src/config.py:3624
 msgid "Custom port must be a port number."
 msgstr "Le port personnalisé doit être un numéro de port"
 
-#: ../src/config.py:2340
+#: ../src/config.py:2342
 msgid "Failed to get secret keys"
 msgstr "Erreur en récupérant les clés secrètes"
 
-#: ../src/config.py:2341
+#: ../src/config.py:2343
 msgid "There is no OpenPGP secret key available."
 msgstr "Aucune clef OpenPGP disponible."
 
-#: ../src/config.py:2375
+#: ../src/config.py:2377
 msgid "OpenPGP Key Selection"
 msgstr "Sélection d'une clé OpenPGP"
 
-#: ../src/config.py:2376
+#: ../src/config.py:2378
 msgid "Choose your OpenPGP key"
 msgstr "Choisissez votre clé OpenPGP"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2385
 msgid "No such account available"
 msgstr "Compte non disponible"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2386
 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:2391 ../src/dialogs.py:2136 ../src/dialogs.py:2371
-#: ../src/dialogs.py:2557 ../src/disco.py:511 ../src/profile_window.py:339
+#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
+#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
 msgid "You are not connected to the server"
 msgstr "Vous n'êtes pas connecté au serveur"
 
-#: ../src/config.py:2392
+#: ../src/config.py:2394
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Vous devez être connecté pour éditer vos informations."
 
-#: ../src/config.py:2396
+#: ../src/config.py:2398
 msgid "Your server doesn't support Vcard"
 msgstr "Votre serveur ne supporte pas les Vcard"
 
-#: ../src/config.py:2397
+#: ../src/config.py:2399
 msgid "Your server can't save your personal information."
 msgstr "Votre serveur ne peut enregistrer d'informations personnelles."
 
-#: ../src/config.py:2510 ../src/config.py:2546
+#: ../src/config.py:2512 ../src/config.py:2548
 msgid "To disable the account, you must be disconnected."
 msgstr "Afin de désactiver un compte vous devez être déconnecté."
 
-#: ../src/config.py:2515
+#: ../src/config.py:2517
 msgid "Account Local already exists."
 msgstr "Ce compte existe déjà localement."
 
-#: ../src/config.py:2516
+#: ../src/config.py:2518
 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:2673
+#: ../src/config.py:2675
 #, python-format
 msgid "Edit %s"
 msgstr "_Éditer %s"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2677
 #, python-format
 msgid "Register to %s"
 msgstr "S'enregistrer à %s"
 
 #. list at the beginning
-#: ../src/config.py:2711
+#: ../src/config.py:2713
 msgid "Ban List"
 msgstr "Liste des bannis"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2714
 msgid "Member List"
 msgstr "Liste des membres"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2714
 msgid "Owner List"
 msgstr "Liste des propriétaires"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2715
 msgid "Administrator List"
 msgstr "Liste des administrateurs"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2763 ../src/disco.py:873 ../src/history_manager.py:201
+#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
 msgid "JID"
 msgstr "Identifiant Jabber"
 
-#: ../src/config.py:2773
+#: ../src/config.py:2789
 msgid "Reason"
 msgstr "Raison"
 
-#: ../src/config.py:2780
+#: ../src/config.py:2796
 msgid "Nick"
 msgstr "Pseudonyme"
 
-#: ../src/config.py:2786
+#: ../src/config.py:2802
 msgid "Role"
 msgstr "Rôle"
 
-#: ../src/config.py:2813
+#: ../src/config.py:2829
 msgid "Banning..."
 msgstr "Bannissement de ..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2815
+#: ../src/config.py:2831
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6525,11 +6694,11 @@ msgstr ""
 "<b>Qui voulez-vous bannir ?</b>\n"
 "\n"
 
-#: ../src/config.py:2817
+#: ../src/config.py:2833
 msgid "Adding Member..."
 msgstr "Ajout d'un Membre ..."
 
-#: ../src/config.py:2818
+#: ../src/config.py:2834
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6537,11 +6706,11 @@ msgstr ""
 "<b>De qui voulez-vous faire un membre ?</b>\n"
 "\n"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2836
 msgid "Adding Owner..."
 msgstr "Ajout d'un Propriétaire ..."
 
-#: ../src/config.py:2821
+#: ../src/config.py:2837
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6549,11 +6718,11 @@ msgstr ""
 "<b>De qui voulez-vous faire un possesseur ?</b>\n"
 "\n"
 
-#: ../src/config.py:2823
+#: ../src/config.py:2839
 msgid "Adding Administrator..."
 msgstr "Ajout d'un Administrateur ..."
 
-#: ../src/config.py:2824
+#: ../src/config.py:2840
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6561,7 +6730,7 @@ msgstr ""
 "<b>De qui voulez-vous faire un administrateur ?</b>\n"
 "\n"
 
-#: ../src/config.py:2825
+#: ../src/config.py:2841
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6578,110 +6747,110 @@ msgstr ""
 "pseudo@domaine,\n"
 "domaine/ressource, ou les adresses comprenant un sous-domaine)."
 
-#: ../src/config.py:2926
+#: ../src/config.py:2943
 #, python-format
 msgid "Removing %s account"
 msgstr "Supprimer le compte %s"
 
-#: ../src/config.py:2941
+#: ../src/config.py:2958
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Émoticônes désactivées"
 
-#: ../src/config.py:2942
+#: ../src/config.py:2959
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2955 ../src/gui_interface.py:1132
-#: ../src/gui_interface.py:1243
+#: ../src/config.py:2972 ../src/gui_interface.py:311
+#: ../src/gui_interface.py:1048
 msgid "Password Required"
 msgstr "Mot de passe requis"
 
-#: ../src/config.py:2956 ../src/gui_interface.py:1223
+#: ../src/config.py:2973 ../src/gui_interface.py:1028
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entrez votre mot de passe pour le compte %s"
 
-#: ../src/config.py:2957 ../src/gui_interface.py:1243
+#: ../src/config.py:2974 ../src/gui_interface.py:1048
 msgid "Save password"
 msgstr "Enregistrer le mot de passe"
 
-#: ../src/config.py:2967
+#: ../src/config.py:2984
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Le compte \"%s\" est connecté au serveur"
 
-#: ../src/config.py:2968
+#: ../src/config.py:2985
 msgid "If you remove it, the connection will be lost."
 msgstr "Si vous l'enlevez, la connection sera perdue."
 
-#: ../src/config.py:2982
+#: ../src/config.py:2999
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "La connexion au proxy a échoué"
 
-#: ../src/config.py:2983
+#: ../src/config.py:3000
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Que voulez vous faire ?"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3001
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Supprimer le compte de Gajim _uniquement"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3002
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3078
+#: ../src/config.py:3095
 msgid "?print_status:All"
 msgstr "?print_status:Tout"
 
-#: ../src/config.py:3079
+#: ../src/config.py:3096
 msgid "Enter and leave only"
 msgstr "Entrées et sorties seulement"
 
-#: ../src/config.py:3080
+#: ../src/config.py:3097
 msgid "?print_status:None"
 msgstr "Aucun"
 
-#: ../src/config.py:3150
+#: ../src/config.py:3167
 msgid "New Group Chat"
 msgstr "Créer un salon de discussion"
 
-#: ../src/config.py:3183
+#: ../src/config.py:3200
 msgid "This bookmark has invalid data"
 msgstr "Ce marque-page contient des données invalides"
 
-#: ../src/config.py:3184
+#: ../src/config.py:3201
 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"
 
 #. invalid char
-#: ../src/config.py:3302 ../src/dialogs.py:1934
+#: ../src/config.py:3319 ../src/dialogs.py:1950
 msgid "Invalid nickname"
 msgstr "Nom d'utilisateur invalide"
 
-#: ../src/config.py:3303 ../src/config.py:3317 ../src/config.py:3331
+#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
 msgid "Character not allowed"
 msgstr "Caractère non-autorisé"
 
-#: ../src/config.py:3316 ../src/config.py:3582
+#: ../src/config.py:3333 ../src/config.py:3599
 msgid "Invalid server"
 msgstr "Serveur invalide"
 
-#: ../src/config.py:3330
+#: ../src/config.py:3347
 msgid "Invalid room"
 msgstr "Salon invalide"
 
-#: ../src/config.py:3498
+#: ../src/config.py:3515
 msgid "Account has been added successfully"
 msgstr "Compte ajouté avec succès"
 
-#: ../src/config.py:3499 ../src/config.py:3505
+#: ../src/config.py:3516 ../src/config.py:3522
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menu item under the Edit menu from the main "
@@ -6691,32 +6860,32 @@ msgstr ""
 "Avancé, ou plus tard en cliquant sur Comptes dans le menu Éditer de la "
 "fenêtre principale."
 
-#: ../src/config.py:3504
+#: ../src/config.py:3521
 msgid "Your new account has been created successfully"
 msgstr "Votre nouveau compte a été créé avec succès"
 
-#: ../src/config.py:3543
+#: ../src/config.py:3560
 msgid "Invalid username"
 msgstr "Nom d'utilisateur non valide"
 
-#: ../src/config.py:3545
+#: ../src/config.py:3562
 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:3583
+#: ../src/config.py:3600
 msgid "Please provide a server on which you want to register."
 msgstr "Saisissez un serveur sur lequel vous voulez vous enregistrer."
 
-#: ../src/config.py:3639 ../src/gui_interface.py:1904
+#: ../src/config.py:3656 ../src/gui_interface.py:1693
 msgid "Certificate Already in File"
 msgstr "Certificat déjà dans un Fichier"
 
-#: ../src/config.py:3640 ../src/gui_interface.py:1905
+#: ../src/config.py:3657 ../src/gui_interface.py:1694
 #, 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:3717
+#: ../src/config.py:3734
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6731,7 +6900,7 @@ msgstr ""
 "Erreur SSL  %(error)s\n"
 "Voulez vous toujours vous connecter au serveur ?"
 
-#: ../src/config.py:3723 ../src/gui_interface.py:1932
+#: ../src/config.py:3740 ../src/gui_interface.py:1721
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6742,63 +6911,72 @@ msgstr ""
 "Empreinte digitale SHA1 du certificat :\n"
 "%s"
 
-#: ../src/config.py:3755 ../src/config.py:3789
+#: ../src/config.py:3772 ../src/config.py:3806
 msgid "An error occurred during account creation"
 msgstr "Une erreur est survenue lors de la création du compte"
 
-#: ../src/config.py:3854
+#: ../src/config.py:3871
 msgid "Account name is in use"
 msgstr "Le nom du compte est utilisé"
 
-#: ../src/config.py:3855
+#: ../src/config.py:3872
 msgid "You already have an account using this name."
 msgstr "Vous avez déjà un compte avec ce nom."
 
-#: ../src/config.py:4009
+#: ../src/config.py:3991
+msgid "PEP node was not removed"
+msgstr "Le nœud PEP n'a pas été supprimé"
+
+#: ../src/config.py:3992
+#, 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"
+
+#: ../src/config.py:4036
 msgid "Active"
 msgstr "Actif"
 
-#: ../src/config.py:4017
+#: ../src/config.py:4044
 msgid "Event"
 msgstr "Événement"
 
-#: ../src/config.py:4052
+#: ../src/config.py:4079
 msgid "First Message Received"
 msgstr "Premier message reçu"
 
-#: ../src/config.py:4053
+#: ../src/config.py:4080
 msgid "Next Message Received Focused"
 msgstr "Message Reçu Suivant Avec le Focus."
 
-#: ../src/config.py:4055
+#: ../src/config.py:4082
 msgid "Next Message Received Unfocused"
 msgstr "Message Reçu Suivant Sans le Focus"
 
-#: ../src/config.py:4056
+#: ../src/config.py:4083
 msgid "Contact Connected"
 msgstr "Contact connecté"
 
-#: ../src/config.py:4057
+#: ../src/config.py:4084
 msgid "Contact Disconnected"
 msgstr "Contact déconnecté"
 
-#: ../src/config.py:4058
+#: ../src/config.py:4085
 msgid "Message Sent"
 msgstr "Message envoyé"
 
-#: ../src/config.py:4059
+#: ../src/config.py:4086
 msgid "Group Chat Message Highlight"
 msgstr "Message d'un salon mis en surbrillance"
 
-#: ../src/config.py:4060
+#: ../src/config.py:4087
 msgid "Group Chat Message Received"
 msgstr "Message reçu dans un salon"
 
-#: ../src/config.py:4061
+#: ../src/config.py:4088
 msgid "GMail Email Received"
 msgstr "Courriel Gmail reçu"
 
-#: ../src/conversation_textview.py:600
+#: ../src/conversation_textview.py:601
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6808,7 +6986,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:619
+#: ../src/conversation_textview.py:620
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6816,45 +6994,45 @@ 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:739
+#: ../src/conversation_textview.py:740
 msgid "_Quote"
 msgstr "_Citation"
 
-#: ../src/conversation_textview.py:746
+#: ../src/conversation_textview.py:747
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Actions pour \"%s\""
 
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Read _Wikipedia Article"
 msgstr "Lire l'Article _Wikipédia"
 
-#: ../src/conversation_textview.py:763
+#: ../src/conversation_textview.py:765
 msgid "Look it up in _Dictionary"
 msgstr "Chercher dans le _Dictionnaire"
 
-#: ../src/conversation_textview.py:780
+#: ../src/conversation_textview.py:782
 #, 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:793
+#: ../src/conversation_textview.py:795
 #, 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:796
+#: ../src/conversation_textview.py:798
 msgid "Web _Search for it"
 msgstr "_Rechercher sur Internet"
 
-#: ../src/conversation_textview.py:802
+#: ../src/conversation_textview.py:804
 msgid "Open as _Link"
 msgstr "Ouvrir en tant que _lien"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1296
+#: ../src/conversation_textview.py:1298
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6862,189 +7040,194 @@ msgstr[0] "Hier"
 msgstr[1] "Hier"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1344 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Sujet : %s\n"
 
-#: ../src/dataforms_widget.py:544
+#: ../src/dataforms_widget.py:545
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Impossible de charger le module d'inactivité"
 
-#: ../src/dataforms_widget.py:546
+#: ../src/dataforms_widget.py:547
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Invisibilité non-supportée"
 
-#: ../src/dataforms_widget.py:601
+#: ../src/dataforms_widget.py:562
+msgid "This field is required"
+msgstr ""
+
+#: ../src/dataforms_widget.py:607
 msgid "Jabber ID already in list"
 msgstr "Identifiant Jabber déjà existant"
 
-#: ../src/dataforms_widget.py:602
+#: ../src/dataforms_widget.py:608
 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:613
+#: ../src/dataforms_widget.py:619
 msgid "new@jabber.id"
 msgstr "nouveau@jabber.id"
 
-#: ../src/dataforms_widget.py:616 ../src/dataforms_widget.py:618
+#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "nouveau%d@jabber.id"
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nom du contact : <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Identifiant Jabber : <i>%s</i>"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:195
 msgid "Group"
 msgstr "Groupe"
 
-#: ../src/dialogs.py:201
+#: ../src/dialogs.py:202
 msgid "In the group"
 msgstr "Dans le groupe"
 
-#: ../src/dialogs.py:292
+#: ../src/dialogs.py:293
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:297
+#: ../src/dialogs.py:298
 msgid "Contact name"
 msgstr "Nom du contact"
 
-#: ../src/dialogs.py:469
+#: ../src/dialogs.py:470
 msgid "Set Mood"
 msgstr "Définir l'Humeur"
 
-#: ../src/dialogs.py:589
+#: ../src/dialogs.py:590
 #, python-format
 msgid "%s Status Message"
 msgstr "Message d'état %s"
 
-#: ../src/dialogs.py:603
+#: ../src/dialogs.py:604
 msgid "Status Message"
 msgstr "Message d'état"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:794
 msgid "Overwrite Status Message?"
 msgstr "Remplacer le message de statut ?"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:795
 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:802
+#: ../src/dialogs.py:803
 msgid "Save as Preset Status Message"
 msgstr "Enregistrer comme messages d'état prédéfini"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:804
 msgid "Please type a name for this status message"
 msgstr "Tapez un nom pour ce message d'état"
 
-#: ../src/dialogs.py:831
+#: ../src/dialogs.py:832
 msgid "AIM Address:"
 msgstr "Adresse AIM :"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:833
 msgid "GG Number:"
 msgstr "Numéro GG :"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:834
 msgid "ICQ Number:"
 msgstr "Numéro ICQ :"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:835
 msgid "MSN Address:"
 msgstr "Adresse MSN :"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:836
 msgid "Yahoo! Address:"
 msgstr "Adresse Yahoo! :"
 
-#: ../src/dialogs.py:872
+#: ../src/dialogs.py:873
 #, 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:875
+#: ../src/dialogs.py:876
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Remplissez les informations sur le contact à ajouter"
 
-#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
+#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
+#: ../src/dialogs.py:3464
 msgid "Invalid User ID"
 msgstr "Identifiant utilisateur non valide"
 
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1052
 msgid "The user ID must not contain a resource."
 msgstr "L'identifiant utilisateur ne doit pas contenir de ressource."
 
-#: ../src/dialogs.py:1051
+#: ../src/dialogs.py:1057
 msgid "You cannot add yourself to your roster."
 msgstr "Vous ne pouvez pas vous ajouter à votre propre roster."
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1071
 msgid "Contact already in roster"
 msgstr "Contact déjà dans la liste"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1072
 msgid "This contact is already listed in your roster."
 msgstr "Le contact est déjà dans votre liste."
 
-#: ../src/dialogs.py:1112
+#: ../src/dialogs.py:1118
 msgid "User ID:"
 msgstr "Identifiant :"
 
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1189
 msgid "A GTK+ jabber client"
 msgstr "Un client Jabber en GTK+"
 
-#: ../src/dialogs.py:1176
+#: ../src/dialogs.py:1190
 msgid "GTK+ Version:"
 msgstr "Version de GTK+ :"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1191
 msgid "PyGTK Version:"
 msgstr "Version de PyGTK :"
 
-#: ../src/dialogs.py:1187
+#: ../src/dialogs.py:1201
 msgid "Current Developers:"
 msgstr "Développeurs actuels :"
 
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1203
 msgid "Past Developers:"
 msgstr "Anciens développeurs :"
 
-#: ../src/dialogs.py:1195
+#: ../src/dialogs.py:1209
 msgid "THANKS:"
 msgstr "MERCI :"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1215
 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:1213
+#: ../src/dialogs.py:1227
 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:1396
+#: ../src/dialogs.py:1410
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7057,106 +7240,106 @@ msgstr ""
 "\n"
 "Le soulignement des fautes d'orthographe ne sera pas utilisé"
 
-#: ../src/dialogs.py:1935 ../src/dialogs.py:2322
+#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
 msgid "The nickname has not allowed characters."
 msgstr "Le pseudonyme contient des caractères non autorisés."
 
-#: ../src/dialogs.py:2053
+#: ../src/dialogs.py:2069
 #, 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:2056
+#: ../src/dialogs.py:2072
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Requête d'inscription de la part de %s"
 
-#: ../src/dialogs.py:2131 ../src/gui_interface.py:2672
+#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Vous êtes déjà dans le salon %s"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2153
 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:2178
+#: ../src/dialogs.py:2194
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Rejoindre un salon de discussion en tant que %s"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2325
 msgid "Invalid Account"
 msgstr "Compte invalide"
 
-#: ../src/dialogs.py:2310
+#: ../src/dialogs.py:2326
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr ""
 "Vous devez choisir un compte depuis lequel vous souhaitez rejoindre le salon "
 "de discussion."
 
-#: ../src/dialogs.py:2321
+#: ../src/dialogs.py:2337
 msgid "Invalid Nickname"
 msgstr "Nom d'utilisateur invalide"
 
-#: ../src/dialogs.py:2326 ../src/dialogs.py:2332
-#: ../src/groupchat_control.py:1832
+#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
+#: ../src/groupchat_control.py:1847
 msgid "Invalid group chat Jabber ID"
 msgstr "Identifiant Jabber de salon invalide"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2343
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "Veuillez entrer l'identifiant Jabber du salon, comme salon@serveur"
 
-#: ../src/dialogs.py:2333 ../src/groupchat_control.py:1833
+#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
 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:2340
+#: ../src/dialogs.py:2356
 msgid "This is not a group chat"
 msgstr "Ceci n'est pas une conversation multi-utilisateurs"
 
-#: ../src/dialogs.py:2341
+#: ../src/dialogs.py:2357
 #, 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:2372
+#: ../src/dialogs.py:2388
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sans connexion, vous ne pouvez pas synchroniser vos contacts."
 
-#: ../src/dialogs.py:2386
+#: ../src/dialogs.py:2402
 msgid "Server"
 msgstr "Serveur"
 
-#: ../src/dialogs.py:2421
+#: ../src/dialogs.py:2437
 msgid "This account is not connected to the server"
 msgstr "Ce compte est connecté au serveur"
 
-#: ../src/dialogs.py:2422
+#: ../src/dialogs.py:2438
 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:2446
+#: ../src/dialogs.py:2462
 msgid "Synchronise"
 msgstr "Synchroniser"
 
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2523
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Commencer une discussion avec le compte %s"
 
-#: ../src/dialogs.py:2509
+#: ../src/dialogs.py:2525
 msgid "Start Chat"
 msgstr "Commencer une discussion"
 
-#: ../src/dialogs.py:2510
+#: ../src/dialogs.py:2526
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7165,168 +7348,168 @@ msgstr ""
 "envoyer un message :"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2536 ../src/dialogs.py:2917 ../src/dialogs.py:3129
+#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
 msgid "Connection not available"
 msgstr "Connexion non disponible"
 
-#: ../src/dialogs.py:2537 ../src/dialogs.py:2918 ../src/dialogs.py:3130
+#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vérifiez que vous êtes connecté avec \"%s\"."
 
-#: ../src/dialogs.py:2546 ../src/dialogs.py:2549
+#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
 msgid "Invalid JID"
 msgstr "Identifiant Jabber invalide"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2565
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossible d'interpréter \"%s\"."
 
-#: ../src/dialogs.py:2558
+#: ../src/dialogs.py:2574
 msgid "Without a connection, you can not change your password."
 msgstr "Vous devez être connecté pour changer votre mot de passe."
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "Invalid password"
 msgstr "Mot de passe invalide"
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "You must enter a password."
 msgstr "Vous devez entrer un mot de passe."
 
-#: ../src/dialogs.py:2581
+#: ../src/dialogs.py:2597
 msgid "Passwords do not match"
 msgstr "Les mots de passe ne correspondent pas"
 
-#: ../src/dialogs.py:2582
+#: ../src/dialogs.py:2598
 msgid "The passwords typed in both fields must be identical."
 msgstr "Les mots de passe tapés dans chaque champs doivent être identiques."
 
 #. default value
-#: ../src/dialogs.py:2619 ../src/notify.py:247 ../src/notify.py:473
+#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
 msgid "Contact Signed In"
 msgstr "Contact connecté"
 
-#: ../src/dialogs.py:2621 ../src/notify.py:255 ../src/notify.py:475
+#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
 msgid "Contact Signed Out"
 msgstr "Contact déconnecté"
 
 #. chat message
-#: ../src/dialogs.py:2623 ../src/notify.py:277 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
 msgid "New Message"
 msgstr "Nouveau message"
 
 #. single message
-#: ../src/dialogs.py:2623 ../src/notify.py:259 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
 msgid "New Single Message"
 msgstr "Nouveau message simple"
 
 #. private message
-#: ../src/dialogs.py:2624 ../src/notify.py:265 ../src/notify.py:478
+#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
 msgid "New Private Message"
 msgstr "Nouveau message privé"
 
-#: ../src/dialogs.py:2624 ../src/gui_interface.py:1358 ../src/notify.py:487
+#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
 msgid "New E-mail"
 msgstr "Nouveau courrier électronique"
 
-#: ../src/dialogs.py:2626 ../src/gui_interface.py:1420 ../src/notify.py:480
+#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
 msgid "File Transfer Request"
 msgstr "Requête de transfert de fichier"
 
-#: ../src/dialogs.py:2628 ../src/gui_interface.py:1320
-#: ../src/gui_interface.py:1389 ../src/notify.py:482
+#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
+#: ../src/gui_interface.py:1186 ../src/notify.py:482
 msgid "File Transfer Error"
 msgstr "Erreur de Transfert de fichier"
 
-#: ../src/dialogs.py:2630 ../src/gui_interface.py:1466
-#: ../src/gui_interface.py:1489 ../src/gui_interface.py:1506
+#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
+#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
 #: ../src/notify.py:484
 msgid "File Transfer Completed"
 msgstr "Transfert de fichier terminé"
 
-#: ../src/dialogs.py:2631 ../src/gui_interface.py:1469 ../src/notify.py:485
+#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
 msgid "File Transfer Stopped"
 msgstr "Transfert de fichier interrompu"
 
-#: ../src/dialogs.py:2633 ../src/gui_interface.py:1152 ../src/notify.py:489
+#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
 msgid "Groupchat Invitation"
 msgstr "Invitation à un salon"
 
-#: ../src/dialogs.py:2635 ../src/notify.py:239 ../src/notify.py:491
+#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
 msgid "Contact Changed Status"
 msgstr "Le contact a changé d'état"
 
-#: ../src/dialogs.py:2836
+#: ../src/dialogs.py:2852
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Message simple en tant que %s"
 
-#: ../src/dialogs.py:2838
+#: ../src/dialogs.py:2854
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Message simple dans le compte %s"
 
-#: ../src/dialogs.py:2840
+#: ../src/dialogs.py:2856
 msgid "Single Message"
 msgstr "Message simple"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2843
+#: ../src/dialogs.py:2859
 #, python-format
 msgid "Send %s"
 msgstr "Envoyer %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:2882
 #, python-format
 msgid "Received %s"
 msgstr "%s Reçu"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2889
+#: ../src/dialogs.py:2905
 #, 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:2968
+#: ../src/dialogs.py:2984
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:2985
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s a écrit :\n"
 
-#: ../src/dialogs.py:3028
+#: ../src/dialogs.py:3044
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML pour %s"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3046
 msgid "XML Console"
 msgstr "Console XML"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "add"
 msgstr "Triste"
 
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "modify"
 msgstr "Modifier"
 
-#: ../src/dialogs.py:3160
+#: ../src/dialogs.py:3176
 #, fuzzy
 msgid "remove"
 msgstr "Suppri_mer"
 
-#: ../src/dialogs.py:3188
+#: ../src/dialogs.py:3204
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7335,155 +7518,189 @@ msgstr ""
 "<b>%s</b> aimerait que vous <b>%s</b> quelques contacts dans votre roster."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3204 ../src/dialogs.py:3250
+#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
 msgid "Add"
 msgstr "Ajouter"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3206 ../src/dialogs.py:3281
+#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
 msgid "Modify"
 msgstr "Modifier"
 
-#: ../src/dialogs.py:3212
+#: ../src/dialogs.py:3228
 msgid "Jabber ID"
 msgstr "Identifiant Jabber"
 
-#: ../src/dialogs.py:3218
+#: ../src/dialogs.py:3234
 msgid "Groups"
 msgstr "Groupes"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3342
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s m'a conseillé de vous ajouter à mes contacts."
 
-#: ../src/dialogs.py:3340
+#: ../src/dialogs.py:3356
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "_Ajouter un contact"
 
-#: ../src/dialogs.py:3377
+#: ../src/dialogs.py:3393
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Enlever le contact de la liste"
 
-#: ../src/dialogs.py:3430
+#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#, python-format
+msgid "Archiving Preferences for %s"
+msgstr ""
+
+#: ../src/dialogs.py:3473
+#, fuzzy
+msgid "Invalid expire value"
+msgstr "Nom de serveur invalide"
+
+#: ../src/dialogs.py:3474
+msgid "Expire must be a valid positive integer."
+msgstr ""
+
+#: ../src/dialogs.py:3521
+msgid "There is an error with the form"
+msgstr ""
+
+#: ../src/dialogs.py:3732
+#, fuzzy
+msgid "There is an error"
+msgstr "Le service a renvoyé une erreur."
+
+#: ../src/dialogs.py:3796
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Liste privée <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3434
+#: ../src/dialogs.py:3800
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Liste privée pour %s"
 
-#: ../src/dialogs.py:3490
+#: ../src/dialogs.py:3856
 #, 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:3495
+#: ../src/dialogs.py:3861
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordre : %(order)s, action: %(action)s"
 
-#: ../src/dialogs.py:3539
+#: ../src/dialogs.py:3905
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Modifier une règle</b>"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:4016
 msgid "<b>Add a rule</b>"
 msgstr "<b>Ajouter une règle</b>"
 
-#: ../src/dialogs.py:3750
+#: ../src/dialogs.py:4116
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listes privées pour %s"
 
-#: ../src/dialogs.py:3752
+#: ../src/dialogs.py:4118
 msgid "Privacy Lists"
 msgstr "Listes privées"
 
-#: ../src/dialogs.py:3822
+#: ../src/dialogs.py:4188
 msgid "Invalid List Name"
 msgstr "Nom de liste invalide"
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4189
 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:3855
+#: ../src/dialogs.py:4221
 msgid "You are invited to a groupchat"
 msgstr "Vous êtes invité(e) dans un groupe de discussion"
 
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4224
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact vous a invité dans un salon de discussion"
 
-#: ../src/dialogs.py:3860
+#: ../src/dialogs.py:4226
 #, 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:3868
+#: ../src/dialogs.py:4234
 #, python-format
 msgid "Comment: %s"
 msgstr "Commentaire : %s"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4236
 msgid "Do you want to accept the invitation?"
 msgstr "Voulez-vous accepter l'invitation ?"
 
-#: ../src/dialogs.py:3932
+#: ../src/dialogs.py:4298
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:3942 ../src/dialogs.py:3985 ../src/dialogs.py:4041
+#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
+#: ../src/dialogs.py:4495
 msgid "All files"
 msgstr "Tous les fichiers"
 
-#: ../src/dialogs.py:3947
+#: ../src/dialogs.py:4313
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:3975
+#: ../src/dialogs.py:4341
 msgid "Choose Sound"
 msgstr "Choisissez un son"
 
-#: ../src/dialogs.py:3990
+#: ../src/dialogs.py:4356
 msgid "Wav Sounds"
 msgstr "Sons wav"
 
-#: ../src/dialogs.py:4028
+#: ../src/dialogs.py:4394
 msgid "Choose Image"
 msgstr "Choisissez une Image"
 
-#: ../src/dialogs.py:4046
+#: ../src/dialogs.py:4412
 msgid "Images"
 msgstr "Images"
 
-#: ../src/dialogs.py:4113
+#: ../src/dialogs.py:4482
+#, fuzzy
+msgid "Choose Archive"
+msgstr "Choisissez une Image"
+
+#: ../src/dialogs.py:4500
+#, fuzzy
+msgid "Zip files"
+msgstr "Tous les fichiers"
+
+#: ../src/dialogs.py:4525
 #, python-format
 msgid "When %s becomes:"
 msgstr "Quand %s devient :"
 
-#: ../src/dialogs.py:4115
+#: ../src/dialogs.py:4527
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Ajout de notifications spéciales pour %s"
 
-#: ../src/dialogs.py:4190
+#: ../src/dialogs.py:4602
 msgid "Condition"
 msgstr "Condition"
 
-#: ../src/dialogs.py:4310
+#: ../src/dialogs.py:4722
 msgid "when I am "
 msgstr "quand je suis "
 
-#: ../src/dialogs.py:4786
+#: ../src/dialogs.py:5198
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7494,19 +7711,19 @@ msgstr ""
 "\n"
 "La Short Authentication String cette session est <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4789
+#: ../src/dialogs.py:5201
 msgid "You have already verified this contact's identity."
 msgstr "Vous avez déjà vérifié l'identité de ce contact."
 
-#: ../src/dialogs.py:4795 ../src/dialogs.py:4879
+#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
 msgid "Contact's identity verified"
 msgstr "Identité du contact vérifiée"
 
-#: ../src/dialogs.py:4801
+#: ../src/dialogs.py:5213
 msgid "Verify again..."
 msgstr "Vérifier à nouveau..."
 
-#: ../src/dialogs.py:4806
+#: ../src/dialogs.py:5218
 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 "
@@ -7516,19 +7733,19 @@ msgstr ""
 "messages et vous en envoyer, vous devez vérifier son identité en cliquant "
 "sur le bouton en-dessous."
 
-#: ../src/dialogs.py:4809 ../src/dialogs.py:4860 ../src/dialogs.py:4873
+#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
 msgid "Contact's identity NOT verified"
 msgstr "Identité du contact NON vérifiée"
 
-#: ../src/dialogs.py:4814
+#: ../src/dialogs.py:5226
 msgid "Verify..."
 msgstr "Vérifier..."
 
-#: ../src/dialogs.py:4825
+#: ../src/dialogs.py:5237
 msgid "Have you verified the contact's identity?"
 msgstr "Avez-vous vérifié l'identité du contact ?"
 
-#: ../src/dialogs.py:4826
+#: ../src/dialogs.py:5238
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7543,24 +7760,24 @@ msgstr ""
 "\n"
 "La Short Authentication String de cette session est : <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4827
+#: ../src/dialogs.py:5239
 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:4861
+#: ../src/dialogs.py:5273
 #, 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:4867
+#: ../src/dialogs.py:5279
 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:4874
+#: ../src/dialogs.py:5286
 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."
@@ -7569,7 +7786,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:4880
+#: ../src/dialogs.py:5292
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7577,19 +7794,19 @@ msgstr ""
 "Une clef GPG est assignée à ce contact, et vous avez confiance en sa clef, "
 "les messages seront donc chiffrés."
 
-#: ../src/dialogs.py:4945
+#: ../src/dialogs.py:5357
 msgid "an audio and video"
 msgstr "audio et vidéo"
 
-#: ../src/dialogs.py:4947
+#: ../src/dialogs.py:5359
 msgid "an audio"
 msgstr "audio"
 
-#: ../src/dialogs.py:4949
+#: ../src/dialogs.py:5361
 msgid "a video"
 msgstr "vidéo"
 
-#: ../src/dialogs.py:4953
+#: ../src/dialogs.py:5365
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7607,24 +7824,24 @@ msgstr "Autres"
 msgid "Conference"
 msgstr "Conférences"
 
-#: ../src/disco.py:512
+#: ../src/disco.py:513
 msgid "Without a connection, you can not browse available services"
 msgstr "Vous devez être connecté pour parcourir les services disponibles"
 
-#: ../src/disco.py:589
+#: ../src/disco.py:600
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Gestion des Services du compte %s"
 
-#: ../src/disco.py:591
+#: ../src/disco.py:602
 msgid "Service Discovery"
 msgstr "Gestion des Services"
 
-#: ../src/disco.py:741
+#: ../src/disco.py:758
 msgid "The service could not be found"
 msgstr "Le service n'a pu être trouvé"
 
-#: ../src/disco.py:742
+#: ../src/disco.py:759
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7632,96 +7849,96 @@ 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:746 ../src/disco.py:1082
+#: ../src/disco.py:763 ../src/disco.py:1100
 msgid "The service is not browsable"
 msgstr "Le service ne peut pas être parcouru"
 
-#: ../src/disco.py:747
+#: ../src/disco.py:764
 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:786 ../src/disco.py:796
+#: ../src/disco.py:804 ../src/disco.py:814
 msgid "Invalid Server Name"
 msgstr "Nom de serveur invalide"
 
-#: ../src/disco.py:850
+#: ../src/disco.py:868
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Parcourt %(address)s en utilisant le compte %(account)s"
 
-#: ../src/disco.py:894
+#: ../src/disco.py:912
 msgid "_Browse"
 msgstr "_Parcourir"
 
-#: ../src/disco.py:1083
+#: ../src/disco.py:1101
 msgid "This service does not contain any items to browse."
 msgstr "Ce service ne contient aucun élément à parcourir."
 
-#: ../src/disco.py:1323
+#: ../src/disco.py:1341
 msgid "_Execute Command"
 msgstr "_Exécuter une commande"
 
-#: ../src/disco.py:1333 ../src/disco.py:1504
+#: ../src/disco.py:1351 ../src/disco.py:1522
 msgid "Re_gister"
 msgstr "_Souscrire"
 
-#: ../src/disco.py:1545
+#: ../src/disco.py:1563
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Scanne %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1736
+#: ../src/disco.py:1754
 msgid "Users"
 msgstr "Utilisateurs"
 
 # ccount). Description column
 #. Description column
-#: ../src/disco.py:1744
+#: ../src/disco.py:1762
 msgid "Description"
 msgstr "Description"
 
 #. Id column
-#: ../src/disco.py:1752
+#: ../src/disco.py:1770
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1817 ../src/gui_interface.py:3182
+#: ../src/disco.py:1835 ../src/gui_interface.py:2995
 msgid "Bookmark already set"
 msgstr "Marque-page déjà spécifié"
 
-#: ../src/disco.py:1818 ../src/gui_interface.py:3183
+#: ../src/disco.py:1836 ../src/gui_interface.py:2996
 #, 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:1827 ../src/gui_interface.py:3197
+#: ../src/disco.py:1845 ../src/gui_interface.py:3010
 msgid "Bookmark has been added successfully"
 msgstr "Marque-page ajouté avec succès"
 
-#: ../src/disco.py:1828 ../src/gui_interface.py:3198
+#: ../src/disco.py:1846 ../src/gui_interface.py:3011
 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:2039
+#: ../src/disco.py:2057
 msgid "Subscribed"
 msgstr "Inscrit"
 
-#: ../src/disco.py:2047
+#: ../src/disco.py:2065
 msgid "Node"
 msgstr "NÅ“ud"
 
-#: ../src/disco.py:2111
+#: ../src/disco.py:2129
 msgid "New post"
 msgstr "Nouvel article"
 
-#: ../src/disco.py:2117
+#: ../src/disco.py:2135
 msgid "_Subscribe"
 msgstr "_Ajouter"
 
-#: ../src/disco.py:2123
+#: ../src/disco.py:2141
 msgid "_Unsubscribe"
 msgstr "_Désinscrire"
 
@@ -7901,17 +8118,19 @@ msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Transforme les expressions LaTeX entre $$ $$."
 
 #: ../src/features_window.py:95
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
-"in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
 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:96
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
+"You have to set 'use_latex' to True in the Advanced Configuration Editor."
 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."
@@ -8067,12 +8286,12 @@ msgstr "Description : %s"
 msgid "%s wants to send you a file:"
 msgstr "%s souhaite vous envoyer un fichier :"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Impossible de remplacer le fichier existant \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -8080,22 +8299,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:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 msgid "This file already exists"
 msgstr "Ce fichier existe déjà"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 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:369 ../src/gtkgui_helpers.py:914
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Le dossier \"%s\" n'est pas accessible en écriture"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
 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."
 
@@ -8197,28 +8416,28 @@ msgstr ""
 "Gajim semble déjà être en cours d'exécution\n"
 "Démarrer quand même ?"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
 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:80
+#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
 msgid "command"
 msgstr "commande"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "montrer l'aide sur la commande"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Montre ou cache la fenêtre principale"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
 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:93
+#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8226,6 +8445,13 @@ msgstr ""
 "Affiche une liste de tous les contacts de la liste. Chaque contact apparaît "
 "sur une ligne séparée"
 
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
+#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
+#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
+#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
 #: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
 #: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
 #: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
@@ -8237,41 +8463,33 @@ msgstr ""
 msgid "account"
 msgstr "compte"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "montrer seulement les contacts du compte spécifié"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Affiche la liste des comptes enregistrés"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
 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:109
+#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
 msgid "status"
 msgstr "état"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106
 #, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"accoun't previous status"
+msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "un parmi : offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
-msgid "message"
-msgstr "message"
-
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "Message d'état"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8280,46 +8498,22 @@ msgstr ""
 "changer l'état de tous les compte qui ont l'option \"synchroniser avec "
 "l'état global\" activée"
 
-#: ../src/gajim-remote.py:117
-msgid "Changes the priority of account or accounts"
-msgstr "Change la priorité du ou des compte(s)"
-
-#: ../src/gajim-remote.py:119
-msgid "priority"
-msgstr "Priorité :"
-
-#: ../src/gajim-remote.py:119
-msgid "priority you want to give to the account"
-msgstr "priorité que vous voulez donner au compte"
-
-#: ../src/gajim-remote.py:121
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-msgstr ""
-"Change la priorité du compte spécifié. Si aucun compte n'est spécifié, "
-"change la priorité de tous les comptes qui ont l'option « synchroniser avec "
-"l'état global » activée"
-
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
 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:129
+#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
 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-plugin.py:118 ../src/gajim-remote-plugin.py:205
 #: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 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:134
-msgid "message content. The account must be specified or \"\""
-msgstr "contenu du message. Le compte doit être spécifié ou \"\""
-
-#: ../src/gajim-remote.py:139
+#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
 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 "
@@ -8329,29 +8523,34 @@ 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-plugin.py:127 ../src/gajim-remote-plugin.py:140
 #: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "L'identifiant Jabber du contact qui recevra le message"
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
+#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "contenu du message"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "clé pgp"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 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:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
+#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
 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:152
+#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
 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 "
@@ -8361,106 +8560,277 @@ 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:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "sujet"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "sujet du message"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
 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:168
+#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "L'identifiant Jabber du salon qui recevra le message"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Récupère les informations détaillées d'un contact"
 
+#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
+#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
 #: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
 #: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "L'identifiant Jabber du contact"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Récupère les informations détaillées d'un compte"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Nom du compte"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Envoyer un fichier à un contact"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "file"
 msgstr "fichier"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Chemin du fichier"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
 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:196
+#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Liste toutes les préférences et leurs valeurs"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Définir la valeur de 'clé' à 'valeur'."
 
-#: ../src/gajim-remote.py:202
-msgid "key=value"
-msgstr "clé=valeur"
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+msgid "key=value"
+msgstr "clé=valeur"
+
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+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-plugin.py:191 ../src/gajim-remote.py:207
+msgid "Deletes a preference item"
+msgstr "Supprime une option de préférence"
+
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "key"
+msgstr "touche"
+
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "name of the preference to be deleted"
+msgstr "nom de la préférence a supprimer"
+
+#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+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-plugin.py:202 ../src/gajim-remote.py:218
+msgid "Removes contact from roster"
+msgstr "Enlever le contact de la liste"
+
+#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+msgid "Adds contact to roster"
+msgstr "Ajouter le contact à la liste"
+
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+msgid "Adds new contact to this account"
+msgstr "Ajoute un nouveau contact à ce compte"
+
+#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+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-plugin.py:226
+#, fuzzy
+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-plugin.py:233 ../src/gajim-remote.py:249
+msgid "Returns number of unread messages"
+msgstr "Renvoie le nombre de messages non-lus"
+
+#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+msgid "Opens 'Start Chat' dialog"
+msgstr "Ouvre la fenêtre « Commencer une discussion »"
+
+#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+msgid "Starts chat, using this account"
+msgstr "Commencer une discussion en utilisant ce compte"
+
+#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+msgid "Sends custom XML"
+msgstr "Envoyer du XML personnalisé"
+
+#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+msgid "XML to send"
+msgstr "XML à envoyer"
+
+#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+"Compte dans lequel le XML sera envoyé ; si non spécifié, le XML sera envoyé "
+"à tous les comptes"
+
+#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
+msgid "Handle a xmpp:/ uri"
+msgstr "Gère une URI du type xmpp:"
+
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
+msgid "uri"
+msgstr "URI"
+
+#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+msgid "Join a MUC room"
+msgstr "Joindre un groupe de discussions"
+
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+msgid "room"
+msgstr "groupe de discussion"
+
+#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+msgid "nick"
+msgstr "pseudonyme"
+
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+msgid "password"
+msgstr "mot de passe"
+
+#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+msgid "Check if Gajim is running"
+msgstr "Vérifie si Gajim est lancé"
+
+#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
+#: ../src/gajim-remote.py:300
+msgid "Shows or hides the ipython window"
+msgstr "Montre ou cache la fenêtre ipython"
+
+#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+msgid "Missing argument \"contact_jid\""
+msgstr "Argument manquant \"jid_contact\""
+
+#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#, python-format
+msgid ""
+"'%s' is not in your roster.\n"
+"Please specify account for sending the message."
+msgstr ""
+"'%s' n'est pas dans votre liste de contact.\n"
+"Précisez le compte pour envoyer le message."
+
+#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+msgid "You have no active account"
+msgstr "Vous n'avez aucun compte actif"
+
+#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+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-plugin.py:412
+#, python-format
+msgid ""
+"Usage: %s %s %s \n"
+"\t %s"
+msgstr ""
+"Usage: %s %s %s \n"
+"\t %s"
+
+#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+msgid "Arguments:"
+msgstr "Arguments :"
+
+#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#, python-format
+msgid "%s not found"
+msgstr "%s non trouvé"
 
-#: ../src/gajim-remote.py:202
-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-plugin.py:423 ../src/gajim-remote.py:445
+#, python-format
+msgid ""
+"Usage: %s command [arguments]\n"
+"Command is one of:\n"
+msgstr ""
+"Utilisation : %s commande [arguments]\n"
+"commande est l'une de :\n"
 
-#: ../src/gajim-remote.py:207
-msgid "Deletes a preference item"
-msgstr "Supprime une option de préférence"
+#: ../src/gajim-remote-plugin.py:496
+#, fuzzy, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Trop d'arguments.\n"
+"Tapez \"%(basename)s help %(command)s\" pour plus d'informations"
 
-#: ../src/gajim-remote.py:209
-msgid "key"
-msgstr "touche"
+#: ../src/gajim-remote-plugin.py:500
+#, fuzzy, python-format
+msgid ""
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
+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:209
-msgid "name of the preference to be deleted"
-msgstr "nom de la préférence a supprimer"
+#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
+msgid "Wrong uri"
+msgstr "Mauvaise adresse (URI)"
 
-#: ../src/gajim-remote.py:213
-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:109
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
+msgstr "un parmi : offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:218
-msgid "Removes contact from roster"
-msgstr "Enlever le contact de la liste"
+#: ../src/gajim-remote.py:117
+msgid "Changes the priority of account or accounts"
+msgstr "Change la priorité du ou des compte(s)"
 
-#: ../src/gajim-remote.py:227
-msgid "Adds contact to roster"
-msgstr "Ajouter le contact à la liste"
+#: ../src/gajim-remote.py:119
+msgid "priority"
+msgstr "Priorité :"
 
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "identifiant Jabber"
+#: ../src/gajim-remote.py:119
+msgid "priority you want to give to the account"
+msgstr "priorité que vous voulez donner au compte"
 
-#: ../src/gajim-remote.py:230
-msgid "Adds new contact to this account"
-msgstr "Ajoute un nouveau contact à ce compte"
+#: ../src/gajim-remote.py:121
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"Change la priorité du compte spécifié. Si aucun compte n'est spécifié, "
+"change la priorité de tous les comptes qui ont l'option « synchroniser avec "
+"l'état global » activée"
 
-#: ../src/gajim-remote.py:235
-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:134
+msgid "message content. The account must be specified or \"\""
+msgstr "contenu du message. Le compte doit être spécifié ou \"\""
 
 #: ../src/gajim-remote.py:242
 msgid ""
@@ -8469,34 +8839,6 @@ msgstr ""
 "Renvoie le message d'état actuel (global à moins qu'un compte ne soit "
 "spécifié)"
 
-#: ../src/gajim-remote.py:249
-msgid "Returns number of unread messages"
-msgstr "Renvoie le nombre de messages non-lus"
-
-#: ../src/gajim-remote.py:253
-msgid "Opens 'Start Chat' dialog"
-msgstr "Ouvre la fenêtre « Commencer une discussion »"
-
-#: ../src/gajim-remote.py:255
-msgid "Starts chat, using this account"
-msgstr "Commencer une discussion en utilisant ce compte"
-
-#: ../src/gajim-remote.py:259
-msgid "Sends custom XML"
-msgstr "Envoyer du XML personnalisé"
-
-#: ../src/gajim-remote.py:261
-msgid "XML to send"
-msgstr "XML à envoyer"
-
-#: ../src/gajim-remote.py:262
-msgid ""
-"Account in which the xml will be sent; if not specified, xml will be sent to "
-"all accounts"
-msgstr ""
-"Compte dans lequel le XML sera envoyé ; si non spécifié, le XML sera envoyé "
-"à tous les comptes"
-
 #: ../src/gajim-remote.py:268
 #, fuzzy
 msgid "Change the avatar"
@@ -8516,14 +8858,6 @@ msgstr ""
 "Compte dans lequel le XML sera envoyé ; si non spécifié, le XML sera envoyé "
 "à tous les comptes"
 
-#: ../src/gajim-remote.py:277
-msgid "Handle a xmpp:/ uri"
-msgstr "Gère une URI du type xmpp:"
-
-#: ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "URI"
-
 #: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr "URI à gérer"
@@ -8536,30 +8870,14 @@ msgstr "Compte avec lequel vous voulez le gérer"
 msgid "Message content"
 msgstr "Contenu du message"
 
-#: ../src/gajim-remote.py:286
-msgid "Join a MUC room"
-msgstr "Joindre un groupe de discussions"
-
-#: ../src/gajim-remote.py:288
-msgid "room"
-msgstr "groupe de discussion"
-
 #: ../src/gajim-remote.py:288
 msgid "Room JID"
 msgstr "JID du salon"
 
-#: ../src/gajim-remote.py:289
-msgid "nick"
-msgstr "pseudonyme"
-
 #: ../src/gajim-remote.py:289
 msgid "Nickname to use"
 msgstr "Surnom à utiliser"
 
-#: ../src/gajim-remote.py:290
-msgid "password"
-msgstr "mot de passe"
-
 #: ../src/gajim-remote.py:290
 msgid "Password to enter the room"
 msgstr "Mot de passe pour entrer dans le salon"
@@ -8568,37 +8886,6 @@ msgstr "Mot de passe pour entrer dans le salon"
 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:296
-msgid "Check if Gajim is running"
-msgstr "Vérifie si Gajim est lancé"
-
-#: ../src/gajim-remote.py:300
-msgid "Shows or hides the ipython window"
-msgstr "Montre ou cache la fenêtre ipython"
-
-#: ../src/gajim-remote.py:327
-msgid "Missing argument \"contact_jid\""
-msgstr "Argument manquant \"jid_contact\""
-
-#: ../src/gajim-remote.py:348
-#, python-format
-msgid ""
-"'%s' is not in your roster.\n"
-"Please specify account for sending the message."
-msgstr ""
-"'%s' n'est pas dans votre liste de contact.\n"
-"Précisez le compte pour envoyer le message."
-
-#: ../src/gajim-remote.py:351
-msgid "You have no active account"
-msgstr "Vous n'avez aucun compte actif"
-
-#: ../src/gajim-remote.py:404
-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:431
 #, python-format
 msgid ""
@@ -8608,24 +8895,6 @@ msgstr ""
 "Utilisation : %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:435
-msgid "Arguments:"
-msgstr "Arguments :"
-
-#: ../src/gajim-remote.py:439
-#, python-format
-msgid "%s not found"
-msgstr "%s non trouvé"
-
-#: ../src/gajim-remote.py:445
-#, python-format
-msgid ""
-"Usage: %s command [arguments]\n"
-"Command is one of:\n"
-msgstr ""
-"Utilisation : %s commande [arguments]\n"
-"commande est l'une de :\n"
-
 #: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
@@ -8648,10 +8917,6 @@ msgstr ""
 msgid "No uri given"
 msgstr ""
 
-#: ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Mauvaise adresse (URI)"
-
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Thème"
@@ -8678,180 +8943,178 @@ 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:169
+#: ../src/groupchat_control.py:170
 msgid "Sending private message failed"
 msgstr "L'envoi du message privé a échoué"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:171
+#: ../src/groupchat_control.py:172
 #, 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:455
 msgid "Insert Nickname"
 msgstr "Insérer un surnom"
 
-#: ../src/groupchat_control.py:631
+#: ../src/groupchat_control.py:636
 msgid "Conversation with "
 msgstr "Conversation avec "
 
-#: ../src/groupchat_control.py:633
+#: ../src/groupchat_control.py:638
 msgid "Continued conversation"
 msgstr "Conversation continuée"
 
-#. Can be a message (see handle_event_gc_config_change in
-#. gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1272 ../src/gui_interface.py:1080
+#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 "N'importe quel occupant est autorisé à voir votre identifiant Jabber complet"
 
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1286
 msgid "Room logging is enabled"
 msgstr "L'enregistrement des conversations du salon est activé"
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1288
 msgid "A new room has been created"
 msgstr "Un nouveau salon a été créé"
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1291
 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:1287
+#: ../src/groupchat_control.py:1297
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s a été éjecté : %(reason)s"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1300
 #, 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:1300
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s a été banni : %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1312
 #, 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:1314 ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
 #, python-format
 msgid "You are now known as %s"
 msgstr "Vous êtes désormais connu sous le nom de %s"
 
-#: ../src/groupchat_control.py:1330 ../src/gui_interface.py:919
+#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
 #, 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/groupchat_control.py:1372 ../src/groupchat_control.py:1377
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1392
 #, 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:1374
+#: ../src/groupchat_control.py:1383
 msgid "affiliation changed"
 msgstr "Changement d'affiliation"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1388
 msgid "room configuration changed to members-only"
 msgstr "La configuration du salon a changé pour « membres seulement »"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1394
 msgid "system shutdown"
 msgstr "Extinction du système"
 
-#: ../src/groupchat_control.py:1470
+#: ../src/groupchat_control.py:1477
 #, 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:1474
+#: ../src/groupchat_control.py:1481
 #, 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:1489
+#: ../src/groupchat_control.py:1496
 #, 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:1493
+#: ../src/groupchat_control.py:1500
 #, 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:1522
+#: ../src/groupchat_control.py:1530
 #, python-format
 msgid "%s has left"
 msgstr "%s est parti"
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1535
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s a rejoint le salon de discussion"
 
-#: ../src/groupchat_control.py:1529 ../src/gui_interface.py:946
+#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
 #: ../src/history_window.py:447 ../src/notify.py:234
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s est maintenant %(status)s"
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1774
 #, 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:1761
+#: ../src/groupchat_control.py:1776
 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:1765 ../src/gui_interface.py:1216
-#: ../src/gui_interface.py:1992 ../src/gui_interface.py:2029
-#: ../src/gui_interface.py:2064 ../src/message_window.py:224
-#: ../src/roster_window.py:2739 ../src/roster_window.py:3399
-#: ../src/roster_window.py:4123
+#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
+#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
+#: ../src/gui_interface.py:1853 ../src/message_window.py:224
+#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
+#: ../src/roster_window.py:4195
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Ne plus me poser la question"
 
-#: ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:1814
 msgid "Changing Subject"
 msgstr "Changement de Sujet"
 
-#: ../src/groupchat_control.py:1800
+#: ../src/groupchat_control.py:1815
 msgid "Please specify the new subject:"
 msgstr "Saisissez le nouveau sujet :"
 
-#: ../src/groupchat_control.py:1807
+#: ../src/groupchat_control.py:1822
 msgid "Changing Nickname"
 msgstr "Changement de Surnom"
 
-#: ../src/groupchat_control.py:1808
+#: ../src/groupchat_control.py:1823
 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:1839
+#: ../src/groupchat_control.py:1854
 #, python-format
 msgid "Destroying %s"
 msgstr "Destruction de %s"
 
-#: ../src/groupchat_control.py:1840
+#: ../src/groupchat_control.py:1855
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8859,22 +9122,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:1842
+#: ../src/groupchat_control.py:1857
 msgid "You may also enter an alternate venue:"
 msgstr "Vous pouvez également entrer une juridiction alternative :"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2028
+#: ../src/groupchat_control.py:2046
 #, python-format
 msgid "Kicking %s"
 msgstr "Exclusion de %s"
 
-#: ../src/groupchat_control.py:2029 ../src/groupchat_control.py:2356
+#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
 msgid "You may specify a reason below:"
 msgstr "Vous pouvez saisir une raison ci-dessous :"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2355
+#: ../src/groupchat_control.py:2373
 #, python-format
 msgid "Banning %s"
 msgstr "Bannissement de %s"
@@ -8900,56 +9163,65 @@ msgid "Details"
 msgstr "Détails"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
+#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Erreur : impossible d'ouvrir %s en lecture"
 
-#: ../src/gtkgui_helpers.py:400
+#: ../src/gtkgui_helpers.py:404
 msgid "Error reading file:"
 msgstr "Erreur de lecture du fichier :"
 
-#: ../src/gtkgui_helpers.py:403
+#: ../src/gtkgui_helpers.py:407
 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:444
+#: ../src/gtkgui_helpers.py:448
 #, 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:818
+#: ../src/gtkgui_helpers.py:822
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim n'est pas le client Jabber par défaut"
 
-#: ../src/gtkgui_helpers.py:819
+#: ../src/gtkgui_helpers.py:823
 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:820
+#: ../src/gtkgui_helpers.py:824
 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:887
+#: ../src/gtkgui_helpers.py:891
 msgid "Extension not supported"
 msgstr "Extension non supportée"
 
-#: ../src/gtkgui_helpers.py:888
+#: ../src/gtkgui_helpers.py:892
 #, 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:924
+#: ../src/gtkgui_helpers.py:928
 msgid "Save Image as..."
 msgstr "Enregistrer l'image sous..."
 
-#: ../src/gui_interface.py:140
+#. we are banned
+#. group chat does not exist
+#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
+#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
+#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
+#: ../src/gui_interface.py:348
+msgid "Unable to join group chat"
+msgstr "Impossible de rejoindre le salon"
+
+#: ../src/gui_interface.py:138
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8960,58 +9232,93 @@ msgstr ""
 "utilisé ou enregistré par un autre occupant.\n"
 "Veuillez entrer un autre surnom ci-dessous :"
 
-#: ../src/gui_interface.py:143
+#: ../src/gui_interface.py:141
 msgid "Always use this nickname when there is a conflict"
 msgstr "Toujours utiliser ce pseudo en cas de conflit"
 
-#: ../src/gui_interface.py:159
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Acceptez vous sa requête ?"
 
-#: ../src/gui_interface.py:161
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Acceptez vous cette requête sur le compte %s ?"
 
-#: ../src/gui_interface.py:164
+#: ../src/gui_interface.py:163
 #, 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/gui_interface.py:213 ../src/notify.py:493
+#: ../src/gui_interface.py:209 ../src/notify.py:493
 msgid "Connection Failed"
 msgstr "La connexion a échoué"
 
-#: ../src/gui_interface.py:606 ../src/gui_interface.py:610
+#: ../src/gui_interface.py:312
+#, 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/gui_interface.py:324
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr "Le nombre maximal d'utilisateurs pour %s a été atteint"
+
+#: ../src/gui_interface.py:333
+#, python-format
+msgid "You are banned from group chat %s."
+msgstr "Vous êtes banni du salon %s."
+
+#: ../src/gui_interface.py:338
+#, python-format
+msgid "Group chat %s does not exist."
+msgstr "Le salon %s n'existe pas."
+
+#: ../src/gui_interface.py:341
+msgid "Group chat creation is restricted."
+msgstr "La création de salon est réservée aux administrateurs."
+
+#: ../src/gui_interface.py:344
+#, 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/gui_interface.py:349
+#, 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."
+
+#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Erreur %(code)s : %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:621 ../src/gui_interface.py:636
+#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "erreur en envoyant %(message)s ( %(error)s )"
 
-#: ../src/gui_interface.py:663 ../src/notify.py:495
+#: ../src/gui_interface.py:540 ../src/notify.py:495
 msgid "Subscription request"
 msgstr "Requête d'Inscription"
 
-#: ../src/gui_interface.py:688
+#: ../src/gui_interface.py:565
 msgid "Authorization accepted"
 msgstr "Autorisation acceptée"
 
-#: ../src/gui_interface.py:689
+#: ../src/gui_interface.py:566
 #, 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/gui_interface.py:702
+#: ../src/gui_interface.py:579
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Le contact \"%s\" a cessé de vous souscrire à sa présence"
 
-#: ../src/gui_interface.py:703
+#: ../src/gui_interface.py:580
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -9019,61 +9326,55 @@ msgstr ""
 "Vous le/la verrez toujours hors-ligne.\n"
 "Voulez vous le/la supprimer de votre liste de contacts ?"
 
-#: ../src/gui_interface.py:727 ../src/notify.py:497
+#: ../src/gui_interface.py:604 ../src/notify.py:497
 msgid "Unsubscribed"
 msgstr "Désinscrit(e)"
 
-#: ../src/gui_interface.py:754
+#: ../src/gui_interface.py:631
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Le contact avec \"%s\" ne peut être établi"
 
-#: ../src/gui_interface.py:1015
+#: ../src/gui_interface.py:859
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s a changé le sujet en %(subject)s"
 
-#: ../src/gui_interface.py:1083
+#: ../src/gui_interface.py:926
 msgid "Room now shows unavailable member"
 msgstr "Le salon affiche dorénavant les membres non-disponibles"
 
-#: ../src/gui_interface.py:1085
+#: ../src/gui_interface.py:928
 msgid "room now does not show unavailable members"
 msgstr "Le salon n'affiche plus les membres non-disponibles"
 
-#: ../src/gui_interface.py:1087
+#: ../src/gui_interface.py:930
 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/gui_interface.py:1091
+#: ../src/gui_interface.py:934
 msgid "Room logging is now enabled"
 msgstr "L'enregistrement des conversations du salon est maintenant activé"
 
-#: ../src/gui_interface.py:1093
+#: ../src/gui_interface.py:936
 msgid "Room logging is now disabled"
 msgstr "L'enregistrement des conversations du salon est maintenant désactivé"
 
-#: ../src/gui_interface.py:1095
+#: ../src/gui_interface.py:938
 msgid "Room is now non-anonymous"
 msgstr "Le salon n'est plus anonyme"
 
-#: ../src/gui_interface.py:1098
+#: ../src/gui_interface.py:941
 msgid "Room is now semi-anonymous"
 msgstr "Le salon est maintenant sami-anonyme"
 
-#: ../src/gui_interface.py:1101
+#: ../src/gui_interface.py:944
 msgid "Room is now fully-anonymous"
 msgstr "Le salon est maintenant totalement anonyme"
 
-#: ../src/gui_interface.py:1133
-#, 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/gui_interface.py:1180
+#: ../src/gui_interface.py:985
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -9081,23 +9382,23 @@ 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/gui_interface.py:1182 ../src/gui_interface.py:1189
+#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Vous êtes actuellement connecté sans clé OpenPGP."
 
-#: ../src/gui_interface.py:1184
+#: ../src/gui_interface.py:989
 msgid "Your passphrase is incorrect"
 msgstr "Votre mot de passe est incorrect"
 
-#: ../src/gui_interface.py:1188
+#: ../src/gui_interface.py:993
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Mot de passe OpenGPG est incorrect"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid "GPG key not trusted"
 msgstr "la clef GPG n'est pas une clef de confiance"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
@@ -9105,7 +9406,7 @@ msgstr ""
 "La clef GPG utilisé pour chiffrer cette conversation n'est pas une clef de "
 "confiance. Voulez-vous vraiment chiffrer ce message ?"
 
-#: ../src/gui_interface.py:1226
+#: ../src/gui_interface.py:1031
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not                 correctly started "
@@ -9114,19 +9415,19 @@ msgstr ""
 "Gnome Keyring est installé mais pas \t\t\t\tcorrectement démarré (variable "
 "d'environnement probablement \t\t\t\tmal configurée)"
 
-#: ../src/gui_interface.py:1330
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nouveau courriel sur %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1332
+#: ../src/gui_interface.py:1133
 #, 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/gui_interface.py:1345
+#: ../src/gui_interface.py:1146
 #, python-format
 msgid ""
 "\n"
@@ -9141,43 +9442,43 @@ msgstr ""
 "Sujet : %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1418
+#: ../src/gui_interface.py:1215
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s souhaite vous envoyer un fichier."
 
-#: ../src/gui_interface.py:1455 ../src/roster_window.py:1856
+#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
 msgid "Remote contact stopped transfer"
 msgstr "Le contact distant à stoppé le transfert"
 
-#: ../src/gui_interface.py:1458 ../src/roster_window.py:1858
+#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
 msgid "Error opening file"
 msgstr "Erreur à l'ouverture du fichier"
 
-#: ../src/gui_interface.py:1490
+#: ../src/gui_interface.py:1287
 #, 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/gui_interface.py:1494
+#: ../src/gui_interface.py:1291
 #, 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/gui_interface.py:1507
+#: ../src/gui_interface.py:1304
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Vous avez bien envoyé %(filename)s à %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1511
+#: ../src/gui_interface.py:1308
 #, 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/gui_interface.py:1623
+#: ../src/gui_interface.py:1426
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -9186,36 +9487,36 @@ msgstr ""
 "Impossible de déchiffrer le message de %s\n"
 "Il a peut-être été manipulé."
 
-#: ../src/gui_interface.py:1630
+#: ../src/gui_interface.py:1433
 msgid "Unable to decrypt message"
 msgstr "Impossible de déchiffrer le message"
 
-#: ../src/gui_interface.py:1702
+#: ../src/gui_interface.py:1505
 msgid "Username Conflict"
 msgstr "Conflit de nom d'utilisateur"
 
-#: ../src/gui_interface.py:1703
+#: ../src/gui_interface.py:1506
 msgid "Please type a new username for your local account"
 msgstr "Veuillez entrer un nouveau surnom pour votre compte local"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1519
 msgid "Ping?"
 msgstr "Ping ?"
 
-#: ../src/gui_interface.py:1729
+#: ../src/gui_interface.py:1532
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong ! (%s s.)"
 
-#: ../src/gui_interface.py:1740
+#: ../src/gui_interface.py:1543
 msgid "Error."
 msgstr "Erreur."
 
-#: ../src/gui_interface.py:1768
+#: ../src/gui_interface.py:1556
 msgid "Resource Conflict"
 msgstr "Conflit de ressource"
 
-#: ../src/gui_interface.py:1769
+#: ../src/gui_interface.py:1557
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -9224,20 +9525,20 @@ msgstr ""
 "entrer une nouvelle"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1816
+#: ../src/gui_interface.py:1604
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s souhaite vous envoyer un fichier."
 
-#: ../src/gui_interface.py:1819
+#: ../src/gui_interface.py:1607
 msgid "Voice Chat Request"
 msgstr "Requête de transfert de fichier"
 
-#: ../src/gui_interface.py:1927
+#: ../src/gui_interface.py:1716
 msgid "Error verifying SSL certificate"
 msgstr "Erreur durant la vérification du certificat SSL"
 
-#: ../src/gui_interface.py:1928
+#: ../src/gui_interface.py:1717
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9248,15 +9549,15 @@ msgstr ""
 "serveur Jabber : %(error)s\n"
 "Voulez-vous toujours vous connecter à ce serveur ?"
 
-#: ../src/gui_interface.py:1936
+#: ../src/gui_interface.py:1725
 msgid "Ignore this error for this certificate."
 msgstr "Ignorer cette erreur pour ce certificat."
 
-#: ../src/gui_interface.py:1956
+#: ../src/gui_interface.py:1745
 msgid "SSL certificate error"
 msgstr "Erreur de certificat SSL"
 
-#: ../src/gui_interface.py:1957
+#: ../src/gui_interface.py:1746
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9274,12 +9575,12 @@ msgstr ""
 "Voulez vous toujours vous connecter et mettre à jour l'empreinte digitale du "
 "certificat ?"
 
-#: ../src/gui_interface.py:1987 ../src/gui_interface.py:2024
-#: ../src/gui_interface.py:2060
+#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
+#: ../src/gui_interface.py:1849
 msgid "Insecure connection"
 msgstr "Connexion non-sécurisée"
 
-#: ../src/gui_interface.py:1988
+#: ../src/gui_interface.py:1777
 #, fuzzy
 msgid ""
 "You are about to connect to the server with an insecure connection. This "
@@ -9290,12 +9591,12 @@ msgstr ""
 "sécurisée. Vous devriez installer PyOpenSSL pour empêcher cela. Êtes-vous "
 "sûr de vouloir le faire ?"
 
-#: ../src/gui_interface.py:1991 ../src/gui_interface.py:2028
-#: ../src/gui_interface.py:2063
+#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
+#: ../src/gui_interface.py:1852
 msgid "Yes, I really want to connect insecurely"
 msgstr "Oui, je veux vraiment me connecter de façon non-sécurisée"
 
-#: ../src/gui_interface.py:2025
+#: ../src/gui_interface.py:1814
 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?"
@@ -9304,7 +9605,7 @@ msgstr ""
 "sécurisée. Vous devriez installer PyOpenSSL pour empêcher cela. Êtes-vous "
 "sûr de vouloir le faire ?"
 
-#: ../src/gui_interface.py:2061
+#: ../src/gui_interface.py:1850
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9314,11 +9615,11 @@ msgstr ""
 "chiffrée. Êtes vous sûr de vouloir le faire ?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2624 ../src/gui_interface.py:2647
+#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
 msgid "Emoticons disabled"
 msgstr "Émoticônes désactivées"
 
-#: ../src/gui_interface.py:2625
+#: ../src/gui_interface.py:2423
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -9326,7 +9627,7 @@ msgstr ""
 "Votre thème d'émoticônes n'a pu être trouvé, les émoticônes sont donc "
 "désactivées."
 
-#: ../src/gui_interface.py:2648
+#: ../src/gui_interface.py:2446
 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 "
@@ -9336,7 +9637,7 @@ msgstr ""
 "mettre à jour le format du fichier emoticons.py. Voir http://trac.gajim.org/"
 "wiki/Emoticons pour plus de détails."
 
-#: ../src/gui_interface.py:2679 ../src/roster_window.py:3560
+#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
 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 "
@@ -9344,35 +9645,35 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gui_interface.py:3058
+#: ../src/gui_interface.py:2871
 msgid "Could not save your settings and preferences"
 msgstr "Impossible d'enregistrer vos informations de configuration"
 
-#: ../src/gui_interface.py:3592
+#: ../src/gui_interface.py:3411
 msgid "Passphrase Required"
 msgstr "Mot de Passe Requis"
 
-#: ../src/gui_interface.py:3593
+#: ../src/gui_interface.py:3412
 #, 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/gui_interface.py:3607
+#: ../src/gui_interface.py:3426
 msgid "GPG key expired"
 msgstr "Clef GPG expirée"
 
-#: ../src/gui_interface.py:3608
+#: ../src/gui_interface.py:3427
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Votre clef GPG a expiré, vous serez connecté(e) à %s sans OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3617
+#: ../src/gui_interface.py:3436
 msgid "Wrong Passphrase"
 msgstr "Mot de passe erroné"
 
-#: ../src/gui_interface.py:3618
+#: ../src/gui_interface.py:3437
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Ressaisissez votre mot de passe GPG ou appuyez sur Annuler."
 
@@ -9410,6 +9711,11 @@ msgstr "Pseudonyme"
 msgid "Message"
 msgstr "Message"
 
+#. holds subject
+#: ../src/history_manager.py:188 ../src/history_manager.py:219
+msgid "Subject"
+msgstr "Sujet"
+
 #: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -9506,19 +9812,19 @@ msgstr "Vous êtes sur le point de fermer plusieurs onglets"
 msgid "Do you really want to close them all?"
 msgstr "Voulez-vous vraiment tous les fermer ?"
 
-#: ../src/message_window.py:484
+#: ../src/message_window.py:485
 msgid "Chats"
 msgstr "Discussions"
 
-#: ../src/message_window.py:486
+#: ../src/message_window.py:487
 msgid "Group Chats"
 msgstr "Salons de discussion"
 
-#: ../src/message_window.py:488
+#: ../src/message_window.py:489
 msgid "Private Chats"
 msgstr "Conversations privées"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:495
 msgid "Messages"
 msgstr "Messages"
 
@@ -9574,56 +9880,56 @@ msgstr "Nouveau message de %(nickname)s"
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../src/profile_window.py:57
+#: ../src/profile_window.py:58
 msgid "Retrieving profile..."
 msgstr "Récupération du profil..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2935
+#: ../src/profile_window.py:111 ../src/roster_window.py:3001
 msgid "File is empty"
 msgstr "Le fichier est vide"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2938
+#: ../src/profile_window.py:114 ../src/roster_window.py:3004
 msgid "File does not exist"
 msgstr "Le fichier n'existe pas"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2940 ../src/roster_window.py:2951
+#: ../src/profile_window.py:128 ../src/profile_window.py:144
+#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
 msgid "Could not load image"
 msgstr "Impossible de charger l'image"
 
-#: ../src/profile_window.py:214
+#: ../src/profile_window.py:215
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Informations du Contact"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:216
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Format : AAAA-MM-JJ"
 
-#: ../src/profile_window.py:269
+#: ../src/profile_window.py:270
 msgid "Information received"
 msgstr "Invitation reçue"
 
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:341
 msgid "Without a connection you can not publish your contact information."
 msgstr "Vous devez être connecté pour publier vos informations."
 
-#: ../src/profile_window.py:353
+#: ../src/profile_window.py:354
 msgid "Sending profile..."
 msgstr "Envoi du profil..."
 
-#: ../src/profile_window.py:368
+#: ../src/profile_window.py:369
 msgid "Information NOT published"
 msgstr "l'information n'a PAS été publiée"
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:376
 msgid "vCard publication failed"
 msgstr "échec lors de la publication de votre vCard"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:377
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9631,51 +9937,51 @@ msgstr ""
 "Une erreur s'est produite lors de la publication de vos informations "
 "personnelles, veuillez réessayer plus tard."
 
-#: ../src/roster_window.py:256 ../src/roster_window.py:1012
+#: ../src/roster_window.py:262 ../src/roster_window.py:1026
 msgid "Merged accounts"
 msgstr "Comptes regroupés"
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1942
 msgid "Authorization has been sent"
 msgstr "L'Autorisation a été envoyée"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1943
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Désormais \"%s\" connaîtra votre état."
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1966
 msgid "Subscription request has been sent"
 msgstr "La requête d'inscription a été envoyée"
 
-#: ../src/roster_window.py:1944
+#: ../src/roster_window.py:1967
 #, 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:1958
+#: ../src/roster_window.py:1981
 msgid "Authorization has been removed"
 msgstr "L'Autorisation a été supprimée"
 
-#: ../src/roster_window.py:1959
+#: ../src/roster_window.py:1982
 #, 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:1986
+#: ../src/roster_window.py:2009
 msgid "GPG is not usable"
 msgstr "GPG n'est pas utilisable"
 
-#: ../src/roster_window.py:1987
+#: ../src/roster_window.py:2010
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Vous serez connecté à %s sans OpenPGP."
 
-#: ../src/roster_window.py:2199 ../src/roster_window.py:3496
+#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
 msgid "You are participating in one or more group chats"
 msgstr "Vous participez à un ou plusieurs salons"
 
-#: ../src/roster_window.py:2200 ../src/roster_window.py:3497
+#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9683,38 +9989,38 @@ msgstr ""
 "Basculer en état invisible entraînera votre déconnexion ces salons. Êtes-"
 "vous sûr de vouloir être invisible ?"
 
-#: ../src/roster_window.py:2226
+#: ../src/roster_window.py:2249
 msgid "desync'ed"
 msgstr "désynchronisé"
 
-#: ../src/roster_window.py:2288
+#: ../src/roster_window.py:2311
 msgid "Really quit Gajim?"
 msgstr "Vraiment quitter Gajim ?"
 
-#: ../src/roster_window.py:2289
+#: ../src/roster_window.py:2312
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Êtes-vous sûr de vouloir quitter Gajim ?"
 
-#: ../src/roster_window.py:2290
+#: ../src/roster_window.py:2313
 msgid "Always close Gajim"
 msgstr "Toujours fermer Gajim"
 
-#: ../src/roster_window.py:2373
+#: ../src/roster_window.py:2396
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Annule le transfert de fichier"
 
-#: ../src/roster_window.py:2374
+#: ../src/roster_window.py:2397
 msgid ""
-"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2405 ../src/roster_window.py:2653
+#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
 msgid "You have unread messages"
 msgstr "Vous avez des messages non lus"
 
-#: ../src/roster_window.py:2406
+#: ../src/roster_window.py:2429
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9722,16 +10028,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:2654
+#: ../src/roster_window.py:2720
 msgid "You must read them before removing this transport."
 msgstr "Vous devez les lire avant de supprimer ce compte."
 
-#: ../src/roster_window.py:2657
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "La passerelle \"%s\" sera enlevée"
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2724
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9739,11 +10045,11 @@ msgstr ""
 "Vous ne pourrez plus envoyer et recevoir de messages des contacts de cette "
 "passerelle."
 
-#: ../src/roster_window.py:2661
+#: ../src/roster_window.py:2727
 msgid "Transports will be removed"
 msgstr "Les passerelles seront enlevées"
 
-#: ../src/roster_window.py:2666
+#: ../src/roster_window.py:2732
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9752,13 +10058,13 @@ msgstr ""
 "Vous ne pourrez plus envoyer et recevoir de messages aux contacts de ces "
 "passerelles : %s"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2800
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "Vous êtes sur le point de bloquer un contact. Êtes-vous sûr de vouloir "
 "continuer ?"
 
-#: ../src/roster_window.py:2736
+#: ../src/roster_window.py:2802
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -9767,58 +10073,58 @@ msgstr ""
 "vous enverra."
 
 #. it's jid
-#: ../src/roster_window.py:2827
+#: ../src/roster_window.py:2893
 msgid "Rename Contact"
 msgstr "Renommer le contact"
 
-#: ../src/roster_window.py:2828
+#: ../src/roster_window.py:2894
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Entrez un nouveau surnom pour le contact %s."
 
-#: ../src/roster_window.py:2835
+#: ../src/roster_window.py:2901
 msgid "Rename Group"
 msgstr "_Renommer le Groupe"
 
-#: ../src/roster_window.py:2836
+#: ../src/roster_window.py:2902
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Entrez un nouveau nom pour le groupe %s."
 
-#: ../src/roster_window.py:2881
+#: ../src/roster_window.py:2947
 msgid "Remove Group"
 msgstr "_Supprimer le Groupe"
 
-#: ../src/roster_window.py:2882
+#: ../src/roster_window.py:2948
 #, 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:2883
+#: ../src/roster_window.py:2949
 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:2922
+#: ../src/roster_window.py:2988
 msgid "Assign OpenPGP Key"
 msgstr "Assigner une clé OpenPGP"
 
-#: ../src/roster_window.py:2923
+#: ../src/roster_window.py:2989
 msgid "Select a key to apply to the contact"
 msgstr "Choisissez la clé correspondant au contact"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3372
 #, 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:3308
+#: ../src/roster_window.py:3374
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 "Vous êtes sur le point de supprimer « %(name)s » (%(jid)s) de votre roster.\n"
 
-#: ../src/roster_window.py:3313
+#: ../src/roster_window.py:3379
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9827,11 +10133,11 @@ msgstr ""
 "verra donc toujours déconnecté(e)."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3319
+#: ../src/roster_window.py:3385
 msgid "Do you want to continue?"
 msgstr "Voulez vous continuer ?"
 
-#: ../src/roster_window.py:3323
+#: ../src/roster_window.py:3389
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9839,16 +10145,16 @@ msgstr ""
 "En supprimant ce contact, vous supprimez également son autorisation. Il/Elle "
 "vous verra donc toujours déconnecté(e)."
 
-#: ../src/roster_window.py:3326
+#: ../src/roster_window.py:3392
 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:3330
+#: ../src/roster_window.py:3396
 msgid "Contacts will be removed from your roster"
 msgstr "Les contacts seront enlevés de la liste de contacts"
 
-#: ../src/roster_window.py:3335
+#: ../src/roster_window.py:3401
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9858,7 +10164,7 @@ msgstr ""
 "vous enlevez aussi leurs autorisations. Ces contacts vous verront donc "
 "toujours déconnecté(e)."
 
-#: ../src/roster_window.py:3393
+#: ../src/roster_window.py:3459
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want  to continue?"
@@ -9866,7 +10172,7 @@ msgstr ""
 "Vous êtes sur le point d'envoyer un statut personnalisé. Êtes-vous sûr de "
 "vouloir continuer ?"
 
-#: ../src/roster_window.py:3395
+#: ../src/roster_window.py:3461
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -9875,20 +10181,20 @@ msgstr ""
 "Ce contact vous vera %(status)s, mais seulement jusqu'à ce que vous changiez "
 "votre statut. Il verra alors votre statut global."
 
-#: ../src/roster_window.py:3414
+#: ../src/roster_window.py:3480
 msgid "No account available"
 msgstr "Aucun compte disponible"
 
-#: ../src/roster_window.py:3415
+#: ../src/roster_window.py:3481
 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:4023
+#: ../src/roster_window.py:4095
 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:4025
+#: ../src/roster_window.py:4097
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9897,14 +10203,14 @@ msgstr ""
 "métacontacts. Par conséquent, ces informations ne seront pas enregistrées "
 "lors de la prochaine connexion."
 
-#: ../src/roster_window.py:4117
+#: ../src/roster_window.py:4189
 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:4119
+#: ../src/roster_window.py:4191
 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 "
@@ -9914,23 +10220,23 @@ 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:4234
+#: ../src/roster_window.py:4306
 msgid "Invalid file URI:"
 msgstr "Url de fichier invalide :"
 
-#: ../src/roster_window.py:4246
+#: ../src/roster_window.py:4318
 #, 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:4361
+#: ../src/roster_window.py:4433
 #, python-format
 msgid "Send %s to %s"
 msgstr "Envoyer %s à %s"
 
-#: ../src/roster_window.py:4367
+#: ../src/roster_window.py:4439
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Faire de %s et %s des métacontacts"
@@ -9940,143 +10246,143 @@ msgstr "Faire de %s et %s des métacontacts"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4816 ../src/roster_window.py:4889
-#: ../src/roster_window.py:4898 ../src/statusicon.py:246
-#: ../src/statusicon.py:293 ../src/statusicon.py:299
+#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
+#: ../src/roster_window.py:4970 ../src/statusicon.py:263
+#: ../src/statusicon.py:310 ../src/statusicon.py:316
 #, python-format
 msgid "using account %s"
 msgstr "du compte %s"
 
 #. add
-#: ../src/roster_window.py:4905
+#: ../src/roster_window.py:4977
 #, python-format
 msgid "to %s account"
 msgstr "au compte %s"
 
 #. disco
-#: ../src/roster_window.py:4910
+#: ../src/roster_window.py:4982
 #, python-format
 msgid "using %s account"
 msgstr "pour le compte %s"
 
-#: ../src/roster_window.py:4948 ../src/statusicon.py:309
+#: ../src/roster_window.py:5020 ../src/statusicon.py:326
 msgid "_Manage Bookmarks..."
 msgstr "Gérer les marque-pages..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4968
+#: ../src/roster_window.py:5040
 #, python-format
 msgid "of account %s"
 msgstr "du compte %s"
 
-#: ../src/roster_window.py:5009
+#: ../src/roster_window.py:5081
 #, python-format
 msgid "for account %s"
 msgstr "pour le compte %s"
 
-#: ../src/roster_window.py:5069 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
 msgid "_Change Status Message"
 msgstr "_Changer le message d'état"
 
-#: ../src/roster_window.py:5102
+#: ../src/roster_window.py:5174
 msgid "Publish Tune"
 msgstr "Publier ce que j'écoute"
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5176
 #, fuzzy
 msgid "Publish Location"
 msgstr "Publier ce que j'écoute"
 
-#: ../src/roster_window.py:5107
+#: ../src/roster_window.py:5179
 msgid "Configure Services..."
 msgstr "Configurer les Services..."
 
-#: ../src/roster_window.py:5252
+#: ../src/roster_window.py:5324
 msgid "_Maximize All"
 msgstr "Tout _maximiser"
 
-#: ../src/roster_window.py:5262 ../src/roster_window.py:5436
+#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
 msgid "Send Group M_essage"
 msgstr "_Envoyer un message de groupe"
 
-#: ../src/roster_window.py:5270
+#: ../src/roster_window.py:5342
 msgid "To all users"
 msgstr "À tous les utilisateurs"
 
-#: ../src/roster_window.py:5274
+#: ../src/roster_window.py:5346
 msgid "To all online users"
 msgstr "À tous les utilisateurs connectés"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5456
+#: ../src/roster_window.py:5528
 msgid "_Manage Contacts"
 msgstr "_Gérer les Contacts"
 
 #. Edit Groups
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5537
 msgid "Edit _Groups"
 msgstr "Éditer les _groupes"
 
 #. Send single message
-#: ../src/roster_window.py:5520
+#: ../src/roster_window.py:5592
 msgid "Send Single Message"
 msgstr "Envoyer un message Simple"
 
 #. Execute Command
-#: ../src/roster_window.py:5567
+#: ../src/roster_window.py:5639
 msgid "Execute Command..."
 msgstr "Exécuter une commande..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5577
+#: ../src/roster_window.py:5649
 msgid "_Manage Transport"
 msgstr "_Gérer les Passerelles"
 
 #. Modify Transport
-#: ../src/roster_window.py:5586
+#: ../src/roster_window.py:5658
 msgid "_Modify Transport"
 msgstr "_Modifier la Passerelle"
 
 #. Rename
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5668
 msgid "_Rename"
 msgstr "_Renommer"
 
-#: ../src/roster_window.py:5656
+#: ../src/roster_window.py:5728
 msgid "_Maximize"
 msgstr "_Maximiser"
 
-#: ../src/roster_window.py:5665
+#: ../src/roster_window.py:5737
 msgid "_Reconnect"
 msgstr "_Reconnecter"
 
-#: ../src/roster_window.py:5672
+#: ../src/roster_window.py:5744
 msgid "_Disconnect"
 msgstr "_Déconnecter"
 
 #. History manager
-#: ../src/roster_window.py:5754
+#: ../src/roster_window.py:5833
 msgid "History Manager"
 msgstr "Gestionnaire d'historique"
 
-#: ../src/roster_window.py:5765
+#: ../src/roster_window.py:5844
 msgid "_Join New Group Chat"
 msgstr "_Joindre un salon de discussion"
 
-#: ../src/roster_window.py:5938
+#: ../src/roster_window.py:6019
 msgid "Change Status Message..."
 msgstr "Changer le message d'état..."
 
-#: ../src/search_window.py:94
+#: ../src/search_window.py:105
 msgid "Waiting for results"
 msgstr "Attente de résultats."
 
-#: ../src/search_window.py:132 ../src/search_window.py:210
+#: ../src/search_window.py:143 ../src/search_window.py:220
 msgid "Error in received dataform"
 msgstr "Erreur dans la forme des données reçues"
 
 #. No result
-#: ../src/search_window.py:166 ../src/search_window.py:202
+#: ../src/search_window.py:177 ../src/search_window.py:212
 msgid "No result"
 msgstr "Aucun résultat."
 
@@ -10089,14 +10395,15 @@ msgstr "Erreur d'écriture du disque"
 msgid "Subject: %s"
 msgstr "Sujet : %s"
 
-#: ../src/session.py:433 ../src/session.py:468
+#: ../src/session.py:447 ../src/session.py:491
 msgid "Confirm these session options"
 msgstr "Confirmer ces options de session"
 
-#: ../src/session.py:435
+#: ../src/session.py:448
 #, fuzzy, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
+"The remote client wants '\n"
+"                            'to negotiate an session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -10108,7 +10415,7 @@ msgstr ""
 "\n"
 "\tCes options sont-elles acceptables ?"
 
-#: ../src/session.py:469
+#: ../src/session.py:492
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10123,16 +10430,16 @@ msgstr ""
 "\n"
 "Continuer la session ?"
 
-#: ../src/statusicon.py:210
+#: ../src/statusicon.py:227
 msgid "_Change Status Message..."
 msgstr "_Changer le message d'état..."
 
-#: ../src/statusicon.py:322
+#: ../src/statusicon.py:339
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "dans le _roster"
 
-#: ../src/statusicon.py:333
+#: ../src/statusicon.py:350
 msgid "Hide this menu"
 msgstr "Cacher ce menu"
 
@@ -10271,39 +10578,39 @@ msgstr ""
 "Ce service n'a pas renvoyé d'informations détaillées.\n"
 "Il est probablement défectueux ou cassé"
 
-#: ../src/vcard.py:251
+#: ../src/vcard.py:265
 msgid "?Client:Unknown"
 msgstr "Inconnu"
 
-#: ../src/vcard.py:253
+#: ../src/vcard.py:267
 msgid "?OS:Unknown"
 msgstr "Inconnu"
 
-#: ../src/vcard.py:274
+#: ../src/vcard.py:288
 msgid "?Time:Unknown"
 msgstr "?Date:Inconnue"
 
-#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
+#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
 #, python-format
 msgid "since %s"
 msgstr "depuis %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:345
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:349
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Affiliation :</b>"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:357
 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:345
+#: ../src/vcard.py:359
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10311,12 +10618,12 @@ msgstr ""
 "Vous vous intéressez à l'état de ce contact mais il ne s'intéresse pas au "
 "vôtre"
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:361
 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:349
+#: ../src/vcard.py:363
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10324,27 +10631,72 @@ 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:356
+#: ../src/vcard.py:370
 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:358
+#: ../src/vcard.py:372
 msgid "There is no pending subscription request."
 msgstr "Il n'y a aucune requête d'inscription en attente."
 
-#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
+#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
 msgid " resource with priority "
 msgstr " ressource avec la priorité "
 
-#~ msgid "_Available"
-#~ msgstr "_Disponible"
+#~ msgid "@"
+#~ msgstr "@"
+
+#~ msgid "_Disable showing event in systray"
+#~ msgstr ""
+#~ "_Désactiver l'affichage des événements dans la zone de notification."
+
+#~ msgid "_Show event in systray"
+#~ msgstr "L'afficher dans la zone de notifications"
 
-#~ msgid "PEP node was not removed"
-#~ msgstr "Le nœud PEP n'a pas été supprimé"
+#, fuzzy
+#~ msgid "Always use GNOME default applications"
+#~ msgstr "Toujours utiliser les applications OS/X par défaut."
+
+#, fuzzy
+#~ msgid "Always use Xfce default applications"
+#~ msgstr "Toujours utiliser les applications OS/X par défaut."
+
+#, fuzzy
+#~ msgid "Autodetect on every Gajim startup"
+#~ msgstr "C_onnexion au démarrage"
+
+#~ msgid "Show systray:"
+#~ msgstr "Afficher l'icône de notifications :"
+
+#~ msgid "Nickname not allowed: %s"
+#~ msgstr "Surnom invalide : %s"
+
+#~ msgid "Room has been destroyed"
+#~ msgstr "Le salon de discussion a été détruit"
 
-#~ msgid "PEP node %(node)s was not removed: %(message)s"
-#~ msgstr "Le nœud PEP %(node)s n'a pas été supprimé : %(message)s"
+#~ msgid "You can join this room instead: %s"
+#~ msgstr "Vous pouvez rejoindre le salon %s à la place"
+
+#~ msgid "I would like to add you to my roster."
+#~ msgstr "Je souhaiterais vous ajouter à ma liste de contacts."
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "nous sommes maintenant inscrits chez %s"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "Requête de désinscription de la part de %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "nous ne sommes plus dans la liste de %s"
+
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "L'identifiant Jabber %s ne respecte pas la norme RFC. Il ne sera pas "
+#~ "ajouté à votre liste de contacts. Utilisez un outil de gestion de liste "
+#~ "de contact tel que http://jru.jabberstudio.org pour le supprimer"
 
 #~ msgid "Account Modification"
 #~ msgstr "Modification du compte"
@@ -10454,45 +10806,9 @@ msgstr " ressource avec la priorité "
 #~ msgid "gtk-delete"
 #~ msgstr "gtk-delete"
 
-#~ msgid "Add this contact to roster (Ctrl+D)"
-#~ msgstr "Ajouter le contact à la liste de contacts (Ctrl+D)"
-
-#~ msgid "Bookmark this room (Ctrl+B)"
-#~ msgstr "Enregistrer ce salon dans les marque-pages (Ctrl+B)"
-
-#~ msgid "Browse the chat history (Ctrl+H)"
-#~ msgstr "Parcourir l'historique des conversations (Ctrl+H)"
-
-#~ msgid "Change the room's subject (Alt+T)"
-#~ msgstr "Changer le sujet du salon (Alt+T)"
-
-#~ msgid "Change your nickname (Ctrl+N)"
-#~ msgstr "Changer votre surnom (Ctrl+N)"
-
-#~ msgid "Invite contacts to the conversation (Ctrl+G)"
-#~ msgstr "Inviter des contacts dans la conversation (Ctrl+G)"
-
 #~ msgid "Send a file (Ctrl+F)"
 #~ msgstr "Envoyer un fichier (Ctrl+F)"
 
-#~ msgid "Show a list of emoticons (Alt+M)"
-#~ msgstr "Afficher une liste des émoticônes (Alt+M)"
-
-#~ msgid "Show a list of formattings"
-#~ msgstr "Afficher une liste de styles"
-
-#~ msgid "Show a menu of advanced functions (Alt+D)"
-#~ msgstr "Affiche un menu de fonctions avancées (Alt+A)"
-
-#~ msgid "Show the contact's profile (Ctrl+I)"
-#~ msgstr "Afficher le profil du contact (Ctrl+I)"
-
-#~ msgid "Toggle audio session"
-#~ msgstr "Démarrer/arrêter une session audio"
-
-#~ msgid "Toggle video session"
-#~ msgstr "Démarrer/arrêter une session vidéo"
-
 #~ msgid ""
 #~ "All chat states\n"
 #~ "Composing only\n"
@@ -10551,9 +10867,6 @@ msgstr " ressource avec la priorité "
 #~ msgid "gtk-cancel"
 #~ msgstr "gtk-cancel"
 
-#~ msgid "_Preferences"
-#~ msgstr "_Préférences"
-
 #~ msgid "_Quit"
 #~ msgstr "_Quitter"
 
@@ -10840,9 +11153,6 @@ msgstr " ressource avec la priorité "
 #~ "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"
 
@@ -10944,13 +11254,6 @@ msgstr " ressource avec la priorité "
 #~ msgid "mood"
 #~ msgstr "humeur"
 
-#~ msgid ""
-#~ "Usage: %s %s %s \n"
-#~ "\t %s"
-#~ msgstr ""
-#~ "Usage: %s %s %s \n"
-#~ "\t %s"
-
 #~ msgid "%s - %s"
 #~ msgstr "%s - %s"
 
diff --git a/po/gl.po b/po/gl.po
index 351ad934f7271ccf8064053dd12a84386670907a..701cb3b77af6e5285eec768b9dc95307d6f19d99 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,11 +6,15 @@
 # Automatically generated, 2004.
 #
 # Iván Méndez López <>, 2009.
+#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 11:28+0200\n"
+"POT-Creation-Date: 2010-10-01 20:39+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"
@@ -30,7 +34,7 @@ msgstr "Entrar nun grupo de charla"
 msgid "_Add Contact..."
 msgstr "_Engadir un contacto..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:17
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
 msgid "_Discover Services"
 msgstr "_Descubrir os servizos"
 
@@ -52,7 +56,7 @@ msgstr "_Abrir a caixa de entrada de GMail"
 msgid "_Personal Events"
 msgstr "Información persoal"
 
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:23
+#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
 #, fuzzy
 msgid "_Start Chat..."
 msgstr "_Iniciar a charla"
@@ -87,76 +91,72 @@ msgid "<b>Please select a server</b>"
 msgstr ""
 
 #: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid "@"
-msgstr ""
-
-#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
 msgstr ""
 
-#: ../data/gui/account_creation_wizard_window.ui.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:10
 #, fuzzy
 msgid "Anon_ymous authentication"
 msgstr "Usar a autenticación"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Connect when I press Finish"
 msgstr "Conectar cando prema Rematar"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: asistente para crear unha conta"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 #, fuzzy
 msgid "I already have an account I want to _use"
 msgstr "Xa teño unha conta e quero empregala"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I want to _register for a new account"
 msgstr "Quero _rexistrar unha conta nova de Jabber"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:16
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 #: ../data/gui/accounts_window.ui.h:28
 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/gui/account_creation_wizard_window.ui.h:17
+#: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Xestionar..."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:18
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
 #: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2263 ../src/config.py:2342
-#: ../src/config.py:2355 ../src/config.py:3596 ../src/config.py:3671
-#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513
-#: ../src/dialogs.py:526 ../src/roster_window.py:2890
-#: ../src/roster_window.py:2896 ../src/roster_window.py:2901
+#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
+#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
+#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
+#: ../src/dialogs.py:527 ../src/roster_window.py:2956
+#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
 msgid "None"
 msgstr "Ningún"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:19
+#: ../data/gui/account_creation_wizard_window.ui.h:18
 #, fuzzy
 msgid "Prox_y:"
 msgstr "Proxy"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #: ../data/gui/accounts_window.ui.h:48
 msgid "Save pass_word"
 msgstr "_Gardar o contrasinal"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:21
+#: ../data/gui/account_creation_wizard_window.ui.h:20
 msgid "Set my profile when I connect"
 msgstr "Configurar o meu perfil ao me conectar"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:22
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Use custom hostname/port"
 msgstr "Usa un nome de host e un porto personalizados"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:23
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -164,35 +164,35 @@ msgstr ""
 "Precisa unha conta para se conectar\n"
 "á rede Jabber"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-#: ../data/gui/roster_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:16
 msgid "_Advanced"
 msgstr "_Avanzado"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:25
 msgid "_Finish"
 msgstr "_Rematar"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:27
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 #, fuzzy
 msgid "_Hostname:"
 msgstr "Nome do host:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #: ../data/gui/accounts_window.ui.h:62
 msgid "_Jabber ID:"
 msgstr "ID de _Jabber: "
 
-#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:28
 #: ../data/gui/accounts_window.ui.h:64
 msgid "_Password:"
 msgstr "C_ontrasinal:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:29
 msgid "_Port:"
 msgstr "_Porto:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:31
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Server:"
 msgstr "_Servidor:"
 
@@ -304,17 +304,17 @@ msgstr "Nome:"
 #. No configured account
 #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
 #: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592
-#: ../src/notify.py:608
+#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
+#: ../src/notify.py:616
 msgid "Gajim"
 msgstr "Gajim"
 
 #. FIXME: Ugly workaround.
 #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
 #. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:61
-#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121
-#: ../src/roster_window.py:2832 ../src/roster_window.py:5379
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
+#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
 msgid "General"
 msgstr "Xeral"
 
@@ -374,7 +374,7 @@ msgstr "A súa información, para se gardar no servidor"
 
 #: ../data/gui/accounts_window.ui.h:35
 #: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:830
+#: ../src/dialogs.py:831
 msgid "Jabber ID:"
 msgstr "ID de Jabber:"
 
@@ -388,7 +388,7 @@ msgid "Mer_ge accounts"
 msgstr "_Combinar as contas"
 
 #: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2356
+#: ../src/config.py:2358
 msgid "No key selected"
 msgstr "Non se seleccionou ningunha chave"
 
@@ -415,7 +415,7 @@ msgid "Priority will change automatically according to your status."
 msgstr "A prioridade mudará automaticamente segundo o seu estado."
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5329
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
 msgid "Re_name"
 msgstr "Re_nomear"
 
@@ -656,42 +656,47 @@ msgstr "Elimina a mensaxe do día (MDD)"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
 #, fuzzy
+msgid "Edit Archi_ving Preferences"
+msgstr "_Preferencias"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#, fuzzy
 msgid "Edit _Privacy Lists..."
 msgstr "Listaxes de _privacidade"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 #, fuzzy
 msgid "Sends a message to users currently connected to this server"
 msgstr ""
 "Envíalles unha mensaxe aos usuarios conectados neste momento ao servidor"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 #, fuzzy
 msgid "Set MOTD..."
 msgstr "Definir a MDD"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Define a mensaxe do día"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Show _XML Console"
 msgstr "Amosar a consola de _XML"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "Actualizar a MDD"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "Actualiza a mensaxe do día"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:11
 msgid "_Administrator"
 msgstr "_Administrador"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:11
+#: ../data/gui/advanced_menuitem_menu.ui.h:12
 #, fuzzy
 msgid "_Send Server Message..."
 msgstr "_Enviar a mensaxe do servidor"
@@ -726,7 +731,7 @@ msgid "All statuses"
 msgstr "Todos os estados"
 
 #: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:233
+#: ../src/common/commands.py:106 ../src/common/helpers.py:239
 #: ../src/tooltips.py:193
 msgid "Away"
 msgstr "Ausente"
@@ -779,7 +784,7 @@ msgid "Have "
 msgstr "Ten "
 
 #: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:249
 msgid "Invisible"
 msgstr "Invisíbel"
 
@@ -788,7 +793,7 @@ msgid "Launch a command"
 msgstr "Enviar un comando"
 
 #: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:216 ../src/tooltips.py:197
+#: ../src/common/helpers.py:222 ../src/tooltips.py:197
 msgid "Not Available"
 msgstr "Non dispoñíbel"
 
@@ -833,12 +838,13 @@ msgid "_Disable existing sound for this event"
 msgstr "_Desactivar os sons existentes para este acontecemento"
 
 #: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in roster"
+#, fuzzy
+msgid "_Disable showing event in notification area"
 msgstr "_Desactivar mostrar os eventos no roster"
 
 #: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in systray"
-msgstr "_Desactivar mostrar os eventos na área de notificación"
+msgid "_Disable showing event in roster"
+msgstr "_Desactivar mostrar os eventos no roster"
 
 #: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
@@ -849,12 +855,13 @@ msgid "_Open chat window with user"
 msgstr "_Abrir unha fiestra de charla con este usuario"
 
 #: ../data/gui/advanced_notifications_window.ui.h:35
-msgid "_Show event in roster"
+#, fuzzy
+msgid "_Show event in notification area"
 msgstr "_Mostrar o evento na listaxe de contactos"
 
 #: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in systray"
-msgstr "_Mostrar o evento na área de notificación"
+msgid "_Show event in roster"
+msgstr "_Mostrar o evento na listaxe de contactos"
 
 #: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
@@ -882,6 +889,45 @@ msgstr "Grupo"
 msgid "when I'm in"
 msgstr "cando eu estea en"
 
+#: ../data/gui/archiving_preferences_window.ui.h:1
+msgid "<i>Method Auto</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "<i>Method Local</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:3
+msgid "<i>Method Manual</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:4
+#, fuzzy
+msgid "Auto"
+msgstr "Autoconectar"
+
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Concede"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "Forbid"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:7
+#, fuzzy
+msgid "No"
+msgstr "Ningún"
+
+#: ../data/gui/archiving_preferences_window.ui.h:8
+#, fuzzy
+msgid "Prefer"
+msgstr "Preferencias"
+
+#: ../data/gui/archiving_preferences_window.ui.h:9
+msgid "Yes"
+msgstr ""
+
 #: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Entrada:"
@@ -909,8 +955,8 @@ msgstr "Contactos"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5348
-#: ../src/roster_window.py:5476 ../src/roster_window.py:5609
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
+#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
 msgid "_Unblock"
 msgstr ""
 
@@ -1004,7 +1050,7 @@ msgid "_Start Chat"
 msgstr "_Iniciar a charla"
 
 #. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4184
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
 msgid "#"
 msgstr "núm."
 
@@ -1052,13 +1098,55 @@ msgstr ""
 msgid "9"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:13
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Engade o contacto á listaxe"
+
 #: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
+msgid "Browse the chat history (Ctrl+H)"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:15
+#, fuzzy
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "está a prestar atención á conversa"
+
+#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+#, fuzzy
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
+#, fuzzy
+msgid "Show a list of formattings"
+msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:19
+#, fuzzy
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr "Engade o contacto á listaxe"
+
+#: ../data/gui/chat_control.ui.h:20
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:21
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
 #: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../data/gui/chat_control.ui.h:15 ../data/gui/groupchat_control.ui.h:3
+#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
 msgid "label"
 msgstr ""
 
@@ -1112,8 +1200,8 @@ msgstr "Editar os grupos"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5284
-#: ../src/roster_window.py:5444
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
+#: ../src/roster_window.py:5516
 msgid "In_vite to"
 msgstr "Con_vidar"
 
@@ -1127,8 +1215,8 @@ msgstr "Contactos"
 msgid "Remo_ve"
 msgstr "_Eliminar"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5294
-#: ../src/roster_window.py:5533
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
+#: ../src/roster_window.py:5605
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Envía XML personalizado"
@@ -1164,8 +1252,8 @@ msgid "_Allow him/her to see my status"
 msgstr "Permitirlle ver o meu estado"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5482 ../src/roster_window.py:5612
+#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
+#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
 msgid "_Block"
 msgstr ""
 
@@ -1175,8 +1263,8 @@ msgstr "Prohibirlle ver o meu estado"
 
 #: ../data/gui/contact_context_menu.ui.h:20
 #: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:21
-#: ../src/roster_window.py:5683
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
+#: ../src/roster_window.py:5755
 msgid "_History"
 msgstr "_Historial"
 
@@ -1319,7 +1407,7 @@ msgstr "<b>Cores do separador para os estados da charla</b>"
 msgid "Account row"
 msgstr "Conta"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:925
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
 msgid "Bold"
 msgstr "Negra"
 
@@ -1357,7 +1445,7 @@ msgstr "Grupo"
 msgid "Inactive"
 msgstr "Inactivo"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:926
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
 msgid "Italic"
 msgstr "Itálica"
 
@@ -1408,7 +1496,7 @@ msgstr "Cambiar o _tema"
 msgid "Configure _Room..."
 msgstr "Configurar a sala"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1782
+#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
 #, fuzzy
 msgid "_Bookmark"
 msgstr "Engadir esta sala aos marcadores"
@@ -1472,19 +1560,33 @@ msgstr "_Enviar unha mensaxe privada"
 msgid "_Voice"
 msgstr "_Voz"
 
+#: ../data/gui/groupchat_control.ui.h:1
+#, fuzzy
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Engadir esta sala aos marcadores"
+
+#: ../data/gui/groupchat_control.ui.h:3
+msgid "Change the room's subject (Alt+T)"
+msgstr ""
+
+#: ../data/gui/groupchat_control.ui.h:4
+#, fuzzy
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Cambiar o _alcume"
+
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Crear unha publicación nova"
 
-#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
-msgid "From"
-msgstr "De"
+#: ../data/gui/groups_post_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:2
+msgid "From:"
+msgstr "De:"
 
-#. holds subject
-#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
-#: ../src/history_manager.py:219
-msgid "Subject"
-msgstr "Asunto"
+#: ../data/gui/groups_post_window.ui.h:3
+#: ../data/gui/single_message_window.ui.h:7
+msgid "Subject:"
+msgstr "Tema:"
 
 #: ../data/gui/history_manager.ui.h:1
 #, fuzzy
@@ -1509,8 +1611,8 @@ msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Xestor do Historial de Gajim"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3208
-#: ../src/dialogs.py:3305
+#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
+#: ../src/dialogs.py:3321
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -1564,12 +1666,74 @@ msgstr "Buscar"
 msgid "_Log conversation history"
 msgstr "Historial de conversas"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
+msgid "approve"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:2
+msgid "body"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:3
+msgid "concede"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:4
+msgid "expire"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:5
+msgid "false"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:6
+msgid "forbid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:7
+#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+msgid "jid"
+msgstr "jid"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:8
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
+#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
+msgid "message"
+msgstr "mensaxe"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
+msgid "oppose"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
+msgid "otr"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:11
+msgid "prefer"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:12
+msgid "require"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:13
+msgid "save"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:14
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
 msgid "Bro_wse Rooms"
 msgstr "_Navegar"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2180
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
 msgid "Join Group Chat"
 msgstr "Entrar nunha sala de charlas"
 
@@ -1607,8 +1771,8 @@ msgstr "Servidor:"
 msgid "_Bookmark this room"
 msgstr "Engadir esta sala aos marcadores"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1341
-#: ../src/disco.py:1786
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../src/disco.py:1804
 msgid "_Join"
 msgstr "_Entrar"
 
@@ -1718,6 +1882,75 @@ msgstr "_Nome de usuario:"
 msgid "Passphrase"
 msgstr "Contrasinal"
 
+#: ../data/gui/plugins_window.ui.h:1
+msgid "&lt;empty&gt;"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:2
+msgid "<empty>"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:3
+#, fuzzy
+msgid "Authors:"
+msgstr "Au_torizar"
+
+#: ../data/gui/plugins_window.ui.h:4
+#, fuzzy
+msgid "Available"
+msgstr "En liñ_a"
+
+#: ../data/gui/plugins_window.ui.h:5
+#, fuzzy
+msgid "Configure"
+msgstr "_Continuar"
+
+#: ../data/gui/plugins_window.ui.h:6
+#, fuzzy
+msgid "Descrition:"
+msgstr "Descrición: %s"
+
+#: ../data/gui/plugins_window.ui.h:7
+#, fuzzy
+msgid "Homepage:"
+msgstr "Páxina web:"
+
+#: ../data/gui/plugins_window.ui.h:8
+msgid "Install"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:9
+#, fuzzy
+msgid "Installed"
+msgstr "Atascado"
+
+#: ../data/gui/plugins_window.ui.h:10
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:11
+msgid "Plugins"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:12
+msgid "Uninstall"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:13
+#, fuzzy
+msgid "Version:"
+msgstr "Versión de GTK+:"
+
+#: ../data/gui/plugins_window.ui.h:14
+msgid "button"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:15
+msgid "homepage url"
+msgstr ""
+
 #: ../data/gui/popup_notification_window.ui.h:1
 #, fuzzy
 msgid "Event Type"
@@ -1855,125 +2088,108 @@ msgid "Always"
 msgstr "Ausente"
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Always use GNOME default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:32
-msgid "Always use KDE default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:33
-msgid "Always use Xfce default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Preguntar a mensaxe de estado cando estea: "
 
-#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
 msgid "Audio / Video"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:33
 msgid "Audio input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Audio output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:38
-#, fuzzy
-msgid "Autodetect on every Gajim startup"
-msgstr "C_onectar ao inicio de Gajim"
-
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:35
 #, fuzzy
 msgid "Chat message:"
 msgstr "Men_saxe de estado:"
 
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:36
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:37
 #, fuzzy
 msgid "Composing only"
 msgstr "A compor"
 
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:38
 msgid "Configure color and font of the interface"
 msgstr "Configurar as cores e as fontes da interface"
 
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Men_saxe de estado:"
 
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Nome de contacto"
 
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:41
 #, fuzzy
 msgid "Custom"
 msgstr "<b>Personalizado</b>"
 
-#: ../data/gui/preferences_window.ui.h:46
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Detached roster with chat grouped by account"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Detached roster with detached chats"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:45
 msgid "Detached roster with single chat"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
-#: ../src/config.py:671
+#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
+#: ../src/config.py:665
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:47
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Amosar na listaxe os a_vatares dos contactos"
 
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:48
 msgid "Display _extra email details"
 msgstr "Amosar os detalles _extra nos correos electrónicos"
 
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:49
 #, fuzzy
 msgid "Display _location of contacts in roster"
 msgstr "Amosar na listaxe os a_vatares dos contactos"
 
-#: ../data/gui/preferences_window.ui.h:54
+#: ../data/gui/preferences_window.ui.h:50
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Amosar na listaxe os a_vatares dos contactos"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display a_vatars of contacts in roster"
 msgstr "Amosar na listaxe os a_vatares dos contactos"
 
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:52
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Amosar na listaxe os a_vatares dos contactos"
 
-#: ../data/gui/preferences_window.ui.h:57
+#: ../data/gui/preferences_window.ui.h:53
 msgid "Display status _messages of contacts in roster"
 msgstr "Amosar na listaxe as _mensaxes de estado dos contactos"
 
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:54
 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 "
@@ -1983,7 +2199,7 @@ msgstr ""
 "estiver a manter cun contacto. Pode especificar aquí que estados de charla "
 "quere que se amosen nas fiestras."
 
-#: ../data/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:55
 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 "
@@ -1993,7 +2209,7 @@ msgstr ""
 "estiver a manter cun contacto. Pode especificar aquí que estados de charla "
 "quere enviarlle á outra persoa."
 
-#: ../data/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:56
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2001,19 +2217,19 @@ msgstr ""
 "O Gajim notificaralle cunha mensaxe emerxente na parte inferior dereita da "
 "pantalla cando un contacto se desconectar"
 
-#: ../data/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:58
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "Oculta os botóns nas fiestras de grupo de charla."
 
-#: ../data/gui/preferences_window.ui.h:63
+#: ../data/gui/preferences_window.ui.h:59
 #, 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/gui/preferences_window.ui.h:64
+#: ../data/gui/preferences_window.ui.h:60
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -2021,18 +2237,18 @@ msgstr ""
 "Se isto está marcado, o Gajim tamén incluirá información sobre o remitente "
 "de correos electrónicos novos"
 
-#: ../data/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:61
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:66
+#: ../data/gui/preferences_window.ui.h:62
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -2040,7 +2256,7 @@ msgstr ""
 "Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
 "listaxe e nos grupos de charla"
 
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -2048,7 +2264,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/gui/preferences_window.ui.h:69
+#: ../data/gui/preferences_window.ui.h:65
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -2056,7 +2272,7 @@ msgstr ""
 "Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
 "listaxe e nos grupos de charla"
 
-#: ../data/gui/preferences_window.ui.h:70
+#: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the location of contacts in the roster window"
@@ -2064,7 +2280,7 @@ msgstr ""
 "Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
 "listaxe e nos grupos de charla"
 
-#: ../data/gui/preferences_window.ui.h:71
+#: ../data/gui/preferences_window.ui.h:67
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -2072,7 +2288,7 @@ msgstr ""
 "Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
 "listaxe e nos grupos de charla"
 
-#: ../data/gui/preferences_window.ui.h:72
+#: ../data/gui/preferences_window.ui.h:68
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -2080,14 +2296,14 @@ msgstr ""
 "Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
 "listaxe e nos grupos de charla"
 
-#: ../data/gui/preferences_window.ui.h:73
+#: ../data/gui/preferences_window.ui.h:69
 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/gui/preferences_window.ui.h:74
+#: ../data/gui/preferences_window.ui.h:70
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -2098,14 +2314,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/gui/preferences_window.ui.h:75
+#: ../data/gui/preferences_window.ui.h:71
 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/gui/preferences_window.ui.h:76
+#: ../data/gui/preferences_window.ui.h:72
 #, fuzzy
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
@@ -2114,7 +2330,7 @@ msgstr ""
 "Se isto está marcado, o Gajim tamén incluirá información sobre o remitente "
 "de correos electrónicos novos"
 
-#: ../data/gui/preferences_window.ui.h:77
+#: ../data/gui/preferences_window.ui.h:73
 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, "
@@ -2124,13 +2340,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/gui/preferences_window.ui.h:78
+#: ../data/gui/preferences_window.ui.h:74
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:79
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2138,104 +2354,104 @@ msgstr ""
 "Se non está desactivado, o Gajim substituirá emoticonas ASCCI ':)' polo seu "
 "equivalente en iconas gráficas estáticas ou animadas"
 
-#: ../data/gui/preferences_window.ui.h:80
+#: ../data/gui/preferences_window.ui.h:76
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:81
+#: ../data/gui/preferences_window.ui.h:77
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "Unha soa fiestra de conversa"
 
-#: ../data/gui/preferences_window.ui.h:82
+#: ../data/gui/preferences_window.ui.h:78
 msgid "Ma_nage..."
 msgstr "Xestio_nar..."
 
-#: ../data/gui/preferences_window.ui.h:83
+#: ../data/gui/preferences_window.ui.h:79
 #, fuzzy
 msgid "Never"
 msgstr "_Nunca"
 
-#: ../data/gui/preferences_window.ui.h:84
+#: ../data/gui/preferences_window.ui.h:80
 #, fuzzy
 msgid "Notifications"
 msgstr "Modificar a conta"
 
-#: ../data/gui/preferences_window.ui.h:85
+#: ../data/gui/preferences_window.ui.h:81
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Notificar cando un contacto: "
 
-#: ../data/gui/preferences_window.ui.h:86
+#: ../data/gui/preferences_window.ui.h:82
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Notificar cando un contacto: "
 
-#: ../data/gui/preferences_window.ui.h:87
+#: ../data/gui/preferences_window.ui.h:83
 #, fuzzy
 msgid "Notify me about it"
 msgstr "_Notificarmo"
 
-#: ../data/gui/preferences_window.ui.h:88
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notify on new _GMail email"
 msgstr "Notificar de novos correos de _GMail"
 
-#: ../data/gui/preferences_window.ui.h:89
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Only when pending events"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:90
+#: ../data/gui/preferences_window.ui.h:86
 #, fuzzy
 msgid "Personal Events"
 msgstr "Información persoal"
 
-#: ../data/gui/preferences_window.ui.h:91
+#: ../data/gui/preferences_window.ui.h:87
 msgid "Play _sounds"
 msgstr "Reproducir _sons"
 
-#: ../data/gui/preferences_window.ui.h:92
+#: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
 msgid "Pop it up"
 msgstr "_Emerxer"
 
-#: ../data/gui/preferences_window.ui.h:93
+#: ../data/gui/preferences_window.ui.h:89
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../data/gui/preferences_window.ui.h:94
+#: ../data/gui/preferences_window.ui.h:90
 msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:96
+#: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
 msgid "STUN server:"
 msgstr "Servidor:"
 
-#: ../data/gui/preferences_window.ui.h:97
+#: ../data/gui/preferences_window.ui.h:93
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Amosar só na _listaxe de contactos"
+msgid "Show notification area icon:"
+msgstr "Usar a icona na á_rea de notificación"
 
-#: ../data/gui/preferences_window.ui.h:98
+#: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
-msgid "Show systray:"
-msgstr "_Mostrar o evento na área de notificación"
+msgid "Show only in roster"
+msgstr "Amosar só na _listaxe de contactos"
 
-#: ../data/gui/preferences_window.ui.h:99
+#: ../data/gui/preferences_window.ui.h:95
 msgid "Sign _in"
 msgstr "Conectar"
 
-#: ../data/gui/preferences_window.ui.h:100
+#: ../data/gui/preferences_window.ui.h:96
 msgid "Sign _out"
 msgstr "_Desconectar"
 
-#: ../data/gui/preferences_window.ui.h:101
+#: ../data/gui/preferences_window.ui.h:97
 msgid "Single window for everything"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:102
+#: ../data/gui/preferences_window.ui.h:98
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2243,30 +2459,30 @@ msgstr ""
 "Algunhas mensaxes poden incluír un contido adornado (formato, cores etc). Se "
 "isto está marcado, o Gajim amosará a mensaxe en bruto."
 
-#: ../data/gui/preferences_window.ui.h:103
+#: ../data/gui/preferences_window.ui.h:99
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "Ordenar os contacto_s polo estado"
 
-#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
 msgid "Status"
 msgstr "Estado"
 
-#: ../data/gui/preferences_window.ui.h:105
+#: ../data/gui/preferences_window.ui.h:101
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "Conxunto de _iconas de estado por defecto:"
 
-#: ../data/gui/preferences_window.ui.h:106
+#: ../data/gui/preferences_window.ui.h:102
 #, fuzzy
 msgid "Style"
 msgstr "Atascado"
 
-#: ../data/gui/preferences_window.ui.h:107
+#: ../data/gui/preferences_window.ui.h:103
 msgid "T_heme:"
 msgstr "Te_ma:"
 
-#: ../data/gui/preferences_window.ui.h:108
+#: ../data/gui/preferences_window.ui.h:104
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2274,7 +2490,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:111
+#: ../data/gui/preferences_window.ui.h:107
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2282,132 +2498,136 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:114
+#: ../data/gui/preferences_window.ui.h:110
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "_Usar as iconas do transporte"
 
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:111
+msgid "Use default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:112
 msgid "Use system _default"
 msgstr "Usar o pre_definido do sistema"
 
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:113
 msgid "Video framerate"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:117
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Video input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:118
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Video output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:119
+#: ../data/gui/preferences_window.ui.h:116
 msgid "Video size"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:120
+#: ../data/gui/preferences_window.ui.h:117
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Cando se reciba un acontecemento novo"
 
-#: ../data/gui/preferences_window.ui.h:121
+#: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
 msgid "Your message:"
 msgstr "Mensaxe de erro: %s"
 
-#: ../data/gui/preferences_window.ui.h:122
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your nickname:"
 msgstr "Ant_es do alcume:"
 
-#: ../data/gui/preferences_window.ui.h:123
+#: ../data/gui/preferences_window.ui.h:120
 #, fuzzy
 msgid "_Away after:"
 msgstr "Pór _ausente despois de:"
 
-#: ../data/gui/preferences_window.ui.h:124
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../data/gui/preferences_window.ui.h:125
+#: ../data/gui/preferences_window.ui.h:122
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "Notificacións de estado nas charlas:"
 
-#: ../data/gui/preferences_window.ui.h:126
+#: ../data/gui/preferences_window.ui.h:123
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Emoticonas:"
 
-#: ../data/gui/preferences_window.ui.h:127
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_File manager:"
 msgstr "A_dministrador de ficheiros:"
 
-#: ../data/gui/preferences_window.ui.h:128
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_Highlight misspelled words"
 msgstr "_Marcar os erros ortográficos"
 
-#: ../data/gui/preferences_window.ui.h:129
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Ignore events from contacts not in the roster"
 msgstr ""
 "_Ignorar as mensaxes de contactos que non estean na listaxe de contactos"
 
-#: ../data/gui/preferences_window.ui.h:130
+#: ../data/gui/preferences_window.ui.h:127
 #, fuzzy
 msgid "_Ignore rich content in incoming messages"
 msgstr "Ignorar o contido adornado en mensaxes entrantes"
 
-#: ../data/gui/preferences_window.ui.h:131
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Log status changes of contacts"
 msgstr "_Rexistrar os cambios de estado dos contactos"
 
-#: ../data/gui/preferences_window.ui.h:132
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Mail client:"
 msgstr "_Cliente de correo:"
 
-#: ../data/gui/preferences_window.ui.h:133
+#: ../data/gui/preferences_window.ui.h:130
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Pór _non dispoñíbel despois de:"
 
-#: ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Reset to Default Colors"
 msgstr "_Restabelecer as cores predeterminadas"
 
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:133
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "Notificacións de estado nas charlas:"
 
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Status message:"
 msgstr "Men_saxe de estado:"
 
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:140
+#: ../data/gui/preferences_window.ui.h:137
 #, fuzzy
 msgid "in _group chats"
 msgstr "Entrar nun grupo de charla"
 
-#: ../data/gui/preferences_window.ui.h:141
+#: ../data/gui/preferences_window.ui.h:138
 #, fuzzy
 msgid "in _roster"
 msgstr "Non está na listaxe"
 
-#: ../data/gui/preferences_window.ui.h:142
+#: ../data/gui/preferences_window.ui.h:139
 msgid "minutes"
 msgstr "minutos"
 
@@ -2460,7 +2680,7 @@ msgstr "ID de Jabber:"
 msgid "Order:"
 msgstr "Orde:"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3436
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
 msgid "Privacy List"
 msgstr "Listaxe de privacidade"
 
@@ -2695,8 +2915,8 @@ msgstr "Eliminar a conta do Gajim e do _servidor"
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5492 ../src/roster_window.py:5622
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
+#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
 msgid "_Remove"
 msgstr "_Eliminar"
 
@@ -2742,59 +2962,63 @@ msgid "Help online"
 msgstr "Axuda en liña"
 
 #: ../data/gui/roster_window.ui.h:8
+msgid "P_lugins"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:9
 msgid "Profile, A_vatar"
 msgstr "Perfil, Ima_xe"
 
-#: ../data/gui/roster_window.ui.h:9
+#: ../data/gui/roster_window.ui.h:10
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "Amosar os contactos desconectados"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
 msgid "Show Trans_ports"
 msgstr "Amosar os trans_portes"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
 msgid "Show _Offline Contacts"
 msgstr "Amosar os contactos desconectados"
 
-#: ../data/gui/roster_window.ui.h:12 ../src/statusicon.py:326
+#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
 msgid "Show _Roster"
 msgstr "Amosar _listaxe"
 
-#: ../data/gui/roster_window.ui.h:13
+#: ../data/gui/roster_window.ui.h:14
 #, 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/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
 #: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Accións"
 
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
 msgid "_Contents"
 msgstr "_Contidos"
 
-#: ../data/gui/roster_window.ui.h:18 ../src/disco.py:1502
+#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../data/gui/roster_window.ui.h:19
+#: ../data/gui/roster_window.ui.h:20
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Help"
 msgstr "_Axuda"
 
-#: ../data/gui/roster_window.ui.h:22
+#: ../data/gui/roster_window.ui.h:23
 #, fuzzy
 msgid "_Send Single Message..."
 msgstr "Enviar unha _mensaxe..."
 
-#: ../data/gui/roster_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:25
 msgid "_View"
 msgstr "_Ver"
 
@@ -2813,12 +3037,12 @@ msgid "_Add contact"
 msgstr "Engadir un _contacto"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5634
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
 #, fuzzy
 msgid "_Information"
 msgstr "Información"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1353
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
 msgid "_Search"
 msgstr "_Buscar"
 
@@ -2838,10 +3062,6 @@ msgstr "Rexistrar en"
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../data/gui/single_message_window.ui.h:2
-msgid "From:"
-msgstr "De:"
-
 #: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Responder esta mensaxe:"
@@ -2858,10 +3078,6 @@ msgstr "Enviar a mensaxe"
 msgid "Send message and close window"
 msgstr "Enviar a mensaxe e pechar a fiestra"
 
-#: ../data/gui/single_message_window.ui.h:7
-msgid "Subject:"
-msgstr "Tema:"
-
 #: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "A:"
@@ -3084,26 +3300,37 @@ msgstr "Mensaxaría Instantánea Gajim"
 msgid "Jabber IM Client"
 msgstr "Cliente de MI de Jabber"
 
-#: ../src/adhoc_commands.py:314
+#: ../src/adhoc_commands.py:323
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Información"
 
-#: ../src/adhoc_commands.py:315
+#: ../src/adhoc_commands.py:324
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:351 ../src/adhoc_commands.py:374
+#: ../src/adhoc_commands.py:370
+#, fuzzy
+msgid "Invalid Form"
+msgstr "A entrada non é válida"
+
+#: ../src/adhoc_commands.py:371
+#, fuzzy
+msgid "The form is not filled correctly."
+msgstr ""
+"A ID de Jabber para o grupo de charla contén caracteres que non se permiten."
+
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:360
+#: ../src/adhoc_commands.py:399
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:471
+#: ../src/adhoc_commands.py:513
 msgid "Service returned an error."
 msgstr ""
 
@@ -3131,7 +3358,7 @@ msgstr "No grupo"
 msgid "Text"
 msgstr ""
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:945
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
 msgid "Color"
 msgstr ""
 
@@ -3168,241 +3395,241 @@ msgstr[1] "Recibiu unha entrada nova:"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "English"
 msgstr "Inglés"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Belarusian"
 msgstr "Búlgaro"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Breton"
 msgstr "Bretón"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Czech"
 msgstr "Checo"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "German"
 msgstr "Alemán"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Greek"
 msgstr "Grego"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "British"
 msgstr "Bretón"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Spanish"
 msgstr "Español"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Basque"
 msgstr "Éuscaro"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "French"
 msgstr "Francés"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Croatian"
 msgstr "Croata"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Norwegian (b)"
 msgstr "Noruegués b"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Dutch"
 msgstr "Holandés"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Norwegian"
 msgstr "Noruegués"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Polish"
 msgstr "Polaco"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Portuguese"
 msgstr "Portugués"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Brazilian Portuguese"
 msgstr "Portugués do Brasil"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Russian"
 msgstr "Ruso"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Serbian"
 msgstr "Alemán"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Chinese (Ch)"
 msgstr "Chinés (Ch)"
 
-#: ../src/chat_control.py:479
+#: ../src/chat_control.py:496
 msgid "Spelling language"
 msgstr "Idioma do corrector"
 
 #. we are not connected
-#: ../src/chat_control.py:511 ../src/chat_control.py:720
+#: ../src/chat_control.py:528 ../src/chat_control.py:737
 msgid "A connection is not available"
 msgstr "Non está dispoñíbel ningunha conexión"
 
-#: ../src/chat_control.py:512 ../src/chat_control.py:721
+#: ../src/chat_control.py:529 ../src/chat_control.py:738
 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:927
+#: ../src/chat_control.py:944
 #, fuzzy
 msgid "Underline"
 msgstr "nove"
 
-#: ../src/chat_control.py:928
+#: ../src/chat_control.py:945
 #, fuzzy
 msgid "Strike"
 msgstr "Alcume"
 
-#: ../src/chat_control.py:951
+#: ../src/chat_control.py:968
 #, fuzzy
 msgid "Font"
 msgstr "_Letra:"
 
-#: ../src/chat_control.py:960
+#: ../src/chat_control.py:977
 #, fuzzy
 msgid "Clear formating"
 msgstr "Información"
 
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1055
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:1039
+#: ../src/chat_control.py:1056
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1503 ../src/chat_control.py:1987
+#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Cifrado activado"
 
 #. Add to roster
-#: ../src/chat_control.py:1528 ../src/common/contacts.py:158
+#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
 #: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:245 ../src/dialogs.py:1064 ../src/dialogs.py:2078
-#: ../src/dialogs.py:2107 ../src/gui_interface.py:674
+#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
+#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
 #: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1610 ../src/roster_window.py:1612
-#: ../src/roster_window.py:1942 ../src/roster_window.py:3289
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
+#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
+#: ../src/roster_window.py:3382
 msgid "Not in Roster"
 msgstr "Non está na listaxe"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1575
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Listaxe de transferencias activas, rematadas e detidas"
 
-#: ../src/chat_control.py:1561
+#: ../src/chat_control.py:1578
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1656
+#: ../src/chat_control.py:1677
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:1869
 #, 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:1967 ../src/dialogs.py:4866
+#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1968
+#: ../src/chat_control.py:1991
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1977
+#: ../src/chat_control.py:2000
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Cifrado desactivado"
 
-#: ../src/chat_control.py:2003
+#: ../src/chat_control.py:2026
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:2028
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2051
 #, fuzzy
 msgid "and authenticated"
 msgstr "Usar a autenticación"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2032
+#: ../src/chat_control.py:2055
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Usar a autenticación"
@@ -3410,58 +3637,66 @@ 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:2039
+#: ../src/chat_control.py:2062
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2182
+#: ../src/chat_control.py:2205
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2191
+#: ../src/chat_control.py:2215
+msgid "This session WILL be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2217
+msgid "This session WILL NOT be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2226
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Esta mensaxe está cifrada]"
 
-#: ../src/chat_control.py:2194
+#: ../src/chat_control.py:2229
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2196
+#: ../src/chat_control.py:2231
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2201
+#: ../src/chat_control.py:2236
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2203
+#: ../src/chat_control.py:2238
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Cifrado desactivado"
 
-#: ../src/chat_control.py:2241 ../src/chat_control.py:2254
+#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Esta mensaxe está cifrada]"
 
-#: ../src/chat_control.py:2247
+#: ../src/chat_control.py:2288
 #, 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:2519
+#: ../src/chat_control.py:2566
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Acaba de recibir unha mensaxe nova de \"%s\""
 
-#: ../src/chat_control.py:2520
+#: ../src/chat_control.py:2567
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3469,22 +3704,20 @@ msgstr ""
 "Se pecha este separador e ten o historial desactivado, esta mensaxe "
 "perderase."
 
-#: ../src/chat_control.py:2663 ../src/common/connection_handlers.py:1635
-#: ../src/common/connection_handlers.py:1758
-#: ../src/common/connection_handlers.py:1960
-#: ../src/common/connection_handlers.py:2110 ../src/common/connection.py:452
+#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
 #: ../src/gajim.py:159 ../src/session.py:138
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2664
+#: ../src/chat_control.py:2714
 #, 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:2906
+#: ../src/chat_control.py:2962
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s está agora %(status)s"
@@ -3498,28 +3731,28 @@ msgstr "a crear a base de datos de rexistros"
 msgid "creating cache database"
 msgstr "a crear a base de datos de rexistros"
 
-#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
-#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
-#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
-#: ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
 #, 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:275 ../src/common/check_paths.py:282
-#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
-#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
-#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:333
+#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
+#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
+#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
 msgid "Gajim will now exit"
 msgstr "Gajim pecharase agora"
 
-#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
+#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
 #, 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:342
+#: ../src/common/check_paths.py:351
 #, python-format
 msgid "creating %s directory"
 msgstr "a crear un directorio %s"
@@ -3591,9 +3824,9 @@ msgstr ""
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:801
-#: ../src/roster_window.py:1614 ../src/roster_window.py:1616
-#: ../src/roster_window.py:5251
+#: ../src/common/helpers.py:57 ../src/roster_window.py:815
+#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
+#: ../src/roster_window.py:5323
 #, fuzzy
 msgid "Groupchats"
 msgstr "Grupos de charla"
@@ -3656,7 +3889,8 @@ msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
 #: ../src/common/config.py:88
-msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgid ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
 #: ../src/common/config.py:93
@@ -3712,9 +3946,9 @@ msgstr ""
 "Listaxe (separada por espazos) de filas (contas e grupos) que están caídas."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:501
-#: ../src/common/optparser.py:290 ../src/common/optparser.py:486
-#: ../src/common/optparser.py:520 ../src/gui_interface.py:3370
+#: ../src/common/config.py:106 ../src/common/config.py:505
+#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
+#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
 #, fuzzy
 msgid "default"
 msgstr "Por defecto"
@@ -3932,7 +4166,8 @@ 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:197
-msgid "Notify of events in the system trayicon."
+#, fuzzy
+msgid "Notify of events in the notification area."
 msgstr "Notifica acontecementos na área de notificación."
 
 #: ../src/common/config.py:203
@@ -3969,9 +4204,10 @@ msgstr ""
 "de charla."
 
 #: ../src/common/config.py:221
+#, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
+"setting is taken into account only if notification icon is used."
 msgstr ""
 "Se é verdadeiro, peche o Gajim cando se preme o botón X do xestor de "
 "fiestras. Esta preferencia só se activa se se usa a icona da área de "
@@ -4244,7 +4480,7 @@ msgstr ""
 #: ../src/common/config.py:270
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
-"systray icon."
+"notification icon."
 msgstr ""
 
 #: ../src/common/config.py:271
@@ -4415,111 +4651,122 @@ msgstr ""
 msgid "Message that is sent to contacts you want to add"
 msgstr "Por favor, cubra a información do contacto que quere engadir"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:374
+msgid "Last time we syncronized with logs from server."
+msgstr ""
+
+#: ../src/common/config.py:436
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Está o OpenPGP activado para este contacto?"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:437 ../src/common/config.py:440
+#: ../src/common/config.py:438 ../src/common/config.py:441
 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:446
+#: ../src/common/config.py:447
 msgid "all or space separated status"
 msgstr "estado separado por espazos ou all"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:448
 msgid "'yes', 'no', or 'both'"
 msgstr "'si', 'non' ou 'ambos'"
 
-#: ../src/common/config.py:448 ../src/common/config.py:450
-#: ../src/common/config.py:451 ../src/common/config.py:454
-#: ../src/common/config.py:455
+#: ../src/common/config.py:449 ../src/common/config.py:451
+#: ../src/common/config.py:452 ../src/common/config.py:455
+#: ../src/common/config.py:456
 msgid "'yes', 'no' or ''"
 msgstr "'si', 'non' ou ''"
 
-#: ../src/common/config.py:461 ../src/common/pep.py:157
+#: ../src/common/config.py:460
+msgid ""
+"State whether plugins should be activated on exit (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
+msgstr ""
+
+#: ../src/common/config.py:465 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "A durmir"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back soon"
 msgstr "Volvo axiña"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back in some minutes."
 msgstr "Volvo nuns minutos."
 
-#: ../src/common/config.py:463 ../src/common/pep.py:127
+#: ../src/common/config.py:467 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "A comer"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:467
 msgid "I'm eating, so leave me a message."
 msgstr "Estou a comer, déixeme unha mensaxe."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "Movie"
 msgstr "Filme"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "I'm watching a movie."
 msgstr "Estou a ver un filme."
 
-#: ../src/common/config.py:465 ../src/common/pep.py:186
+#: ../src/common/config.py:469 ../src/common/pep.py:186
 msgid "Working"
 msgstr "A traballar"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:469
 msgid "I'm working."
 msgstr "Estou a traballar."
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "I'm on the phone."
 msgstr "Estou a falar por teléfono."
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "Out"
 msgstr "Fóra"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "I'm out enjoying life."
 msgstr "Estou fóra a gozar da vida."
 
-#: ../src/common/config.py:478
+#: ../src/common/config.py:482
 msgid "I'm available."
 msgstr "Estou dispoñíbel."
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:483
 msgid "I'm free for chat."
 msgstr "Estou libre para falar."
 
-#: ../src/common/config.py:480 ../src/config.py:1600
+#: ../src/common/config.py:484 ../src/config.py:1600
 msgid "Be right back."
 msgstr "Volvo axiña"
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:485
 msgid "I'm not available."
 msgstr "Non estou dispoñíbel."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:486
 msgid "Do not disturb."
 msgstr "Non molestar."
 
-#: ../src/common/config.py:483 ../src/common/config.py:484
+#: ../src/common/config.py:487 ../src/common/config.py:488
 msgid "Bye!"
 msgstr "Adeus!"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:498
 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."
@@ -4528,181 +4775,92 @@ msgstr ""
 "palabras de muc_highlight_words, ou cuando unha mensaxe dun grupo de charla "
 "contén o teu alcume."
 
-#: ../src/common/config.py:495
+#: ../src/common/config.py:499
 msgid "Sound to play when any MUC message arrives."
 msgstr "Son para reproducir cando chega calquera mensaxe MUC"
 
-#: ../src/common/config.py:504 ../src/common/optparser.py:304
+#: ../src/common/config.py:508 ../src/common/optparser.py:308
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:290
+#: ../src/common/config.py:512 ../src/common/optparser.py:294
 msgid "grocery"
 msgstr "ultramariño"
 
-#: ../src/common/config.py:512
+#: ../src/common/config.py:516
 msgid "human"
 msgstr "humano"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:520
 msgid "marine"
-msgstr "mariño"
-
-#: ../src/common/connection_handlers.py:84
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
-msgid "Unable to load idle module"
-msgstr "Non se pode cargar o módulo inactivo"
-
-#: ../src/common/connection_handlers.py:117
-#, 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:124
-#, fuzzy
-msgid "Registration succeeded"
-msgstr "Rexistrar %s"
-
-#: ../src/common/connection_handlers.py:125
-#, python-format
-msgid "Registration with agent %s succeeded"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:133
-#, fuzzy
-msgid "Registration failed"
-msgstr "Fallou a conexión"
-
-#: ../src/common/connection_handlers.py:133
-#, python-format
-msgid ""
-"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:445
-#: ../src/common/connection_handlers.py:1633
-#: ../src/common/connection_handlers.py:1756
-#: ../src/common/connection_handlers.py:1957
-#: ../src/common/connection_handlers.py:2108 ../src/common/connection.py:449
-#: ../src/gajim.py:341
-msgid "Disk Write Error"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:678 ../src/common/connection.py:1472
-#, fuzzy
-msgid "Invisibility not supported"
-msgstr "Extensión non admitida"
-
-#: ../src/common/connection_handlers.py:679 ../src/common/connection.py:1473
-#, python-format
-msgid "Account %s doesn't support invisibility."
-msgstr ""
-
-#: ../src/common/connection_handlers.py:1446 ../src/common/connection.py:253
-#: ../src/config.py:2091 ../src/config.py:2100 ../src/config.py:2168
-#: ../src/config.py:3560 ../src/dataforms_widget.py:597 ../src/dialogs.py:2931
-msgid "Invalid Jabber ID"
-msgstr "A ID de Jabber non é válida"
-
-#: ../src/common/connection_handlers.py:1447
-msgid "A message from a non-valid JID arrived, it has been ignored."
-msgstr ""
-
-#: ../src/common/connection_handlers.py:1636
-#: ../src/common/connection_handlers.py:1759
-#: ../src/common/connection_handlers.py:1961
-#: ../src/common/connection_handlers.py:2111 ../src/common/connection.py:453
-#: ../src/gajim.py:160 ../src/session.py:139
-#, 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:1805
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Alcume non permitido: %s"
-
-#: ../src/common/connection_handlers.py:1902
-#: ../src/common/connection_handlers.py:1911
-#: ../src/common/connection_handlers.py:1918
-#: ../src/common/connection_handlers.py:1922
-#: ../src/common/connection_handlers.py:1926
-#: ../src/common/connection_handlers.py:1931 ../src/gui_interface.py:139
-msgid "Unable to join group chat"
-msgstr "Non se puido entrar no grupo de charla"
-
-#: ../src/common/connection_handlers.py:1903
-#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:1912
-#, fuzzy, python-format
-msgid "You are banned from group chat %s."
-msgstr "Está expulsado deste grupo de charla."
-
-#: ../src/common/connection_handlers.py:1919
-#, fuzzy, python-format
-msgid "Group chat %s does not exist."
-msgstr "Non existe o grupo de charla."
-
-#: ../src/common/connection_handlers.py:1923
-msgid "Group chat creation is restricted."
-msgstr "A creación de grupos de charla está restrinxida."
+msgstr "mariño"
 
-#: ../src/common/connection_handlers.py:1927
-#, 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:94
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
+msgid "Unable to load idle module"
+msgstr "Non se pode cargar o módulo inactivo"
 
-#: ../src/common/connection_handlers.py:1932
-#, fuzzy, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Non está na listaxe de membros"
+#: ../src/common/connection_handlers.py:127
+#, 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"
 
-#. Room has been destroyed. see
-#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:1976
+#: ../src/common/connection_handlers.py:134
 #, fuzzy
-msgid "Room has been destroyed"
-msgstr "Eliminouse a autorización"
+msgid "Registration succeeded"
+msgstr "Rexistrar %s"
 
-#: ../src/common/connection_handlers.py:1984
+#: ../src/common/connection_handlers.py:135
 #, python-format
-msgid "You can join this room instead: %s"
+msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2020
-msgid "I would like to add you to my roster."
-msgstr "Gustaríame engadilo á miña listaxe de contactos"
+#: ../src/common/connection_handlers.py:143
+#, fuzzy
+msgid "Registration failed"
+msgstr "Fallou a conexión"
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2041
+#: ../src/common/connection_handlers.py:143
 #, python-format
-msgid "we are now subscribed to %s"
-msgstr "estamos agora subscritos a %s"
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:2043
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "solicitude de eliminación de subscrición de %s"
+#: ../src/common/connection_handlers.py:466
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
+#: ../src/gajim.py:341
+msgid "Disk Write Error"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
+#, fuzzy
+msgid "Invisibility not supported"
+msgstr "Extensión non admitida"
 
-#: ../src/common/connection_handlers.py:2045
+#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
 #, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "xa non estamos subscritos a %s"
+msgid "Account %s doesn't support invisibility."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
+#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
+#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
+msgid "Invalid Jabber ID"
+msgstr "A ID de Jabber non é válida"
+
+#: ../src/common/connection_handlers.py:1405
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr ""
 
-#: ../src/common/connection_handlers.py:2240
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
+#: ../src/gajim.py:160 ../src/session.py:139
 #, python-format
 msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
+"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 ""
-"A ID de Jabber %s non cumpre a norma RFC. Non se engadirá á súa listaxe de "
-"contactos. Use as ferramentas de xestión de listaxe de contactos roster como "
-"http://jru.jabberstudio.org/ para o eliminar"
 
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
@@ -4834,28 +4992,28 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:254 ../src/dialogs.py:2932
+#: ../src/common/connection.py:256 ../src/dialogs.py:2948
 #, 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:276
+#: ../src/common/connection.py:278
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:281
 #, 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:331
+#: ../src/common/connection.py:333
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Esta mensaxe está *cifrada* (Mira :JEP:`27`]"
 
-#: ../src/common/connection.py:439
+#: ../src/common/connection.py:441
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4864,152 +5022,152 @@ msgstr ""
 "Asunto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:807
+#: ../src/common/connection.py:809
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Perdeuse a conexión da conta \"%s\""
 
-#: ../src/common/connection.py:808
+#: ../src/common/connection.py:810
 msgid "Reconnect manually."
 msgstr "Reconectar manualmente."
 
-#: ../src/common/connection.py:820
+#: ../src/common/connection.py:822
 #, 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:854
+#: ../src/common/connection.py:856
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:867
+#: ../src/common/connection.py:869
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr ""
 
 #. wrong answer
-#: ../src/common/connection.py:882
+#: ../src/common/connection.py:884
 msgid "Invalid answer"
 msgstr "A resposta non é válida"
 
-#: ../src/common/connection.py:883
+#: ../src/common/connection.py:885
 #, 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:1165 ../src/common/connection.py:1294
-#: ../src/common/connection.py:1784
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
+#: ../src/common/connection.py:1792
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Non se pode conectar a \"%s\""
 
-#: ../src/common/connection.py:1166 ../src/gui_interface.py:755
+#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
 msgid "Check your connection or try again later."
 msgstr "Comprobe a súa conexión ou probe máis tarde."
 
-#: ../src/common/connection.py:1171
+#: ../src/common/connection.py:1173
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Gardouse en: %s"
 
-#: ../src/common/connection.py:1184
+#: ../src/common/connection.py:1186
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Fallou a conexión"
 
-#: ../src/common/connection.py:1215 ../src/common/connection.py:1274
+#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Non se pode conectar a \"%s\""
 
-#: ../src/common/connection.py:1216 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
 #, 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:1241
+#: ../src/common/connection.py:1243
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1244
+#: ../src/common/connection.py:1246
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1248
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr ""
 
-#: ../src/common/connection.py:1295
+#: ../src/common/connection.py:1297
 msgid "Check your connection or try again later"
 msgstr "Comprobe a súa conexión ou probe máis tarde"
 
-#: ../src/common/connection.py:1324
+#: ../src/common/connection.py:1329
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Fallou a autenticación con \"%s\""
 
-#: ../src/common/connection.py:1326
+#: ../src/common/connection.py:1331
 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:1395
+#: ../src/common/connection.py:1400
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "Erro ao engadir o servizo. %s"
 
-#: ../src/common/connection.py:1396
+#: ../src/common/connection.py:1401
 #, 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:1650
+#: ../src/common/connection.py:1658
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1653
+#: ../src/common/connection.py:1661
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Contactos"
 
-#: ../src/common/connection.py:1799 ../src/common/connection.py:1822
+#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
 msgid "Not fetched because of invisible status"
 msgstr "Non se conseguiu debido ao estado invisíbel"
 
-#: ../src/common/connection.py:2254
+#: ../src/common/connection.py:2262
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Fallou a conexión"
 
-#: ../src/common/connection.py:2255
+#: ../src/common/connection.py:2263
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
 #: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:674
+#: ../src/gui_interface.py:551
 msgid "Observers"
 msgstr "Observadores"
 
 #: ../src/common/contacts.py:139 ../src/common/contacts.py:366
 #: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1499 ../src/gui_interface.py:424
-#: ../src/roster_window.py:840 ../src/roster_window.py:1525
-#: ../src/roster_window.py:1606 ../src/roster_window.py:1608
-#: ../src/roster_window.py:1769
+#: ../src/disco.py:1517 ../src/roster_window.py:854
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
+#: ../src/roster_window.py:2466
 msgid "Transports"
 msgstr "Transportes"
 
@@ -5238,203 +5396,219 @@ msgstr "Final de semana"
 msgid "Weekend!"
 msgstr "Fin de semana!"
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:148
+msgid "Username must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:153
 msgid "Invalid character in username."
 msgstr "Hai un caracter non válido no nome de usuario."
 
-#: ../src/common/helpers.py:156
-msgid "Server address required."
-msgstr "É necesario o enderezo do servidor."
+#: ../src/common/helpers.py:159
+msgid "Server must be between 1 and 1023 chars"
+msgstr ""
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 msgid "Invalid character in hostname."
 msgstr "Carácter non válido no nome do host."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:166
+msgid "Server address required."
+msgstr "É necesario o enderezo do servidor."
+
+#: ../src/common/helpers.py:170
+msgid "Resource must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:175
 msgid "Invalid character in resource."
 msgstr "Carácter non válido no recurso."
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:215
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: ../src/common/helpers.py:211 ../src/tooltips.py:195
+#: ../src/common/helpers.py:217 ../src/tooltips.py:195
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:220
 msgid "_Not Available"
 msgstr "_Non dispoñíbel"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:225
 msgid "_Free for Chat"
 msgstr "_Libre para falar"
 
-#: ../src/common/helpers.py:221 ../src/tooltips.py:191
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Free for Chat"
 msgstr "Libre para falar"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:230
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "Pausada"
 
-#: ../src/common/helpers.py:226 ../src/tooltips.py:189
+#: ../src/common/helpers.py:232 ../src/tooltips.py:189
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Pausada"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:234
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:237
 msgid "A_way"
 msgstr "A_usente"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:242
 msgid "_Offline"
 msgstr "D_esconectado"
 
-#: ../src/common/helpers.py:238 ../src/tooltips.py:199
+#: ../src/common/helpers.py:244 ../src/tooltips.py:199
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:247
 msgid "_Invisible"
 msgstr "_Invisíbel"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:253
 msgid "?contact has status:Unknown"
 msgstr "Descoñecido"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:255
 msgid "?contact has status:Has errors"
 msgstr "Ten erros"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:260
 msgid "?Subscription we already have:None"
 msgstr "Ningunha"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:262
 msgid "To"
 msgstr "A"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
+msgid "From"
+msgstr "De"
+
+#: ../src/common/helpers.py:266
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:274
 msgid "?Ask (for Subscription):None"
 msgstr "Ningunha"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:276
 msgid "Subscribe"
 msgstr "_Engadir"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:285
 msgid "?Group Chat Contact Role:None"
 msgstr "Ningún"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:288
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:290
 msgid "Moderator"
 msgstr "Moderador"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:293
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:295
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:298
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:300
 msgid "Visitor"
 msgstr "Visitante"
 
-#: ../src/common/helpers.py:300 ../src/tooltips.py:210
+#: ../src/common/helpers.py:306 ../src/tooltips.py:210
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Ningún"
 
-#: ../src/common/helpers.py:302 ../src/tooltips.py:216
+#: ../src/common/helpers.py:308 ../src/tooltips.py:216
 msgid "Owner"
 msgstr "Propietario"
 
-#: ../src/common/helpers.py:304 ../src/tooltips.py:214
+#: ../src/common/helpers.py:310 ../src/tooltips.py:214
 msgid "Administrator"
 msgstr "Administrador"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:212
+#: ../src/common/helpers.py:312 ../src/tooltips.py:212
 msgid "Member"
 msgstr "Membro"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:351
 msgid "is paying attention to the conversation"
 msgstr "está a prestar atención á conversa"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:353
 msgid "is doing something else"
 msgstr "está a facer algo máis"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:355
 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:352
+#: ../src/common/helpers.py:358
 msgid "paused composing a message"
 msgstr "Parou de escribir"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:360
 msgid "has closed the chat window or tab"
 msgstr "pechou a fiestra de charla"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:619
+#: ../src/common/helpers.py:625
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:622
+#: ../src/common/helpers.py:628
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:626
+#: ../src/common/helpers.py:632
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:629
+#: ../src/common/helpers.py:635
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:633
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:636
+#: ../src/common/helpers.py:642
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:645
 #, python-format
 msgid "%s B"
 msgstr "%s B"
@@ -5477,12 +5651,12 @@ msgstr "Gajim - %s"
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:111
+#: ../src/common/jingle_rtp.py:107
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Configuración da sala"
 
-#: ../src/common/jingle_rtp.py:112
+#: ../src/common/jingle_rtp.py:108
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5494,30 +5668,30 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:209
+#: ../src/common/jingle_rtp.py:205
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:210
+#: ../src/common/jingle_rtp.py:206
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Mensaxe de erro: %s"
 
-#: ../src/common/jingle_rtp.py:336
+#: ../src/common/jingle_rtp.py:335
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:339
+#: ../src/common/jingle_rtp.py:338
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:382
+#: ../src/common/jingle_rtp.py:381
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:390
+#: ../src/common/jingle_rtp.py:389
 msgid "video output"
 msgstr ""
 
@@ -5594,11 +5768,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "erro: non se pode abrir %s para lectura"
 
-#: ../src/common/optparser.py:299 ../src/common/optparser.py:300
+#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
 msgid "cyan"
 msgstr "ciano"
 
-#: ../src/common/optparser.py:379
+#: ../src/common/optparser.py:383
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "migrando os rexistros da base de datos aos índices"
@@ -6335,17 +6509,17 @@ msgstr ""
 "cancelarase."
 
 #. we're not english
-#: ../src/common/stanza_session.py:303
+#: ../src/common/stanza_session.py:423
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:178
+#: ../src/common/zeroconf/connection_zeroconf.py:181
 msgid "Avahi error"
 msgstr "Erro de Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:179
+#: ../src/common/zeroconf/connection_zeroconf.py:182
 #, python-format
 msgid ""
 "%s\n"
@@ -6354,46 +6528,46 @@ msgstr ""
 "%s\n"
 "A mensaxaría de ligazón local podería non funcionar correctamente."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:190
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, 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:199
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Could not start local service"
 msgstr "Non foi posíbel iniciar o servizo local"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Non foi posíbel ligar ao porto %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-#: ../src/common/zeroconf/connection_zeroconf.py:283
-#: ../src/common/zeroconf/connection_zeroconf.py:294
-#: ../src/common/zeroconf/connection_zeroconf.py:308
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:286
+#: ../src/common/zeroconf/connection_zeroconf.py:297
+#: ../src/common/zeroconf/connection_zeroconf.py:311
 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:282
-#: ../src/common/zeroconf/connection_zeroconf.py:293
-#: ../src/common/zeroconf/connection_zeroconf.py:307
+#: ../src/common/zeroconf/connection_zeroconf.py:285
+#: ../src/common/zeroconf/connection_zeroconf.py:296
+#: ../src/common/zeroconf/connection_zeroconf.py:310
 #, 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:325
+#: ../src/common/zeroconf/connection_zeroconf.py:328
 #, 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:335
+#: ../src/common/zeroconf/connection_zeroconf.py:338
 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/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:363
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6416,16 +6590,16 @@ msgstr "Mensaxes de estado por defecto"
 msgid "Enabled"
 msgstr "Activar"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3078
+#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
 msgid "Default"
 msgstr "Por defecto"
 
-#: ../src/config.py:739 ../src/dialogs.py:1395
+#: ../src/config.py:733 ../src/dialogs.py:1409
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Non está dispoñíbel o dicionario para o idioma %s"
 
-#: ../src/config.py:740
+#: ../src/config.py:734
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6443,9 +6617,9 @@ msgid "status message text"
 msgstr "texto da mensaxe de estado"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2383 ../src/dialogs.py:2449
-#: ../src/dialogs.py:3215 ../src/disco.py:866 ../src/disco.py:1726
-#: ../src/disco.py:2030 ../src/history_window.py:90
+#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
+#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
+#: ../src/disco.py:2048 ../src/history_window.py:90
 msgid "Name"
 msgstr "Nome"
 
@@ -6481,7 +6655,7 @@ msgstr "Comezou unha charla coa conta %s"
 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:1976 ../src/config.py:2509 ../src/config.py:2545
+#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
 msgid "You are currently connected to the server"
 msgstr "Está actualmente conectado ao servidor"
 
@@ -6519,136 +6693,136 @@ msgstr "O nome da conta non pode estar baleiro."
 msgid "Account name cannot contain spaces."
 msgstr "O nome da conta non pode conter espazos."
 
-#: ../src/config.py:2072
+#: ../src/config.py:2074
 #, fuzzy
 msgid "Rename Account"
 msgstr "Xestionar as contas"
 
-#: ../src/config.py:2073
+#: ../src/config.py:2075
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Introduza un nome novo para o grupo %s"
 
-#: ../src/config.py:2101
+#: ../src/config.py:2103
 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:2318 ../src/config.py:3606
+#: ../src/config.py:2320 ../src/config.py:3623
 msgid "Invalid entry"
 msgstr "A entrada non é válida"
 
-#: ../src/config.py:2319 ../src/config.py:3607
+#: ../src/config.py:2321 ../src/config.py:3624
 msgid "Custom port must be a port number."
 msgstr "O porto personalizado debe ser un número de porto"
 
-#: ../src/config.py:2340
+#: ../src/config.py:2342
 msgid "Failed to get secret keys"
 msgstr "Produciuse un erro ao obter as chaves secretas"
 
-#: ../src/config.py:2341
+#: ../src/config.py:2343
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Houbo un problema ao recuperar as súas chaves secretas de OpenPGP"
 
-#: ../src/config.py:2375
+#: ../src/config.py:2377
 msgid "OpenPGP Key Selection"
 msgstr "Selección da chave de OpenPGP"
 
-#: ../src/config.py:2376
+#: ../src/config.py:2378
 msgid "Choose your OpenPGP key"
 msgstr "Elixa a súa chave de OpenPGP"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2385
 msgid "No such account available"
 msgstr "Non está dispoñíbel esta conta"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2386
 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:2391 ../src/dialogs.py:2136 ../src/dialogs.py:2371
-#: ../src/dialogs.py:2557 ../src/disco.py:511 ../src/profile_window.py:339
+#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
+#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
 msgid "You are not connected to the server"
 msgstr "Non está conectado ao servidor"
 
-#: ../src/config.py:2392
+#: ../src/config.py:2394
 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:2396
+#: ../src/config.py:2398
 msgid "Your server doesn't support Vcard"
 msgstr "O seu servidor non admite o vCard"
 
-#: ../src/config.py:2397
+#: ../src/config.py:2399
 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:2510 ../src/config.py:2546
+#: ../src/config.py:2512 ../src/config.py:2548
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Para cambiar o nome da conta, debe estar desconectado"
 
-#: ../src/config.py:2515
+#: ../src/config.py:2517
 msgid "Account Local already exists."
 msgstr "A conta local xa existe."
 
-#: ../src/config.py:2516
+#: ../src/config.py:2518
 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:2673
+#: ../src/config.py:2675
 #, python-format
 msgid "Edit %s"
 msgstr "Editar %s"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2677
 #, python-format
 msgid "Register to %s"
 msgstr "Rexistrar %s"
 
 #. list at the beginning
-#: ../src/config.py:2711
+#: ../src/config.py:2713
 msgid "Ban List"
 msgstr "Listaxe de expulsión"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2714
 msgid "Member List"
 msgstr "Listaxe de membros"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2714
 msgid "Owner List"
 msgstr "Listaxe de propietarios"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2715
 msgid "Administrator List"
 msgstr "Listaxe de administradores"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2763 ../src/disco.py:873 ../src/history_manager.py:201
+#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2773
+#: ../src/config.py:2789
 msgid "Reason"
 msgstr "Motivo"
 
-#: ../src/config.py:2780
+#: ../src/config.py:2796
 msgid "Nick"
 msgstr "Alcume"
 
-#: ../src/config.py:2786
+#: ../src/config.py:2802
 msgid "Role"
 msgstr "Posto"
 
-#: ../src/config.py:2813
+#: ../src/config.py:2829
 msgid "Banning..."
 msgstr "A expulsar..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2815
+#: ../src/config.py:2831
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6656,11 +6830,11 @@ msgstr ""
 "<b>A quen quere expulsar?</b>\n"
 "\n"
 
-#: ../src/config.py:2817
+#: ../src/config.py:2833
 msgid "Adding Member..."
 msgstr "A engadir o membro..."
 
-#: ../src/config.py:2818
+#: ../src/config.py:2834
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6668,11 +6842,11 @@ msgstr ""
 "<b>A quen quere facer membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2836
 msgid "Adding Owner..."
 msgstr "A engadir un propietario..."
 
-#: ../src/config.py:2821
+#: ../src/config.py:2837
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -6681,11 +6855,11 @@ msgstr ""
 "<b>A quen quere facer como propietario?</b>\n"
 "\n"
 
-#: ../src/config.py:2823
+#: ../src/config.py:2839
 msgid "Adding Administrator..."
 msgstr "A engadir administrador..."
 
-#: ../src/config.py:2824
+#: ../src/config.py:2840
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6693,7 +6867,7 @@ msgstr ""
 "<b>A quen quere facer como administrador?</b>\n"
 "\n"
 
-#: ../src/config.py:2825
+#: ../src/config.py:2841
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6710,84 +6884,84 @@ msgstr ""
 "usuario@dominio, dominio/recurso ou enderezo que contén\n"
 "un subdominio."
 
-#: ../src/config.py:2926
+#: ../src/config.py:2943
 #, python-format
 msgid "Removing %s account"
 msgstr "A eliminar a conta %s"
 
-#: ../src/config.py:2941
+#: ../src/config.py:2958
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Cifrado desactivado"
 
-#: ../src/config.py:2942
+#: ../src/config.py:2959
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2955 ../src/gui_interface.py:1132
-#: ../src/gui_interface.py:1243
+#: ../src/config.py:2972 ../src/gui_interface.py:311
+#: ../src/gui_interface.py:1048
 msgid "Password Required"
 msgstr "É necesario o contrasinal"
 
-#: ../src/config.py:2956 ../src/gui_interface.py:1223
+#: ../src/config.py:2973 ../src/gui_interface.py:1028
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduza un contrasinal para a conta %s"
 
-#: ../src/config.py:2957 ../src/gui_interface.py:1243
+#: ../src/config.py:2974 ../src/gui_interface.py:1048
 msgid "Save password"
 msgstr "Gardar o contrasinal"
 
-#: ../src/config.py:2967
+#: ../src/config.py:2984
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "A conta \"%s\" está conectada ao servidor"
 
-#: ../src/config.py:2968
+#: ../src/config.py:2985
 msgid "If you remove it, the connection will be lost."
 msgstr "Se a elimina, perderase a conexión co servidor"
 
-#: ../src/config.py:2982
+#: ../src/config.py:2999
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Fallou a conexión"
 
-#: ../src/config.py:2983
+#: ../src/config.py:3000
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Que quere facer?"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3001
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Eliminar a _conta unicamente do Gajim"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3002
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3078
+#: ../src/config.py:3095
 msgid "?print_status:All"
 msgstr "Todos"
 
-#: ../src/config.py:3079
+#: ../src/config.py:3096
 msgid "Enter and leave only"
 msgstr "Entrar e saír soamente"
 
-#: ../src/config.py:3080
+#: ../src/config.py:3097
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Todos"
 
-#: ../src/config.py:3150
+#: ../src/config.py:3167
 msgid "New Group Chat"
 msgstr "Novo grupo de charla"
 
-#: ../src/config.py:3183
+#: ../src/config.py:3200
 msgid "This bookmark has invalid data"
 msgstr "Este marcador ten información que non é válida"
 
-#: ../src/config.py:3184
+#: ../src/config.py:3201
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6795,31 +6969,31 @@ msgstr ""
 "este marcador."
 
 #. invalid char
-#: ../src/config.py:3302 ../src/dialogs.py:1934
+#: ../src/config.py:3319 ../src/dialogs.py:1950
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/config.py:3303 ../src/config.py:3317 ../src/config.py:3331
+#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Alcume non permitido: %s"
 
-#: ../src/config.py:3316 ../src/config.py:3582
+#: ../src/config.py:3333 ../src/config.py:3599
 #, fuzzy
 msgid "Invalid server"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/config.py:3330
+#: ../src/config.py:3347
 #, fuzzy
 msgid "Invalid room"
 msgstr "A entrada non é válida"
 
-#: ../src/config.py:3498
+#: ../src/config.py:3515
 msgid "Account has been added successfully"
 msgstr "A conta engadiuse con éxito"
 
-#: ../src/config.py:3499 ../src/config.py:3505
+#: ../src/config.py:3516 ../src/config.py:3522
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6829,34 +7003,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:3504
+#: ../src/config.py:3521
 msgid "Your new account has been created successfully"
 msgstr "A súa conta nova creouse con éxito"
 
-#: ../src/config.py:3543
+#: ../src/config.py:3560
 msgid "Invalid username"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/config.py:3545
+#: ../src/config.py:3562
 msgid "You must provide a username to configure this account."
 msgstr "Debe pórlle un nome para configurar esta conta."
 
-#: ../src/config.py:3583
+#: ../src/config.py:3600
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Especifique o novo alcume que quere usar:"
 
-#: ../src/config.py:3639 ../src/gui_interface.py:1904
+#: ../src/config.py:3656 ../src/gui_interface.py:1693
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "O contacto xa está na listaxe"
 
-#: ../src/config.py:3640 ../src/gui_interface.py:1905
+#: ../src/config.py:3657 ../src/gui_interface.py:1694
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3717
+#: ../src/config.py:3734
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6866,7 +7040,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3723 ../src/gui_interface.py:1932
+#: ../src/config.py:3740 ../src/gui_interface.py:1721
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6874,73 +7048,82 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3755 ../src/config.py:3789
+#: ../src/config.py:3772 ../src/config.py:3806
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Produciuse un erro durante a creación da conta"
 
-#: ../src/config.py:3854
+#: ../src/config.py:3871
 msgid "Account name is in use"
 msgstr "O nome da conta está en uso"
 
-#: ../src/config.py:3855
+#: ../src/config.py:3872
 msgid "You already have an account using this name."
 msgstr "Xa ten unha conta en que emprega este nome"
 
-#: ../src/config.py:4009
+#: ../src/config.py:3991
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/config.py:3992
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#: ../src/config.py:4036
 msgid "Active"
 msgstr "Activo"
 
-#: ../src/config.py:4017
+#: ../src/config.py:4044
 msgid "Event"
 msgstr "Acontecemento"
 
-#: ../src/config.py:4052
+#: ../src/config.py:4079
 msgid "First Message Received"
 msgstr "Recibiuse a primeira mensaxe"
 
-#: ../src/config.py:4053
+#: ../src/config.py:4080
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Recibiuse unha mensaxe nova"
 
-#: ../src/config.py:4055
+#: ../src/config.py:4082
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Recibiuse unha mensaxe nova"
 
-#: ../src/config.py:4056
+#: ../src/config.py:4083
 msgid "Contact Connected"
 msgstr "Nome de contacto"
 
-#: ../src/config.py:4057
+#: ../src/config.py:4084
 msgid "Contact Disconnected"
 msgstr "Contacto desconectado"
 
-#: ../src/config.py:4058
+#: ../src/config.py:4085
 msgid "Message Sent"
 msgstr "Enviouse a mensaxe"
 
-#: ../src/config.py:4059
+#: ../src/config.py:4086
 msgid "Group Chat Message Highlight"
 msgstr "Remarcado da mensaxe de grupo de charla"
 
-#: ../src/config.py:4060
+#: ../src/config.py:4087
 msgid "Group Chat Message Received"
 msgstr "Recibiuse unha mensaxe de grupo de charla"
 
-#: ../src/config.py:4061
+#: ../src/config.py:4088
 msgid "GMail Email Received"
 msgstr "Recibiuse un correo de GMail"
 
-#: ../src/conversation_textview.py:600
+#: ../src/conversation_textview.py:601
 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:619
+#: ../src/conversation_textview.py:620
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6949,45 +7132,45 @@ 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:739
+#: ../src/conversation_textview.py:740
 #, fuzzy
 msgid "_Quote"
 msgstr "_Saír"
 
-#: ../src/conversation_textview.py:746
+#: ../src/conversation_textview.py:747
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Accións para \"%s\""
 
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Read _Wikipedia Article"
 msgstr "Ler artigo da _Wikipedia"
 
-#: ../src/conversation_textview.py:763
+#: ../src/conversation_textview.py:765
 msgid "Look it up in _Dictionary"
 msgstr "Buscalo no _Dicionario"
 
-#: ../src/conversation_textview.py:780
+#: ../src/conversation_textview.py:782
 #, 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:793
+#: ../src/conversation_textview.py:795
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Falta un \"%s\" no URL da busca web"
 
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 msgid "Web _Search for it"
 msgstr "_Buscalo na rede"
 
-#: ../src/conversation_textview.py:802
+#: ../src/conversation_textview.py:804
 msgid "Open as _Link"
 msgstr "_Abrir como ligazón"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1296
+#: ../src/conversation_textview.py:1298
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6995,86 +7178,90 @@ msgstr[0] "Onte"
 msgstr[1] "Onte"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1344 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Asunto: %s\n"
 
-#: ../src/dataforms_widget.py:544
+#: ../src/dataforms_widget.py:545
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Non se pode cargar o módulo inactivo"
 
-#: ../src/dataforms_widget.py:546
+#: ../src/dataforms_widget.py:547
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Extensión non admitida"
 
-#: ../src/dataforms_widget.py:601
+#: ../src/dataforms_widget.py:562
+msgid "This field is required"
+msgstr ""
+
+#: ../src/dataforms_widget.py:607
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Cliente de MI de Jabber"
 
-#: ../src/dataforms_widget.py:602
+#: ../src/dataforms_widget.py:608
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:613
+#: ../src/dataforms_widget.py:619
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:616 ../src/dataforms_widget.py:618
+#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nome do contacto : <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "ID de Jabber : <i>%s</i>"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:195
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:201
+#: ../src/dialogs.py:202
 msgid "In the group"
 msgstr "No grupo"
 
-#: ../src/dialogs.py:292
+#: ../src/dialogs.py:293
 msgid "KeyID"
 msgstr "Chave ID"
 
-#: ../src/dialogs.py:297
+#: ../src/dialogs.py:298
 msgid "Contact name"
 msgstr "Nome de contacto"
 
-#: ../src/dialogs.py:469
+#: ../src/dialogs.py:470
 #, fuzzy
 msgid "Set Mood"
 msgstr "Definir a MDD"
 
-#: ../src/dialogs.py:589
+#: ../src/dialogs.py:590
 #, python-format
 msgid "%s Status Message"
 msgstr "Mensaxe de estado %s"
 
-#: ../src/dialogs.py:603
+#: ../src/dialogs.py:604
 msgid "Status Message"
 msgstr "Mensaxe de estado"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:794
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Mensaxe de estado"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:795
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
@@ -7082,107 +7269,108 @@ msgstr ""
 "Este nome xa está en uso por outra das súas contas. Por favor, escolla outro "
 "nome."
 
-#: ../src/dialogs.py:802
+#: ../src/dialogs.py:803
 msgid "Save as Preset Status Message"
 msgstr "Gardar como mensaxe de estado predefinido"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:804
 msgid "Please type a name for this status message"
 msgstr "Escriba un nome para esta mensaxe de estado"
 
-#: ../src/dialogs.py:831
+#: ../src/dialogs.py:832
 msgid "AIM Address:"
 msgstr "Enderezo de AIM:"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:833
 msgid "GG Number:"
 msgstr "Número de GG:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:834
 msgid "ICQ Number:"
 msgstr "Número de ICQ:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:835
 msgid "MSN Address:"
 msgstr "Enderezo de MSN:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:836
 msgid "Yahoo! Address:"
 msgstr "Enderezo de Yahoo!:"
 
-#: ../src/dialogs.py:872
+#: ../src/dialogs.py:873
 #, 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:875
+#: ../src/dialogs.py:876
 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:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
+#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
+#: ../src/dialogs.py:3464
 msgid "Invalid User ID"
 msgstr "A ID de usuario non é válida"
 
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1052
 msgid "The user ID must not contain a resource."
 msgstr "Esta ID de usuario non contén un recurso."
 
-#: ../src/dialogs.py:1051
+#: ../src/dialogs.py:1057
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Gustaríame engadilo á miña listaxe de contactos"
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1071
 msgid "Contact already in roster"
 msgstr "O contacto xa está na listaxe"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1072
 msgid "This contact is already listed in your roster."
 msgstr "Xa engadiu este contacto á súa listaxe."
 
-#: ../src/dialogs.py:1112
+#: ../src/dialogs.py:1118
 msgid "User ID:"
 msgstr "ID de usuario:"
 
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1189
 msgid "A GTK+ jabber client"
 msgstr "Un cliente de Jabber en GTK"
 
-#: ../src/dialogs.py:1176
+#: ../src/dialogs.py:1190
 msgid "GTK+ Version:"
 msgstr "Versión de GTK+:"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1191
 msgid "PyGTK Version:"
 msgstr "Versión de PyGTK:"
 
-#: ../src/dialogs.py:1187
+#: ../src/dialogs.py:1201
 msgid "Current Developers:"
 msgstr "Desenvolvedores actuais:"
 
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1203
 msgid "Past Developers:"
 msgstr "Desenvolvedores anteriores:"
 
-#: ../src/dialogs.py:1195
+#: ../src/dialogs.py:1209
 msgid "THANKS:"
 msgstr "AGRADECEMENTOS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1215
 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:1213
+#: ../src/dialogs.py:1227
 msgid "translator-credits"
 msgstr "Fran Alburquerque <membriskhan@gmail.com>"
 
-#: ../src/dialogs.py:1396
+#: ../src/dialogs.py:1410
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7193,110 +7381,110 @@ 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:1935 ../src/dialogs.py:2322
+#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
 #, 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:2053
+#: ../src/dialogs.py:2069
 #, 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:2056
+#: ../src/dialogs.py:2072
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Solicitude de subscrición de %s"
 
-#: ../src/dialogs.py:2131 ../src/gui_interface.py:2672
+#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Xa está na sala %s"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2153
 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:2178
+#: ../src/dialogs.py:2194
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entrar nun grupo de charla coa conta %s"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2325
 #, fuzzy
 msgid "Invalid Account"
 msgstr "O nome da conta non é válido"
 
-#: ../src/dialogs.py:2310
+#: ../src/dialogs.py:2326
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Debe crear unha conta antes de poder conversar con outros contactos."
 
-#: ../src/dialogs.py:2321
+#: ../src/dialogs.py:2337
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/dialogs.py:2326 ../src/dialogs.py:2332
-#: ../src/groupchat_control.py:1832
+#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
+#: ../src/groupchat_control.py:1847
 msgid "Invalid group chat Jabber ID"
 msgstr "A ID de Jabber non é válida para o grupo de charla"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2343
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr ""
 "A ID de Jabber para o grupo de charla contén caracteres que non se permiten."
 
-#: ../src/dialogs.py:2333 ../src/groupchat_control.py:1833
+#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
 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:2340
+#: ../src/dialogs.py:2356
 msgid "This is not a group chat"
 msgstr "Isto non é un grupo de charla"
 
-#: ../src/dialogs.py:2341
+#: ../src/dialogs.py:2357
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s non é o nome dun grupo de charla."
 
-#: ../src/dialogs.py:2372
+#: ../src/dialogs.py:2388
 #, 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:2386
+#: ../src/dialogs.py:2402
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/dialogs.py:2421
+#: ../src/dialogs.py:2437
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "A conta \"%s\" está conectada ao servidor"
 
-#: ../src/dialogs.py:2422
+#: ../src/dialogs.py:2438
 #, 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:2446
+#: ../src/dialogs.py:2462
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2523
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar a charla coa conta %s"
 
-#: ../src/dialogs.py:2509
+#: ../src/dialogs.py:2525
 msgid "Start Chat"
 msgstr "Iniciar a charla"
 
-#: ../src/dialogs.py:2510
+#: ../src/dialogs.py:2526
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7305,168 +7493,168 @@ msgstr ""
 "enviar unha mensaxe de charla:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2536 ../src/dialogs.py:2917 ../src/dialogs.py:3129
+#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
 msgid "Connection not available"
 msgstr "Conexión non dispoñíbel"
 
-#: ../src/dialogs.py:2537 ../src/dialogs.py:2918 ../src/dialogs.py:3130
+#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, asegúrese de estar conectado con \"%s\"."
 
-#: ../src/dialogs.py:2546 ../src/dialogs.py:2549
+#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
 msgid "Invalid JID"
 msgstr "A ID de Jabber non é válida"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2565
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Non se pode analizar \"%s\"."
 
-#: ../src/dialogs.py:2558
+#: ../src/dialogs.py:2574
 msgid "Without a connection, you can not change your password."
 msgstr "Sen unha conexión, non pode cambiar o seu contrasinal."
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "Invalid password"
 msgstr "O contrasinal non é válido"
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "You must enter a password."
 msgstr "Debe introducir un contrasinal."
 
-#: ../src/dialogs.py:2581
+#: ../src/dialogs.py:2597
 msgid "Passwords do not match"
 msgstr "Os contrasinais non coinciden"
 
-#: ../src/dialogs.py:2582
+#: ../src/dialogs.py:2598
 msgid "The passwords typed in both fields must be identical."
 msgstr "Os contrasinais escritos nos dous campos deben ser idénticos."
 
 #. default value
-#: ../src/dialogs.py:2619 ../src/notify.py:247 ../src/notify.py:473
+#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
 msgid "Contact Signed In"
 msgstr "Contacto conectado"
 
-#: ../src/dialogs.py:2621 ../src/notify.py:255 ../src/notify.py:475
+#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
 msgid "Contact Signed Out"
 msgstr "Contacto desconectado"
 
 #. chat message
-#: ../src/dialogs.py:2623 ../src/notify.py:277 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
 msgid "New Message"
 msgstr "Mensaxe nova"
 
 #. single message
-#: ../src/dialogs.py:2623 ../src/notify.py:259 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
 msgid "New Single Message"
 msgstr "Mensaxe nova"
 
 #. private message
-#: ../src/dialogs.py:2624 ../src/notify.py:265 ../src/notify.py:478
+#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
 msgid "New Private Message"
 msgstr "Mensaxe privada nova"
 
-#: ../src/dialogs.py:2624 ../src/gui_interface.py:1358 ../src/notify.py:487
+#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
 msgid "New E-mail"
 msgstr "Correo electrónico novo"
 
-#: ../src/dialogs.py:2626 ../src/gui_interface.py:1420 ../src/notify.py:480
+#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
 msgid "File Transfer Request"
 msgstr "Solicitude de transferencia de ficheiro"
 
-#: ../src/dialogs.py:2628 ../src/gui_interface.py:1320
-#: ../src/gui_interface.py:1389 ../src/notify.py:482
+#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
+#: ../src/gui_interface.py:1186 ../src/notify.py:482
 msgid "File Transfer Error"
 msgstr "Produciuse un erro na transferencia do ficheiro"
 
-#: ../src/dialogs.py:2630 ../src/gui_interface.py:1466
-#: ../src/gui_interface.py:1489 ../src/gui_interface.py:1506
+#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
+#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
 #: ../src/notify.py:484
 msgid "File Transfer Completed"
 msgstr "Rematou a transferencia do ficheiro"
 
-#: ../src/dialogs.py:2631 ../src/gui_interface.py:1469 ../src/notify.py:485
+#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
 msgid "File Transfer Stopped"
 msgstr "Detívose a transferencia do ficheiro"
 
-#: ../src/dialogs.py:2633 ../src/gui_interface.py:1152 ../src/notify.py:489
+#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
 msgid "Groupchat Invitation"
 msgstr "Convite a grupo de charla"
 
-#: ../src/dialogs.py:2635 ../src/notify.py:239 ../src/notify.py:491
+#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
 msgid "Contact Changed Status"
 msgstr "Un contacto cambiou o seu estado"
 
-#: ../src/dialogs.py:2836
+#: ../src/dialogs.py:2852
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Mensaxe nova coa conta %s"
 
-#: ../src/dialogs.py:2838
+#: ../src/dialogs.py:2854
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Entrou unha mensaxe nova na conta %s"
 
-#: ../src/dialogs.py:2840
+#: ../src/dialogs.py:2856
 msgid "Single Message"
 msgstr "Mensaxe:"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2843
+#: ../src/dialogs.py:2859
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:2882
 #, python-format
 msgid "Received %s"
 msgstr "Recibida %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2889
+#: ../src/dialogs.py:2905
 #, 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:2968
+#: ../src/dialogs.py:2984
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:2985
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escribiu:\n"
 
-#: ../src/dialogs.py:3028
+#: ../src/dialogs.py:3044
 #, python-format
 msgid "XML Console for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3046
 msgid "XML Console"
 msgstr "Consola XML"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "add"
 msgstr "Atascado"
 
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "modify"
 msgstr "_Modificar"
 
-#: ../src/dialogs.py:3160
+#: ../src/dialogs.py:3176
 #, fuzzy
 msgid "remove"
 msgstr "_Eliminar"
 
-#: ../src/dialogs.py:3188
+#: ../src/dialogs.py:3204
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7474,160 +7662,193 @@ msgid ""
 msgstr "Gustaríame engadilo á miña listaxe de contactos."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3204 ../src/dialogs.py:3250
+#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
 #, fuzzy
 msgid "Add"
 msgstr "Enderezo"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3206 ../src/dialogs.py:3281
+#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
 #, fuzzy
 msgid "Modify"
 msgstr "_Modificar"
 
-#: ../src/dialogs.py:3212
+#: ../src/dialogs.py:3228
 #, fuzzy
 msgid "Jabber ID"
 msgstr "ID de Jabber:"
 
-#: ../src/dialogs.py:3218
+#: ../src/dialogs.py:3234
 #, fuzzy
 msgid "Groups"
 msgstr "Grupo"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3342
 #, 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:3340
+#: ../src/dialogs.py:3356
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "Engadir un _contacto"
 
-#: ../src/dialogs.py:3377
+#: ../src/dialogs.py:3393
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Elimina o contacto da listaxe"
 
-#: ../src/dialogs.py:3430
+#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#, python-format
+msgid "Archiving Preferences for %s"
+msgstr ""
+
+#: ../src/dialogs.py:3473
+#, fuzzy
+msgid "Invalid expire value"
+msgstr "O nome de usuario non é válido"
+
+#: ../src/dialogs.py:3474
+msgid "Expire must be a valid positive integer."
+msgstr ""
+
+#: ../src/dialogs.py:3521
+msgid "There is an error with the form"
+msgstr ""
+
+#: ../src/dialogs.py:3732
+msgid "There is an error"
+msgstr ""
+
+#: ../src/dialogs.py:3796
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Listaxe de privacidade <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3434
+#: ../src/dialogs.py:3800
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Listaxe de privacidade para %s"
 
-#: ../src/dialogs.py:3490
+#: ../src/dialogs.py:3856
 #, 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:3495
+#: ../src/dialogs.py:3861
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Orde: %s, acción: %s"
 
-#: ../src/dialogs.py:3539
+#: ../src/dialogs.py:3905
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Editar unha regra</b>"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:4016
 msgid "<b>Add a rule</b>"
 msgstr "<b>Engadir unha regra</b>"
 
-#: ../src/dialogs.py:3750
+#: ../src/dialogs.py:4116
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listaxes de privacidade para %s"
 
-#: ../src/dialogs.py:3752
+#: ../src/dialogs.py:4118
 msgid "Privacy Lists"
 msgstr "Listaxes de privacidade"
 
-#: ../src/dialogs.py:3822
+#: ../src/dialogs.py:4188
 msgid "Invalid List Name"
 msgstr "O nome de listaxe non é válido"
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4189
 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:3855
+#: ../src/dialogs.py:4221
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Está expulsado deste grupo de charla."
 
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4224
 #, 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:3860
+#: ../src/dialogs.py:4226
 #, 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:3868
+#: ../src/dialogs.py:4234
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentario: %s"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4236
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3932
+#: ../src/dialogs.py:4298
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:3942 ../src/dialogs.py:3985 ../src/dialogs.py:4041
+#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
+#: ../src/dialogs.py:4495
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: ../src/dialogs.py:3947
+#: ../src/dialogs.py:4313
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:3975
+#: ../src/dialogs.py:4341
 msgid "Choose Sound"
 msgstr "Elixir un son"
 
-#: ../src/dialogs.py:3990
+#: ../src/dialogs.py:4356
 msgid "Wav Sounds"
 msgstr "Sons Wav"
 
-#: ../src/dialogs.py:4028
+#: ../src/dialogs.py:4394
 msgid "Choose Image"
 msgstr "Elixir unha imaxe"
 
-#: ../src/dialogs.py:4046
+#: ../src/dialogs.py:4412
 msgid "Images"
 msgstr "Imaxes"
 
-#: ../src/dialogs.py:4113
+#: ../src/dialogs.py:4482
+#, fuzzy
+msgid "Choose Archive"
+msgstr "Elixir unha imaxe"
+
+#: ../src/dialogs.py:4500
+#, fuzzy
+msgid "Zip files"
+msgstr "Todos os ficheiros"
+
+#: ../src/dialogs.py:4525
 #, python-format
 msgid "When %s becomes:"
 msgstr "Cando %s estea:"
 
-#: ../src/dialogs.py:4115
+#: ../src/dialogs.py:4527
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Engadir unha notificación especial para %s"
 
-#: ../src/dialogs.py:4190
+#: ../src/dialogs.py:4602
 msgid "Condition"
 msgstr "Condición"
 
-#: ../src/dialogs.py:4310
+#: ../src/dialogs.py:4722
 msgid "when I am "
 msgstr "cando estea "
 
-#: ../src/dialogs.py:4786
+#: ../src/dialogs.py:5198
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7635,38 +7856,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4789
+#: ../src/dialogs.py:5201
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4795 ../src/dialogs.py:4879
+#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4801
+#: ../src/dialogs.py:5213
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4806
+#: ../src/dialogs.py:5218
 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:4809 ../src/dialogs.py:4860 ../src/dialogs.py:4873
+#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4814
+#: ../src/dialogs.py:5226
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4825
+#: ../src/dialogs.py:5237
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4826
+#: ../src/dialogs.py:5238
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7676,44 +7897,44 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4827
+#: ../src/dialogs.py:5239
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4861
+#: ../src/dialogs.py:5273
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4867
+#: ../src/dialogs.py:5279
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4874
+#: ../src/dialogs.py:5286
 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:4880
+#: ../src/dialogs.py:5292
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:4945
+#: ../src/dialogs.py:5357
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4947
+#: ../src/dialogs.py:5359
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4949
+#: ../src/dialogs.py:5361
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4953
+#: ../src/dialogs.py:5365
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7729,24 +7950,24 @@ msgstr "Outros"
 msgid "Conference"
 msgstr "Conferencia"
 
-#: ../src/disco.py:512
+#: ../src/disco.py:513
 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:589
+#: ../src/disco.py:600
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Xestión de servizos coa conta %s"
 
-#: ../src/disco.py:591
+#: ../src/disco.py:602
 msgid "Service Discovery"
 msgstr "Xestión de servizos"
 
-#: ../src/disco.py:741
+#: ../src/disco.py:758
 msgid "The service could not be found"
 msgstr "O servizo non se achou"
 
-#: ../src/disco.py:742
+#: ../src/disco.py:759
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7754,97 +7975,97 @@ msgstr ""
 "Non hai servizo neste enderezo ou non está a responder. Comprobe o enderezo "
 "e ténteo máis tarde."
 
-#: ../src/disco.py:746 ../src/disco.py:1082
+#: ../src/disco.py:763 ../src/disco.py:1100
 msgid "The service is not browsable"
 msgstr "O servizo non é navegábel"
 
-#: ../src/disco.py:747
+#: ../src/disco.py:764
 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:786 ../src/disco.py:796
+#: ../src/disco.py:804 ../src/disco.py:814
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/disco.py:850
+#: ../src/disco.py:868
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Navegar %s coa conta %s"
 
-#: ../src/disco.py:894
+#: ../src/disco.py:912
 msgid "_Browse"
 msgstr "_Navegar"
 
-#: ../src/disco.py:1083
+#: ../src/disco.py:1101
 msgid "This service does not contain any items to browse."
 msgstr "Este servizo non contén elementos para navegar."
 
-#: ../src/disco.py:1323
+#: ../src/disco.py:1341
 #, fuzzy
 msgid "_Execute Command"
 msgstr "Executar o _comando..."
 
-#: ../src/disco.py:1333 ../src/disco.py:1504
+#: ../src/disco.py:1351 ../src/disco.py:1522
 msgid "Re_gister"
 msgstr "_Subscribir"
 
-#: ../src/disco.py:1545
+#: ../src/disco.py:1563
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Escaneando %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1736
+#: ../src/disco.py:1754
 msgid "Users"
 msgstr "Usuarios"
 
 #. Description column
-#: ../src/disco.py:1744
+#: ../src/disco.py:1762
 msgid "Description"
 msgstr "Descrición"
 
 #. Id column
-#: ../src/disco.py:1752
+#: ../src/disco.py:1770
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1817 ../src/gui_interface.py:3182
+#: ../src/disco.py:1835 ../src/gui_interface.py:2995
 msgid "Bookmark already set"
 msgstr "O marcador xa se definiu"
 
-#: ../src/disco.py:1818 ../src/gui_interface.py:3183
+#: ../src/disco.py:1836 ../src/gui_interface.py:2996
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "A sala \"%s\" xa está nos seus marcadores."
 
-#: ../src/disco.py:1827 ../src/gui_interface.py:3197
+#: ../src/disco.py:1845 ../src/gui_interface.py:3010
 msgid "Bookmark has been added successfully"
 msgstr "O marcador engadiuse con éxito"
 
-#: ../src/disco.py:1828 ../src/gui_interface.py:3198
+#: ../src/disco.py:1846 ../src/gui_interface.py:3011
 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:2039
+#: ../src/disco.py:2057
 msgid "Subscribed"
 msgstr "Engadiuse"
 
-#: ../src/disco.py:2047
+#: ../src/disco.py:2065
 #, fuzzy
 msgid "Node"
 msgstr "Ningún"
 
-#: ../src/disco.py:2111
+#: ../src/disco.py:2129
 msgid "New post"
 msgstr "Publicación nova"
 
-#: ../src/disco.py:2117
+#: ../src/disco.py:2135
 msgid "_Subscribe"
 msgstr "_Engadir"
 
-#: ../src/disco.py:2123
+#: ../src/disco.py:2141
 msgid "_Unsubscribe"
 msgstr "_Eliminar"
 
@@ -8020,14 +8241,14 @@ msgstr ""
 
 #: ../src/features_window.py:95
 msgid ""
-"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
-"in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 
 #: ../src/features_window.py:96
 msgid ""
-"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
+"You have to set 'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 
 #: ../src/features_window.py:97
@@ -8186,34 +8407,34 @@ msgstr "Descrición: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s quere enviarlle un ficheiro:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Non se pode sobrescribir o ficheiro existente \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
 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:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 msgid "This file already exists"
 msgstr "Este ficheiro xa existe"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 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:369 ../src/gtkgui_helpers.py:914
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Non se pode escribir no directorio \"%s\""
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
 msgid "You do not have permission to create files in this directory."
 msgstr "Non ten autorización para crear ficheiros neste directorio."
 
@@ -8317,29 +8538,29 @@ msgstr ""
 "Outra instancia dO Gajim semella estar xa en execución\n"
 "Quere executar unha outra?"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
 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:80
+#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
 msgid "command"
 msgstr "comando"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "amosar axuda sobre un comando"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Amosa ou oculta a fiestra da listaxe de contactos"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Amosa unha fiestra emerxente co seguinte acontecemento pendente"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
 #, fuzzy
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
@@ -8348,6 +8569,13 @@ msgstr ""
 "Amosa unha listaxe de todos os contactos na listaxe. Cada contacto aparece "
 "nunha liña distinta"
 
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
+#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
+#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
+#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
 #: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
 #: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
 #: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
@@ -8359,43 +8587,35 @@ msgstr ""
 msgid "account"
 msgstr "conta"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "amosar só contactos da conta especificada"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Amosa unha listaxe de contas que están rexistradas"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
 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:109
+#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
 msgid "status"
 msgstr "estado"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106
 #, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"accoun't previous status"
+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:110 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
-msgid "message"
-msgstr "mensaxe"
-
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "mensaxe de estado"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8404,48 +8624,20 @@ msgstr ""
 "o estado de todas as contas que teñen a opción \"sync with global status\" "
 "activada"
 
-#: ../src/gajim-remote.py:117
-#, fuzzy
-msgid "Changes the priority of account or accounts"
-msgstr "Cambia o estado dunha ou de varias contas"
-
-#: ../src/gajim-remote.py:119
-#, fuzzy
-msgid "priority"
-msgstr "Pr_ioridade:"
-
-#: ../src/gajim-remote.py:119
-#, fuzzy
-msgid "priority you want to give to the account"
-msgstr "Quero _rexistrar unha conta nova de Jabber"
-
-#: ../src/gajim-remote.py:121
-#, fuzzy
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-msgstr ""
-"cambia o estado da conta \"account\". Se non se especifica, probe a cambiar "
-"o estado de todas as contas que teñen a opción \"sync with global status\" "
-"activada"
-
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
 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:129
+#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID do contacto co que quere conversar"
 
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
 #: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 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:134
-msgid "message content. The account must be specified or \"\""
-msgstr ""
-
-#: ../src/gajim-remote.py:139
+#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
 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 "
@@ -8455,29 +8647,34 @@ msgstr ""
 "OpenPGP como a conta son opcionais. Se quere definir só 'conta' sen 'chave "
 "pgp', só defina 'chave pgp' a ''."
 
+#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
 #: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID do contacto que recibirá a mensaxe"
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
+#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "contido da mensaxe"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "chave pgp"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 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:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
+#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
 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:152
+#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
 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 "
@@ -8487,146 +8684,299 @@ msgstr ""
 "OpenPGP como a conta son optativas. Se quere definir só 'conta' sen 'chave "
 "pgp', só defina 'chave pgp' a ''."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "tema"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "tema da mensaxe"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID do contacto que recibirá a mensaxe"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Obter información detallada dun contacto"
 
+#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
+#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
 #: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
 #: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID do contacto"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Obter información detallada dunha conta"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Nome da conta"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Enviarlle un ficheiro a un contacto"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "file"
 msgstr "ficheiro"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Camiño do ficheiro"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "se se especifica, o ficheiro enviarase mediante esta conta"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Nomea todas as preferencias e os seus valores"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Define o valor de 'entrada' a 'valor'."
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "entrada=valor"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 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:207
+#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Elimina un elemento de preferencia"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
 msgid "key"
 msgstr "entrada"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "nome da preferencia para eliminar"
 
-#: ../src/gajim-remote.py:213
-msgid "Writes the current state of Gajim preferences to the .config file"
+#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+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-plugin.py:202 ../src/gajim-remote.py:218
+msgid "Removes contact from roster"
+msgstr "Elimina o contacto da listaxe"
+
+#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+msgid "Adds contact to roster"
+msgstr "Engade o contacto á listaxe"
+
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+msgid "Adds new contact to this account"
+msgstr "Engade un contacto novo a esta conta."
+
+#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+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-plugin.py:226
+#, fuzzy
+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-plugin.py:233 ../src/gajim-remote.py:249
+#, fuzzy
+msgid "Returns number of unread messages"
+msgstr "Devolve o número de mensaxes sen ler"
+
+#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+msgid "Opens 'Start Chat' dialog"
+msgstr "Abre o diálogo de iniciar charla"
+
+#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+msgid "Starts chat, using this account"
+msgstr "Iniciar unha charla con esta conta"
+
+#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+msgid "Sends custom XML"
+msgstr "Envía XML personalizado"
+
+#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+msgid "XML to send"
+msgstr "XML para enviar"
+
+#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+"Conta a que se lle enviará; se non se especificar nada, o xml enviaráselles "
+"a todas as contas"
+
+#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
+msgid "Handle a xmpp:/ uri"
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
+msgid "uri"
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+msgid "Join a MUC room"
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+#, fuzzy
+msgid "room"
+msgstr "De"
+
+#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+#, fuzzy
+msgid "nick"
+msgstr "Alcume"
+
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+#, fuzzy
+msgid "password"
+msgstr "Contrasinal: "
+
+#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#, fuzzy
+msgid "Check if Gajim is running"
+msgstr "Por favor, comprobe se o avahi-daemon está en execución."
+
+#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
+#: ../src/gajim-remote.py:300
+#, fuzzy
+msgid "Shows or hides the ipython window"
+msgstr "Amosa ou oculta a fiestra da listaxe de contactos"
+
+#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+msgid "Missing argument \"contact_jid\""
+msgstr "Non se atopa o argumento \"contact_jid\""
+
+#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#, python-format
+msgid ""
+"'%s' is not in your roster.\n"
+"Please specify account for sending the message."
+msgstr ""
+"'%s' non está na súa listaxe de contactos.\n"
+"Por favor, especifique unha conta para enviar a mensaxe."
+
+#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+msgid "You have no active account"
+msgstr "Non ten contas activas"
+
+#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+msgid "It seems Gajim is not running. So you can't use gajim-remote."
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:412
+#, python-format
+msgid ""
+"Usage: %s %s %s \n"
+"\t %s"
 msgstr ""
-"Escribe o estado actual da preferencias do Gajim para o ficheiro de "
-"configuración"
+"Modo de uso: %s %s %s \n"
+"\t %s"
 
-#: ../src/gajim-remote.py:218
-msgid "Removes contact from roster"
-msgstr "Elimina o contacto da listaxe"
+#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+msgid "Arguments:"
+msgstr "Argumentos"
 
-#: ../src/gajim-remote.py:227
-msgid "Adds contact to roster"
-msgstr "Engade o contacto á listaxe"
+#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#, python-format
+msgid "%s not found"
+msgstr "Non se encontrou %s"
 
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "jid"
+#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
+#, python-format
+msgid ""
+"Usage: %s command [arguments]\n"
+"Command is one of:\n"
+msgstr ""
+"Modo de uso: %s comando [argumentos]\n"
+"Comando é un de:\n"
 
-#: ../src/gajim-remote.py:230
-msgid "Adds new contact to this account"
-msgstr "Engade un contacto novo a esta conta."
+#: ../src/gajim-remote-plugin.py:496
+#, fuzzy, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"O argumento \"%s\" non se especificou. \n"
+"Escriba \"%s help %s\" para máis información"
 
-#: ../src/gajim-remote.py:235
-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-plugin.py:500
+#, fuzzy, python-format
+msgid ""
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"O argumento \"%s\" non se especificou. \n"
+"Escriba \"%s help %s\" para máis información"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
+#, fuzzy
+msgid "Wrong uri"
+msgstr "Host errado"
+
+#: ../src/gajim-remote.py:109
+#, fuzzy
 msgid ""
-"Returns current status message (the global one unless account is specified)"
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
 msgstr ""
-"Devolve a mensaxe de estado actual (o global se non se especificar unha "
-"conta)"
+"un de: desconectado, en liña, libre para falar, ausente, non dispoñíbel, "
+"ocupado, invisíbel"
 
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:117
 #, fuzzy
-msgid "Returns number of unread messages"
-msgstr "Devolve o número de mensaxes sen ler"
+msgid "Changes the priority of account or accounts"
+msgstr "Cambia o estado dunha ou de varias contas"
 
-#: ../src/gajim-remote.py:253
-msgid "Opens 'Start Chat' dialog"
-msgstr "Abre o diálogo de iniciar charla"
+#: ../src/gajim-remote.py:119
+#, fuzzy
+msgid "priority"
+msgstr "Pr_ioridade:"
 
-#: ../src/gajim-remote.py:255
-msgid "Starts chat, using this account"
-msgstr "Iniciar unha charla con esta conta"
+#: ../src/gajim-remote.py:119
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Quero _rexistrar unha conta nova de Jabber"
 
-#: ../src/gajim-remote.py:259
-msgid "Sends custom XML"
-msgstr "Envía XML personalizado"
+#: ../src/gajim-remote.py:121
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"cambia o estado da conta \"account\". Se non se especifica, probe a cambiar "
+"o estado de todas as contas que teñen a opción \"sync with global status\" "
+"activada"
 
-#: ../src/gajim-remote.py:261
-msgid "XML to send"
-msgstr "XML para enviar"
+#: ../src/gajim-remote.py:134
+msgid "message content. The account must be specified or \"\""
+msgstr ""
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:242
 msgid ""
-"Account in which the xml will be sent; if not specified, xml will be sent to "
-"all accounts"
+"Returns current status message (the global one unless account is specified)"
 msgstr ""
-"Conta a que se lle enviará; se non se especificar nada, o xml enviaráselles "
-"a todas as contas"
+"Devolve a mensaxe de estado actual (o global se non se especificar unha "
+"conta)"
 
 #: ../src/gajim-remote.py:268
 #, fuzzy
@@ -8647,14 +8997,6 @@ msgstr ""
 "Conta a que se lle enviará; se non se especificar nada, o xml enviaráselles "
 "a todas as contas"
 
-#: ../src/gajim-remote.py:277
-msgid "Handle a xmpp:/ uri"
-msgstr ""
-
-#: ../src/gajim-remote.py:279
-msgid "uri"
-msgstr ""
-
 #: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr ""
@@ -8668,35 +9010,16 @@ msgstr ""
 msgid "Message content"
 msgstr "contido da mensaxe"
 
-#: ../src/gajim-remote.py:286
-msgid "Join a MUC room"
-msgstr ""
-
-#: ../src/gajim-remote.py:288
-#, fuzzy
-msgid "room"
-msgstr "De"
-
 #: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "Room JID"
 msgstr "Sala:"
 
-#: ../src/gajim-remote.py:289
-#, fuzzy
-msgid "nick"
-msgstr "Alcume"
-
 #: ../src/gajim-remote.py:289
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Non se achou o alcume: %s"
 
-#: ../src/gajim-remote.py:290
-#, fuzzy
-msgid "password"
-msgstr "Contrasinal: "
-
 #: ../src/gajim-remote.py:290
 #, fuzzy
 msgid "Password to enter the room"
@@ -8706,37 +9029,6 @@ msgstr "Os contrasinais non coinciden"
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:296
-#, fuzzy
-msgid "Check if Gajim is running"
-msgstr "Por favor, comprobe se o avahi-daemon está en execución."
-
-#: ../src/gajim-remote.py:300
-#, fuzzy
-msgid "Shows or hides the ipython window"
-msgstr "Amosa ou oculta a fiestra da listaxe de contactos"
-
-#: ../src/gajim-remote.py:327
-msgid "Missing argument \"contact_jid\""
-msgstr "Non se atopa o argumento \"contact_jid\""
-
-#: ../src/gajim-remote.py:348
-#, python-format
-msgid ""
-"'%s' is not in your roster.\n"
-"Please specify account for sending the message."
-msgstr ""
-"'%s' non está na súa listaxe de contactos.\n"
-"Por favor, especifique unha conta para enviar a mensaxe."
-
-#: ../src/gajim-remote.py:351
-msgid "You have no active account"
-msgstr "Non ten contas activas"
-
-#: ../src/gajim-remote.py:404
-msgid "It seems Gajim is not running. So you can't use gajim-remote."
-msgstr ""
-
 #: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
@@ -8744,24 +9036,6 @@ msgid ""
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:435
-msgid "Arguments:"
-msgstr "Argumentos"
-
-#: ../src/gajim-remote.py:439
-#, python-format
-msgid "%s not found"
-msgstr "Non se encontrou %s"
-
-#: ../src/gajim-remote.py:445
-#, python-format
-msgid ""
-"Usage: %s command [arguments]\n"
-"Command is one of:\n"
-msgstr ""
-"Modo de uso: %s comando [argumentos]\n"
-"Comando é un de:\n"
-
 #: ../src/gajim-remote.py:514
 #, fuzzy, python-format
 msgid ""
@@ -8784,11 +9058,6 @@ msgstr ""
 msgid "No uri given"
 msgstr ""
 
-#: ../src/gajim-remote.py:540
-#, fuzzy
-msgid "Wrong uri"
-msgstr "Host errado"
-
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Tema"
@@ -8815,203 +9084,201 @@ msgstr "Non pode eliminar o tema actual"
 msgid "Please first choose another for your current theme."
 msgstr "Por favor, primeiro elixa outro distinto como tema actual."
 
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:170
 msgid "Sending private message failed"
 msgstr "O envío da mensaxe privada fallou"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:171
+#: ../src/groupchat_control.py:172
 #, 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:450
+#: ../src/groupchat_control.py:455
 msgid "Insert Nickname"
 msgstr "Introducir alcume"
 
-#: ../src/groupchat_control.py:631
+#: ../src/groupchat_control.py:636
 #, fuzzy
 msgid "Conversation with "
 msgstr "Historial de conversas"
 
-#: ../src/groupchat_control.py:633
+#: ../src/groupchat_control.py:638
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Conexión"
 
-#. Can be a message (see handle_event_gc_config_change in
-#. gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1272 ../src/gui_interface.py:1080
+#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1286
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1288
 #, fuzzy
 msgid "A new room has been created"
 msgstr "A súa conta nova creouse con éxito"
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1291
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1287
+#: ../src/groupchat_control.py:1297
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi expulsado por %(reason)s"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1300
 #, 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:1300
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s foi expulsado: %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1312
 #, 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:1314 ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
 #, python-format
 msgid "You are now known as %s"
 msgstr "Coñéceselle como %s"
 
-#: ../src/groupchat_control.py:1330 ../src/gui_interface.py:919
+#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s coñéceselle como %s"
 
-#: ../src/groupchat_control.py:1372 ../src/groupchat_control.py:1377
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1392
 #, 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:1374
+#: ../src/groupchat_control.py:1383
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Afiliación:"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1388
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1394
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1470
+#: ../src/groupchat_control.py:1477
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1474
+#: ../src/groupchat_control.py:1481
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1489
+#: ../src/groupchat_control.py:1496
 #, 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:1493
+#: ../src/groupchat_control.py:1500
 #, 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:1522
+#: ../src/groupchat_control.py:1530
 #, python-format
 msgid "%s has left"
 msgstr "%s saíu"
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1535
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s entrou no grupo de charla"
 
-#: ../src/groupchat_control.py:1529 ../src/gui_interface.py:946
+#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
 #: ../src/history_window.py:447 ../src/notify.py:234
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s está agora %(status)s"
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1774
 #, 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:1761
+#: ../src/groupchat_control.py:1776
 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:1765 ../src/gui_interface.py:1216
-#: ../src/gui_interface.py:1992 ../src/gui_interface.py:2029
-#: ../src/gui_interface.py:2064 ../src/message_window.py:224
-#: ../src/roster_window.py:2739 ../src/roster_window.py:3399
-#: ../src/roster_window.py:4123
+#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
+#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
+#: ../src/gui_interface.py:1853 ../src/message_window.py:224
+#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
+#: ../src/roster_window.py:4195
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Non me preguntar outra vez"
 
-#: ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:1814
 msgid "Changing Subject"
 msgstr "Cambiando o asunto"
 
-#: ../src/groupchat_control.py:1800
+#: ../src/groupchat_control.py:1815
 msgid "Please specify the new subject:"
 msgstr "Especifique o asunto novo:"
 
-#: ../src/groupchat_control.py:1807
+#: ../src/groupchat_control.py:1822
 msgid "Changing Nickname"
 msgstr "Cambiando o alcume"
 
-#: ../src/groupchat_control.py:1808
+#: ../src/groupchat_control.py:1823
 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:1839
+#: ../src/groupchat_control.py:1854
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Descrición: %s"
 
-#: ../src/groupchat_control.py:1840
+#: ../src/groupchat_control.py:1855
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1842
+#: ../src/groupchat_control.py:1857
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2028
+#: ../src/groupchat_control.py:2046
 #, python-format
 msgid "Kicking %s"
 msgstr "A expulsar %s"
 
-#: ../src/groupchat_control.py:2029 ../src/groupchat_control.py:2356
+#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
 msgid "You may specify a reason below:"
 msgstr "Debe especificar un motivo debaixo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2355
+#: ../src/groupchat_control.py:2373
 #, python-format
 msgid "Banning %s"
 msgstr "A expulsar %s"
@@ -9036,56 +9303,65 @@ msgid "Details"
 msgstr "Detalles"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
+#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Erro: non se pode abrir %s para lectura"
 
-#: ../src/gtkgui_helpers.py:400
+#: ../src/gtkgui_helpers.py:404
 msgid "Error reading file:"
 msgstr "Erro ao ler o ficheiro:"
 
-#: ../src/gtkgui_helpers.py:403
+#: ../src/gtkgui_helpers.py:407
 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:444
+#: ../src/gtkgui_helpers.py:448
 #, 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:818
+#: ../src/gtkgui_helpers.py:822
 msgid "Gajim is not the default Jabber client"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:819
+#: ../src/gtkgui_helpers.py:823
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:820
+#: ../src/gtkgui_helpers.py:824
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:887
+#: ../src/gtkgui_helpers.py:891
 msgid "Extension not supported"
 msgstr "Extensión non admitida"
 
-#: ../src/gtkgui_helpers.py:888
+#: ../src/gtkgui_helpers.py:892
 #, 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:924
+#: ../src/gtkgui_helpers.py:928
 msgid "Save Image as..."
 msgstr "Gardar a imaxe como..."
 
-#: ../src/gui_interface.py:140
+#. we are banned
+#. group chat does not exist
+#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
+#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
+#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
+#: ../src/gui_interface.py:348
+msgid "Unable to join group chat"
+msgstr "Non se puido entrar no grupo de charla"
+
+#: ../src/gui_interface.py:138
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9096,165 +9372,194 @@ msgstr ""
 "ocupante. \n"
 "Por favor, especifique outro alcume abaixo:"
 
-#: ../src/gui_interface.py:143
+#: ../src/gui_interface.py:141
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:159
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Acepta esta solicitude?"
 
-#: ../src/gui_interface.py:161
+#: ../src/gui_interface.py:160
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Acepta esta solicitude?"
 
-#: ../src/gui_interface.py:164
+#: ../src/gui_interface.py:163
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Autorización HTTP (%s) para %s (id: %s)"
 
-#: ../src/gui_interface.py:213 ../src/notify.py:493
+#: ../src/gui_interface.py:209 ../src/notify.py:493
 msgid "Connection Failed"
 msgstr "Fallou a conexión"
 
-#: ../src/gui_interface.py:606 ../src/gui_interface.py:610
+#: ../src/gui_interface.py:312
+#, 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/gui_interface.py:324
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/gui_interface.py:333
+#, fuzzy, python-format
+msgid "You are banned from group chat %s."
+msgstr "Está expulsado deste grupo de charla."
+
+#: ../src/gui_interface.py:338
+#, fuzzy, python-format
+msgid "Group chat %s does not exist."
+msgstr "Non existe o grupo de charla."
+
+#: ../src/gui_interface.py:341
+msgid "Group chat creation is restricted."
+msgstr "A creación de grupos de charla está restrinxida."
+
+#: ../src/gui_interface.py:344
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "É necesario usar o alcume rexistrado."
+
+#: ../src/gui_interface.py:349
+#, fuzzy, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Non está na listaxe de membros"
+
+#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:621 ../src/gui_interface.py:636
+#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "produciuse un erro mentres se enviaba %s ( %s )"
 
-#: ../src/gui_interface.py:663 ../src/notify.py:495
+#: ../src/gui_interface.py:540 ../src/notify.py:495
 #, fuzzy
 msgid "Subscription request"
 msgstr "Solicitude de subscrición"
 
-#: ../src/gui_interface.py:688
+#: ../src/gui_interface.py:565
 msgid "Authorization accepted"
 msgstr "Autorización aceptada"
 
-#: ../src/gui_interface.py:689
+#: ../src/gui_interface.py:566
 #, 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/gui_interface.py:702
+#: ../src/gui_interface.py:579
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "O contacto \"%s\" eliminou a súa subscrición"
 
-#: ../src/gui_interface.py:703
+#: ../src/gui_interface.py:580
 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/gui_interface.py:727 ../src/notify.py:497
+#: ../src/gui_interface.py:604 ../src/notify.py:497
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Eliminar"
 
-#: ../src/gui_interface.py:754
+#: ../src/gui_interface.py:631
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Non foi posíbel estabelecer o contacto con \"%s\""
 
-#: ../src/gui_interface.py:1015
+#: ../src/gui_interface.py:859
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1083
+#: ../src/gui_interface.py:926
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gui_interface.py:1085
+#: ../src/gui_interface.py:928
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gui_interface.py:1087
+#: ../src/gui_interface.py:930
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:1091
+#: ../src/gui_interface.py:934
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1093
+#: ../src/gui_interface.py:936
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1095
+#: ../src/gui_interface.py:938
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1098
+#: ../src/gui_interface.py:941
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1101
+#: ../src/gui_interface.py:944
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1133
-#, 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/gui_interface.py:1180
+#: ../src/gui_interface.py:985
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gui_interface.py:1182 ../src/gui_interface.py:1189
+#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Está actualmente conectado sen a súa chave de GPG"
 
-#: ../src/gui_interface.py:1184
+#: ../src/gui_interface.py:989
 msgid "Your passphrase is incorrect"
 msgstr "O contrasinal é incorrecto"
 
-#: ../src/gui_interface.py:1188
+#: ../src/gui_interface.py:993
 #, fuzzy
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "O contrasinal é incorrecto"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid "GPG key not trusted"
 msgstr ""
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
 msgstr ""
 
-#: ../src/gui_interface.py:1226
+#: ../src/gui_interface.py:1031
 msgid ""
 "Gnome Keyring is installed but not                 correctly started "
 "(environment variable probably not                 correctly set)"
 msgstr ""
 
-#: ../src/gui_interface.py:1330
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Hai un correo novo en %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1332
+#: ../src/gui_interface.py:1133
 #, 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/gui_interface.py:1345
+#: ../src/gui_interface.py:1146
 #, python-format
 msgid ""
 "\n"
@@ -9264,103 +9569,103 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1418
+#: ../src/gui_interface.py:1215
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quere enviarlle un ficheiro."
 
-#: ../src/gui_interface.py:1455 ../src/roster_window.py:1856
+#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Elimina o contacto da listaxe"
 
-#: ../src/gui_interface.py:1458 ../src/roster_window.py:1858
+#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
 #, fuzzy
 msgid "Error opening file"
 msgstr "Erro ao ler o ficheiro:"
 
-#: ../src/gui_interface.py:1490
+#: ../src/gui_interface.py:1287
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Recibiu con éxito o ficheiro %(filename)s de %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1494
+#: ../src/gui_interface.py:1291
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Detívose a transferencia do ficheiro %(filename)s de %(name)s."
 
-#: ../src/gui_interface.py:1507
+#: ../src/gui_interface.py:1304
 #, 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/gui_interface.py:1511
+#: ../src/gui_interface.py:1308
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Detívose a transferencia de %(filename)s a %(name)s."
 
-#: ../src/gui_interface.py:1623
+#: ../src/gui_interface.py:1426
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gui_interface.py:1630
+#: ../src/gui_interface.py:1433
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "En cada _mensaxe"
 
-#: ../src/gui_interface.py:1702
+#: ../src/gui_interface.py:1505
 msgid "Username Conflict"
 msgstr "Conflito co nome de usuario"
 
-#: ../src/gui_interface.py:1703
+#: ../src/gui_interface.py:1506
 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/gui_interface.py:1716
+#: ../src/gui_interface.py:1519
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gui_interface.py:1729
+#: ../src/gui_interface.py:1532
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gui_interface.py:1740
+#: ../src/gui_interface.py:1543
 msgid "Error."
 msgstr ""
 
-#: ../src/gui_interface.py:1768
+#: ../src/gui_interface.py:1556
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Conflito co nome de usuario"
 
-#: ../src/gui_interface.py:1769
+#: ../src/gui_interface.py:1557
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1816
+#: ../src/gui_interface.py:1604
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s quere enviarlle un ficheiro."
 
-#: ../src/gui_interface.py:1819
+#: ../src/gui_interface.py:1607
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Solicitude de transferencia de ficheiro"
 
-#: ../src/gui_interface.py:1927
+#: ../src/gui_interface.py:1716
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1928
+#: ../src/gui_interface.py:1717
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9368,15 +9673,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1936
+#: ../src/gui_interface.py:1725
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1956
+#: ../src/gui_interface.py:1745
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gui_interface.py:1957
+#: ../src/gui_interface.py:1746
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9387,13 +9692,13 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gui_interface.py:1987 ../src/gui_interface.py:2024
-#: ../src/gui_interface.py:2060
+#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
+#: ../src/gui_interface.py:1849
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Conexión"
 
-#: ../src/gui_interface.py:1988
+#: ../src/gui_interface.py:1777
 #, fuzzy
 msgid ""
 "You are about to connect to the server with an insecure connection. This "
@@ -9401,18 +9706,18 @@ msgid ""
 "want to do that?"
 msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
 
-#: ../src/gui_interface.py:1991 ../src/gui_interface.py:2028
-#: ../src/gui_interface.py:2063
+#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
+#: ../src/gui_interface.py:1852
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gui_interface.py:2025
+#: ../src/gui_interface.py:1814
 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/gui_interface.py:2061
+#: ../src/gui_interface.py:1850
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9420,58 +9725,58 @@ msgid ""
 msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2624 ../src/gui_interface.py:2647
+#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Cifrado desactivado"
 
-#: ../src/gui_interface.py:2625
+#: ../src/gui_interface.py:2423
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2648
+#: ../src/gui_interface.py:2446
 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/gui_interface.py:2679 ../src/roster_window.py:3560
+#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
 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/gui_interface.py:3058
+#: ../src/gui_interface.py:2871
 msgid "Could not save your settings and preferences"
 msgstr "Non se poden gardar as preferencias"
 
-#: ../src/gui_interface.py:3592
+#: ../src/gui_interface.py:3411
 msgid "Passphrase Required"
 msgstr "É necesario o contrasinal"
 
-#: ../src/gui_interface.py:3593
+#: ../src/gui_interface.py:3412
 #, 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/gui_interface.py:3607
+#: ../src/gui_interface.py:3426
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gui_interface.py:3608
+#: ../src/gui_interface.py:3427
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Conectarase a %s sen o OpenPGP"
 
 #. ask again
-#: ../src/gui_interface.py:3617
+#: ../src/gui_interface.py:3436
 msgid "Wrong Passphrase"
 msgstr "O contrasinal é incorrecto"
 
-#: ../src/gui_interface.py:3618
+#: ../src/gui_interface.py:3437
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Por favor, volva escribir o seu contrasinal de GPG ou prema Cancelar."
 
@@ -9510,6 +9815,11 @@ msgstr "Alcume"
 msgid "Message"
 msgstr "Mensaxe"
 
+#. holds subject
+#: ../src/history_manager.py:188 ../src/history_manager.py:219
+msgid "Subject"
+msgstr "Asunto"
+
 #: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -9611,19 +9921,19 @@ msgstr "Non está conectado ao servidor"
 msgid "Do you really want to close them all?"
 msgstr "Está seguro de que quere eliminar a mensaxe que seleccionou?"
 
-#: ../src/message_window.py:484
+#: ../src/message_window.py:485
 msgid "Chats"
 msgstr "Charlas"
 
-#: ../src/message_window.py:486
+#: ../src/message_window.py:487
 msgid "Group Chats"
 msgstr "Grupos de charla"
 
-#: ../src/message_window.py:488
+#: ../src/message_window.py:489
 msgid "Private Chats"
 msgstr "Charlas privadas"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:495
 msgid "Messages"
 msgstr "Mensaxes"
 
@@ -9680,58 +9990,58 @@ msgstr "Mensaxe nova de %(nickname)s"
 msgid "Ignore"
 msgstr "nove"
 
-#: ../src/profile_window.py:57
+#: ../src/profile_window.py:58
 msgid "Retrieving profile..."
 msgstr "A recuperar o perfil..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2935
+#: ../src/profile_window.py:111 ../src/roster_window.py:3001
 #, fuzzy
 msgid "File is empty"
 msgstr "Camiño do ficheiro"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2938
+#: ../src/profile_window.py:114 ../src/roster_window.py:3004
 #, fuzzy
 msgid "File does not exist"
 msgstr "Non existe o grupo de charla."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2940 ../src/roster_window.py:2951
+#: ../src/profile_window.py:128 ../src/profile_window.py:144
+#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
 msgid "Could not load image"
 msgstr "Non foi posíbel cargar a imaxe"
 
-#: ../src/profile_window.py:214
+#: ../src/profile_window.py:215
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Información"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:216
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Formato: AAAA-MM-DD"
 
-#: ../src/profile_window.py:269
+#: ../src/profile_window.py:270
 msgid "Information received"
 msgstr "Información recibida"
 
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:341
 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:353
+#: ../src/profile_window.py:354
 msgid "Sending profile..."
 msgstr "A enviar o perfil..."
 
-#: ../src/profile_window.py:368
+#: ../src/profile_window.py:369
 msgid "Information NOT published"
 msgstr "Información NON publicada"
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:376
 msgid "vCard publication failed"
 msgstr "Fallou a publicación da vCard"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:377
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9739,51 +10049,51 @@ msgstr ""
 "Produciuse un erro mentres se publicaba a súa información persoal, probe de "
 "novo máis tarde."
 
-#: ../src/roster_window.py:256 ../src/roster_window.py:1012
+#: ../src/roster_window.py:262 ../src/roster_window.py:1026
 msgid "Merged accounts"
 msgstr "Contas combinadas"
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1942
 msgid "Authorization has been sent"
 msgstr "Enviouse a autorización"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1943
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Agora \"%s\" poderá saber o seu estado."
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1966
 msgid "Subscription request has been sent"
 msgstr "Enviouse a solicitude de subscrición"
 
-#: ../src/roster_window.py:1944
+#: ../src/roster_window.py:1967
 #, 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:1958
+#: ../src/roster_window.py:1981
 msgid "Authorization has been removed"
 msgstr "Eliminouse a autorización"
 
-#: ../src/roster_window.py:1959
+#: ../src/roster_window.py:1982
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Agora \"%s\" sempre o/a verá desconectado."
 
-#: ../src/roster_window.py:1986
+#: ../src/roster_window.py:2009
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:1987
+#: ../src/roster_window.py:2010
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Conectarase a %s sen o OpenPGP"
 
-#: ../src/roster_window.py:2199 ../src/roster_window.py:3496
+#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
 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:2200 ../src/roster_window.py:3497
+#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9791,39 +10101,39 @@ 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:2226
+#: ../src/roster_window.py:2249
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2288
+#: ../src/roster_window.py:2311
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2289
+#: ../src/roster_window.py:2312
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Está seguro de que quere abandonar a sala \"%s\"?"
 
-#: ../src/roster_window.py:2290
+#: ../src/roster_window.py:2313
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2373
+#: ../src/roster_window.py:2396
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Cancelar a transferencia"
 
-#: ../src/roster_window.py:2374
+#: ../src/roster_window.py:2397
 msgid ""
-"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2405 ../src/roster_window.py:2653
+#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
 msgid "You have unread messages"
 msgstr "Ten mensaxes sen ler"
 
-#: ../src/roster_window.py:2406
+#: ../src/roster_window.py:2429
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9832,16 +10142,16 @@ msgstr ""
 "As mensaxes só estarán dispoñíbeis para a súa lectura posterior se ten o "
 "historial activado"
 
-#: ../src/roster_window.py:2654
+#: ../src/roster_window.py:2720
 msgid "You must read them before removing this transport."
 msgstr "Debe lelas antes de eliminar este transporte."
 
-#: ../src/roster_window.py:2657
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Eliminarase o transporte \"%s\""
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2724
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -9849,11 +10159,11 @@ msgid ""
 msgstr ""
 "Xa non poderá enviar e recibir mensaxes a contactos desde este transporte"
 
-#: ../src/roster_window.py:2661
+#: ../src/roster_window.py:2727
 msgid "Transports will be removed"
 msgstr "Eliminaranse os transportes"
 
-#: ../src/roster_window.py:2666
+#: ../src/roster_window.py:2732
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9862,69 +10172,69 @@ msgstr ""
 "Xa non poderá enviar e recibir mensaxes a contactos desde estes transportes: "
 "%s"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2800
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
 
-#: ../src/roster_window.py:2736
+#: ../src/roster_window.py:2802
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2827
+#: ../src/roster_window.py:2893
 msgid "Rename Contact"
 msgstr "Renomear o contacto"
 
-#: ../src/roster_window.py:2828
+#: ../src/roster_window.py:2894
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Introduza un alcume novo para o contacto %s"
 
-#: ../src/roster_window.py:2835
+#: ../src/roster_window.py:2901
 msgid "Rename Group"
 msgstr "Renomear o grupo"
 
-#: ../src/roster_window.py:2836
+#: ../src/roster_window.py:2902
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Introduza un nome novo para o grupo %s"
 
-#: ../src/roster_window.py:2881
+#: ../src/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Eliminar o grupo"
 
-#: ../src/roster_window.py:2882
+#: ../src/roster_window.py:2948
 #, 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:2883
+#: ../src/roster_window.py:2949
 #, 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:2922
+#: ../src/roster_window.py:2988
 msgid "Assign OpenPGP Key"
 msgstr "Asignar chave de OpenPGP"
 
-#: ../src/roster_window.py:2923
+#: ../src/roster_window.py:2989
 msgid "Select a key to apply to the contact"
 msgstr "Seleccione unha chave para lle aplicar ao contacto"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3372
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Eliminarase o contacto \"%s\" da súa listaxe"
 
-#: ../src/roster_window.py:3308
+#: ../src/roster_window.py:3374
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3313
+#: ../src/roster_window.py:3379
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9933,12 +10243,12 @@ msgstr ""
 "ela sempre o/a verá desconectado."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3319
+#: ../src/roster_window.py:3385
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Que quere facer?"
 
-#: ../src/roster_window.py:3323
+#: ../src/roster_window.py:3389
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9946,16 +10256,16 @@ msgstr ""
 "Ao eliminar este contacto tamén se eliminará a autorización. Este contacto "
 "sempre o/a verá desconectado."
 
-#: ../src/roster_window.py:3326
+#: ../src/roster_window.py:3392
 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:3330
+#: ../src/roster_window.py:3396
 msgid "Contacts will be removed from your roster"
 msgstr "Os contactos eliminaranse da súa listaxe"
 
-#: ../src/roster_window.py:3335
+#: ../src/roster_window.py:3401
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9965,32 +10275,32 @@ msgstr ""
 "tamén eliminará as autorizacións resultantes e eles/elas sempre o/a verán "
 "desconectado."
 
-#: ../src/roster_window.py:3393
+#: ../src/roster_window.py:3459
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want  to continue?"
 msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
 
-#: ../src/roster_window.py:3395
+#: ../src/roster_window.py:3461
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he or she will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3414
+#: ../src/roster_window.py:3480
 msgid "No account available"
 msgstr "A conta non está dispoñíbel"
 
-#: ../src/roster_window.py:3415
+#: ../src/roster_window.py:3481
 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:4023
+#: ../src/roster_window.py:4095
 msgid "Metacontacts storage not supported by your server"
 msgstr "O teu servidor non admite o almacenamento de metacontactos"
 
-#: ../src/roster_window.py:4025
+#: ../src/roster_window.py:4097
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9999,12 +10309,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:4117
+#: ../src/roster_window.py:4189
 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:4119
+#: ../src/roster_window.py:4191
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -10015,24 +10325,24 @@ msgstr ""
 "Xeralmente se usan cando a mesma persoa ten varias contas de Jabber ou "
 "contas de transportes."
 
-#: ../src/roster_window.py:4234
+#: ../src/roster_window.py:4306
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "O ficheiro non é válido"
 
-#: ../src/roster_window.py:4246
+#: ../src/roster_window.py:4318
 #, 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:4361
+#: ../src/roster_window.py:4433
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Enviar %s"
 
-#: ../src/roster_window.py:4367
+#: ../src/roster_window.py:4439
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Facer %s e %s metacontactos"
@@ -10042,151 +10352,151 @@ msgstr "Facer %s e %s metacontactos"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4816 ../src/roster_window.py:4889
-#: ../src/roster_window.py:4898 ../src/statusicon.py:246
-#: ../src/statusicon.py:293 ../src/statusicon.py:299
+#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
+#: ../src/roster_window.py:4970 ../src/statusicon.py:263
+#: ../src/statusicon.py:310 ../src/statusicon.py:316
 #, python-format
 msgid "using account %s"
 msgstr "a usar a conta %s"
 
 #. add
-#: ../src/roster_window.py:4905
+#: ../src/roster_window.py:4977
 #, python-format
 msgid "to %s account"
 msgstr "á conta %s"
 
 #. disco
-#: ../src/roster_window.py:4910
+#: ../src/roster_window.py:4982
 #, python-format
 msgid "using %s account"
 msgstr "a usar a conta %s"
 
-#: ../src/roster_window.py:4948 ../src/statusicon.py:309
+#: ../src/roster_window.py:5020 ../src/statusicon.py:326
 msgid "_Manage Bookmarks..."
 msgstr "Xestionar _marcadores..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4968
+#: ../src/roster_window.py:5040
 #, python-format
 msgid "of account %s"
 msgstr "da conta %s"
 
-#: ../src/roster_window.py:5009
+#: ../src/roster_window.py:5081
 #, python-format
 msgid "for account %s"
 msgstr "para a conta %s"
 
-#: ../src/roster_window.py:5069 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
 msgid "_Change Status Message"
 msgstr "_Cambiar a mensaxe de estado"
 
-#: ../src/roster_window.py:5102
+#: ../src/roster_window.py:5174
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publicar"
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5176
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Publicar"
 
-#: ../src/roster_window.py:5107
+#: ../src/roster_window.py:5179
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Descubrir os servizos..."
 
-#: ../src/roster_window.py:5252
+#: ../src/roster_window.py:5324
 msgid "_Maximize All"
 msgstr ""
 
-#: ../src/roster_window.py:5262 ../src/roster_window.py:5436
+#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
 msgid "Send Group M_essage"
 msgstr "Enviar mensaxe ao grupo"
 
-#: ../src/roster_window.py:5270
+#: ../src/roster_window.py:5342
 msgid "To all users"
 msgstr "A todos os usuarios"
 
-#: ../src/roster_window.py:5274
+#: ../src/roster_window.py:5346
 msgid "To all online users"
 msgstr "A todos os usuarios en liña"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5456
+#: ../src/roster_window.py:5528
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Renomear o contacto"
 
 #. Edit Groups
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5537
 msgid "Edit _Groups"
 msgstr "Editar os grupos"
 
 #. Send single message
-#: ../src/roster_window.py:5520
+#: ../src/roster_window.py:5592
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Enviar mensaxe"
 
 #. Execute Command
-#: ../src/roster_window.py:5567
+#: ../src/roster_window.py:5639
 msgid "Execute Command..."
 msgstr "Executar o comando..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5577
+#: ../src/roster_window.py:5649
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transportes"
 
 #. Modify Transport
-#: ../src/roster_window.py:5586
+#: ../src/roster_window.py:5658
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Amosar os trans_portes"
 
 #. Rename
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5668
 msgid "_Rename"
 msgstr "Renomear"
 
-#: ../src/roster_window.py:5656
+#: ../src/roster_window.py:5728
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5665
+#: ../src/roster_window.py:5737
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Contacto desconectado"
 
-#: ../src/roster_window.py:5672
+#: ../src/roster_window.py:5744
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Contacto desconectado"
 
 #. History manager
-#: ../src/roster_window.py:5754
+#: ../src/roster_window.py:5833
 msgid "History Manager"
 msgstr "Historial"
 
-#: ../src/roster_window.py:5765
+#: ../src/roster_window.py:5844
 msgid "_Join New Group Chat"
 msgstr "_Entrar nun outro grupo de charla"
 
-#: ../src/roster_window.py:5938
+#: ../src/roster_window.py:6019
 msgid "Change Status Message..."
 msgstr "Cambiar a mensaxe de estado..."
 
-#: ../src/search_window.py:94
+#: ../src/search_window.py:105
 msgid "Waiting for results"
 msgstr ""
 
-#: ../src/search_window.py:132 ../src/search_window.py:210
+#: ../src/search_window.py:143 ../src/search_window.py:220
 msgid "Error in received dataform"
 msgstr ""
 
 #. No result
-#: ../src/search_window.py:166 ../src/search_window.py:202
+#: ../src/search_window.py:177 ../src/search_window.py:212
 msgid "No result"
 msgstr ""
 
@@ -10199,21 +10509,22 @@ msgstr ""
 msgid "Subject: %s"
 msgstr "Asunto: %s"
 
-#: ../src/session.py:433 ../src/session.py:468
+#: ../src/session.py:447 ../src/session.py:491
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:435
+#: ../src/session.py:448
 #, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
+"The remote client wants '\n"
+"                            'to negotiate an session with these features:\n"
 "\n"
 "%s\n"
 "\n"
 "Are these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:469
+#: ../src/session.py:492
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10223,16 +10534,16 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/statusicon.py:210
+#: ../src/statusicon.py:227
 msgid "_Change Status Message..."
 msgstr "_Cambiar a mensaxe de estado..."
 
-#: ../src/statusicon.py:322
+#: ../src/statusicon.py:339
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Non está na listaxe"
 
-#: ../src/statusicon.py:333
+#: ../src/statusicon.py:350
 msgid "Hide this menu"
 msgstr "Ocultar este menú"
 
@@ -10373,34 +10684,34 @@ msgstr ""
 "Este servizo podería non responder con información detallada.\n"
 "Posibelmente é antigo ou está roto"
 
-#: ../src/vcard.py:251
+#: ../src/vcard.py:265
 msgid "?Client:Unknown"
 msgstr "Descoñecido"
 
-#: ../src/vcard.py:253
+#: ../src/vcard.py:267
 msgid "?OS:Unknown"
 msgstr "Descoñecido"
 
-#: ../src/vcard.py:274
+#: ../src/vcard.py:288
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "Descoñecido"
 
-#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
+#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
 #, python-format
 msgid "since %s"
 msgstr "desde %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:345
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:349
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Programas</b>"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:357
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10408,7 +10719,7 @@ msgstr ""
 "Este contacto está interesado na información da súa presenza, mais vostede "
 "non o está na súa"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:359
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10416,14 +10727,14 @@ msgstr ""
 "Está interesado na información da presenza do contacto, mais el/ela non o "
 "está en vostede"
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:361
 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:349
+#: ../src/vcard.py:363
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10431,21 +10742,59 @@ msgstr ""
 "Non está interesado na presenza do contacto e el/ela tampouco o está en "
 "vostede"
 
-#: ../src/vcard.py:356
+#: ../src/vcard.py:370
 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:358
+#: ../src/vcard.py:372
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
+#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
 msgid " resource with priority "
 msgstr " recurso con prioridade "
 
-#~ msgid "_Available"
-#~ msgstr "En liñ_a"
+#~ msgid "_Disable showing event in systray"
+#~ msgstr "_Desactivar mostrar os eventos na área de notificación"
+
+#~ msgid "_Show event in systray"
+#~ msgstr "_Mostrar o evento na área de notificación"
+
+#, fuzzy
+#~ msgid "Autodetect on every Gajim startup"
+#~ msgstr "C_onectar ao inicio de Gajim"
+
+#, fuzzy
+#~ msgid "Show systray:"
+#~ msgstr "_Mostrar o evento na área de notificación"
+
+#~ msgid "Nickname not allowed: %s"
+#~ msgstr "Alcume non permitido: %s"
+
+#, fuzzy
+#~ msgid "Room has been destroyed"
+#~ msgstr "Eliminouse a autorización"
+
+#~ msgid "I would like to add you to my roster."
+#~ msgstr "Gustaríame engadilo á miña listaxe de contactos"
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "estamos agora subscritos a %s"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "solicitude de eliminación de subscrición de %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "xa non estamos subscritos a %s"
+
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "A ID de Jabber %s non cumpre a norma RFC. Non se engadirá á súa listaxe "
+#~ "de contactos. Use as ferramentas de xestión de listaxe de contactos "
+#~ "roster como http://jru.jabberstudio.org/ para o eliminar"
 
 #~ msgid "Account Modification"
 #~ msgstr "Modificar a conta"
@@ -10540,34 +10889,6 @@ msgstr " recurso con prioridade "
 #~ msgid "gtk-delete"
 #~ msgstr "Eliminar"
 
-#, fuzzy
-#~ msgid "Add this contact to roster (Ctrl+D)"
-#~ msgstr "Engade o contacto á listaxe"
-
-#, fuzzy
-#~ msgid "Bookmark this room (Ctrl+B)"
-#~ msgstr "Engadir esta sala aos marcadores"
-
-#, fuzzy
-#~ msgid "Change your nickname (Ctrl+N)"
-#~ msgstr "Cambiar o _alcume"
-
-#, fuzzy
-#~ msgid "Invite contacts to the conversation (Ctrl+G)"
-#~ msgstr "está a prestar atención á conversa"
-
-#, fuzzy
-#~ msgid "Show a list of emoticons (Alt+M)"
-#~ msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
-
-#, fuzzy
-#~ msgid "Show a list of formattings"
-#~ msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
-
-#, fuzzy
-#~ msgid "Show a menu of advanced functions (Alt+D)"
-#~ msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
-
 #~ msgid ""
 #~ "All chat states\n"
 #~ "Composing only\n"
@@ -10606,9 +10927,6 @@ msgstr " recurso con prioridade "
 #~ msgid "gtk-cancel"
 #~ msgstr "Eliminar"
 
-#~ msgid "_Preferences"
-#~ msgstr "_Preferencias"
-
 #~ msgid "_Quit"
 #~ msgstr "_Saír"
 
@@ -11032,9 +11350,6 @@ msgstr " recurso con prioridade "
 #~ msgid "The auto not available status message"
 #~ msgstr "A mensaxe de estado de non autodispoñíbel"
 
-#~ msgid "Use t_rayicon (aka. notification area icon)"
-#~ msgstr "Usar a icona na á_rea de notificación"
-
 #~ msgid ""
 #~ "When a new event (message, file transfer request etc..) is received, the "
 #~ "following methods may be used to inform you about it. Please note that "
@@ -11161,13 +11476,6 @@ msgstr " recurso con prioridade "
 #~ "O soporte de manexo de sesión non está dispoñíbel (falta o módulo gnome."
 #~ "ui)"
 
-#~ msgid ""
-#~ "Usage: %s %s %s \n"
-#~ "\t %s"
-#~ msgstr ""
-#~ "Modo de uso: %s %s %s \n"
-#~ "\t %s"
-
 #~ msgid "Private Chat"
 #~ msgstr "Charla privada"
 
diff --git a/po/hr.po b/po/hr.po
index 173032cb1a10ebe67e64b2b070c4215356739604..e6ad7cb2dde96e2418f782b120021a9508107d9a 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,11 +6,15 @@
 # Armando V. <synan@rilinux.hr> 2006.
 # Vedran M. <rivanvx@gmail.com> 2006.
 #
+#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 11:28+0200\n"
+"POT-Creation-Date: 2010-10-01 20:39+0200\n"
 "PO-Revision-Date: 2009-10-31 20:49+0100\n"
 "Last-Translator: Adrian C. <anrxc@sysphere.org>\n"
 "Language-Team: Croatian\n"
@@ -29,7 +33,7 @@ msgstr "_Grupni Razgovori..."
 msgid "_Add Contact..."
 msgstr "_Dodaj Kontakt..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:17
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
 msgid "_Discover Services"
 msgstr "_Otkrivanje Usluga"
 
@@ -49,7 +53,7 @@ msgstr "_Otvori Gmail Sandučić"
 msgid "_Personal Events"
 msgstr "_Osobni Događaji"
 
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:23
+#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
 msgid "_Start Chat..."
 msgstr "_Novi Razgovor..."
 
@@ -81,10 +85,6 @@ msgid "<b>Please select a server</b>"
 msgstr "<b>Molim odaberite poslužitelj</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid "@"
-msgstr "@"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
@@ -92,64 +92,64 @@ msgstr ""
 "Dodaj ovaj certifikat na listu povjerljivih certifikata.\n"
 "SHA1 potpis certifikata:\n"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:10
 msgid "Anon_ymous authentication"
 msgstr "Anon_imna autentifikacija"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Connect when I press Finish"
 msgstr "Spoji se kada pritisnem Završi"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Čarobnjak za Stvaranje Računa"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "I already have an account I want to _use"
 msgstr "Već imam račun koji želim _koristiti"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I want to _register for a new account"
 msgstr "Želim se _registrirati novi račun"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:16
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 #: ../data/gui/accounts_window.ui.h:28
 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/gui/account_creation_wizard_window.ui.h:17
+#: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Uredi..."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:18
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
 #: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2263 ../src/config.py:2342
-#: ../src/config.py:2355 ../src/config.py:3596 ../src/config.py:3671
-#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513
-#: ../src/dialogs.py:526 ../src/roster_window.py:2890
-#: ../src/roster_window.py:2896 ../src/roster_window.py:2901
+#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
+#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
+#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
+#: ../src/dialogs.py:527 ../src/roster_window.py:2956
+#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
 msgid "None"
 msgstr "Ništa"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:19
+#: ../data/gui/account_creation_wizard_window.ui.h:18
 msgid "Prox_y:"
 msgstr "Prox_y:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #: ../data/gui/accounts_window.ui.h:48
 msgid "Save pass_word"
 msgstr "Snimi lo_zinku"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:21
+#: ../data/gui/account_creation_wizard_window.ui.h:20
 msgid "Set my profile when I connect"
 msgstr "Postavi moj profil pri spajanju"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:22
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Use custom hostname/port"
 msgstr "Koristi vlastito ime poslužitelja/port"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:23
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -157,34 +157,34 @@ msgstr ""
 "Morate imati račun kako bi se mogli spojiti\n"
 "na Jabber mrežu."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-#: ../data/gui/roster_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:16
 msgid "_Advanced"
 msgstr "_Napredno"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:25
 msgid "_Finish"
 msgstr "_Završi"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:27
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Hostname:"
 msgstr "_Ime poslužitelja:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #: ../data/gui/accounts_window.ui.h:62
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:28
 #: ../data/gui/accounts_window.ui.h:64
 msgid "_Password:"
 msgstr "_Lozinka:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:29
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:31
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Server:"
 msgstr "_Poslužitelj:"
 
@@ -292,17 +292,17 @@ msgstr "Ime:"
 #. No configured account
 #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
 #: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592
-#: ../src/notify.py:608
+#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
+#: ../src/notify.py:616
 msgid "Gajim"
 msgstr "Gajim"
 
 #. FIXME: Ugly workaround.
 #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
 #. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:61
-#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121
-#: ../src/roster_window.py:2832 ../src/roster_window.py:5379
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
+#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
 msgid "General"
 msgstr "Općenito"
 
@@ -359,7 +359,7 @@ msgstr "Informacije o vama, kako stoji na poslužitelju"
 
 #: ../data/gui/accounts_window.ui.h:35
 #: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:830
+#: ../src/dialogs.py:831
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -373,7 +373,7 @@ msgid "Mer_ge accounts"
 msgstr "_Spoji račune"
 
 #: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2356
+#: ../src/config.py:2358
 msgid "No key selected"
 msgstr "Niti jedan ključ nije odabran"
 
@@ -400,7 +400,7 @@ msgid "Priority will change automatically according to your status."
 msgstr "Prioritet će biti automatski promijenjen prema vašem statusu."
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5329
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
 msgid "Re_name"
 msgstr "Pre_imenuj"
 
@@ -625,38 +625,43 @@ msgid "Deletes Message of the Day"
 msgstr "Briše Poruku Dana"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
+#, fuzzy
+msgid "Edit Archi_ving Preferences"
+msgstr "_Postavke"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Edit _Privacy Lists..."
 msgstr "Izmjeni Liste _Privatnosti..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sends a message to users currently connected to this server"
 msgstr "Šalje poruku trenutno spojenim korisnicima na ovom poslužitelju"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Set MOTD..."
 msgstr "Postavi MOTD..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Postavlja Poruku Dana (Message of the Day)"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Show _XML Console"
 msgstr "Prikaži _XML Konzolu"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "Update MOTD..."
 msgstr "Osvježi MOTD..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "Osvježava Poruku Dana"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:11
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:11
+#: ../data/gui/advanced_menuitem_menu.ui.h:12
 msgid "_Send Server Message..."
 msgstr "_Pošalji Poslužiteljsku Poruku..."
 
@@ -690,7 +695,7 @@ msgid "All statuses"
 msgstr "Svi statusi"
 
 #: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:233
+#: ../src/common/commands.py:106 ../src/common/helpers.py:239
 #: ../src/tooltips.py:193
 msgid "Away"
 msgstr "Odsutan"
@@ -743,7 +748,7 @@ msgid "Have "
 msgstr "Imam "
 
 #: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:249
 msgid "Invisible"
 msgstr "Nevidljiv"
 
@@ -752,7 +757,7 @@ msgid "Launch a command"
 msgstr "Pokrenite naredbu"
 
 #: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:216 ../src/tooltips.py:197
+#: ../src/common/helpers.py:222 ../src/tooltips.py:197
 msgid "Not Available"
 msgstr "Nedostupan"
 
@@ -797,12 +802,13 @@ msgid "_Disable existing sound for this event"
 msgstr "_Onemogući postojeći zvuk za ovaj događaj"
 
 #: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in roster"
+#, fuzzy
+msgid "_Disable showing event in notification area"
 msgstr "_Onemogući prikazivanje događaja u listi kontakata"
 
 #: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in systray"
-msgstr "_Onemogući prikazivanje događaja u traci radne površine"
+msgid "_Disable showing event in roster"
+msgstr "_Onemogući prikazivanje događaja u listi kontakata"
 
 #: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
@@ -813,12 +819,13 @@ msgid "_Open chat window with user"
 msgstr "_Otvori prozor za razgovor sa korisnikom"
 
 #: ../data/gui/advanced_notifications_window.ui.h:35
-msgid "_Show event in roster"
+#, fuzzy
+msgid "_Show event in notification area"
 msgstr "Prikaži događaj u _listi kontakata"
 
 #: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in systray"
-msgstr "_Prikaži događaj u traci radne površine"
+msgid "_Show event in roster"
+msgstr "Prikaži događaj u _listi kontakata"
 
 #: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
@@ -846,6 +853,45 @@ msgstr "Grupe"
 msgid "when I'm in"
 msgstr "kada sam u"
 
+#: ../data/gui/archiving_preferences_window.ui.h:1
+msgid "<i>Method Auto</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "<i>Method Local</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:3
+msgid "<i>Method Manual</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:4
+#, fuzzy
+msgid "Auto"
+msgstr "Automatsko spajanje"
+
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Concede"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "Forbid"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:7
+#, fuzzy
+msgid "No"
+msgstr "Ništa"
+
+#: ../data/gui/archiving_preferences_window.ui.h:8
+#, fuzzy
+msgid "Prefer"
+msgstr "Postavke"
+
+#: ../data/gui/archiving_preferences_window.ui.h:9
+msgid "Yes"
+msgstr ""
+
 #: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Unos:"
@@ -872,8 +918,8 @@ msgstr "Blokirani Kontakti"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5348
-#: ../src/roster_window.py:5476 ../src/roster_window.py:5609
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
+#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
 msgid "_Unblock"
 msgstr "_Odblokiraj"
 
@@ -961,7 +1007,7 @@ msgid "_Start Chat"
 msgstr "_Započni Razgovor"
 
 #. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4184
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
 msgid "#"
 msgstr "#"
 
@@ -1009,13 +1055,50 @@ msgstr ""
 msgid "9"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:13
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Dodaj kontakt na listu (Ctrl+D)"
+
 #: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Pregledaj povijest razgovora (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:15
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Pozovi kontakte na razgovor (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Prikaži popis emoticona (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
+msgid "Show a list of formattings"
+msgstr "Prikaži popis formata"
+
+#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Prikaži izbornik naprednih mogućnosti (Alt+A)"
+
+#: ../data/gui/chat_control.ui.h:19
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr "Prikaži profil kontakta (Ctrl+I)"
+
+#: ../data/gui/chat_control.ui.h:20
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:21
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
 #: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Pošalji"
 
-#: ../data/gui/chat_control.ui.h:15 ../data/gui/groupchat_control.ui.h:3
+#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
 msgid "label"
 msgstr ""
 
@@ -1065,8 +1148,8 @@ msgstr "Uredi _Grupe..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5284
-#: ../src/roster_window.py:5444
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
+#: ../src/roster_window.py:5516
 msgid "In_vite to"
 msgstr "Pozo_vi u"
 
@@ -1078,8 +1161,8 @@ msgstr "Pozovi _Kontakte"
 msgid "Remo_ve"
 msgstr "Uklo_ni"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5294
-#: ../src/roster_window.py:5533
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
+#: ../src/roster_window.py:5605
 msgid "Send Cus_tom Status"
 msgstr "Postavi Prila_gođeni Status"
 
@@ -1112,8 +1195,8 @@ msgid "_Allow him/her to see my status"
 msgstr "_Dozvoli njemu/njoj da vidi moj status"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5482 ../src/roster_window.py:5612
+#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
+#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
 msgid "_Block"
 msgstr "_Blokiraj"
 
@@ -1123,8 +1206,8 @@ msgstr "_Zabrani mu/joj da vidi moj status"
 
 #: ../data/gui/contact_context_menu.ui.h:20
 #: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:21
-#: ../src/roster_window.py:5683
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
+#: ../src/roster_window.py:5755
 msgid "_History"
 msgstr "_Povijest razgovora"
 
@@ -1258,7 +1341,7 @@ msgstr "<b>Boje Statusa (kartice)</b>"
 msgid "Account row"
 msgstr "Korisnički račun"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:925
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
 msgid "Bold"
 msgstr "Podebljano"
 
@@ -1296,7 +1379,7 @@ msgstr "Grupa"
 msgid "Inactive"
 msgstr "Neaktivno"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:926
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
 msgid "Italic"
 msgstr "Ukošeno"
 
@@ -1344,7 +1427,7 @@ msgstr "Promijeni _Temu..."
 msgid "Configure _Room..."
 msgstr "Podešavanje _Sobe..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1782
+#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
 msgid "_Bookmark"
 msgstr "_Postavi Oznaku"
 
@@ -1404,19 +1487,31 @@ msgstr "_Pošalji Privatnu Poruku"
 msgid "_Voice"
 msgstr "_Glas"
 
+#: ../data/gui/groupchat_control.ui.h:1
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Postavi knjižnu oznaku za sobu (Ctrl+B)"
+
+#: ../data/gui/groupchat_control.ui.h:3
+msgid "Change the room's subject (Alt+T)"
+msgstr "Promjeni predmet razgovora u sobi (Alt+T)"
+
+#: ../data/gui/groupchat_control.ui.h:4
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Promijeni nadimak (Ctrl+N)"
+
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Stvorite novi dopis"
 
-#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
-msgid "From"
-msgstr "Od"
+#: ../data/gui/groups_post_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:2
+msgid "From:"
+msgstr "Od:"
 
-#. holds subject
-#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
-#: ../src/history_manager.py:219
-msgid "Subject"
-msgstr "Tema"
+#: ../data/gui/groups_post_window.ui.h:3
+#: ../data/gui/single_message_window.ui.h:7
+msgid "Subject:"
+msgstr "Tema:"
 
 #: ../data/gui/history_manager.ui.h:1
 msgid ""
@@ -1434,8 +1529,8 @@ msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Dobrodošli u Gajim Upravitelj Zapisima</b></big>"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3208
-#: ../src/dialogs.py:3305
+#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
+#: ../src/dialogs.py:3321
 msgid "Delete"
 msgstr "Obriši"
 
@@ -1494,12 +1589,75 @@ msgstr "Pretraga:"
 msgid "_Log conversation history"
 msgstr "_Pamti povijest razgovora"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
+msgid "approve"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:2
+msgid "body"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:3
+msgid "concede"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:4
+msgid "expire"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:5
+msgid "false"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:6
+msgid "forbid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:7
+#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+msgid "jid"
+msgstr "jid"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:8
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
+#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
+msgid "message"
+msgstr "poruka"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
+msgid "oppose"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
+#, fuzzy
+msgid "otr"
+msgstr "Vruć"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:11
+msgid "prefer"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:12
+msgid "require"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:13
+msgid "save"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:14
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
 msgid "Bro_wse Rooms"
 msgstr "_Pregled"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2180
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
 msgid "Join Group Chat"
 msgstr "Pridružiti se Grupnom Razgovoru"
 
@@ -1537,8 +1695,8 @@ msgstr "Poslužitelj:"
 msgid "_Bookmark this room"
 msgstr "Postavi knjižnu oznaku za sobu"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1341
-#: ../src/disco.py:1786
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../src/disco.py:1804
 msgid "_Join"
 msgstr "_Pridruživanje"
 
@@ -1643,6 +1801,75 @@ msgstr "_Korisničko ime:"
 msgid "Passphrase"
 msgstr "Lozinka"
 
+#: ../data/gui/plugins_window.ui.h:1
+msgid "&lt;empty&gt;"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:2
+msgid "<empty>"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:3
+#, fuzzy
+msgid "Authors:"
+msgstr "_Odobri"
+
+#: ../data/gui/plugins_window.ui.h:4
+#, fuzzy
+msgid "Available"
+msgstr "_Dostupan"
+
+#: ../data/gui/plugins_window.ui.h:5
+#, fuzzy
+msgid "Configure"
+msgstr "_Postavi"
+
+#: ../data/gui/plugins_window.ui.h:6
+#, fuzzy
+msgid "Descrition:"
+msgstr "Opis: "
+
+#: ../data/gui/plugins_window.ui.h:7
+#, fuzzy
+msgid "Homepage:"
+msgstr "<b>Osobna Stranica:</b>"
+
+#: ../data/gui/plugins_window.ui.h:8
+msgid "Install"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:9
+#, fuzzy
+msgid "Installed"
+msgstr "Zaustavljeno"
+
+#: ../data/gui/plugins_window.ui.h:10
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:11
+msgid "Plugins"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:12
+msgid "Uninstall"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:13
+#, fuzzy
+msgid "Version:"
+msgstr "GTK+ Verzija:"
+
+#: ../data/gui/plugins_window.ui.h:14
+msgid "button"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:15
+msgid "homepage url"
+msgstr ""
+
 #: ../data/gui/popup_notification_window.ui.h:1
 #, fuzzy
 msgid "Event Type"
@@ -1769,123 +1996,103 @@ msgid "Always"
 msgstr "Odsutan"
 
 #: ../data/gui/preferences_window.ui.h:31
-#, fuzzy
-msgid "Always use GNOME default applications"
-msgstr "Uvijek koristi OS/X predefinirane aplikacije"
-
-#: ../data/gui/preferences_window.ui.h:32
-#, fuzzy
-msgid "Always use KDE default applications"
-msgstr "Uvijek koristi OS/X predefinirane aplikacije"
-
-#: ../data/gui/preferences_window.ui.h:33
-#, fuzzy
-msgid "Always use Xfce default applications"
-msgstr "Uvijek koristi OS/X predefinirane aplikacije"
-
-#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Zatraži statusnu poruku kada se:"
 
-#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
 msgid "Audio / Video"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:33
 msgid "Audio input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Audio output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:38
-#, fuzzy
-msgid "Autodetect on every Gajim startup"
-msgstr "Sp_oji se prilikom pokretanja Gajima"
-
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:35
 msgid "Chat message:"
 msgstr "Poruka:"
 
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:36
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Pri pokretanju provjeri ako je Gajim _zadani Jabber klijent"
 
-#: ../data/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:37
 #, fuzzy
 msgid "Composing only"
 msgstr "Pisanje"
 
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:38
 msgid "Configure color and font of the interface"
 msgstr "Postavi boje i font sučelja"
 
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Poruka:"
 
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Ime kontakta"
 
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:41
 msgid "Custom"
 msgstr "Osobni"
 
-#: ../data/gui/preferences_window.ui.h:46
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Detached roster with chat grouped by account"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Detached roster with detached chats"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:45
 msgid "Detached roster with single chat"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
-#: ../src/config.py:671
+#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
+#: ../src/config.py:665
 msgid "Disabled"
 msgstr "Onemogućeno"
 
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:47
 msgid "Display _activity of contacts in roster"
 msgstr "Prikaži _aktivnost kontakata na listi"
 
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:48
 msgid "Display _extra email details"
 msgstr "Prikaži dodatne email _detalje"
 
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:49
 #, fuzzy
 msgid "Display _location of contacts in roster"
 msgstr "Prikaži _raspoloženje kontakata na listi"
 
-#: ../data/gui/preferences_window.ui.h:54
+#: ../data/gui/preferences_window.ui.h:50
 msgid "Display _tunes of contacts in roster"
 msgstr "Prikaži _glazbu kontakata na listi"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display a_vatars of contacts in roster"
 msgstr "Prikaži a_vatare kontakata na listi"
 
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display m_ood of contacts in roster"
 msgstr "Prikaži _raspoloženje kontakata na listi"
 
-#: ../data/gui/preferences_window.ui.h:57
+#: ../data/gui/preferences_window.ui.h:53
 msgid "Display status _messages of contacts in roster"
 msgstr "Prikaži statusne _poruke kontakata na listi"
 
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:54
 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 "
@@ -1895,7 +2102,7 @@ msgstr ""
 "sa kontaktom. Ovdje možete odrediti koji statusi razgovora će se prikazati u "
 "prozorima razgovora."
 
-#: ../data/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:55
 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 "
@@ -1905,7 +2112,7 @@ msgstr ""
 "sa kontaktom. Ovdje možete odrediti koji statusi razgovora će se slati "
 "drugoj osobi."
 
-#: ../data/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:56
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1913,11 +2120,11 @@ msgstr ""
 "Gajim će vas obavijestiti o kontaktima koji su se upravo odjavili sa malim "
 "prozorom u donjem desnom kutu ekrana"
 
-#: ../data/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:58
 msgid "Hide all buttons in chat windows"
 msgstr "Sakrij dugmad u prozoru razgovora."
 
-#: ../data/gui/preferences_window.ui.h:63
+#: ../data/gui/preferences_window.ui.h:59
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1925,21 +2132,21 @@ msgstr ""
 "Ako je označeno, Gajim će dopustiti drugima da vide koji operativni sustav "
 "koristite"
 
-#: ../data/gui/preferences_window.ui.h:64
+#: ../data/gui/preferences_window.ui.h:60
 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/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:61
 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/gui/preferences_window.ui.h:66
+#: ../data/gui/preferences_window.ui.h:62
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1947,7 +2154,7 @@ msgstr ""
 "Ako je označeno, Gajim će promjeniti status u Nedostupan kad se računalo ne "
 "koristi još duže."
 
-#: ../data/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1955,7 +2162,7 @@ msgstr ""
 "Ako je označeno, Gajim će prikazivati avatare kontakata u listi kontakata i "
 "u grupnim razgovorima"
 
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1963,29 +2170,29 @@ msgstr ""
 "Ako je označeno, Gajim će prikazivati statusne poruke kontakata ispod imena "
 "kontakta u listi kontakata i u grupnim razgovorima"
 
-#: ../data/gui/preferences_window.ui.h:69
+#: ../data/gui/preferences_window.ui.h:65
 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/gui/preferences_window.ui.h:70
+#: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the location of contacts in the roster window"
 msgstr "Ako je označeno, Gajim će prikazivati raspoloženje kontakata na listi"
 
-#: ../data/gui/preferences_window.ui.h:71
+#: ../data/gui/preferences_window.ui.h:67
 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/gui/preferences_window.ui.h:72
+#: ../data/gui/preferences_window.ui.h:68
 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/gui/preferences_window.ui.h:73
+#: ../data/gui/preferences_window.ui.h:69
 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 "
@@ -1996,7 +2203,7 @@ msgstr ""
 "desnim klikom miša na polje za unos teksta, zadani jezik će se koristiti za "
 "dani kontakt ili grupni razgovor."
 
-#: ../data/gui/preferences_window.ui.h:74
+#: ../data/gui/preferences_window.ui.h:70
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -2006,7 +2213,7 @@ msgstr ""
 "vaše liste. Koristite sa oprezom, blokira sve poruke koje dolaze od ljudi "
 "van vaše liste kontakata"
 
-#: ../data/gui/preferences_window.ui.h:75
+#: ../data/gui/preferences_window.ui.h:71
 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 "
@@ -2016,7 +2223,7 @@ msgstr ""
 "da se kod E2E enkripcije druga strana mora složiti s time, inače poruke neće "
 "biti zapisane."
 
-#: ../data/gui/preferences_window.ui.h:76
+#: ../data/gui/preferences_window.ui.h:72
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -2024,7 +2231,7 @@ msgstr ""
 "Ako je označeno, Gajim će obavještavati o novim e-mail porukama primljenim "
 "preko GMail"
 
-#: ../data/gui/preferences_window.ui.h:77
+#: ../data/gui/preferences_window.ui.h:73
 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, "
@@ -2033,7 +2240,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/gui/preferences_window.ui.h:78
+#: ../data/gui/preferences_window.ui.h:74
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -2041,7 +2248,7 @@ msgstr ""
 "Ako je označeno, Gajim neće pitati za statusnu poruku. Koristit će se "
 "odabrana predefinirana poruka."
 
-#: ../data/gui/preferences_window.ui.h:79
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2049,45 +2256,45 @@ msgstr ""
 "Ako nije onemogućeno, Gajim će zamjeniti ascii smajliće poput ':)' sa "
 "ekvivalentnim animiranim ili statičnim grafičkim emotikonama"
 
-#: ../data/gui/preferences_window.ui.h:80
+#: ../data/gui/preferences_window.ui.h:76
 msgid "Log _encrypted chat session"
 msgstr "Spremaj _kriptirane razgovore"
 
-#: ../data/gui/preferences_window.ui.h:81
+#: ../data/gui/preferences_window.ui.h:77
 msgid "Ma_ke message windows compact"
 msgstr "Na_pravi prozore sa razgovorom kompaktnim"
 
-#: ../data/gui/preferences_window.ui.h:82
+#: ../data/gui/preferences_window.ui.h:78
 msgid "Ma_nage..."
 msgstr "Izmje_ni..."
 
-#: ../data/gui/preferences_window.ui.h:83
+#: ../data/gui/preferences_window.ui.h:79
 #, fuzzy
 msgid "Never"
 msgstr "_Nikada"
 
-#: ../data/gui/preferences_window.ui.h:84
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Notifications"
 msgstr "Obavijesti"
 
-#: ../data/gui/preferences_window.ui.h:85
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Notify me about contacts that sign _in"
 msgstr "Obavijesti me o kontaktima koji se _prijave"
 
-#: ../data/gui/preferences_window.ui.h:86
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Notify me about contacts that sign _out"
 msgstr "Obavijesti me o kontaktima koji se _odjave"
 
-#: ../data/gui/preferences_window.ui.h:87
+#: ../data/gui/preferences_window.ui.h:83
 #, fuzzy
 msgid "Notify me about it"
 msgstr "_Obavijesti me o tome"
 
-#: ../data/gui/preferences_window.ui.h:88
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notify on new _GMail email"
 msgstr "Obavijesti o novoj _Gmail e-pošti"
 
-#: ../data/gui/preferences_window.ui.h:89
+#: ../data/gui/preferences_window.ui.h:85
 #, fuzzy
 msgid "Only when pending events"
 msgstr ""
@@ -2095,56 +2302,57 @@ msgstr ""
 "Samo kod događaja na čekanju\n"
 "Uvijek"
 
-#: ../data/gui/preferences_window.ui.h:90
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Personal Events"
 msgstr "Osobni Događaji"
 
-#: ../data/gui/preferences_window.ui.h:91
+#: ../data/gui/preferences_window.ui.h:87
 msgid "Play _sounds"
 msgstr "Dozvoli _zvukove"
 
-#: ../data/gui/preferences_window.ui.h:92
+#: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
 msgid "Pop it up"
 msgstr "_Iskoči ga"
 
-#: ../data/gui/preferences_window.ui.h:93
+#: ../data/gui/preferences_window.ui.h:89
 msgid "Preferences"
 msgstr "Postavke"
 
-#: ../data/gui/preferences_window.ui.h:94
+#: ../data/gui/preferences_window.ui.h:90
 msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:96
+#: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
 msgid "STUN server:"
 msgstr "Poslužitelj:"
 
-#: ../data/gui/preferences_window.ui.h:97
+#: ../data/gui/preferences_window.ui.h:93
+#, fuzzy
+msgid "Show notification area icon:"
+msgstr "Koristi t_ray ikonu"
+
+#: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
 msgid "Show only in roster"
 msgstr "Prikaži samo u _listi kontakata"
 
-#: ../data/gui/preferences_window.ui.h:98
-msgid "Show systray:"
-msgstr "Prikaži ikonu u traci radne površine:"
-
-#: ../data/gui/preferences_window.ui.h:99
+#: ../data/gui/preferences_window.ui.h:95
 msgid "Sign _in"
 msgstr "_Prijavim"
 
-#: ../data/gui/preferences_window.ui.h:100
+#: ../data/gui/preferences_window.ui.h:96
 msgid "Sign _out"
 msgstr "_Odjavim"
 
-#: ../data/gui/preferences_window.ui.h:101
+#: ../data/gui/preferences_window.ui.h:97
 msgid "Single window for everything"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:102
+#: ../data/gui/preferences_window.ui.h:98
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2152,27 +2360,27 @@ msgstr ""
 "Neke poruke mogu uključivati bogati sadržaj (formatiranje, boje itd.) Ako je "
 "označeno, Gajim će prikazati samo čisti tekst poruke."
 
-#: ../data/gui/preferences_window.ui.h:103
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sort contacts by status"
 msgstr "Sortiranje kontakata po statusu"
 
-#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
 msgid "Status"
 msgstr "Status"
 
-#: ../data/gui/preferences_window.ui.h:105
+#: ../data/gui/preferences_window.ui.h:101
 msgid "Status _iconset:"
 msgstr "Statusne _ikone:"
 
-#: ../data/gui/preferences_window.ui.h:106
+#: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Izgled"
 
-#: ../data/gui/preferences_window.ui.h:107
+#: ../data/gui/preferences_window.ui.h:103
 msgid "T_heme:"
 msgstr "_Tema:"
 
-#: ../data/gui/preferences_window.ui.h:108
+#: ../data/gui/preferences_window.ui.h:104
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2184,7 +2392,7 @@ msgstr ""
 "$S će biti zamjenjen sa prijašnjom porukom$T će biti zamjenjen sa auto-away "
 "vremenskim ograničenjem"
 
-#: ../data/gui/preferences_window.ui.h:111
+#: ../data/gui/preferences_window.ui.h:107
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2196,121 +2404,126 @@ msgstr ""
 "$S će biti zamjenjen sa prijašnjom porukom\n"
 "$T će biti zamjenjen sa auto-not-available vremenskim ograničenjem"
 
-#: ../data/gui/preferences_window.ui.h:114
+#: ../data/gui/preferences_window.ui.h:110
 msgid "Use _transports icons"
 msgstr "Različite _ikone za prijenose"
 
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:111
+#, fuzzy
+msgid "Use default applications"
+msgstr "Uvijek koristi OS/X predefinirane aplikacije"
+
+#: ../data/gui/preferences_window.ui.h:112
 msgid "Use system _default"
 msgstr "Definirano _sustavom"
 
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:113
 msgid "Video framerate"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:117
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Video input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:118
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Video output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:119
+#: ../data/gui/preferences_window.ui.h:116
 msgid "Video size"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:120
+#: ../data/gui/preferences_window.ui.h:117
 msgid "When new event is received:"
 msgstr "Kod novih događaja:"
 
-#: ../data/gui/preferences_window.ui.h:121
+#: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
 msgid "Your message:"
 msgstr "Poruka Greške: %s"
 
-#: ../data/gui/preferences_window.ui.h:122
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your nickname:"
 msgstr "Nadimak:"
 
-#: ../data/gui/preferences_window.ui.h:123
+#: ../data/gui/preferences_window.ui.h:120
 msgid "_Away after:"
 msgstr "_Odsutan automatski nakon:"
 
-#: ../data/gui/preferences_window.ui.h:124
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Preglednik:"
 
-#: ../data/gui/preferences_window.ui.h:125
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Display chat state notifications:"
 msgstr "_Prikaži obavijesti o statusu razgovora:"
 
-#: ../data/gui/preferences_window.ui.h:126
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Emoticons:"
 msgstr "_Emotikoni:"
 
-#: ../data/gui/preferences_window.ui.h:127
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_File manager:"
 msgstr "_Upravitelj datotekama:"
 
-#: ../data/gui/preferences_window.ui.h:128
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_Highlight misspelled words"
 msgstr "_Istakni pogrešno napisane riječi"
 
-#: ../data/gui/preferences_window.ui.h:129
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignoriraj događaje od kontakata koji nisu na listi kontakata"
 
-#: ../data/gui/preferences_window.ui.h:130
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignoriraj bogati sadržaj u dolaznim porukama"
 
-#: ../data/gui/preferences_window.ui.h:131
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Log status changes of contacts"
 msgstr "_Pamti promjene statusa kontakata"
 
-#: ../data/gui/preferences_window.ui.h:132
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Mail client:"
 msgstr "_Mail klijent:"
 
-#: ../data/gui/preferences_window.ui.h:133
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Not available after:"
 msgstr "_Nedostupan automatski nakon:"
 
-#: ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Open..."
 msgstr "_Otvori..."
 
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Reset to Default Colors"
 msgstr "_Vrati predefinirane boje"
 
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Send chat state notifications:"
 msgstr "_Å alji obavijesti o statusu razgovora"
 
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Status message:"
 msgstr "_Statusna poruka:"
 
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_URL highlight:"
 msgstr "_URL isticanje:"
 
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_Window behavior:"
 msgstr "_Ponašanje Prozora"
 
-#: ../data/gui/preferences_window.ui.h:140
+#: ../data/gui/preferences_window.ui.h:137
 msgid "in _group chats"
 msgstr "u _grupnim razgovorima"
 
-#: ../data/gui/preferences_window.ui.h:141
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _roster"
 msgstr "na _listi"
 
-#: ../data/gui/preferences_window.ui.h:142
+#: ../data/gui/preferences_window.ui.h:139
 msgid "minutes"
 msgstr "minuta"
 
@@ -2362,7 +2575,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Poredak:"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3436
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
 msgid "Privacy List"
 msgstr "Lista Privatnosti"
 
@@ -2573,8 +2786,8 @@ msgstr "Ukloni račun iz Gajima i sa po_služitelja"
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5492 ../src/roster_window.py:5622
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
+#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
 msgid "_Remove"
 msgstr "_Ukloni"
 
@@ -2619,56 +2832,60 @@ msgid "Help online"
 msgstr "Online Pomoć"
 
 #: ../data/gui/roster_window.ui.h:8
+msgid "P_lugins"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:9
 msgid "Profile, A_vatar"
 msgstr "Profil, A_vatar"
 
-#: ../data/gui/roster_window.ui.h:9
+#: ../data/gui/roster_window.ui.h:10
 msgid "Show Only _Active Contacts"
 msgstr "Prikaži Samo _Aktivne Kontakte"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
 msgid "Show Trans_ports"
 msgstr "Prikaži _Prijenose"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
 msgid "Show _Offline Contacts"
 msgstr "Prikaži _Odspojene Kontakte"
 
-#: ../data/gui/roster_window.ui.h:12 ../src/statusicon.py:326
+#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
 msgid "Show _Roster"
 msgstr "Prikaži _Listu Kontakata"
 
-#: ../data/gui/roster_window.ui.h:13
+#: ../data/gui/roster_window.ui.h:14
 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/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
 #: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Akcije"
 
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
 msgid "_Contents"
 msgstr "_Sadržaj"
 
-#: ../data/gui/roster_window.ui.h:18 ../src/disco.py:1502
+#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: ../data/gui/roster_window.ui.h:19
+#: ../data/gui/roster_window.ui.h:20
 msgid "_FAQ"
 msgstr "_ÄŒesta pitanja"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Help"
 msgstr "_Pomoć"
 
-#: ../data/gui/roster_window.ui.h:22
+#: ../data/gui/roster_window.ui.h:23
 msgid "_Send Single Message..."
 msgstr "_Slanje Jedne Poruke..."
 
-#: ../data/gui/roster_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:25
 msgid "_View"
 msgstr "_Prikaz"
 
@@ -2685,11 +2902,11 @@ msgid "_Add contact"
 msgstr "_Dodaj kontakt"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5634
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
 msgid "_Information"
 msgstr "_Informacije"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1353
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
 msgid "_Search"
 msgstr "_Pretraga"
 
@@ -2709,10 +2926,6 @@ msgstr "Registriraj na"
 msgid "_Cancel"
 msgstr "_Odustani"
 
-#: ../data/gui/single_message_window.ui.h:2
-msgid "From:"
-msgstr "Od:"
-
 #: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Odgovori na ovu poruku"
@@ -2729,10 +2942,6 @@ msgstr "Pošalji poruku"
 msgid "Send message and close window"
 msgstr "Pošalji poruku i zatvori prozor"
 
-#: ../data/gui/single_message_window.ui.h:7
-msgid "Subject:"
-msgstr "Tema:"
-
 #: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Za:"
@@ -2940,25 +3149,35 @@ msgstr "Gajim Instant Messenger"
 msgid "Jabber IM Client"
 msgstr "Jabber IM Klijent"
 
-#: ../src/adhoc_commands.py:314
+#: ../src/adhoc_commands.py:323
 msgid "Cancel confirmation"
 msgstr "Otkaži potvrdu"
 
-#: ../src/adhoc_commands.py:315
+#: ../src/adhoc_commands.py:324
 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:351 ../src/adhoc_commands.py:374
+#: ../src/adhoc_commands.py:370
+#, fuzzy
+msgid "Invalid Form"
+msgstr "Neispravna soba"
+
+#: ../src/adhoc_commands.py:371
+#, fuzzy
+msgid "The form is not filled correctly."
+msgstr "Nadimak sadrži nedozvoljene znakove."
+
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
 msgid "Service sent malformed data"
 msgstr "Servis je poslao neispravne podatke"
 
-#: ../src/adhoc_commands.py:360
+#: ../src/adhoc_commands.py:399
 msgid "Service changed the session identifier."
 msgstr "Servis je promjenio identifikator sesije."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:471
+#: ../src/adhoc_commands.py:513
 msgid "Service returned an error."
 msgstr "Servis je odgovorio sa greškom."
 
@@ -2983,7 +3202,7 @@ msgstr "Cijeli broj"
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:945
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
 msgid "Color"
 msgstr "Boja"
 
@@ -3021,184 +3240,184 @@ msgstr[2] "Primili ste nove unose (i %(count)d nije prikazano):"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "English"
 msgstr "Engleski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Belarusian"
 msgstr "Bjeloruski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Bulgarian"
 msgstr "Bugarski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Breton"
 msgstr "Bretonski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Czech"
 msgstr "Češki"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "German"
 msgstr "Njemački"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Greek"
 msgstr "Grčki"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "British"
 msgstr "Britanski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Spanish"
 msgstr "Å panjolski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Basque"
 msgstr "Baskijski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "French"
 msgstr "Francuski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Italian"
 msgstr "Talijanski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian (b)"
 msgstr "Norveški (b)"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Dutch"
 msgstr "Nizozemski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian"
 msgstr "Norveški"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Polish"
 msgstr "Poljski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Portuguese"
 msgstr "Portugalski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Brazilian Portuguese"
 msgstr "Brazilski Portugalski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Russian"
 msgstr "Ruski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Serbian"
 msgstr "Srpski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Slovak"
 msgstr "Slovački"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Swedish"
 msgstr "Å vedski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Chinese (Ch)"
 msgstr "Kineski (Ch)"
 
-#: ../src/chat_control.py:479
+#: ../src/chat_control.py:496
 msgid "Spelling language"
 msgstr "Jezik pravopisa"
 
 #. we are not connected
-#: ../src/chat_control.py:511 ../src/chat_control.py:720
+#: ../src/chat_control.py:528 ../src/chat_control.py:737
 msgid "A connection is not available"
 msgstr "Veza nije dostupna"
 
-#: ../src/chat_control.py:512 ../src/chat_control.py:721
+#: ../src/chat_control.py:529 ../src/chat_control.py:738
 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:927
+#: ../src/chat_control.py:944
 msgid "Underline"
 msgstr "Podcrtaj"
 
-#: ../src/chat_control.py:928
+#: ../src/chat_control.py:945
 msgid "Strike"
 msgstr "Precrtaj"
 
-#: ../src/chat_control.py:951
+#: ../src/chat_control.py:968
 msgid "Font"
 msgstr "Font"
 
-#: ../src/chat_control.py:960
+#: ../src/chat_control.py:977
 msgid "Clear formating"
 msgstr "Očisti oblikovanje"
 
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1055
 msgid "Really send file?"
 msgstr "Zaista pošalji datoteku?"
 
-#: ../src/chat_control.py:1039
+#: ../src/chat_control.py:1056
 #, 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:1503 ../src/chat_control.py:1987
+#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
 msgid "GPG encryption enabled"
 msgstr "GPG enkripcija omogućena"
 
 #. Add to roster
-#: ../src/chat_control.py:1528 ../src/common/contacts.py:158
+#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
 #: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:245 ../src/dialogs.py:1064 ../src/dialogs.py:2078
-#: ../src/dialogs.py:2107 ../src/gui_interface.py:674
+#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
+#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
 #: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1610 ../src/roster_window.py:1612
-#: ../src/roster_window.py:1942 ../src/roster_window.py:3289
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
+#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
+#: ../src/roster_window.py:3382
 msgid "Not in Roster"
 msgstr "Nije na Listi Kontakata"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1575
 msgid "This contact does not support file transfer."
 msgstr "Ovaj kontakt ne podržava prijenosa datoteka."
 
-#: ../src/chat_control.py:1561
+#: ../src/chat_control.py:1578
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr "Trebate znati pravi JID kontakta za slanje datoteke."
 
-#: ../src/chat_control.py:1656
+#: ../src/chat_control.py:1677
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:1869
 #, 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:1967 ../src/dialogs.py:4866
+#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
 msgid "No GPG key assigned"
 msgstr "GPG ključ nije dodjeljen"
 
-#: ../src/chat_control.py:1968
+#: ../src/chat_control.py:1991
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3206,50 +3425,50 @@ msgstr ""
 "Niti jedan GPG ključ nije dodjeljen ovom kontaktu. Nije moguće kriptirati "
 "poruke sa GPG."
 
-#: ../src/chat_control.py:1977
+#: ../src/chat_control.py:2000
 msgid "GPG encryption disabled"
 msgstr "GPG enkripcija onemogućena"
 
-#: ../src/chat_control.py:2003
+#: ../src/chat_control.py:2026
 msgid "Session WILL be logged"
 msgstr "Sesija ĆE biti sačuvana"
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:2028
 msgid "Session WILL NOT be logged"
 msgstr "Sesija NEĆE biti sačuvana"
 
 #. encryption %s active
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is"
 msgstr "je"
 
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is NOT"
 msgstr "NIJE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will"
 msgstr "će"
 
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will NOT"
 msgstr "NEĆE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2051
 msgid "and authenticated"
 msgstr "i autentičan"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2032
+#: ../src/chat_control.py:2055
 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:2039
+#: ../src/chat_control.py:2062
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3258,48 +3477,57 @@ msgstr ""
 "%(type)s enkripcija %(status)s aktivna %(authenticated)s.\n"
 "Vaš razgovor %(logged)s biti zapisan."
 
-#: ../src/chat_control.py:2182
+#: ../src/chat_control.py:2205
 msgid "Session negotiation cancelled"
 msgstr "Pregovaranje o sesiji neuspješno"
 
-#: ../src/chat_control.py:2191
+#: ../src/chat_control.py:2215
+msgid "This session WILL be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2217
+#, fuzzy
+msgid "This session WILL NOT be archived on server"
+msgstr "Sesija NEĆE biti sačuvana"
+
+#: ../src/chat_control.py:2226
 msgid "This session is encrypted"
 msgstr "Ova razgovor je kriptiran"
 
-#: ../src/chat_control.py:2194
+#: ../src/chat_control.py:2229
 msgid " and WILL be logged"
 msgstr "i biti ĆE sačuvana"
 
-#: ../src/chat_control.py:2196
+#: ../src/chat_control.py:2231
 msgid " and WILL NOT be logged"
 msgstr "i NEĆE biti sačuvana"
 
-#: ../src/chat_control.py:2201
+#: ../src/chat_control.py:2236
 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:2203
+#: ../src/chat_control.py:2238
 msgid "E2E encryption disabled"
 msgstr "E2E enkripcija onemogućena"
 
-#: ../src/chat_control.py:2241 ../src/chat_control.py:2254
+#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
 msgid "The following message was NOT encrypted"
 msgstr "Ova poruka NIJE kriptirana"
 
-#: ../src/chat_control.py:2247
+#: ../src/chat_control.py:2288
 msgid "The following message was encrypted"
 msgstr "Ova poruka je kriptirana"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2519
+#: ../src/chat_control.py:2566
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Upravo ste primili novu poruku od \"%s\""
 
-#: ../src/chat_control.py:2520
+#: ../src/chat_control.py:2567
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3307,15 +3535,13 @@ msgstr ""
 "Ako zatvorite ovu karticu, a imate povijest onemogućenu, ova poruka biti će "
 "izgubljena."
 
-#: ../src/chat_control.py:2663 ../src/common/connection_handlers.py:1635
-#: ../src/common/connection_handlers.py:1758
-#: ../src/common/connection_handlers.py:1960
-#: ../src/common/connection_handlers.py:2110 ../src/common/connection.py:452
+#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
 #: ../src/gajim.py:159 ../src/session.py:138
 msgid "Database Error"
 msgstr "Pogreška Baze Podataka"
 
-#: ../src/chat_control.py:2664
+#: ../src/chat_control.py:2714
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3324,7 +3550,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:2906
+#: ../src/chat_control.py:2962
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s je trenutno %(status)s"
@@ -3338,28 +3564,28 @@ msgstr "kreiram bazu zabilješki"
 msgid "creating cache database"
 msgstr "kreiram bazu zabilješki"
 
-#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
-#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
-#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
-#: ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
 #, 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:275 ../src/common/check_paths.py:282
-#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
-#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
-#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:333
+#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
+#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
+#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
 msgid "Gajim will now exit"
 msgstr "Gajim će se sad isključiti"
 
-#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
+#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
 #, 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:342
+#: ../src/common/check_paths.py:351
 #, python-format
 msgid "creating %s directory"
 msgstr "kreiram %s direktorij"
@@ -3423,9 +3649,9 @@ msgstr "Izaberite grupne razgovore koje želite napustiti"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:801
-#: ../src/roster_window.py:1614 ../src/roster_window.py:1616
-#: ../src/roster_window.py:5251
+#: ../src/common/helpers.py:57 ../src/roster_window.py:815
+#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
+#: ../src/roster_window.py:5323
 msgid "Groupchats"
 msgstr "Grupni Razgovori"
 
@@ -3489,7 +3715,9 @@ msgstr ""
 "produžene nedostupnosti."
 
 #: ../src/common/config.py:88
-msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+#, fuzzy
+msgid ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 "Kada prikazati ikonu u traci radne površine. Može biti 'never', 'on_event', "
 "'always'."
@@ -3540,9 +3768,9 @@ msgid ""
 msgstr "Lista (odvojena razmacima) redova (računa i grupa) koji su otvoreni."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:501
-#: ../src/common/optparser.py:290 ../src/common/optparser.py:486
-#: ../src/common/optparser.py:520 ../src/gui_interface.py:3370
+#: ../src/common/config.py:106 ../src/common/config.py:505
+#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
+#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
 msgid "default"
 msgstr "predefinirano"
 
@@ -3769,7 +3997,8 @@ msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard definira KiB = 1024 bajtova, KB = 1000 bajtova"
 
 #: ../src/common/config.py:197
-msgid "Notify of events in the system trayicon."
+#, fuzzy
+msgid "Notify of events in the notification area."
 msgstr "Obavijesti o svim događajima u traci radne površine."
 
 #: ../src/common/config.py:203
@@ -3808,9 +4037,10 @@ msgstr ""
 "razgovorima."
 
 #: ../src/common/config.py:221
+#, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
+"setting is taken into account only if notification icon is used."
 msgstr ""
 "Ako je Aktivno, Gajim se završava kad je pritisnut X gumb. Ova postavka je "
 "upotrebljena samo ako je \"trayicon\" u upotrebi."
@@ -4084,9 +4314,10 @@ msgstr ""
 "čiste."
 
 #: ../src/common/config.py:270
+#, fuzzy
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
-"systray icon."
+"notification icon."
 msgstr ""
 "Ako je Aktivno, prozori sa obavijestima notification-daemon-a će biti "
 "prikačeni uz ikonu u traci radne površine."
@@ -4286,11 +4517,15 @@ msgstr ""
 msgid "Message that is sent to contacts you want to add"
 msgstr "Molim ispunite podatke kontakta kojeg želite dodati"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:374
+msgid "Last time we syncronized with logs from server."
+msgstr ""
+
+#: ../src/common/config.py:436
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Je li OpenPGP omogućen za ovog kontakta?"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4298,101 +4533,108 @@ msgstr ""
 "Treba li Gajim automatski započeti kriptiranu sesiju sa ovim kontaktom, ako "
 "je to moguće?"
 
-#: ../src/common/config.py:437 ../src/common/config.py:440
+#: ../src/common/config.py:438 ../src/common/config.py:441
 msgid "Language for which we want to check misspelled words"
 msgstr "Jezik koji se koristi za provjeru pravopisa"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:447
 msgid "all or space separated status"
 msgstr "sve ili razmakom odvojen status"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:448
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', ili 'both'"
 
-#: ../src/common/config.py:448 ../src/common/config.py:450
-#: ../src/common/config.py:451 ../src/common/config.py:454
-#: ../src/common/config.py:455
+#: ../src/common/config.py:449 ../src/common/config.py:451
+#: ../src/common/config.py:452 ../src/common/config.py:455
+#: ../src/common/config.py:456
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' ili ''"
 
-#: ../src/common/config.py:461 ../src/common/pep.py:157
+#: ../src/common/config.py:460
+msgid ""
+"State whether plugins should be activated on exit (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
+msgstr ""
+
+#: ../src/common/config.py:465 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Spavam"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back soon"
 msgstr "Vraćam se ubrzo"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back in some minutes."
 msgstr "Vraćam se za nekoliko minuta."
 
-#: ../src/common/config.py:463 ../src/common/pep.py:127
+#: ../src/common/config.py:467 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Jedem"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:467
 msgid "I'm eating, so leave me a message."
 msgstr "Jedem, ostavite mi poruku."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "I'm watching a movie."
 msgstr "Gledam film."
 
-#: ../src/common/config.py:465 ../src/common/pep.py:186
+#: ../src/common/config.py:469 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Radim"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:469
 msgid "I'm working."
 msgstr "Radim."
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "I'm on the phone."
 msgstr "Telefoniram."
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "Out"
 msgstr "Vani"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "I'm out enjoying life."
 msgstr "Vani uživam život."
 
-#: ../src/common/config.py:478
+#: ../src/common/config.py:482
 msgid "I'm available."
 msgstr "Dostupan sam."
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:483
 msgid "I'm free for chat."
 msgstr "Slobodan sam za razgovor."
 
-#: ../src/common/config.py:480 ../src/config.py:1600
+#: ../src/common/config.py:484 ../src/config.py:1600
 msgid "Be right back."
 msgstr "Odmah se vraćam."
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:485
 msgid "I'm not available."
 msgstr "Nedostupan sam."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:486
 msgid "Do not disturb."
 msgstr "Ne uznemiravaj."
 
-#: ../src/common/config.py:483 ../src/common/config.py:484
+#: ../src/common/config.py:487 ../src/common/config.py:488
 msgid "Bye!"
 msgstr "Pozdrav!"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:498
 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."
@@ -4401,50 +4643,50 @@ msgstr ""
 "muc_highlight_words, ili kada neka poruka grupnog razgovora sadrži vaš "
 "nadimak."
 
-#: ../src/common/config.py:495
+#: ../src/common/config.py:499
 msgid "Sound to play when any MUC message arrives."
 msgstr "Zvuk koji će svirati kada stigne neka MUC poruka."
 
-#: ../src/common/config.py:504 ../src/common/optparser.py:304
+#: ../src/common/config.py:508 ../src/common/optparser.py:308
 msgid "green"
 msgstr "zelena"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:290
+#: ../src/common/config.py:512 ../src/common/optparser.py:294
 msgid "grocery"
 msgstr "namirnice"
 
-#: ../src/common/config.py:512
+#: ../src/common/config.py:516
 msgid "human"
 msgstr "ljudska"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:520
 msgid "marine"
 msgstr "morska"
 
-#: ../src/common/connection_handlers.py:84
+#: ../src/common/connection_handlers.py:94
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Nije moguće učitati modul idle"
 
-#: ../src/common/connection_handlers.py:117
+#: ../src/common/connection_handlers.py:127
 #, 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:124
+#: ../src/common/connection_handlers.py:134
 msgid "Registration succeeded"
 msgstr "Registracija uspijela"
 
-#: ../src/common/connection_handlers.py:125
+#: ../src/common/connection_handlers.py:135
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registracija sa agentom %s je uspjela"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 msgid "Registration failed"
 msgstr "Registracija nije uspijela"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -4452,38 +4694,34 @@ msgstr ""
 "Registracija sa agentom %(agent)s nije uspjela, uz poruku o grešci "
 "%(error)s: %(error_msg)s"
 
-#: ../src/common/connection_handlers.py:445
-#: ../src/common/connection_handlers.py:1633
-#: ../src/common/connection_handlers.py:1756
-#: ../src/common/connection_handlers.py:1957
-#: ../src/common/connection_handlers.py:2108 ../src/common/connection.py:449
+#: ../src/common/connection_handlers.py:466
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
 #: ../src/gajim.py:341
 msgid "Disk Write Error"
 msgstr "Disk Write Error"
 
-#: ../src/common/connection_handlers.py:678 ../src/common/connection.py:1472
+#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
 msgid "Invisibility not supported"
 msgstr "Nevidljivost nije podržana"
 
-#: ../src/common/connection_handlers.py:679 ../src/common/connection.py:1473
+#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Račun %s ne podržava nevidljivost."
 
-#: ../src/common/connection_handlers.py:1446 ../src/common/connection.py:253
-#: ../src/config.py:2091 ../src/config.py:2100 ../src/config.py:2168
-#: ../src/config.py:3560 ../src/dataforms_widget.py:597 ../src/dialogs.py:2931
+#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
+#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
+#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
 msgid "Invalid Jabber ID"
 msgstr "Neispravan Jabber ID"
 
-#: ../src/common/connection_handlers.py:1447
+#: ../src/common/connection_handlers.py:1405
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr "Primljena poruka nevažećeg JID-a, automatski je ignorirana."
 
-#: ../src/common/connection_handlers.py:1636
-#: ../src/common/connection_handlers.py:1759
-#: ../src/common/connection_handlers.py:1961
-#: ../src/common/connection_handlers.py:2111 ../src/common/connection.py:453
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
 #: ../src/gajim.py:160 ../src/session.py:139
 #, python-format
 msgid ""
@@ -4494,90 +4732,6 @@ msgstr ""
 "(pogledajte http://trac.gajim.org/wiki/DatabaseBackup) ili obrisati (svi "
 "zapisi razgovora će biti izgubljeni)."
 
-#: ../src/common/connection_handlers.py:1805
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Nedozvoljeni nadimak: %s "
-
-#: ../src/common/connection_handlers.py:1902
-#: ../src/common/connection_handlers.py:1911
-#: ../src/common/connection_handlers.py:1918
-#: ../src/common/connection_handlers.py:1922
-#: ../src/common/connection_handlers.py:1926
-#: ../src/common/connection_handlers.py:1931 ../src/gui_interface.py:139
-msgid "Unable to join group chat"
-msgstr "Nije moguće pridružiti se grupnom razgovoru"
-
-#: ../src/common/connection_handlers.py:1903
-#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr "Maksimalan broj korisnika za %s je dosegnut"
-
-#: ../src/common/connection_handlers.py:1912
-#, python-format
-msgid "You are banned from group chat %s."
-msgstr "Zabranjen vam je pristup grupnom razgovoru %s."
-
-#: ../src/common/connection_handlers.py:1919
-#, python-format
-msgid "Group chat %s does not exist."
-msgstr "Grupni razgovor %s ne postoji."
-
-#: ../src/common/connection_handlers.py:1923
-msgid "Group chat creation is restricted."
-msgstr "Stvaranje grupnih razgovora je ograničeno."
-
-#: ../src/common/connection_handlers.py:1927
-#, 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:1932
-#, 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:1976
-msgid "Room has been destroyed"
-msgstr "Soba je uništena"
-
-#: ../src/common/connection_handlers.py:1984
-#, 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:2020
-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:2041
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "sada smo pretplaćeni na %s"
-
-#: ../src/common/connection_handlers.py:2043
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "Zahtjev za ukidanjem pretplate od %s"
-
-#: ../src/common/connection_handlers.py:2045
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "sada smo ukinuli pretplatu za %s"
-
-#: ../src/common/connection_handlers.py:2240
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"JID %s ne poštuje RFC pravila. Neće biti dodan na vašu listu kontakata. "
-"Upotrijebite alate za upravljanje listom kontakata kao Å¡to je http://jru."
-"jabberstudio.org/ za uklanjanje"
-
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr "Nemoguće dobaviti certifikat izdavača"
@@ -4706,27 +4860,27 @@ msgstr "Korištenje ključa ne uključuje potpisivanje certifikata"
 msgid "Application verification failure"
 msgstr "Application verification failure"
 
-#: ../src/common/connection.py:254 ../src/dialogs.py:2932
+#: ../src/common/connection.py:256 ../src/dialogs.py:2948
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Nije moguće poslati poruku na %s, ovaj JID nije ispravan."
 
-#: ../src/common/connection.py:276
+#: ../src/common/connection.py:278
 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:279
+#: ../src/common/connection.py:281
 #, 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:331
+#: ../src/common/connection.py:333
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Ova poruka je *kriptirana* (Vidi :XEP:`27`]"
 
-#: ../src/common/connection.py:439
+#: ../src/common/connection.py:441
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4735,78 +4889,78 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:807
+#: ../src/common/connection.py:809
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Veza sa računom \"%s\" je izgubljena"
 
-#: ../src/common/connection.py:808
+#: ../src/common/connection.py:810
 msgid "Reconnect manually."
 msgstr "Ponovo se spojite ručno."
 
-#: ../src/common/connection.py:820
+#: ../src/common/connection.py:822
 #, 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:854
+#: ../src/common/connection.py:856
 #, 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:867
+#: ../src/common/connection.py:869
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Nepoznata SSL greška: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:882
+#: ../src/common/connection.py:884
 msgid "Invalid answer"
 msgstr "Nepravilan odgovor"
 
-#: ../src/common/connection.py:883
+#: ../src/common/connection.py:885
 #, 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:1165 ../src/common/connection.py:1294
-#: ../src/common/connection.py:1784
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
+#: ../src/common/connection.py:1792
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nije moguća veza sa \"%s\""
 
-#: ../src/common/connection.py:1166 ../src/gui_interface.py:755
+#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
 msgid "Check your connection or try again later."
 msgstr "Provjerite svoju vezu ili pokušajte kasnije."
 
-#: ../src/common/connection.py:1171
+#: ../src/common/connection.py:1173
 #, python-format
 msgid "Server replied: %s"
 msgstr "Odgovor poslužitelja: %s"
 
-#: ../src/common/connection.py:1184
+#: ../src/common/connection.py:1186
 msgid "Connection to proxy failed"
 msgstr "Veza na proxy nije uspjela"
 
-#: ../src/common/connection.py:1215 ../src/common/connection.py:1274
+#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Neuspješno povezivanje na račun %s"
 
-#: ../src/common/connection.py:1216 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
 #, 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:1241
+#: ../src/common/connection.py:1243
 #, 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:1244
+#: ../src/common/connection.py:1246
 #, python-format
 msgid ""
 "\n"
@@ -4815,7 +4969,7 @@ msgstr ""
 "\n"
 "SSL Greška: <b>%s</b>"
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1248
 #, python-format
 msgid ""
 "\n"
@@ -4824,24 +4978,24 @@ msgstr ""
 "\n"
 "Nepoznata SSL greška: %d"
 
-#: ../src/common/connection.py:1295
+#: ../src/common/connection.py:1297
 msgid "Check your connection or try again later"
 msgstr "Provjerite vašu vezu ili pokušajte ponovno kasnije"
 
-#: ../src/common/connection.py:1324
+#: ../src/common/connection.py:1329
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentifikacija sa \"%s\" nije uspjela"
 
-#: ../src/common/connection.py:1326
+#: ../src/common/connection.py:1331
 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:1395
+#: ../src/common/connection.py:1400
 msgid "Error while removing privacy list"
 msgstr "Greška prilikom brisanja liste privatnosti"
 
-#: ../src/common/connection.py:1396
+#: ../src/common/connection.py:1401
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4850,40 +5004,40 @@ 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:1650
+#: ../src/common/connection.py:1658
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Poslan kontakt: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1653
+#: ../src/common/connection.py:1661
 msgid "Sent contacts:"
 msgstr "Poslani kontakti:"
 
-#: ../src/common/connection.py:1799 ../src/common/connection.py:1822
+#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
 msgid "Not fetched because of invisible status"
 msgstr "Nije dohvaćeno zbog statusa nevidljivosti"
 
-#: ../src/common/connection.py:2254
+#: ../src/common/connection.py:2262
 msgid "Unregister failed"
 msgstr "Brisanje registracije nije uspijelo"
 
-#: ../src/common/connection.py:2255
+#: ../src/common/connection.py:2263
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 "Brisanje registracije na poslužitelju %(server)s nije uspjelo: %(error)s"
 
 #: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:674
+#: ../src/gui_interface.py:551
 msgid "Observers"
 msgstr "Posmatrači"
 
 #: ../src/common/contacts.py:139 ../src/common/contacts.py:366
 #: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1499 ../src/gui_interface.py:424
-#: ../src/roster_window.py:840 ../src/roster_window.py:1525
-#: ../src/roster_window.py:1606 ../src/roster_window.py:1608
-#: ../src/roster_window.py:1769
+#: ../src/disco.py:1517 ../src/roster_window.py:854
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
+#: ../src/roster_window.py:2466
 msgid "Transports"
 msgstr "Prijenosi"
 
@@ -5109,203 +5263,219 @@ msgstr "Kraj tjedna"
 msgid "Weekend!"
 msgstr "Vikend!"
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:148
+msgid "Username must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:153
 msgid "Invalid character in username."
 msgstr "Neispravan znak u korisničkom imenu."
 
-#: ../src/common/helpers.py:156
-msgid "Server address required."
-msgstr "Potrebna je adresa poslužitelja."
+#: ../src/common/helpers.py:159
+msgid "Server must be between 1 and 1023 chars"
+msgstr ""
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 msgid "Invalid character in hostname."
 msgstr "Neispravan znak u imenu računala."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:166
+msgid "Server address required."
+msgstr "Potrebna je adresa poslužitelja."
+
+#: ../src/common/helpers.py:170
+msgid "Resource must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:175
 msgid "Invalid character in resource."
 msgstr "Neispravan znak u resursu."
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:215
 msgid "_Busy"
 msgstr "_Zauzet"
 
-#: ../src/common/helpers.py:211 ../src/tooltips.py:195
+#: ../src/common/helpers.py:217 ../src/tooltips.py:195
 msgid "Busy"
 msgstr "Zauzet"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:220
 msgid "_Not Available"
 msgstr "_Nedostupan"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:225
 msgid "_Free for Chat"
 msgstr "_Slobodan za razgovor"
 
-#: ../src/common/helpers.py:221 ../src/tooltips.py:191
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Free for Chat"
 msgstr "Slobodan za razgovor"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:230
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?status prijenosa:Stanka"
 
-#: ../src/common/helpers.py:226 ../src/tooltips.py:189
+#: ../src/common/helpers.py:232 ../src/tooltips.py:189
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?status prijenosa:Stanka"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:234
 msgid "Connecting"
 msgstr "Povezujem"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:237
 msgid "A_way"
 msgstr "O_dsutan"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:242
 msgid "_Offline"
 msgstr "_Odspojen"
 
-#: ../src/common/helpers.py:238 ../src/tooltips.py:199
+#: ../src/common/helpers.py:244 ../src/tooltips.py:199
 msgid "Offline"
 msgstr "Odspojen"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:247
 msgid "_Invisible"
 msgstr "_Nevidljiv"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:253
 msgid "?contact has status:Unknown"
 msgstr "?kontakt ima status:Nepoznat"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:255
 msgid "?contact has status:Has errors"
 msgstr "?kontakt ima status:Ima greške"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:260
 msgid "?Subscription we already have:None"
 msgstr "?Pretplata koju već imamo:Ništa"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:262
 msgid "To"
 msgstr "Za"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
+msgid "From"
+msgstr "Od"
+
+#: ../src/common/helpers.py:266
 msgid "Both"
 msgstr "Oboje"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:274
 msgid "?Ask (for Subscription):None"
 msgstr "?Pitaj (za Pretplatu):Ništa"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:276
 msgid "Subscribe"
 msgstr "Pretplatite se"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:285
 msgid "?Group Chat Contact Role:None"
 msgstr "?Uloga Kontakta u Grupnom Razgvoru:Nikakva"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:288
 msgid "Moderators"
 msgstr "Moderatori"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:290
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:293
 msgid "Participants"
 msgstr "Sudionici"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:295
 msgid "Participant"
 msgstr "Sudionik"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:298
 msgid "Visitors"
 msgstr "Posjetitelji"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:300
 msgid "Visitor"
 msgstr "Posjetitelj"
 
-#: ../src/common/helpers.py:300 ../src/tooltips.py:210
+#: ../src/common/helpers.py:306 ../src/tooltips.py:210
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Vezanost Kontakta u Grupnom Razgvoru:Nikakva"
 
-#: ../src/common/helpers.py:302 ../src/tooltips.py:216
+#: ../src/common/helpers.py:308 ../src/tooltips.py:216
 msgid "Owner"
 msgstr "Vlasnik"
 
-#: ../src/common/helpers.py:304 ../src/tooltips.py:214
+#: ../src/common/helpers.py:310 ../src/tooltips.py:214
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:212
+#: ../src/common/helpers.py:312 ../src/tooltips.py:212
 msgid "Member"
 msgstr "ÄŒlan"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:351
 msgid "is paying attention to the conversation"
 msgstr "obraća pažnju na razgovor"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:353
 msgid "is doing something else"
 msgstr "radi nešto drugo"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:355
 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:352
+#: ../src/common/helpers.py:358
 msgid "paused composing a message"
 msgstr "stanka pri pisanju poruke"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:360
 msgid "has closed the chat window or tab"
 msgstr "je zatvorio/zatvorila prozor za razgovor"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:619
+#: ../src/common/helpers.py:625
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:622
+#: ../src/common/helpers.py:628
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:626
+#: ../src/common/helpers.py:632
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:629
+#: ../src/common/helpers.py:635
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:633
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:636
+#: ../src/common/helpers.py:642
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:645
 #, python-format
 msgid "%s B"
 msgstr "%s B"
@@ -5350,12 +5520,12 @@ msgstr "Gajim - %s"
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:111
+#: ../src/common/jingle_rtp.py:107
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Konfiguracija Sobe"
 
-#: ../src/common/jingle_rtp.py:112
+#: ../src/common/jingle_rtp.py:108
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5367,30 +5537,30 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:209
+#: ../src/common/jingle_rtp.py:205
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:210
+#: ../src/common/jingle_rtp.py:206
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Poruka Greške: %s"
 
-#: ../src/common/jingle_rtp.py:336
+#: ../src/common/jingle_rtp.py:335
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:339
+#: ../src/common/jingle_rtp.py:338
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:382
+#: ../src/common/jingle_rtp.py:381
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:390
+#: ../src/common/jingle_rtp.py:389
 msgid "video output"
 msgstr ""
 
@@ -5467,11 +5637,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "greška: nemogu otvoriti %s za čitanje"
 
-#: ../src/common/optparser.py:299 ../src/common/optparser.py:300
+#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
 msgid "cyan"
 msgstr "cijan"
 
-#: ../src/common/optparser.py:379
+#: ../src/common/optparser.py:383
 msgid "migrating logs database to indices"
 msgstr "migriram bazu zabilješki u indekse"
 
@@ -6144,7 +6314,7 @@ msgstr ""
 "otkazan."
 
 #. we're not english
-#: ../src/common/stanza_session.py:303
+#: ../src/common/stanza_session.py:423
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6152,11 +6322,11 @@ msgstr ""
 "[Ovo je dio kriptirane poruke. Ukoliko vidite ovu poruku nešto je pošlo po "
 "zlu.]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:178
+#: ../src/common/zeroconf/connection_zeroconf.py:181
 msgid "Avahi error"
 msgstr "Avahi greška"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:179
+#: ../src/common/zeroconf/connection_zeroconf.py:182
 #, python-format
 msgid ""
 "%s\n"
@@ -6165,44 +6335,44 @@ msgstr ""
 "%s\n"
 "Poruke lokalne veze možda ne rade kako treba."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:190
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Molimo provjerite da su Avahi ili Bonjour instalirani."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:199
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Could not start local service"
 msgstr "Nije moguće pokrenuti lokalnu uslugu"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Nemoguće vezanje na port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-#: ../src/common/zeroconf/connection_zeroconf.py:283
-#: ../src/common/zeroconf/connection_zeroconf.py:294
-#: ../src/common/zeroconf/connection_zeroconf.py:308
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:286
+#: ../src/common/zeroconf/connection_zeroconf.py:297
+#: ../src/common/zeroconf/connection_zeroconf.py:311
 msgid "Please check if avahi-daemon is running."
 msgstr "Molim provjerite da li je avahi-daemon pokrenut."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:282
-#: ../src/common/zeroconf/connection_zeroconf.py:293
-#: ../src/common/zeroconf/connection_zeroconf.py:307
+#: ../src/common/zeroconf/connection_zeroconf.py:285
+#: ../src/common/zeroconf/connection_zeroconf.py:296
+#: ../src/common/zeroconf/connection_zeroconf.py:310
 #, 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:325
+#: ../src/common/zeroconf/connection_zeroconf.py:328
 msgid "Your message could not be sent."
 msgstr "Vašu poruku nije moguće poslati."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:335
+#: ../src/common/zeroconf/connection_zeroconf.py:338
 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:360
+#: ../src/common/zeroconf/connection_zeroconf.py:363
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6222,16 +6392,16 @@ msgstr "Predefinirana Poruka"
 msgid "Enabled"
 msgstr "Omogućeno"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3078
+#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
 msgid "Default"
 msgstr "Predefinirano"
 
-#: ../src/config.py:739 ../src/dialogs.py:1395
+#: ../src/config.py:733 ../src/dialogs.py:1409
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Riječnik za jezik %s nije dostupan"
 
-#: ../src/config.py:740
+#: ../src/config.py:734
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6250,9 +6420,9 @@ msgid "status message text"
 msgstr "tekst statusne poruke"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2383 ../src/dialogs.py:2449
-#: ../src/dialogs.py:3215 ../src/disco.py:866 ../src/disco.py:1726
-#: ../src/disco.py:2030 ../src/history_window.py:90
+#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
+#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
+#: ../src/disco.py:2048 ../src/history_window.py:90
 msgid "Name"
 msgstr "Ime"
 
@@ -6288,7 +6458,7 @@ msgstr ""
 "Prozori svih razgovora i grupnih razgovora biti će zatvoreni. Želite li "
 "nastaviti?"
 
-#: ../src/config.py:1976 ../src/config.py:2509 ../src/config.py:2545
+#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
 msgid "You are currently connected to the server"
 msgstr "Trenutno ste spojeni na poslužitelj"
 
@@ -6323,131 +6493,131 @@ msgstr "Ime računa ne može biti prazno."
 msgid "Account name cannot contain spaces."
 msgstr "Ime računa ne može sadržavati razmake."
 
-#: ../src/config.py:2072
+#: ../src/config.py:2074
 msgid "Rename Account"
 msgstr "Preimenuj Račun"
 
-#: ../src/config.py:2073
+#: ../src/config.py:2075
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Unesite novo ime za račun %s"
 
-#: ../src/config.py:2101
+#: ../src/config.py:2103
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID mora biti forme \"korisnik@poslužitelj\"."
 
-#: ../src/config.py:2318 ../src/config.py:3606
+#: ../src/config.py:2320 ../src/config.py:3623
 msgid "Invalid entry"
 msgstr "Neispravan unos"
 
-#: ../src/config.py:2319 ../src/config.py:3607
+#: ../src/config.py:2321 ../src/config.py:3624
 msgid "Custom port must be a port number."
 msgstr "Osobni port mora biti broj porta."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2342
 msgid "Failed to get secret keys"
 msgstr "Neuspješno dohvaćanje tajnih ključeva"
 
-#: ../src/config.py:2341
+#: ../src/config.py:2343
 msgid "There is no OpenPGP secret key available."
 msgstr "OpenPGP tajni ključ nije dostupan."
 
-#: ../src/config.py:2375
+#: ../src/config.py:2377
 msgid "OpenPGP Key Selection"
 msgstr "Odabir OpenPGP Ključeva"
 
-#: ../src/config.py:2376
+#: ../src/config.py:2378
 msgid "Choose your OpenPGP key"
 msgstr "Odaberite svoj OpenPGP ključ"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2385
 msgid "No such account available"
 msgstr "Takav račun nije dostupan"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2386
 msgid "You must create your account before editing your personal information."
 msgstr "Morate napravit svoj račun prije izmjena osobnih informacija."
 
-#: ../src/config.py:2391 ../src/dialogs.py:2136 ../src/dialogs.py:2371
-#: ../src/dialogs.py:2557 ../src/disco.py:511 ../src/profile_window.py:339
+#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
+#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
 msgid "You are not connected to the server"
 msgstr "Niste spojeni na poslužitelj."
 
-#: ../src/config.py:2392
+#: ../src/config.py:2394
 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:2396
+#: ../src/config.py:2398
 msgid "Your server doesn't support Vcard"
 msgstr "Vaš poslužitelj ne podržava Vcard"
 
-#: ../src/config.py:2397
+#: ../src/config.py:2399
 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:2510 ../src/config.py:2546
+#: ../src/config.py:2512 ../src/config.py:2548
 msgid "To disable the account, you must be disconnected."
 msgstr "Za deaktivaciju računa morate biti odspojeni."
 
-#: ../src/config.py:2515
+#: ../src/config.py:2517
 msgid "Account Local already exists."
 msgstr "Račun Lokalno već postoji."
 
-#: ../src/config.py:2516
+#: ../src/config.py:2518
 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:2673
+#: ../src/config.py:2675
 #, python-format
 msgid "Edit %s"
 msgstr "Izmjena %s"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2677
 #, python-format
 msgid "Register to %s"
 msgstr "Registrirati se na %s"
 
 #. list at the beginning
-#: ../src/config.py:2711
+#: ../src/config.py:2713
 msgid "Ban List"
 msgstr "Ban Lista"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2714
 msgid "Member List"
 msgstr "Lista ÄŒlanova"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2714
 msgid "Owner List"
 msgstr "Lista Vasnika"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2715
 msgid "Administrator List"
 msgstr "Lista Administratora"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2763 ../src/disco.py:873 ../src/history_manager.py:201
+#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2773
+#: ../src/config.py:2789
 msgid "Reason"
 msgstr "Razlog"
 
-#: ../src/config.py:2780
+#: ../src/config.py:2796
 msgid "Nick"
 msgstr "Nadimak"
 
-#: ../src/config.py:2786
+#: ../src/config.py:2802
 msgid "Role"
 msgstr "Uloga"
 
-#: ../src/config.py:2813
+#: ../src/config.py:2829
 msgid "Banning..."
 msgstr "Zabranjivanje..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2815
+#: ../src/config.py:2831
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6455,11 +6625,11 @@ msgstr ""
 "<b>Koga želite zabraniti?</b>\n"
 "\n"
 
-#: ../src/config.py:2817
+#: ../src/config.py:2833
 msgid "Adding Member..."
 msgstr "Dodaja ÄŒlana..."
 
-#: ../src/config.py:2818
+#: ../src/config.py:2834
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6467,11 +6637,11 @@ msgstr ""
 "<b>Koga želite učiniti članom?</b>\n"
 "\n"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2836
 msgid "Adding Owner..."
 msgstr "Dodavanje Vlasnika..."
 
-#: ../src/config.py:2821
+#: ../src/config.py:2837
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6479,11 +6649,11 @@ msgstr ""
 "<b>Koga želite učiniti vlasnikom?</b>\n"
 "\n"
 
-#: ../src/config.py:2823
+#: ../src/config.py:2839
 msgid "Adding Administrator..."
 msgstr "Dodajem Administratora..."
 
-#: ../src/config.py:2824
+#: ../src/config.py:2840
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6491,7 +6661,7 @@ msgstr ""
 "<b>Koga želite učiniti administratorom?</b>\n"
 "\n"
 
-#: ../src/config.py:2825
+#: ../src/config.py:2841
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6507,83 +6677,83 @@ 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:2926
+#: ../src/config.py:2943
 #, python-format
 msgid "Removing %s account"
 msgstr "Uklanjanje %s računa"
 
-#: ../src/config.py:2941
+#: ../src/config.py:2958
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Emotikoni onemogućeni"
 
-#: ../src/config.py:2942
+#: ../src/config.py:2959
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2955 ../src/gui_interface.py:1132
-#: ../src/gui_interface.py:1243
+#: ../src/config.py:2972 ../src/gui_interface.py:311
+#: ../src/gui_interface.py:1048
 msgid "Password Required"
 msgstr "Potrebna Lozinka"
 
-#: ../src/config.py:2956 ../src/gui_interface.py:1223
+#: ../src/config.py:2973 ../src/gui_interface.py:1028
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Unesite svoju lozinku za račun %s"
 
-#: ../src/config.py:2957 ../src/gui_interface.py:1243
+#: ../src/config.py:2974 ../src/gui_interface.py:1048
 msgid "Save password"
 msgstr "Spremiti lozinku"
 
-#: ../src/config.py:2967
+#: ../src/config.py:2984
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Račun \"%s\" je spojen na poslužitelj"
 
-#: ../src/config.py:2968
+#: ../src/config.py:2985
 msgid "If you remove it, the connection will be lost."
 msgstr "Ukoliko ga uklonite, veza će biti izgubljena."
 
-#: ../src/config.py:2982
+#: ../src/config.py:2999
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Veza na proxy nije uspjela"
 
-#: ../src/config.py:2983
+#: ../src/config.py:3000
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Å to želite učiniti?"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3001
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Ukloni račun sam_o iz Gajima"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3002
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3078
+#: ../src/config.py:3095
 msgid "?print_status:All"
 msgstr "?ispis_statusa:Sve"
 
-#: ../src/config.py:3079
+#: ../src/config.py:3096
 msgid "Enter and leave only"
 msgstr "Samo ulasci i izlasci"
 
-#: ../src/config.py:3080
+#: ../src/config.py:3097
 msgid "?print_status:None"
 msgstr "?ispis_statusa:Ništa"
 
-#: ../src/config.py:3150
+#: ../src/config.py:3167
 msgid "New Group Chat"
 msgstr "Novi Grupni Razgovor"
 
-#: ../src/config.py:3183
+#: ../src/config.py:3200
 msgid "This bookmark has invalid data"
 msgstr "Ova knjižna oznaka ima neispravne podatke"
 
-#: ../src/config.py:3184
+#: ../src/config.py:3201
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6591,27 +6761,27 @@ msgstr ""
 "oznaku."
 
 #. invalid char
-#: ../src/config.py:3302 ../src/dialogs.py:1934
+#: ../src/config.py:3319 ../src/dialogs.py:1950
 msgid "Invalid nickname"
 msgstr "Neispravan nadimak"
 
-#: ../src/config.py:3303 ../src/config.py:3317 ../src/config.py:3331
+#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
 msgid "Character not allowed"
 msgstr "Znak nije dozvoljen"
 
-#: ../src/config.py:3316 ../src/config.py:3582
+#: ../src/config.py:3333 ../src/config.py:3599
 msgid "Invalid server"
 msgstr "Neispravan poslužitelj"
 
-#: ../src/config.py:3330
+#: ../src/config.py:3347
 msgid "Invalid room"
 msgstr "Neispravna soba"
 
-#: ../src/config.py:3498
+#: ../src/config.py:3515
 msgid "Account has been added successfully"
 msgstr "Račun je uspješno dodan"
 
-#: ../src/config.py:3499 ../src/config.py:3505
+#: ../src/config.py:3516 ../src/config.py:3522
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menu item under the Edit menu from the main "
@@ -6620,32 +6790,32 @@ msgstr ""
 "Napredne opcije računa možete urediti pritiskom na gumb Napredno, ili "
 "kasnije klikom na Korisnički Računi u izborniku Uredi glavnog prozora."
 
-#: ../src/config.py:3504
+#: ../src/config.py:3521
 msgid "Your new account has been created successfully"
 msgstr "Vaš novi račun je uspješno stvoren"
 
-#: ../src/config.py:3543
+#: ../src/config.py:3560
 msgid "Invalid username"
 msgstr "Neispravno korisničko ime"
 
-#: ../src/config.py:3545
+#: ../src/config.py:3562
 msgid "You must provide a username to configure this account."
 msgstr "Morate ponuditi korisničko ime za postavke ovog računa."
 
-#: ../src/config.py:3583
+#: ../src/config.py:3600
 msgid "Please provide a server on which you want to register."
 msgstr "Molimo specificirajte poslužitelj na koji se želite registrirati."
 
-#: ../src/config.py:3639 ../src/gui_interface.py:1904
+#: ../src/config.py:3656 ../src/gui_interface.py:1693
 msgid "Certificate Already in File"
 msgstr "Certifikat je već na listi"
 
-#: ../src/config.py:3640 ../src/gui_interface.py:1905
+#: ../src/config.py:3657 ../src/gui_interface.py:1694
 #, 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:3717
+#: ../src/config.py:3734
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6660,7 +6830,7 @@ msgstr ""
 "SSL Greška: %(error)s\n"
 "Još uvijek se želite povezati na ovaj poslužitelj?"
 
-#: ../src/config.py:3723 ../src/gui_interface.py:1932
+#: ../src/config.py:3740 ../src/gui_interface.py:1721
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6671,63 +6841,72 @@ msgstr ""
 "SHA1 otisak certifikata:\n"
 "%s"
 
-#: ../src/config.py:3755 ../src/config.py:3789
+#: ../src/config.py:3772 ../src/config.py:3806
 msgid "An error occurred during account creation"
 msgstr "Pojavila se greška pri stvaranju računa"
 
-#: ../src/config.py:3854
+#: ../src/config.py:3871
 msgid "Account name is in use"
 msgstr "Ime računa se već koristi"
 
-#: ../src/config.py:3855
+#: ../src/config.py:3872
 msgid "You already have an account using this name."
 msgstr "Već imate račun pod tim imenom."
 
-#: ../src/config.py:4009
+#: ../src/config.py:3991
+msgid "PEP node was not removed"
+msgstr "PEP čvor nije obrisan"
+
+#: ../src/config.py:3992
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr "PEP čvor %(node)s nije obrisan: %(message)s"
+
+#: ../src/config.py:4036
 msgid "Active"
 msgstr "Aktivno"
 
-#: ../src/config.py:4017
+#: ../src/config.py:4044
 msgid "Event"
 msgstr "Događaj"
 
-#: ../src/config.py:4052
+#: ../src/config.py:4079
 msgid "First Message Received"
 msgstr "Prva Poruka Primljena"
 
-#: ../src/config.py:4053
+#: ../src/config.py:4080
 msgid "Next Message Received Focused"
 msgstr "Sljedeća Poruka Primljena sa Fokusom"
 
-#: ../src/config.py:4055
+#: ../src/config.py:4082
 msgid "Next Message Received Unfocused"
 msgstr "Sljedeća Poruka Primljena bez Fokusa"
 
-#: ../src/config.py:4056
+#: ../src/config.py:4083
 msgid "Contact Connected"
 msgstr "Kontakt Spojen"
 
-#: ../src/config.py:4057
+#: ../src/config.py:4084
 msgid "Contact Disconnected"
 msgstr "Kontakt Odspojen"
 
-#: ../src/config.py:4058
+#: ../src/config.py:4085
 msgid "Message Sent"
 msgstr "Poruka Poslana"
 
-#: ../src/config.py:4059
+#: ../src/config.py:4086
 msgid "Group Chat Message Highlight"
 msgstr "Označavanje Poruke Grupnog Razgovora"
 
-#: ../src/config.py:4060
+#: ../src/config.py:4087
 msgid "Group Chat Message Received"
 msgstr "Primljena Poruka Grupnog Razgovora"
 
-#: ../src/config.py:4061
+#: ../src/config.py:4088
 msgid "GMail Email Received"
 msgstr "Primljen Gmail Email"
 
-#: ../src/conversation_textview.py:600
+#: ../src/conversation_textview.py:601
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6737,7 +6916,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:619
+#: ../src/conversation_textview.py:620
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6745,44 +6924,44 @@ 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:739
+#: ../src/conversation_textview.py:740
 msgid "_Quote"
 msgstr "_Citat"
 
-#: ../src/conversation_textview.py:746
+#: ../src/conversation_textview.py:747
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Akcije za \"%s\""
 
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Read _Wikipedia Article"
 msgstr "Pročitajte članak na _Wikipedii"
 
-#: ../src/conversation_textview.py:763
+#: ../src/conversation_textview.py:765
 msgid "Look it up in _Dictionary"
 msgstr "Potražiti u _Riječniku"
 
-#: ../src/conversation_textview.py:780
+#: ../src/conversation_textview.py:782
 #, 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:793
+#: ../src/conversation_textview.py:795
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL-u Web Pretrage nedostaje \"%s\""
 
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 msgid "Web _Search for it"
 msgstr "_Pretraži Web"
 
-#: ../src/conversation_textview.py:802
+#: ../src/conversation_textview.py:804
 msgid "Open as _Link"
 msgstr "Otvori kao _Poveznicu"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1296
+#: ../src/conversation_textview.py:1298
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6791,182 +6970,187 @@ msgstr[1] "Jučer"
 msgstr[2] "Jučer"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1344 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
 
-#: ../src/dataforms_widget.py:544
+#: ../src/dataforms_widget.py:545
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Nije moguće učitati modul idle"
 
-#: ../src/dataforms_widget.py:546
+#: ../src/dataforms_widget.py:547
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Nevidljivost nije podržana"
 
-#: ../src/dataforms_widget.py:601
+#: ../src/dataforms_widget.py:562
+msgid "This field is required"
+msgstr ""
+
+#: ../src/dataforms_widget.py:607
 msgid "Jabber ID already in list"
 msgstr "Jabber ID je već na listi"
 
-#: ../src/dataforms_widget.py:602
+#: ../src/dataforms_widget.py:608
 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:613
+#: ../src/dataforms_widget.py:619
 msgid "new@jabber.id"
 msgstr "novi@jabber.id"
 
-#: ../src/dataforms_widget.py:616 ../src/dataforms_widget.py:618
+#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "novi%d@jabber.id"
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Ime kontakta: <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:195
 msgid "Group"
 msgstr "Grupa"
 
-#: ../src/dialogs.py:201
+#: ../src/dialogs.py:202
 msgid "In the group"
 msgstr "U grupi"
 
-#: ../src/dialogs.py:292
+#: ../src/dialogs.py:293
 msgid "KeyID"
 msgstr "ID ključa"
 
-#: ../src/dialogs.py:297
+#: ../src/dialogs.py:298
 msgid "Contact name"
 msgstr "Ime kontakta"
 
-#: ../src/dialogs.py:469
+#: ../src/dialogs.py:470
 msgid "Set Mood"
 msgstr "Postavi Raspoloženje"
 
-#: ../src/dialogs.py:589
+#: ../src/dialogs.py:590
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Statusna Poruka"
 
-#: ../src/dialogs.py:603
+#: ../src/dialogs.py:604
 msgid "Status Message"
 msgstr "Statusna Poruka"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:794
 msgid "Overwrite Status Message?"
 msgstr "Prepiši Statusnu Poruku?"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:795
 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:802
+#: ../src/dialogs.py:803
 msgid "Save as Preset Status Message"
 msgstr "Snimiti kao Unaprijed Postavljenu Statusnu Poruku"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:804
 msgid "Please type a name for this status message"
 msgstr "Molim unesite ime za ovu statusnu poruku"
 
-#: ../src/dialogs.py:831
+#: ../src/dialogs.py:832
 msgid "AIM Address:"
 msgstr "AIM Adresa:"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:833
 msgid "GG Number:"
 msgstr "GG Broj:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:834
 msgid "ICQ Number:"
 msgstr "ICQ Broj:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:835
 msgid "MSN Address:"
 msgstr "MSN Adresa:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:836
 msgid "Yahoo! Address:"
 msgstr "Yahoo! Adresa:"
 
-#: ../src/dialogs.py:872
+#: ../src/dialogs.py:873
 #, 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:875
+#: ../src/dialogs.py:876
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Molim ispunite podatke kontakta kojeg želite dodati"
 
-#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
+#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
+#: ../src/dialogs.py:3464
 msgid "Invalid User ID"
 msgstr "Neispravan Korisnički ID"
 
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1052
 msgid "The user ID must not contain a resource."
 msgstr "ID korisnika ne smije sadržavati resurs."
 
-#: ../src/dialogs.py:1051
+#: ../src/dialogs.py:1057
 msgid "You cannot add yourself to your roster."
 msgstr "Nemoguće dodati samog sebe na vlastitu listu."
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1071
 msgid "Contact already in roster"
 msgstr "Kontakt je već na listi"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1072
 msgid "This contact is already listed in your roster."
 msgstr "Ovaj kontakt je već na vašoj listi kontakata."
 
-#: ../src/dialogs.py:1112
+#: ../src/dialogs.py:1118
 msgid "User ID:"
 msgstr "ID Korisnika:"
 
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1189
 msgid "A GTK+ jabber client"
 msgstr "GTK+ jabber klijent"
 
-#: ../src/dialogs.py:1176
+#: ../src/dialogs.py:1190
 msgid "GTK+ Version:"
 msgstr "GTK+ Verzija:"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1191
 msgid "PyGTK Version:"
 msgstr "PyGTK Verzija:"
 
-#: ../src/dialogs.py:1187
+#: ../src/dialogs.py:1201
 msgid "Current Developers:"
 msgstr "Trenutni Razvojni Programeri:"
 
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1203
 msgid "Past Developers:"
 msgstr "Prošli Razvojni Programeri:"
 
-#: ../src/dialogs.py:1195
+#: ../src/dialogs.py:1209
 msgid "THANKS:"
 msgstr "ZAHVALE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1215
 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:1213
+#: ../src/dialogs.py:1227
 msgid "translator-credits"
 msgstr ""
 "Adrian C. <anrxc@sysphere.org>\n"
@@ -6974,7 +7158,7 @@ msgstr ""
 "Armando V. <synan@rilinux.hr>\n"
 "Vedran M. <rivanvx@gmail.com>"
 
-#: ../src/dialogs.py:1396
+#: ../src/dialogs.py:1410
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6986,100 +7170,100 @@ msgstr ""
 "pravopisa, ili odaberite drugi jezik postavkom odabira speller_language "
 "opcije."
 
-#: ../src/dialogs.py:1935 ../src/dialogs.py:2322
+#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
 msgid "The nickname has not allowed characters."
 msgstr "Nadimak sadrži nedozvoljene znakove."
 
-#: ../src/dialogs.py:2053
+#: ../src/dialogs.py:2069
 #, 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:2056
+#: ../src/dialogs.py:2072
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Zahtjev za pretplatom od %s"
 
-#: ../src/dialogs.py:2131 ../src/gui_interface.py:2672
+#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Već ste u grupnom razgovoru %s"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2153
 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:2178
+#: ../src/dialogs.py:2194
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Pridružiti se Grupnom Razgovoru sa računom %s"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2325
 msgid "Invalid Account"
 msgstr "Neispravan Račun"
 
-#: ../src/dialogs.py:2310
+#: ../src/dialogs.py:2326
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Morate izabrati račun sa kojeg želite ući u sobu."
 
-#: ../src/dialogs.py:2321
+#: ../src/dialogs.py:2337
 msgid "Invalid Nickname"
 msgstr "Neispravan Nadimak"
 
-#: ../src/dialogs.py:2326 ../src/dialogs.py:2332
-#: ../src/groupchat_control.py:1832
+#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
+#: ../src/groupchat_control.py:1847
 msgid "Invalid group chat Jabber ID"
 msgstr "Neispravan Jabber ID grupnog razgovora"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2343
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "Jabber ID grupnog razgovora ima nedozvoljene znakove."
 
-#: ../src/dialogs.py:2333 ../src/groupchat_control.py:1833
+#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Jabber ID grupnog razgovora ima nedozvoljene znakove."
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2356
 msgid "This is not a group chat"
 msgstr "Ovo nije grupni razgovor"
 
-#: ../src/dialogs.py:2341
+#: ../src/dialogs.py:2357
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s nije ime grupnog razgovora."
 
-#: ../src/dialogs.py:2372
+#: ../src/dialogs.py:2388
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bez veze nije moguća sinkronizirati vaše kontakte."
 
-#: ../src/dialogs.py:2386
+#: ../src/dialogs.py:2402
 msgid "Server"
 msgstr "Poslužitelj"
 
-#: ../src/dialogs.py:2421
+#: ../src/dialogs.py:2437
 msgid "This account is not connected to the server"
 msgstr "Ovaj račun nije spojen sa poslužiteljem"
 
-#: ../src/dialogs.py:2422
+#: ../src/dialogs.py:2438
 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:2446
+#: ../src/dialogs.py:2462
 msgid "Synchronise"
 msgstr "Sinkroniziraj"
 
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2523
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Započeti Razgovor sa računom %s"
 
-#: ../src/dialogs.py:2509
+#: ../src/dialogs.py:2525
 msgid "Start Chat"
 msgstr "Započeti Razgovor"
 
-#: ../src/dialogs.py:2510
+#: ../src/dialogs.py:2526
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7088,168 +7272,168 @@ msgstr ""
 "poslati poruku:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2536 ../src/dialogs.py:2917 ../src/dialogs.py:3129
+#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
 msgid "Connection not available"
 msgstr "Veza nije dostupna"
 
-#: ../src/dialogs.py:2537 ../src/dialogs.py:2918 ../src/dialogs.py:3130
+#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Molim potvrdite da ste spojeni na \"%s\"."
 
-#: ../src/dialogs.py:2546 ../src/dialogs.py:2549
+#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
 msgid "Invalid JID"
 msgstr "Neispravan JID"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2565
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nije moguće učitati \"%s\"."
 
-#: ../src/dialogs.py:2558
+#: ../src/dialogs.py:2574
 msgid "Without a connection, you can not change your password."
 msgstr "Bez veze nije moguća promjena lozinke."
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "Invalid password"
 msgstr "Neispravna lozinka"
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "You must enter a password."
 msgstr "Morate unesti lozinku."
 
-#: ../src/dialogs.py:2581
+#: ../src/dialogs.py:2597
 msgid "Passwords do not match"
 msgstr "Lozinke se ne podudaraju"
 
-#: ../src/dialogs.py:2582
+#: ../src/dialogs.py:2598
 msgid "The passwords typed in both fields must be identical."
 msgstr "Lozinke upisane u oba polja moraju biti identične."
 
 #. default value
-#: ../src/dialogs.py:2619 ../src/notify.py:247 ../src/notify.py:473
+#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
 msgid "Contact Signed In"
 msgstr "Kontakt Se Prijavio"
 
-#: ../src/dialogs.py:2621 ../src/notify.py:255 ../src/notify.py:475
+#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
 msgid "Contact Signed Out"
 msgstr "Kontakt Se Odjavio"
 
 #. chat message
-#: ../src/dialogs.py:2623 ../src/notify.py:277 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
 msgid "New Message"
 msgstr "Nova Poruka"
 
 #. single message
-#: ../src/dialogs.py:2623 ../src/notify.py:259 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
 msgid "New Single Message"
 msgstr "Nova Jedna Poruka"
 
 #. private message
-#: ../src/dialogs.py:2624 ../src/notify.py:265 ../src/notify.py:478
+#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
 msgid "New Private Message"
 msgstr "Nova Privatna Poruka"
 
-#: ../src/dialogs.py:2624 ../src/gui_interface.py:1358 ../src/notify.py:487
+#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
 msgid "New E-mail"
 msgstr "Novi E-mail"
 
-#: ../src/dialogs.py:2626 ../src/gui_interface.py:1420 ../src/notify.py:480
+#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
 msgid "File Transfer Request"
 msgstr "Zahtjev Razmjene Datoteka"
 
-#: ../src/dialogs.py:2628 ../src/gui_interface.py:1320
-#: ../src/gui_interface.py:1389 ../src/notify.py:482
+#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
+#: ../src/gui_interface.py:1186 ../src/notify.py:482
 msgid "File Transfer Error"
 msgstr "Greška u Razmjeni Datoteka"
 
-#: ../src/dialogs.py:2630 ../src/gui_interface.py:1466
-#: ../src/gui_interface.py:1489 ../src/gui_interface.py:1506
+#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
+#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
 #: ../src/notify.py:484
 msgid "File Transfer Completed"
 msgstr "Razmjena Datoteka Završena"
 
-#: ../src/dialogs.py:2631 ../src/gui_interface.py:1469 ../src/notify.py:485
+#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
 msgid "File Transfer Stopped"
 msgstr "Razmjena Datoteka Zaustavljena"
 
-#: ../src/dialogs.py:2633 ../src/gui_interface.py:1152 ../src/notify.py:489
+#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
 msgid "Groupchat Invitation"
 msgstr "Poziv na Grupni Razgovor"
 
-#: ../src/dialogs.py:2635 ../src/notify.py:239 ../src/notify.py:491
+#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
 msgid "Contact Changed Status"
 msgstr "Kontakt Promjenio Status"
 
-#: ../src/dialogs.py:2836
+#: ../src/dialogs.py:2852
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Jedna Poruka koristeći račun %s"
 
-#: ../src/dialogs.py:2838
+#: ../src/dialogs.py:2854
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Jedna Poruka u računu %s"
 
-#: ../src/dialogs.py:2840
+#: ../src/dialogs.py:2856
 msgid "Single Message"
 msgstr "Jedna Poruka"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2843
+#: ../src/dialogs.py:2859
 #, python-format
 msgid "Send %s"
 msgstr "Poslati %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:2882
 #, python-format
 msgid "Received %s"
 msgstr "Primljene %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2889
+#: ../src/dialogs.py:2905
 #, 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:2968
+#: ../src/dialogs.py:2984
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:2985
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s piše:\n"
 
-#: ../src/dialogs.py:3028
+#: ../src/dialogs.py:3044
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konzola za %s"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3046
 msgid "XML Console"
 msgstr "XML Konzola"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "add"
 msgstr "Tužan"
 
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "modify"
 msgstr "Uredi"
 
-#: ../src/dialogs.py:3160
+#: ../src/dialogs.py:3176
 #, fuzzy
 msgid "remove"
 msgstr "Uklo_ni"
 
-#: ../src/dialogs.py:3188
+#: ../src/dialogs.py:3204
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7257,156 +7441,190 @@ msgid ""
 msgstr "<b>%s</b> želi da <b>%s</b> neke kontakte na vašoj listi."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3204 ../src/dialogs.py:3250
+#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
 msgid "Add"
 msgstr "Dodaj"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3206 ../src/dialogs.py:3281
+#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
 msgid "Modify"
 msgstr "Uredi"
 
-#: ../src/dialogs.py:3212
+#: ../src/dialogs.py:3228
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3218
+#: ../src/dialogs.py:3234
 msgid "Groups"
 msgstr "Grupe"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3342
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s vas je preporučio za dodavanje na moju listu kontakata."
 
-#: ../src/dialogs.py:3340
+#: ../src/dialogs.py:3356
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "_Dodaj kontakt"
 
-#: ../src/dialogs.py:3377
+#: ../src/dialogs.py:3393
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Uklanja kontakt sa liste"
 
-#: ../src/dialogs.py:3430
+#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#, python-format
+msgid "Archiving Preferences for %s"
+msgstr ""
+
+#: ../src/dialogs.py:3473
+#, fuzzy
+msgid "Invalid expire value"
+msgstr "Neispravno Ime Poslužitelja"
+
+#: ../src/dialogs.py:3474
+msgid "Expire must be a valid positive integer."
+msgstr ""
+
+#: ../src/dialogs.py:3521
+msgid "There is an error with the form"
+msgstr ""
+
+#: ../src/dialogs.py:3732
+#, fuzzy
+msgid "There is an error"
+msgstr "Servis je odgovorio sa greškom."
+
+#: ../src/dialogs.py:3796
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista Privatnosti <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3434
+#: ../src/dialogs.py:3800
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista Privatnosti za %s"
 
-#: ../src/dialogs.py:3490
+#: ../src/dialogs.py:3856
 #, 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:3495
+#: ../src/dialogs.py:3861
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Redosljed: %(order)s, akcija: %(action)s"
 
-#: ../src/dialogs.py:3539
+#: ../src/dialogs.py:3905
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Izmjena pravila</b>"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:4016
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dodaj pravilo</b>"
 
-#: ../src/dialogs.py:3750
+#: ../src/dialogs.py:4116
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Liste Privatnosti za %s"
 
-#: ../src/dialogs.py:3752
+#: ../src/dialogs.py:4118
 msgid "Privacy Lists"
 msgstr "Liste Privatnosti"
 
-#: ../src/dialogs.py:3822
+#: ../src/dialogs.py:4188
 msgid "Invalid List Name"
 msgstr "Neispravno Ime Liste"
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4189
 msgid "You must enter a name to create a privacy list."
 msgstr "Morate unesti ime za stvaranje liste privatnosti."
 
-#: ../src/dialogs.py:3855
+#: ../src/dialogs.py:4221
 msgid "You are invited to a groupchat"
 msgstr "Pozvani ste na grupni razgovor"
 
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4224
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact vas je pozvao da se uključite u raspravu."
 
-#: ../src/dialogs.py:3860
+#: ../src/dialogs.py:4226
 #, 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:3868
+#: ../src/dialogs.py:4234
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentar: %s"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4236
 msgid "Do you want to accept the invitation?"
 msgstr "Želite li prihvatiti poziv?"
 
-#: ../src/dialogs.py:3932
+#: ../src/dialogs.py:4298
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:3942 ../src/dialogs.py:3985 ../src/dialogs.py:4041
+#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
+#: ../src/dialogs.py:4495
 msgid "All files"
 msgstr "Sve datoteke"
 
-#: ../src/dialogs.py:3947
+#: ../src/dialogs.py:4313
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:3975
+#: ../src/dialogs.py:4341
 msgid "Choose Sound"
 msgstr "Odabir Zvuka"
 
-#: ../src/dialogs.py:3990
+#: ../src/dialogs.py:4356
 msgid "Wav Sounds"
 msgstr "Wav Zvuci"
 
-#: ../src/dialogs.py:4028
+#: ../src/dialogs.py:4394
 msgid "Choose Image"
 msgstr "Odabir Slike"
 
-#: ../src/dialogs.py:4046
+#: ../src/dialogs.py:4412
 msgid "Images"
 msgstr "Slike"
 
-#: ../src/dialogs.py:4113
+#: ../src/dialogs.py:4482
+#, fuzzy
+msgid "Choose Archive"
+msgstr "Odabir Slike"
+
+#: ../src/dialogs.py:4500
+#, fuzzy
+msgid "Zip files"
+msgstr "Sve datoteke"
+
+#: ../src/dialogs.py:4525
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kad %s postane:"
 
-#: ../src/dialogs.py:4115
+#: ../src/dialogs.py:4527
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dodavanje Posebne Obavijesti za %s"
 
-#: ../src/dialogs.py:4190
+#: ../src/dialogs.py:4602
 msgid "Condition"
 msgstr "Uvjet"
 
-#: ../src/dialogs.py:4310
+#: ../src/dialogs.py:4722
 msgid "when I am "
 msgstr "kada sam "
 
-#: ../src/dialogs.py:4786
+#: ../src/dialogs.py:5198
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7417,19 +7635,19 @@ msgstr ""
 "\n"
 "Short Authentication String ove sesije je <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4789
+#: ../src/dialogs.py:5201
 msgid "You have already verified this contact's identity."
 msgstr "Već ste potvrdili identitet ovog kontakta."
 
-#: ../src/dialogs.py:4795 ../src/dialogs.py:4879
+#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
 msgid "Contact's identity verified"
 msgstr "Kontaktov identitet potvrđen"
 
-#: ../src/dialogs.py:4801
+#: ../src/dialogs.py:5213
 msgid "Verify again..."
 msgstr "Potvrdi ponovno..."
 
-#: ../src/dialogs.py:4806
+#: ../src/dialogs.py:5218
 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 "
@@ -7439,19 +7657,19 @@ msgstr ""
 "ili slati vama poruke, morate potvrditi njihov identitet klikom na dugme "
 "ispod."
 
-#: ../src/dialogs.py:4809 ../src/dialogs.py:4860 ../src/dialogs.py:4873
+#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktov identitet NIJE potvrđen"
 
-#: ../src/dialogs.py:4814
+#: ../src/dialogs.py:5226
 msgid "Verify..."
 msgstr "Potvrdi..."
 
-#: ../src/dialogs.py:4825
+#: ../src/dialogs.py:5237
 msgid "Have you verified the contact's identity?"
 msgstr "Jeste li potvrdili kontaktov identitet?"
 
-#: ../src/dialogs.py:4826
+#: ../src/dialogs.py:5238
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7466,22 +7684,22 @@ msgstr ""
 "\n"
 "Short Authentication String ove sesije je <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4827
+#: ../src/dialogs.py:5239
 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:4861
+#: ../src/dialogs.py:5273
 #, 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:4867
+#: ../src/dialogs.py:5279
 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:4874
+#: ../src/dialogs.py:5286
 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."
@@ -7490,7 +7708,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:4880
+#: ../src/dialogs.py:5292
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7498,19 +7716,19 @@ msgstr ""
 "GPG ključ je dodijeljen ovom kontaktu, i vi vjerujete njegovom ključu, tako "
 "da će poruke biti kriptirane."
 
-#: ../src/dialogs.py:4945
+#: ../src/dialogs.py:5357
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4947
+#: ../src/dialogs.py:5359
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4949
+#: ../src/dialogs.py:5361
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4953
+#: ../src/dialogs.py:5365
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7526,24 +7744,24 @@ msgstr "Ostali"
 msgid "Conference"
 msgstr "Konferencija"
 
-#: ../src/disco.py:512
+#: ../src/disco.py:513
 msgid "Without a connection, you can not browse available services"
 msgstr "Ukoliko niste spojeni nećete moći pregledati dostupne usluge"
 
-#: ../src/disco.py:589
+#: ../src/disco.py:600
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Otkrivanje Usluga koristeći račun %s"
 
-#: ../src/disco.py:591
+#: ../src/disco.py:602
 msgid "Service Discovery"
 msgstr "Otkrivanje Usluga"
 
-#: ../src/disco.py:741
+#: ../src/disco.py:758
 msgid "The service could not be found"
 msgstr "Usluga nije pronađena"
 
-#: ../src/disco.py:742
+#: ../src/disco.py:759
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7551,95 +7769,95 @@ msgstr ""
 "Na adresi koju ste naveli nema usluge ili odgovora. Provjerite adresu i "
 "pokušajte ponovo."
 
-#: ../src/disco.py:746 ../src/disco.py:1082
+#: ../src/disco.py:763 ../src/disco.py:1100
 msgid "The service is not browsable"
 msgstr "Uslugu nije moguće pretražiti"
 
-#: ../src/disco.py:747
+#: ../src/disco.py:764
 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:786 ../src/disco.py:796
+#: ../src/disco.py:804 ../src/disco.py:814
 msgid "Invalid Server Name"
 msgstr "Neispravno Ime Poslužitelja"
 
-#: ../src/disco.py:850
+#: ../src/disco.py:868
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Pregled %(address)s koristeći račun %(account)s"
 
-#: ../src/disco.py:894
+#: ../src/disco.py:912
 msgid "_Browse"
 msgstr "_Pregled"
 
-#: ../src/disco.py:1083
+#: ../src/disco.py:1101
 msgid "This service does not contain any items to browse."
 msgstr "Ova usluga ne sadrži stvari za pretraživanje"
 
-#: ../src/disco.py:1323
+#: ../src/disco.py:1341
 msgid "_Execute Command"
 msgstr "_Izvrši Naredbu..."
 
-#: ../src/disco.py:1333 ../src/disco.py:1504
+#: ../src/disco.py:1351 ../src/disco.py:1522
 msgid "Re_gister"
 msgstr "Re_gistracija"
 
-#: ../src/disco.py:1545
+#: ../src/disco.py:1563
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skeniranje %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1736
+#: ../src/disco.py:1754
 msgid "Users"
 msgstr "Korisnici"
 
 #. Description column
-#: ../src/disco.py:1744
+#: ../src/disco.py:1762
 msgid "Description"
 msgstr "Opis"
 
 #. Id column
-#: ../src/disco.py:1752
+#: ../src/disco.py:1770
 msgid "Id"
 msgstr "Identifikacija"
 
-#: ../src/disco.py:1817 ../src/gui_interface.py:3182
+#: ../src/disco.py:1835 ../src/gui_interface.py:2995
 msgid "Bookmark already set"
 msgstr "Knjižna oznaka je već postavljena"
 
-#: ../src/disco.py:1818 ../src/gui_interface.py:3183
+#: ../src/disco.py:1836 ../src/gui_interface.py:2996
 #, 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:1827 ../src/gui_interface.py:3197
+#: ../src/disco.py:1845 ../src/gui_interface.py:3010
 msgid "Bookmark has been added successfully"
 msgstr "Knjižna oznaka je bez uspješno dodana"
 
-#: ../src/disco.py:1828 ../src/gui_interface.py:3198
+#: ../src/disco.py:1846 ../src/gui_interface.py:3011
 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:2039
+#: ../src/disco.py:2057
 msgid "Subscribed"
 msgstr "Pretplaćeno"
 
-#: ../src/disco.py:2047
+#: ../src/disco.py:2065
 msgid "Node"
 msgstr "ÄŒvor"
 
-#: ../src/disco.py:2111
+#: ../src/disco.py:2129
 msgid "New post"
 msgstr "Nova objava"
 
-#: ../src/disco.py:2117
+#: ../src/disco.py:2135
 msgid "_Subscribe"
 msgstr "_Pretplatiti se"
 
-#: ../src/disco.py:2123
+#: ../src/disco.py:2141
 msgid "_Unsubscribe"
 msgstr "_Ukinuti pretplatu"
 
@@ -7813,17 +8031,19 @@ msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Pretvara LaTeX izraze između $$ $$ znakova."
 
 #: ../src/features_window.py:95
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
-"in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 "Potrebni su texlive-latex-base i dvipng. Morate postaviti 'use_latex' na "
 "Aktivno u Naprednom Uređivaču Postavki."
 
 #: ../src/features_window.py:96
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
+"You have to set 'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 "Potrebni su texlive-latex-base i dvipng (Sve je u MixTeX). Morate postaviti "
 "'use_latex' na Aktivno u Naprednom Uređivaču Postavki."
@@ -7980,33 +8200,33 @@ msgstr "Opis: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s vam želi poslati datoteku:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Nije moguće prepisati postojeću datoteku \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
 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:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 msgid "This file already exists"
 msgstr "Ova datoteka već postoji"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 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:369 ../src/gtkgui_helpers.py:914
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "U direktorij \"%s\" nije moguće zapisivati"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
 msgid "You do not have permission to create files in this directory."
 msgstr "Nemate ovlasti stvarati datoteke u ovom direktoriju"
 
@@ -8109,28 +8329,28 @@ msgstr ""
 "Trenutno je već pokrenuta jedna instanca Gajima\n"
 "Svejedno pokrenuti?"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
 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:80
+#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
 msgid "command"
 msgstr "naredba"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "prikaži pomoć za komandu"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Prikazuje ili skriva prozor liste"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Prikazuje prozor sa sljedećim događajem na čekanju"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8138,6 +8358,13 @@ msgstr ""
 "Ispisuje listu svih kontakata na listi. Svaki kontakt pojavljuje se u "
 "odvojenoj liniji"
 
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
+#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
+#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
+#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
 #: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
 #: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
 #: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
@@ -8149,43 +8376,35 @@ msgstr ""
 msgid "account"
 msgstr "račun"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "prikaži samo kontakte ovog računa"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Ispisuje listu registriranih računa"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
 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:109
+#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106
 #, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"accoun't previous status"
+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:110 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
-msgid "message"
-msgstr "poruka"
-
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "statusna poruka"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8194,43 +8413,20 @@ msgstr ""
 "statusa svih računa koji imaju podešenu opciju \"sinkronizacija sa globalnim "
 "statusom\""
 
-#: ../src/gajim-remote.py:117
-msgid "Changes the priority of account or accounts"
-msgstr "Mjenja status jednog ili više računa"
-
-#: ../src/gajim-remote.py:119
-msgid "priority"
-msgstr "prioritet"
-
-#: ../src/gajim-remote.py:119
-msgid "priority you want to give to the account"
-msgstr "prioritet koji želite dodjeliti računu"
-
-#: ../src/gajim-remote.py:121
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-msgstr ""
-"izmjena prioriteta danog računa. Ako nije određeno, promjena statusa svih "
-"računa koji imaju postavljenu opciju \"sinkronizacija sa globalnim statusom\""
-
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
 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:129
+#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID kontakta sa kojim želite razgovarati"
 
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
 #: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 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:134
-msgid "message content. The account must be specified or \"\""
-msgstr "sadržaj poruke. Korisnički račun mora biti naveden ili \"\""
-
-#: ../src/gajim-remote.py:139
+#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
 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 "
@@ -8240,29 +8436,34 @@ msgstr ""
 "Ako želite postaviti samo 'račun', bez 'OpenPGP ključa', samo postavite "
 "'OpenPGP ključ' kao ''."
 
+#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
 #: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID kontakta koji će primiti poruku"
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
+#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "sadržaj poruke"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "pgp ključ"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 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:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
+#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
 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:152
+#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
 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 "
@@ -8272,140 +8473,280 @@ msgstr ""
 "želite postaviti samo 'račun', bez 'OpenPGP ključa', postavite 'OpenPGP "
 "ključ' kao ''."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "tema"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "tema poruke"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Å alje novu poruku grupnom razgovoru kojem ste pristupili."
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "JID sobe koja će primiti poruku"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Daje detaljne informacije o kontaktu"
 
+#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
+#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
 #: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
 #: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID kontakta"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Daje detaljne informacije o računu"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Ime računa"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Å alje datoteku kontaktu"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "file"
 msgstr "datoteka"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Putanja datoteke"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
 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:196
+#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Prikatuje sve postavke i njihove vrijednosti"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Postavlja vrijednost 'ključa' na 'vrijednost'."
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "ključ=vrijednost"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 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:207
-msgid "Deletes a preference item"
-msgstr "Briše element postavke"
+#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
+msgid "Deletes a preference item"
+msgstr "Briše element postavke"
+
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "key"
+msgstr "ključ"
+
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "name of the preference to be deleted"
+msgstr "ime postavke koja će se brisati"
+
+#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+msgid "Writes the current state of Gajim preferences to the .config file"
+msgstr "Zapisuje trenutno stanje Gajim postavku u .config datoteku"
+
+#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
+msgid "Removes contact from roster"
+msgstr "Uklanja kontakt sa liste"
+
+#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+msgid "Adds contact to roster"
+msgstr "Dodaje kontakt na listu"
+
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+msgid "Adds new contact to this account"
+msgstr "Dodaje novi kontakt ovom računu"
+
+#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+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-plugin.py:226
+#, fuzzy
+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-plugin.py:233 ../src/gajim-remote.py:249
+msgid "Returns number of unread messages"
+msgstr "Vraća broj nepročitanih poruka"
+
+#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+msgid "Opens 'Start Chat' dialog"
+msgstr "Otvaranje dialoga 'Započeti Razgovor'"
+
+#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+msgid "Starts chat, using this account"
+msgstr "Započinje razgovor, koristeći ovaj račun"
+
+#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+msgid "Sends custom XML"
+msgstr "Šalje korisnički XML"
+
+#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+msgid "XML to send"
+msgstr "XML za slanje"
+
+#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+"Račun u kojem će xml biti poslan; ako nije specificirano, xml će biti poslan "
+"na sve račune"
+
+#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
+msgid "Handle a xmpp:/ uri"
+msgstr "Rukuj xmpp:/ adresama"
+
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
+msgid "uri"
+msgstr "uri"
+
+#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+msgid "Join a MUC room"
+msgstr "Pridruživanje Novoj Sobi"
+
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+msgid "room"
+msgstr "soba"
+
+#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+msgid "nick"
+msgstr "nadimak"
+
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+msgid "password"
+msgstr "lozinka"
+
+#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+msgid "Check if Gajim is running"
+msgstr "Provjerite da li je Gajim pokrenut"
+
+#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
+#: ../src/gajim-remote.py:300
+msgid "Shows or hides the ipython window"
+msgstr "Prikazuje ili skriva ipython prozor"
+
+#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+msgid "Missing argument \"contact_jid\""
+msgstr "Nedostaje argument \"contact_jid\""
+
+#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#, python-format
+msgid ""
+"'%s' is not in your roster.\n"
+"Please specify account for sending the message."
+msgstr ""
+"'%s' nije na vašoj listi.\n"
+"Molim odredite račun za slanje poruke."
+
+#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+msgid "You have no active account"
+msgstr "nemate aktivnih računa"
 
-#: ../src/gajim-remote.py:209
-msgid "key"
-msgstr "ključ"
+#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+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:209
-msgid "name of the preference to be deleted"
-msgstr "ime postavke koja će se brisati"
+#: ../src/gajim-remote-plugin.py:412
+#, python-format
+msgid ""
+"Usage: %s %s %s \n"
+"\t %s"
+msgstr ""
+"Korištenje: %s %s %s \n"
+"\t %s"
 
-#: ../src/gajim-remote.py:213
-msgid "Writes the current state of Gajim preferences to the .config file"
-msgstr "Zapisuje trenutno stanje Gajim postavku u .config datoteku"
+#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+msgid "Arguments:"
+msgstr "Argumenti:"
 
-#: ../src/gajim-remote.py:218
-msgid "Removes contact from roster"
-msgstr "Uklanja kontakt sa liste"
+#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#, python-format
+msgid "%s not found"
+msgstr "%s nije pronađen"
 
-#: ../src/gajim-remote.py:227
-msgid "Adds contact to roster"
-msgstr "Dodaje kontakt na listu"
+#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
+#, python-format
+msgid ""
+"Usage: %s command [arguments]\n"
+"Command is one of:\n"
+msgstr ""
+"Uporaba: %s naredba [argumenti]\n"
+"Naredba je jedna od:\n"
 
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "jid"
+#: ../src/gajim-remote-plugin.py:496
+#, fuzzy, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Previše argumenata. \n"
+"Unesite \"%(basename)s help %(command)s\" za više informacija"
 
-#: ../src/gajim-remote.py:230
-msgid "Adds new contact to this account"
-msgstr "Dodaje novi kontakt ovom računu"
+#: ../src/gajim-remote-plugin.py:500
+#, fuzzy, python-format
+msgid ""
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Argument \"%(arg)s\" nije određen. \n"
+"Unesite \"%(basename)s help %(command)s\" za više informacija"
 
-#: ../src/gajim-remote.py:235
-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-plugin.py:518 ../src/gajim-remote.py:540
+msgid "Wrong uri"
+msgstr "Krivi uri"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:109
+#, fuzzy
 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)"
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
+msgstr ""
+"jedno od: odspojen, povezan, razgovor, odsutan, produženo nedostupan, ne "
+"uznemiravaj, nevidljiv"
 
-#: ../src/gajim-remote.py:249
-msgid "Returns number of unread messages"
-msgstr "Vraća broj nepročitanih poruka"
+#: ../src/gajim-remote.py:117
+msgid "Changes the priority of account or accounts"
+msgstr "Mjenja status jednog ili više računa"
 
-#: ../src/gajim-remote.py:253
-msgid "Opens 'Start Chat' dialog"
-msgstr "Otvaranje dialoga 'Započeti Razgovor'"
+#: ../src/gajim-remote.py:119
+msgid "priority"
+msgstr "prioritet"
 
-#: ../src/gajim-remote.py:255
-msgid "Starts chat, using this account"
-msgstr "Započinje razgovor, koristeći ovaj račun"
+#: ../src/gajim-remote.py:119
+msgid "priority you want to give to the account"
+msgstr "prioritet koji želite dodjeliti računu"
 
-#: ../src/gajim-remote.py:259
-msgid "Sends custom XML"
-msgstr "Šalje korisnički XML"
+#: ../src/gajim-remote.py:121
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"izmjena prioriteta danog računa. Ako nije određeno, promjena statusa svih "
+"računa koji imaju postavljenu opciju \"sinkronizacija sa globalnim statusom\""
 
-#: ../src/gajim-remote.py:261
-msgid "XML to send"
-msgstr "XML za slanje"
+#: ../src/gajim-remote.py:134
+msgid "message content. The account must be specified or \"\""
+msgstr "sadržaj poruke. Korisnički račun mora biti naveden ili \"\""
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:242
 msgid ""
-"Account in which the xml will be sent; if not specified, xml will be sent to "
-"all accounts"
-msgstr ""
-"Račun u kojem će xml biti poslan; ako nije specificirano, xml će biti poslan "
-"na sve račune"
+"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:268
 #, fuzzy
@@ -8426,14 +8767,6 @@ msgstr ""
 "Račun u kojem će xml biti poslan; ako nije specificirano, xml će biti poslan "
 "na sve račune"
 
-#: ../src/gajim-remote.py:277
-msgid "Handle a xmpp:/ uri"
-msgstr "Rukuj xmpp:/ adresama"
-
-#: ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "uri"
-
 #: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr "URI za obraditi"
@@ -8446,30 +8779,14 @@ msgstr "Račun sa kojim želite obraditi"
 msgid "Message content"
 msgstr "Sadržaj poruke"
 
-#: ../src/gajim-remote.py:286
-msgid "Join a MUC room"
-msgstr "Pridruživanje Novoj Sobi"
-
-#: ../src/gajim-remote.py:288
-msgid "room"
-msgstr "soba"
-
 #: ../src/gajim-remote.py:288
 msgid "Room JID"
 msgstr "JID Sobe"
 
-#: ../src/gajim-remote.py:289
-msgid "nick"
-msgstr "nadimak"
-
 #: ../src/gajim-remote.py:289
 msgid "Nickname to use"
 msgstr "Nadimak koji će se koristiti"
 
-#: ../src/gajim-remote.py:290
-msgid "password"
-msgstr "lozinka"
-
 #: ../src/gajim-remote.py:290
 msgid "Password to enter the room"
 msgstr "Lozinka za ulaz u sobu"
@@ -8478,35 +8795,6 @@ msgstr "Lozinka za ulaz u sobu"
 msgid "Account from which you want to enter the room"
 msgstr "Račun sa kojeg želite ući u sobu"
 
-#: ../src/gajim-remote.py:296
-msgid "Check if Gajim is running"
-msgstr "Provjerite da li je Gajim pokrenut"
-
-#: ../src/gajim-remote.py:300
-msgid "Shows or hides the ipython window"
-msgstr "Prikazuje ili skriva ipython prozor"
-
-#: ../src/gajim-remote.py:327
-msgid "Missing argument \"contact_jid\""
-msgstr "Nedostaje argument \"contact_jid\""
-
-#: ../src/gajim-remote.py:348
-#, python-format
-msgid ""
-"'%s' is not in your roster.\n"
-"Please specify account for sending the message."
-msgstr ""
-"'%s' nije na vašoj listi.\n"
-"Molim odredite račun za slanje poruke."
-
-#: ../src/gajim-remote.py:351
-msgid "You have no active account"
-msgstr "nemate aktivnih računa"
-
-#: ../src/gajim-remote.py:404
-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:431
 #, python-format
 msgid ""
@@ -8516,24 +8804,6 @@ msgstr ""
 "Uporaba: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:435
-msgid "Arguments:"
-msgstr "Argumenti:"
-
-#: ../src/gajim-remote.py:439
-#, python-format
-msgid "%s not found"
-msgstr "%s nije pronađen"
-
-#: ../src/gajim-remote.py:445
-#, python-format
-msgid ""
-"Usage: %s command [arguments]\n"
-"Command is one of:\n"
-msgstr ""
-"Uporaba: %s naredba [argumenti]\n"
-"Naredba je jedna od:\n"
-
 #: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
@@ -8556,10 +8826,6 @@ msgstr ""
 msgid "No uri given"
 msgstr ""
 
-#: ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Krivi uri"
-
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Tema"
@@ -8585,180 +8851,178 @@ msgstr "Ne možete izbrisati svoju trenutnu temu"
 msgid "Please first choose another for your current theme."
 msgstr "Molim prvo odaberite neku drugu temu za trenutnu."
 
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:170
 msgid "Sending private message failed"
 msgstr "Slanje privatne poruke neuspješno"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:171
+#: ../src/groupchat_control.py:172
 #, 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:455
 msgid "Insert Nickname"
 msgstr "Umetni _Nadimak"
 
-#: ../src/groupchat_control.py:631
+#: ../src/groupchat_control.py:636
 msgid "Conversation with "
 msgstr "Razgovor sa"
 
-#: ../src/groupchat_control.py:633
+#: ../src/groupchat_control.py:638
 msgid "Continued conversation"
 msgstr "Nastavljeni razgovor"
 
-#. Can be a message (see handle_event_gc_config_change in
-#. gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1272 ../src/gui_interface.py:1080
+#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Svakom sudioniku je sada dopušteno da vidi vaš puni JID"
 
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1286
 msgid "Room logging is enabled"
 msgstr "Zapisivanje razgovora u sobi je omogućeno"
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1288
 msgid "A new room has been created"
 msgstr "Nova soba je stvorena"
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1291
 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:1287
+#: ../src/groupchat_control.py:1297
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s je izbačen: %(reason)s"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1300
 #, 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:1300
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s ima zabranjen pristup: %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1312
 #, 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:1314 ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
 #, python-format
 msgid "You are now known as %s"
 msgstr "Od sada ste poznati kao %s"
 
-#: ../src/groupchat_control.py:1330 ../src/gui_interface.py:919
+#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s je od sada poznat kao %(new_nick)s"
 
-#: ../src/groupchat_control.py:1372 ../src/groupchat_control.py:1377
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1392
 #, 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:1374
+#: ../src/groupchat_control.py:1383
 msgid "affiliation changed"
 msgstr "pripadnost promjenjena"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1388
 msgid "room configuration changed to members-only"
 msgstr "konfiguracija sobe promjenjena na members-only"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1394
 msgid "system shutdown"
 msgstr "zaustavljanje sustava"
 
-#: ../src/groupchat_control.py:1470
+#: ../src/groupchat_control.py:1477
 #, 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:1474
+#: ../src/groupchat_control.py:1481
 #, 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:1489
+#: ../src/groupchat_control.py:1496
 #, 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:1493
+#: ../src/groupchat_control.py:1500
 #, 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:1522
+#: ../src/groupchat_control.py:1530
 #, python-format
 msgid "%s has left"
 msgstr "%s je napustio"
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1535
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s se pridružio grupnom razgovoru"
 
-#: ../src/groupchat_control.py:1529 ../src/gui_interface.py:946
+#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
 #: ../src/history_window.py:447 ../src/notify.py:234
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s je trenutno %(status)s"
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1774
 #, 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:1761
+#: ../src/groupchat_control.py:1776
 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:1765 ../src/gui_interface.py:1216
-#: ../src/gui_interface.py:1992 ../src/gui_interface.py:2029
-#: ../src/gui_interface.py:2064 ../src/message_window.py:224
-#: ../src/roster_window.py:2739 ../src/roster_window.py:3399
-#: ../src/roster_window.py:4123
+#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
+#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
+#: ../src/gui_interface.py:1853 ../src/message_window.py:224
+#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
+#: ../src/roster_window.py:4195
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Ne pitaj me više"
 
-#: ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:1814
 msgid "Changing Subject"
 msgstr "Mijenjanje Teme"
 
-#: ../src/groupchat_control.py:1800
+#: ../src/groupchat_control.py:1815
 msgid "Please specify the new subject:"
 msgstr "Molim specificirajte novu temu:"
 
-#: ../src/groupchat_control.py:1807
+#: ../src/groupchat_control.py:1822
 msgid "Changing Nickname"
 msgstr "Mijenjam Nadimak"
 
-#: ../src/groupchat_control.py:1808
+#: ../src/groupchat_control.py:1823
 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:1839
+#: ../src/groupchat_control.py:1854
 #, python-format
 msgid "Destroying %s"
 msgstr "Uništavam %s"
 
-#: ../src/groupchat_control.py:1840
+#: ../src/groupchat_control.py:1855
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8766,22 +9030,22 @@ msgstr ""
 "Definitivno će te uništiti ovu sobu.\n"
 "Ispod možete navesti razlog:"
 
-#: ../src/groupchat_control.py:1842
+#: ../src/groupchat_control.py:1857
 msgid "You may also enter an alternate venue:"
 msgstr "Također možete unjeti alternativno mjesto sastanka:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2028
+#: ../src/groupchat_control.py:2046
 #, python-format
 msgid "Kicking %s"
 msgstr "Izbacujem %s"
 
-#: ../src/groupchat_control.py:2029 ../src/groupchat_control.py:2356
+#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
 msgid "You may specify a reason below:"
 msgstr "Možete specificirati razlog ispod:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2355
+#: ../src/groupchat_control.py:2373
 #, python-format
 msgid "Banning %s"
 msgstr "Zabranjujem pristup %s"
@@ -8806,54 +9070,63 @@ msgid "Details"
 msgstr "Detalji"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
+#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Greška: nije moguće otvoriti %s za čitanje"
 
-#: ../src/gtkgui_helpers.py:400
+#: ../src/gtkgui_helpers.py:404
 msgid "Error reading file:"
 msgstr "Greška pri čitanju datoteke:"
 
-#: ../src/gtkgui_helpers.py:403
+#: ../src/gtkgui_helpers.py:407
 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:444
+#: ../src/gtkgui_helpers.py:448
 #, 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:818
+#: ../src/gtkgui_helpers.py:822
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim nije zadani Jabber klijent"
 
-#: ../src/gtkgui_helpers.py:819
+#: ../src/gtkgui_helpers.py:823
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Želite li postaviti Gajim za zadani Jabber klijent?"
 
-#: ../src/gtkgui_helpers.py:820
+#: ../src/gtkgui_helpers.py:824
 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:887
+#: ../src/gtkgui_helpers.py:891
 msgid "Extension not supported"
 msgstr "Produžetak nije podržan"
 
-#: ../src/gtkgui_helpers.py:888
+#: ../src/gtkgui_helpers.py:892
 #, 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:924
+#: ../src/gtkgui_helpers.py:928
 msgid "Save Image as..."
 msgstr "Snimiti Sliku kao..."
 
-#: ../src/gui_interface.py:140
+#. we are banned
+#. group chat does not exist
+#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
+#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
+#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
+#: ../src/gui_interface.py:348
+msgid "Unable to join group chat"
+msgstr "Nije moguće pridružiti se grupnom razgovoru"
+
+#: ../src/gui_interface.py:138
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8864,58 +9137,93 @@ msgstr ""
 "registriran od strane drugog učesnika.\n"
 "Molimo unesite drugi nadimak ispod:"
 
-#: ../src/gui_interface.py:143
+#: ../src/gui_interface.py:141
 msgid "Always use this nickname when there is a conflict"
 msgstr "U slučaju konflikta uvijek koristi ovaj nadimak"
 
-#: ../src/gui_interface.py:159
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Prihvaćate li ovaj zahtjev?"
 
-#: ../src/gui_interface.py:161
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Prihvaćate li ovaj zahtjev na računu %s?"
 
-#: ../src/gui_interface.py:164
+#: ../src/gui_interface.py:163
 #, 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/gui_interface.py:213 ../src/notify.py:493
+#: ../src/gui_interface.py:209 ../src/notify.py:493
 msgid "Connection Failed"
 msgstr "Veza Prekinuta"
 
-#: ../src/gui_interface.py:606 ../src/gui_interface.py:610
+#: ../src/gui_interface.py:312
+#, 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/gui_interface.py:324
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr "Maksimalan broj korisnika za %s je dosegnut"
+
+#: ../src/gui_interface.py:333
+#, python-format
+msgid "You are banned from group chat %s."
+msgstr "Zabranjen vam je pristup grupnom razgovoru %s."
+
+#: ../src/gui_interface.py:338
+#, python-format
+msgid "Group chat %s does not exist."
+msgstr "Grupni razgovor %s ne postoji."
+
+#: ../src/gui_interface.py:341
+msgid "Group chat creation is restricted."
+msgstr "Stvaranje grupnih razgovora je ograničeno."
+
+#: ../src/gui_interface.py:344
+#, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Morate koristiti vaš registrirani nadimak u grupnom razgovoru %s."
+
+#: ../src/gui_interface.py:349
+#, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Niste u listi članova grupnog razgovora %s."
+
+#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Greška %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:621 ../src/gui_interface.py:636
+#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "greška prilikom slanja %(message)s ( %(error)s )"
 
-#: ../src/gui_interface.py:663 ../src/notify.py:495
+#: ../src/gui_interface.py:540 ../src/notify.py:495
 msgid "Subscription request"
 msgstr "Zahtjev za pretplatom"
 
-#: ../src/gui_interface.py:688
+#: ../src/gui_interface.py:565
 msgid "Authorization accepted"
 msgstr "Autorizacija prihvaćena"
 
-#: ../src/gui_interface.py:689
+#: ../src/gui_interface.py:566
 #, 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/gui_interface.py:702
+#: ../src/gui_interface.py:579
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontankt \"%s\" je uklonio pretplatu od vas"
 
-#: ../src/gui_interface.py:703
+#: ../src/gui_interface.py:580
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8923,60 +9231,54 @@ msgstr ""
 "Uvijek ćete vidjeti njega ili nju kao odspojenu.\n"
 "Želite li ukloniti njega ili nju sa vaše liste kontakata?"
 
-#: ../src/gui_interface.py:727 ../src/notify.py:497
+#: ../src/gui_interface.py:604 ../src/notify.py:497
 msgid "Unsubscribed"
 msgstr "Pretplata uklonjena"
 
-#: ../src/gui_interface.py:754
+#: ../src/gui_interface.py:631
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt sa \"%s\" ne može biti uspostavljen"
 
-#: ../src/gui_interface.py:1015
+#: ../src/gui_interface.py:859
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s je postavio temu na %(subject)s"
 
-#: ../src/gui_interface.py:1083
+#: ../src/gui_interface.py:926
 msgid "Room now shows unavailable member"
 msgstr "Soba od sada prikazuje nedostupne članove"
 
-#: ../src/gui_interface.py:1085
+#: ../src/gui_interface.py:928
 msgid "room now does not show unavailable members"
 msgstr "Soba od sada ne prikazuje nedostupne članove"
 
-#: ../src/gui_interface.py:1087
+#: ../src/gui_interface.py:930
 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/gui_interface.py:1091
+#: ../src/gui_interface.py:934
 msgid "Room logging is now enabled"
 msgstr "Zapisivanje razgovora u sobi je sada omogućeno"
 
-#: ../src/gui_interface.py:1093
+#: ../src/gui_interface.py:936
 msgid "Room logging is now disabled"
 msgstr "Zapisivanje razgovora u sobi je sada onemogućeno"
 
-#: ../src/gui_interface.py:1095
+#: ../src/gui_interface.py:938
 msgid "Room is now non-anonymous"
 msgstr "Soba je sada non-anonymous"
 
-#: ../src/gui_interface.py:1098
+#: ../src/gui_interface.py:941
 msgid "Room is now semi-anonymous"
 msgstr "Soba je sada semi-anonymous"
 
-#: ../src/gui_interface.py:1101
+#: ../src/gui_interface.py:944
 msgid "Room is now fully-anonymous"
 msgstr "Soba je sada fully-anonymous"
 
-#: ../src/gui_interface.py:1133
-#, 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/gui_interface.py:1180
+#: ../src/gui_interface.py:985
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -8984,23 +9286,23 @@ msgstr ""
 "Postavili ste Gajim da koristi GPG agent, ali GPG agent nije pokrenut ili je "
 "odgovorio sa krivom lozinkom.\n"
 
-#: ../src/gui_interface.py:1182 ../src/gui_interface.py:1189
+#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Trenutno ste spojeni bez OpenPGP ključa."
 
-#: ../src/gui_interface.py:1184
+#: ../src/gui_interface.py:989
 msgid "Your passphrase is incorrect"
 msgstr "Vaša lozinka nije točna"
 
-#: ../src/gui_interface.py:1188
+#: ../src/gui_interface.py:993
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Netočna OpenGPG Lozinka"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid "GPG key not trusted"
 msgstr "GPG nije pouzdan"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
@@ -9008,7 +9310,7 @@ msgstr ""
 "GPG ključ koji se koristi za kriptiranje ovog razgovora nije pouzdan. Zaista "
 "želite kriptirati ovu poruku?"
 
-#: ../src/gui_interface.py:1226
+#: ../src/gui_interface.py:1031
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not                 correctly started "
@@ -9017,12 +9319,12 @@ msgstr ""
 "Gnome Keyring je instaliran, ali nije \t\t\t\tispravno pokrenut (vjerojatno "
 "varijabla okruženja nije \t\t\t\tispravno postavljena)"
 
-#: ../src/gui_interface.py:1330
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Novi E-mail na %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1332
+#: ../src/gui_interface.py:1133
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -9030,7 +9332,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/gui_interface.py:1345
+#: ../src/gui_interface.py:1146
 #, python-format
 msgid ""
 "\n"
@@ -9045,42 +9347,42 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1418
+#: ../src/gui_interface.py:1215
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vam želi poslati datoteku."
 
-#: ../src/gui_interface.py:1455 ../src/roster_window.py:1856
+#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
 msgid "Remote contact stopped transfer"
 msgstr "Druga strana je prekinula prijenos"
 
-#: ../src/gui_interface.py:1458 ../src/roster_window.py:1858
+#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
 msgid "Error opening file"
 msgstr "Greška pri čitanju datoteke"
 
-#: ../src/gui_interface.py:1490
+#: ../src/gui_interface.py:1287
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Uspješno ste primili %(filename)s od %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1494
+#: ../src/gui_interface.py:1291
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Prijenos %(filename)s od %(name)s je zaustavljen."
 
-#: ../src/gui_interface.py:1507
+#: ../src/gui_interface.py:1304
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Uspješno ste poslali %(filename)s %(name)s"
 
 #. ft stopped
-#: ../src/gui_interface.py:1511
+#: ../src/gui_interface.py:1308
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Prijenos %(filename)s %(name)s je zaustavljen. "
 
-#: ../src/gui_interface.py:1623
+#: ../src/gui_interface.py:1426
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -9089,57 +9391,57 @@ msgstr ""
 "Nemoguće dekriptirati poruke od %s\n"
 "Možda ih je netko izmjenio."
 
-#: ../src/gui_interface.py:1630
+#: ../src/gui_interface.py:1433
 msgid "Unable to decrypt message"
 msgstr "Nemoguće dekriptirati poruku"
 
-#: ../src/gui_interface.py:1702
+#: ../src/gui_interface.py:1505
 msgid "Username Conflict"
 msgstr "Konflikt korisničkog imena"
 
-#: ../src/gui_interface.py:1703
+#: ../src/gui_interface.py:1506
 msgid "Please type a new username for your local account"
 msgstr "Molim unesite novo korisničko ime za vaš lokalni račun"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1519
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gui_interface.py:1729
+#: ../src/gui_interface.py:1532
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gui_interface.py:1740
+#: ../src/gui_interface.py:1543
 msgid "Error."
 msgstr "Greška."
 
-#: ../src/gui_interface.py:1768
+#: ../src/gui_interface.py:1556
 msgid "Resource Conflict"
 msgstr "Konflikt Resursa"
 
-#: ../src/gui_interface.py:1769
+#: ../src/gui_interface.py:1557
 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."
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1816
+#: ../src/gui_interface.py:1604
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s vam želi poslati datoteku."
 
-#: ../src/gui_interface.py:1819
+#: ../src/gui_interface.py:1607
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Zahtjev Razmjene Datoteka"
 
-#: ../src/gui_interface.py:1927
+#: ../src/gui_interface.py:1716
 msgid "Error verifying SSL certificate"
 msgstr "Greška kod ovjere SSL certifikata"
 
-#: ../src/gui_interface.py:1928
+#: ../src/gui_interface.py:1717
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9150,15 +9452,15 @@ msgstr ""
 "%(error)s\n"
 "Još uvijek se želite povezati na ovaj poslužitelj?"
 
-#: ../src/gui_interface.py:1936
+#: ../src/gui_interface.py:1725
 msgid "Ignore this error for this certificate."
 msgstr "Ignoriraj ovu grešku za ovaj certifikat."
 
-#: ../src/gui_interface.py:1956
+#: ../src/gui_interface.py:1745
 msgid "SSL certificate error"
 msgstr "Greška SSL certifikata"
 
-#: ../src/gui_interface.py:1957
+#: ../src/gui_interface.py:1746
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9175,12 +9477,12 @@ msgstr ""
 "\n"
 "Još uvijek se želite povezati i korigirati otisak certifikata?"
 
-#: ../src/gui_interface.py:1987 ../src/gui_interface.py:2024
-#: ../src/gui_interface.py:2060
+#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
+#: ../src/gui_interface.py:1849
 msgid "Insecure connection"
 msgstr "Nesigurna Veza"
 
-#: ../src/gui_interface.py:1988
+#: ../src/gui_interface.py:1777
 #, fuzzy
 msgid ""
 "You are about to connect to the server with an insecure connection. This "
@@ -9190,12 +9492,12 @@ msgstr ""
 "Spremate se poslati vašu lozinku preko nesigurne veze. Trebali bi "
 "instalirati PyOpenSSL da bi to izbjegli. Sigurni ste da želite nastaviti?"
 
-#: ../src/gui_interface.py:1991 ../src/gui_interface.py:2028
-#: ../src/gui_interface.py:2063
+#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
+#: ../src/gui_interface.py:1852
 msgid "Yes, I really want to connect insecurely"
 msgstr "Da, stvarno želim nesigurno povezivanje"
 
-#: ../src/gui_interface.py:2025
+#: ../src/gui_interface.py:1814
 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?"
@@ -9203,7 +9505,7 @@ msgstr ""
 "Spremate se poslati vašu lozinku preko nesigurne veze. Trebali bi "
 "instalirati PyOpenSSL da bi to izbjegli. Sigurni ste da želite nastaviti?"
 
-#: ../src/gui_interface.py:2061
+#: ../src/gui_interface.py:1850
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9213,17 +9515,17 @@ msgstr ""
 "da želite nastaviti?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2624 ../src/gui_interface.py:2647
+#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
 msgid "Emoticons disabled"
 msgstr "Emotikoni onemogućeni"
 
-#: ../src/gui_interface.py:2625
+#: ../src/gui_interface.py:2423
 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/gui_interface.py:2648
+#: ../src/gui_interface.py:2446
 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 "
@@ -9233,40 +9535,40 @@ msgstr ""
 "format emoticons.py datoteke. Pogledajte http://trac.gajim.org/wiki/"
 "Emoticons za više detalja."
 
-#: ../src/gui_interface.py:2679 ../src/roster_window.py:3560
+#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
 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/gui_interface.py:3058
+#: ../src/gui_interface.py:2871
 msgid "Could not save your settings and preferences"
 msgstr "Nije moguće spremanje vaših postavki"
 
-#: ../src/gui_interface.py:3592
+#: ../src/gui_interface.py:3411
 msgid "Passphrase Required"
 msgstr "Potrebna Lozinka"
 
-#: ../src/gui_interface.py:3593
+#: ../src/gui_interface.py:3412
 #, 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/gui_interface.py:3607
+#: ../src/gui_interface.py:3426
 msgid "GPG key expired"
 msgstr "GPG ključ istekao"
 
-#: ../src/gui_interface.py:3608
+#: ../src/gui_interface.py:3427
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Vaš GPG ključ je istekao, biti će te spojeni na %s bez OpenPGP-a."
 
 #. ask again
-#: ../src/gui_interface.py:3617
+#: ../src/gui_interface.py:3436
 msgid "Wrong Passphrase"
 msgstr "Kriva Lozinka"
 
-#: ../src/gui_interface.py:3618
+#: ../src/gui_interface.py:3437
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Molim ponovo utipkajte svoju GPG lozinku ili pritisnite Odustani"
 
@@ -9304,6 +9606,11 @@ msgstr "Nadimak"
 msgid "Message"
 msgstr "Poruka"
 
+#. holds subject
+#: ../src/history_manager.py:188 ../src/history_manager.py:219
+msgid "Subject"
+msgstr "Tema"
+
 #: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -9402,19 +9709,19 @@ msgstr "Zatvorit će te nekoliko kartica"
 msgid "Do you really want to close them all?"
 msgstr "Da li ih zaista želite sve zatvoriti?"
 
-#: ../src/message_window.py:484
+#: ../src/message_window.py:485
 msgid "Chats"
 msgstr "Razgovori"
 
-#: ../src/message_window.py:486
+#: ../src/message_window.py:487
 msgid "Group Chats"
 msgstr "Grupni Razgovori"
 
-#: ../src/message_window.py:488
+#: ../src/message_window.py:489
 msgid "Private Chats"
 msgstr "Privanti Razgovori"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:495
 msgid "Messages"
 msgstr "Poruke"
 
@@ -9470,56 +9777,56 @@ msgstr "Nova poruka od %(nickname)s"
 msgid "Ignore"
 msgstr "Ignoriraj"
 
-#: ../src/profile_window.py:57
+#: ../src/profile_window.py:58
 msgid "Retrieving profile..."
 msgstr "Dohvaćam profil..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2935
+#: ../src/profile_window.py:111 ../src/roster_window.py:3001
 msgid "File is empty"
 msgstr "Datoteka je prazna"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2938
+#: ../src/profile_window.py:114 ../src/roster_window.py:3004
 msgid "File does not exist"
 msgstr "Datoteka ne postoji"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2940 ../src/roster_window.py:2951
+#: ../src/profile_window.py:128 ../src/profile_window.py:144
+#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
 msgid "Could not load image"
 msgstr "Nemogu učitati sliku"
 
-#: ../src/profile_window.py:214
+#: ../src/profile_window.py:215
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Informacije Kontakta"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:216
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Format: GGGG-MM-DD"
 
-#: ../src/profile_window.py:269
+#: ../src/profile_window.py:270
 msgid "Information received"
 msgstr "Primljene informacije"
 
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:341
 msgid "Without a connection you can not publish your contact information."
 msgstr "Bez veze ne možete objaviti informacije o sebi"
 
-#: ../src/profile_window.py:353
+#: ../src/profile_window.py:354
 msgid "Sending profile..."
 msgstr "Å aljem profil..."
 
-#: ../src/profile_window.py:368
+#: ../src/profile_window.py:369
 msgid "Information NOT published"
 msgstr "Informacije NISU objavljene"
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:376
 msgid "vCard publication failed"
 msgstr "Objava vCard neuspješna"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:377
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9527,51 +9834,51 @@ msgstr ""
 "Nastala je greška prilikom objavljivanja vaših osobnih podataka, pokušajte "
 "ponovno kasnije."
 
-#: ../src/roster_window.py:256 ../src/roster_window.py:1012
+#: ../src/roster_window.py:262 ../src/roster_window.py:1026
 msgid "Merged accounts"
 msgstr "Spojeni računi"
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1942
 msgid "Authorization has been sent"
 msgstr "Odobrenje je poslano"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1943
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Sada će \"%s\" znati vaš status."
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1966
 msgid "Subscription request has been sent"
 msgstr "Zahtjev za pretplatom je poslan"
 
-#: ../src/roster_window.py:1944
+#: ../src/roster_window.py:1967
 #, 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:1958
+#: ../src/roster_window.py:1981
 msgid "Authorization has been removed"
 msgstr "Odobrenje je uklonjeno"
 
-#: ../src/roster_window.py:1959
+#: ../src/roster_window.py:1982
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Sada će vas \"%s\" uvijek vidjeti kao odspojenog."
 
-#: ../src/roster_window.py:1986
+#: ../src/roster_window.py:2009
 msgid "GPG is not usable"
 msgstr "GPG nije upotrebljiv"
 
-#: ../src/roster_window.py:1987
+#: ../src/roster_window.py:2010
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Biti će te spojeni na %s bez OpenPGP-a."
 
-#: ../src/roster_window.py:2199 ../src/roster_window.py:3496
+#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
 msgid "You are participating in one or more group chats"
 msgstr "Sudjelujete u jednom ili više grupnih razovora"
 
-#: ../src/roster_window.py:2200 ../src/roster_window.py:3497
+#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9579,38 +9886,38 @@ 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:2226
+#: ../src/roster_window.py:2249
 msgid "desync'ed"
 msgstr "desinkroniziran"
 
-#: ../src/roster_window.py:2288
+#: ../src/roster_window.py:2311
 msgid "Really quit Gajim?"
 msgstr "Zaista zatvori Gajim?"
 
-#: ../src/roster_window.py:2289
+#: ../src/roster_window.py:2312
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Jeste li sigurni da želite zatvoriti Gajim?"
 
-#: ../src/roster_window.py:2290
+#: ../src/roster_window.py:2313
 msgid "Always close Gajim"
 msgstr "Uvijek zatvori Gajim"
 
-#: ../src/roster_window.py:2373
+#: ../src/roster_window.py:2396
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Prekini transfer datoteke"
 
-#: ../src/roster_window.py:2374
+#: ../src/roster_window.py:2397
 msgid ""
-"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2405 ../src/roster_window.py:2653
+#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
 msgid "You have unread messages"
 msgstr "Imte nepročitane poruke"
 
-#: ../src/roster_window.py:2406
+#: ../src/roster_window.py:2429
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9618,16 +9925,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:2654
+#: ../src/roster_window.py:2720
 msgid "You must read them before removing this transport."
 msgstr "Morate ih pročitati prije uklanjanja ovog prijenosa."
 
-#: ../src/roster_window.py:2657
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Prijenos \"%s\" biti će uklonjen"
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2724
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9635,11 +9942,11 @@ msgstr ""
 "Više nećete biti u mogućnosti razmjenjivati poruka sa kontaktima koji "
 "koriste ovaj prijenos."
 
-#: ../src/roster_window.py:2661
+#: ../src/roster_window.py:2727
 msgid "Transports will be removed"
 msgstr "Prijenos će biti uklonjen"
 
-#: ../src/roster_window.py:2666
+#: ../src/roster_window.py:2732
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9648,11 +9955,11 @@ msgstr ""
 "Više nećete biti u mogućnosti razmjenjivati poruka sa kontaktima ovih "
 "prijenosa: %s"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2800
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Spremate se blokirati kontakt. Jeste li sigurni da želite nastaviti?"
 
-#: ../src/roster_window.py:2736
+#: ../src/roster_window.py:2802
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -9661,56 +9968,56 @@ msgstr ""
 "primiti."
 
 #. it's jid
-#: ../src/roster_window.py:2827
+#: ../src/roster_window.py:2893
 msgid "Rename Contact"
 msgstr "Preimenuj Kontakt"
 
-#: ../src/roster_window.py:2828
+#: ../src/roster_window.py:2894
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Unesite novi nadimak za kontakt %s"
 
-#: ../src/roster_window.py:2835
+#: ../src/roster_window.py:2901
 msgid "Rename Group"
 msgstr "Preimenuj Grupu"
 
-#: ../src/roster_window.py:2836
+#: ../src/roster_window.py:2902
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Unesite novo ime za grupu %s"
 
-#: ../src/roster_window.py:2881
+#: ../src/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Ukloni Grupu"
 
-#: ../src/roster_window.py:2882
+#: ../src/roster_window.py:2948
 #, 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:2883
+#: ../src/roster_window.py:2949
 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:2922
+#: ../src/roster_window.py:2988
 msgid "Assign OpenPGP Key"
 msgstr "Dodjeli OpenPGP Ključ"
 
-#: ../src/roster_window.py:2923
+#: ../src/roster_window.py:2989
 msgid "Select a key to apply to the contact"
 msgstr "Odaberite ključ za dodavanje kontaktu"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3372
 #, 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:3308
+#: ../src/roster_window.py:3374
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr "Spremate se ukloniti \"%(name)s\" (%(jid)s) sa vaše liste kontakata.\n"
 
-#: ../src/roster_window.py:3313
+#: ../src/roster_window.py:3379
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9719,11 +10026,11 @@ msgstr ""
 "će vas ta osoba uvijek vidjeti kao da ste odspojeni."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3319
+#: ../src/roster_window.py:3385
 msgid "Do you want to continue?"
 msgstr "Želite li nastaviti?"
 
-#: ../src/roster_window.py:3323
+#: ../src/roster_window.py:3389
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9731,16 +10038,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:3326
+#: ../src/roster_window.py:3392
 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:3330
+#: ../src/roster_window.py:3396
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakti će biti uklonjeni sa vaše liste kontakata"
 
-#: ../src/roster_window.py:3335
+#: ../src/roster_window.py:3401
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9750,14 +10057,14 @@ 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:3393
+#: ../src/roster_window.py:3459
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want  to continue?"
 msgstr ""
 "Spremate se poslati osobni status. Jeste li sigurni da želite nastaviti?"
 
-#: ../src/roster_window.py:3395
+#: ../src/roster_window.py:3461
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -9766,20 +10073,20 @@ msgstr ""
 "Privremeno će te za ovaj kontakt imati status %(status)s, sve dok ne "
 "promijenite vaš status. Tada će vidjeti vaš globalni status."
 
-#: ../src/roster_window.py:3414
+#: ../src/roster_window.py:3480
 msgid "No account available"
 msgstr "Nema dostupnih računa"
 
-#: ../src/roster_window.py:3415
+#: ../src/roster_window.py:3481
 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:4023
+#: ../src/roster_window.py:4095
 msgid "Metacontacts storage not supported by your server"
 msgstr "Spremanje metakontakata nije podržano na vašem poslužitelju"
 
-#: ../src/roster_window.py:4025
+#: ../src/roster_window.py:4097
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9787,13 +10094,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:4117
+#: ../src/roster_window.py:4189
 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:4119
+#: ../src/roster_window.py:4191
 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 "
@@ -9803,11 +10110,11 @@ msgstr ""
 "oni se koriste kada ista osoba ima nekoliko Jabber računa ili računa "
 "prijenosa."
 
-#: ../src/roster_window.py:4234
+#: ../src/roster_window.py:4306
 msgid "Invalid file URI:"
 msgstr "Neispravan URI datoteke:"
 
-#: ../src/roster_window.py:4246
+#: ../src/roster_window.py:4318
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9815,12 +10122,12 @@ 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:4361
+#: ../src/roster_window.py:4433
 #, python-format
 msgid "Send %s to %s"
 msgstr "Poslati %s prema %s"
 
-#: ../src/roster_window.py:4367
+#: ../src/roster_window.py:4439
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Učini %s i %s pseudokontaktima"
@@ -9830,143 +10137,143 @@ msgstr "Učini %s i %s pseudokontaktima"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4816 ../src/roster_window.py:4889
-#: ../src/roster_window.py:4898 ../src/statusicon.py:246
-#: ../src/statusicon.py:293 ../src/statusicon.py:299
+#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
+#: ../src/roster_window.py:4970 ../src/statusicon.py:263
+#: ../src/statusicon.py:310 ../src/statusicon.py:316
 #, python-format
 msgid "using account %s"
 msgstr "koristeći račun %s"
 
 #. add
-#: ../src/roster_window.py:4905
+#: ../src/roster_window.py:4977
 #, python-format
 msgid "to %s account"
 msgstr "na %s račun"
 
 #. disco
-#: ../src/roster_window.py:4910
+#: ../src/roster_window.py:4982
 #, python-format
 msgid "using %s account"
 msgstr "koristeći %s račun"
 
-#: ../src/roster_window.py:4948 ../src/statusicon.py:309
+#: ../src/roster_window.py:5020 ../src/statusicon.py:326
 msgid "_Manage Bookmarks..."
 msgstr "Upravljanje Knjižni_m Oznakama..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4968
+#: ../src/roster_window.py:5040
 #, python-format
 msgid "of account %s"
 msgstr "računa %s"
 
-#: ../src/roster_window.py:5009
+#: ../src/roster_window.py:5081
 #, python-format
 msgid "for account %s"
 msgstr "za račun %s"
 
-#: ../src/roster_window.py:5069 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
 msgid "_Change Status Message"
 msgstr "_Izmjena Statusne Poruke"
 
-#: ../src/roster_window.py:5102
+#: ../src/roster_window.py:5174
 msgid "Publish Tune"
 msgstr "Objavi Glazbu"
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5176
 #, fuzzy
 msgid "Publish Location"
 msgstr "Objavi Glazbu"
 
-#: ../src/roster_window.py:5107
+#: ../src/roster_window.py:5179
 msgid "Configure Services..."
 msgstr "Postavi Usluge..."
 
-#: ../src/roster_window.py:5252
+#: ../src/roster_window.py:5324
 msgid "_Maximize All"
 msgstr "_Maksimiziraj Sve"
 
-#: ../src/roster_window.py:5262 ../src/roster_window.py:5436
+#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
 msgid "Send Group M_essage"
 msgstr "Pošalji _Grupnu Poruku"
 
-#: ../src/roster_window.py:5270
+#: ../src/roster_window.py:5342
 msgid "To all users"
 msgstr "Svim korisnicima"
 
-#: ../src/roster_window.py:5274
+#: ../src/roster_window.py:5346
 msgid "To all online users"
 msgstr "Svim spojenim korisnicima"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5456
+#: ../src/roster_window.py:5528
 msgid "_Manage Contacts"
 msgstr "_Upravljanje Kontaktima"
 
 #. Edit Groups
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5537
 msgid "Edit _Groups"
 msgstr "Izmjeni _Grupe"
 
 #. Send single message
-#: ../src/roster_window.py:5520
+#: ../src/roster_window.py:5592
 msgid "Send Single Message"
 msgstr "Pošalji Jednu Poruku"
 
 #. Execute Command
-#: ../src/roster_window.py:5567
+#: ../src/roster_window.py:5639
 msgid "Execute Command..."
 msgstr "Izvrši Naredbu..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5577
+#: ../src/roster_window.py:5649
 msgid "_Manage Transport"
 msgstr "_Upravljanje Prijenosom"
 
 #. Modify Transport
-#: ../src/roster_window.py:5586
+#: ../src/roster_window.py:5658
 msgid "_Modify Transport"
 msgstr "_Izmjeni Prijenos"
 
 #. Rename
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5668
 msgid "_Rename"
 msgstr "_Preimenuj"
 
-#: ../src/roster_window.py:5656
+#: ../src/roster_window.py:5728
 msgid "_Maximize"
 msgstr "_Maksimiziraj"
 
-#: ../src/roster_window.py:5665
+#: ../src/roster_window.py:5737
 msgid "_Reconnect"
 msgstr "_Ponovno spajanje"
 
-#: ../src/roster_window.py:5672
+#: ../src/roster_window.py:5744
 msgid "_Disconnect"
 msgstr "_Odspoji"
 
 #. History manager
-#: ../src/roster_window.py:5754
+#: ../src/roster_window.py:5833
 msgid "History Manager"
 msgstr "Upravitelj Zapisima"
 
-#: ../src/roster_window.py:5765
+#: ../src/roster_window.py:5844
 msgid "_Join New Group Chat"
 msgstr "_Pridruži se Novom Grupnom Razgovoru"
 
-#: ../src/roster_window.py:5938
+#: ../src/roster_window.py:6019
 msgid "Change Status Message..."
 msgstr "Promijeni Statusnu Poruku..."
 
-#: ../src/search_window.py:94
+#: ../src/search_window.py:105
 msgid "Waiting for results"
 msgstr "ÄŒekanje na rezultate"
 
-#: ../src/search_window.py:132 ../src/search_window.py:210
+#: ../src/search_window.py:143 ../src/search_window.py:220
 msgid "Error in received dataform"
 msgstr "Greška u primljenom podatkovnom obrascu"
 
 #. No result
-#: ../src/search_window.py:166 ../src/search_window.py:202
+#: ../src/search_window.py:177 ../src/search_window.py:212
 msgid "No result"
 msgstr "Nema rezultata"
 
@@ -9979,14 +10286,15 @@ msgstr "Disk WriteError"
 msgid "Subject: %s"
 msgstr "Tema: %s"
 
-#: ../src/session.py:433 ../src/session.py:468
+#: ../src/session.py:447 ../src/session.py:491
 msgid "Confirm these session options"
 msgstr "Potvrdi ove sesijske postavke"
 
-#: ../src/session.py:435
+#: ../src/session.py:448
 #, fuzzy, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
+"The remote client wants '\n"
+"                            'to negotiate an session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -9998,7 +10306,7 @@ msgstr ""
 "\n"
 "\tJesu li te postavke prihvatljive?"
 
-#: ../src/session.py:469
+#: ../src/session.py:492
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10013,16 +10321,16 @@ msgstr ""
 "\n"
 "Nastavi sesiju?"
 
-#: ../src/statusicon.py:210
+#: ../src/statusicon.py:227
 msgid "_Change Status Message..."
 msgstr "_Promijeni Statusnu Poruku..."
 
-#: ../src/statusicon.py:322
+#: ../src/statusicon.py:339
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "na _listi"
 
-#: ../src/statusicon.py:333
+#: ../src/statusicon.py:350
 msgid "Hide this menu"
 msgstr "Sakrij ovaj izbornik"
 
@@ -10161,32 +10469,32 @@ msgstr ""
 "Ova usluga nije mogla odgovoriti sa detaljnim informacijama.\n"
 "Najvjerojatnije je zastarjela ili neispravna"
 
-#: ../src/vcard.py:251
+#: ../src/vcard.py:265
 msgid "?Client:Unknown"
 msgstr "?Klijent:Nepoznat"
 
-#: ../src/vcard.py:253
+#: ../src/vcard.py:267
 msgid "?OS:Unknown"
 msgstr "?OS:Nepoznat"
 
-#: ../src/vcard.py:274
+#: ../src/vcard.py:288
 msgid "?Time:Unknown"
 msgstr "?Vrijeme:Nepoznato"
 
-#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
+#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:345
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:349
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Pripadnost:</b>"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:357
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10194,7 +10502,7 @@ msgstr ""
 "Ovaj kontakt je zainteresiran za informacije o vašem prisutstvu, ali vas ne "
 "zanimaju informacije o njegovom/njenom prisustvu"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:359
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10202,39 +10510,83 @@ msgstr ""
 "Vi ste zainteresirani za informacije o prisustvu nekog kontakta, ali nju/"
 "njega ne interesira vaše prisutstvo"
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:361
 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:349
+#: ../src/vcard.py:363
 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:356
+#: ../src/vcard.py:370
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Čekate odgovor kontakta o vašem zahtjevu za pretplatom"
 
-#: ../src/vcard.py:358
+#: ../src/vcard.py:372
 msgid "There is no pending subscription request."
 msgstr "Niti jedan zahtjev za pretplatu nije u toku."
 
-#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
+#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
 msgid " resource with priority "
 msgstr " resurs s prioritetom "
 
-#~ msgid "_Available"
-#~ msgstr "_Dostupan"
+#~ msgid "@"
+#~ msgstr "@"
+
+#~ msgid "_Disable showing event in systray"
+#~ msgstr "_Onemogući prikazivanje događaja u traci radne površine"
 
-#~ msgid "PEP node was not removed"
-#~ msgstr "PEP čvor nije obrisan"
+#~ msgid "_Show event in systray"
+#~ msgstr "_Prikaži događaj u traci radne površine"
 
-#~ msgid "PEP node %(node)s was not removed: %(message)s"
-#~ msgstr "PEP čvor %(node)s nije obrisan: %(message)s"
+#, fuzzy
+#~ msgid "Always use GNOME default applications"
+#~ msgstr "Uvijek koristi OS/X predefinirane aplikacije"
+
+#, fuzzy
+#~ msgid "Always use Xfce default applications"
+#~ msgstr "Uvijek koristi OS/X predefinirane aplikacije"
+
+#, fuzzy
+#~ msgid "Autodetect on every Gajim startup"
+#~ msgstr "Sp_oji se prilikom pokretanja Gajima"
+
+#~ msgid "Show systray:"
+#~ msgstr "Prikaži ikonu u traci radne površine:"
+
+#~ msgid "Nickname not allowed: %s"
+#~ msgstr "Nedozvoljeni nadimak: %s "
+
+#~ msgid "Room has been destroyed"
+#~ msgstr "Soba je uništena"
+
+#~ msgid "You can join this room instead: %s"
+#~ msgstr "Možete se pridružiti ovoj sobi umjesto: %s"
+
+#~ msgid "I would like to add you to my roster."
+#~ msgstr "Želio bih te dodati na moju listu kontakata."
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "sada smo pretplaćeni na %s"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "Zahtjev za ukidanjem pretplate od %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "sada smo ukinuli pretplatu za %s"
+
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "JID %s ne poštuje RFC pravila. Neće biti dodan na vašu listu kontakata. "
+#~ "Upotrijebite alate za upravljanje listom kontakata kao Å¡to je http://jru."
+#~ "jabberstudio.org/ za uklanjanje"
 
 #~ msgid "Account Modification"
 #~ msgstr "Modifikacija Korisničkog Računa"
@@ -10344,40 +10696,9 @@ msgstr " resurs s prioritetom "
 #~ msgid "gtk-delete"
 #~ msgstr "gtk-delete"
 
-#~ msgid "Add this contact to roster (Ctrl+D)"
-#~ msgstr "Dodaj kontakt na listu (Ctrl+D)"
-
-#~ msgid "Bookmark this room (Ctrl+B)"
-#~ msgstr "Postavi knjižnu oznaku za sobu (Ctrl+B)"
-
-#~ msgid "Browse the chat history (Ctrl+H)"
-#~ msgstr "Pregledaj povijest razgovora (Ctrl+H)"
-
-#~ msgid "Change the room's subject (Alt+T)"
-#~ msgstr "Promjeni predmet razgovora u sobi (Alt+T)"
-
-#~ msgid "Change your nickname (Ctrl+N)"
-#~ msgstr "Promijeni nadimak (Ctrl+N)"
-
-#~ msgid "Invite contacts to the conversation (Ctrl+G)"
-#~ msgstr "Pozovi kontakte na razgovor (Ctrl+G)"
-
 #~ msgid "Send a file (Ctrl+F)"
 #~ msgstr "Pošalji datoteku (Ctrl+F)"
 
-#~ msgid "Show a list of emoticons (Alt+M)"
-#~ msgstr "Prikaži popis emoticona (Alt+M)"
-
-#~ msgid "Show a list of formattings"
-#~ msgstr "Prikaži popis formata"
-
-#, fuzzy
-#~ msgid "Show a menu of advanced functions (Alt+D)"
-#~ msgstr "Prikaži izbornik naprednih mogućnosti (Alt+A)"
-
-#~ msgid "Show the contact's profile (Ctrl+I)"
-#~ msgstr "Prikaži profil kontakta (Ctrl+I)"
-
 #~ msgid ""
 #~ "All chat states\n"
 #~ "Composing only\n"
@@ -10436,9 +10757,6 @@ msgstr " resurs s prioritetom "
 #~ msgid "gtk-cancel"
 #~ msgstr "gtk-cancel"
 
-#~ msgid "_Preferences"
-#~ msgstr "_Postavke"
-
 #~ msgid "_Quit"
 #~ msgstr "_Izlaz"
 
@@ -10923,9 +11241,6 @@ msgstr " resurs s prioritetom "
 #~ msgid "Treat all incoming messages as:"
 #~ msgstr "Tretiraj sve dolazne poruke kao:"
 
-#~ msgid "Use t_rayicon (aka. notification area icon)"
-#~ msgstr "Koristi t_ray ikonu"
-
 #~ msgid ""
 #~ "When a new event (message, file transfer request etc..) is received, the "
 #~ "following methods may be used to inform you about it. Please note that "
@@ -11036,13 +11351,6 @@ msgstr " resurs s prioritetom "
 #~ msgstr ""
 #~ "Podrška za Upravljanje Seansama nije dostupna (nedostaje gnome.ui modul)"
 
-#~ msgid ""
-#~ "Usage: %s %s %s \n"
-#~ "\t %s"
-#~ msgstr ""
-#~ "Korištenje: %s %s %s \n"
-#~ "\t %s"
-
 #~ msgid "%s does not appear to be a valid JID"
 #~ msgstr "%s ne izgleda kao valjani JID"
 
diff --git a/po/it.po b/po/it.po
index f67d09e08bad691adc4e51acc3124c9c81ac9c1a..be0c03aa5170660d4476a3475856bae53278a098 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,11 +6,15 @@
 # Andrea Ratti <scimiot@yahoo.it>, 2005.
 # Matteo Dell'Amico <della@linux.it>, 2005, 2006.
 # Daniel Coppi <neoex.dc@gmail.com>, 2007.
+#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 11:28+0200\n"
+"POT-Creation-Date: 2010-10-01 20:39+0200\n"
 "PO-Revision-Date: 2009-08-19 23:53+0200\n"
 "Last-Translator: neoex <neoex.dc@gmail.com>\n"
 "Language-Team: Italian <>\n"
@@ -28,7 +32,7 @@ msgstr "Entra in chat di _gruppo..."
 msgid "_Add Contact..."
 msgstr "_Aggiungi Contatto..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:17
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
 msgid "_Discover Services"
 msgstr "_Ricerca servizi"
 
@@ -49,7 +53,7 @@ msgstr "_Apri posta ricevuta"
 msgid "_Personal Events"
 msgstr "Informazioni personali"
 
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:23
+#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
 msgid "_Start Chat..."
 msgstr "_Inizia chat..."
 
@@ -82,75 +86,71 @@ msgid "<b>Please select a server</b>"
 msgstr "<b>Selezionare un server</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid "@"
-msgstr ""
-
-#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
 msgstr ""
 
-#: ../data/gui/account_creation_wizard_window.ui.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:10
 #, fuzzy
 msgid "Anon_ymous authentication"
 msgstr "Usa autenticazione"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Connect when I press Finish"
 msgstr "Connettiti alla pressione di Fine"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Assistente creazione account"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 #, fuzzy
 msgid "I already have an account I want to _use"
 msgstr "Ho già un account da usare"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I want to _register for a new account"
 msgstr "Voglio _registrare un nuovo account"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:16
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 #: ../data/gui/accounts_window.ui.h:28
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Se marcato, Gajim ricorderà la password per questo account"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:17
+#: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Gestisci..."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:18
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
 #: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2263 ../src/config.py:2342
-#: ../src/config.py:2355 ../src/config.py:3596 ../src/config.py:3671
-#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513
-#: ../src/dialogs.py:526 ../src/roster_window.py:2890
-#: ../src/roster_window.py:2896 ../src/roster_window.py:2901
+#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
+#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
+#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
+#: ../src/dialogs.py:527 ../src/roster_window.py:2956
+#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
 msgid "None"
 msgstr "Nessuno"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:19
+#: ../data/gui/account_creation_wizard_window.ui.h:18
 msgid "Prox_y:"
 msgstr "Prox_y:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #: ../data/gui/accounts_window.ui.h:48
 msgid "Save pass_word"
 msgstr "Ricorda la pass_word"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:21
+#: ../data/gui/account_creation_wizard_window.ui.h:20
 msgid "Set my profile when I connect"
 msgstr "Configura il mio profilo appena effettuata la connessione"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:22
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Use custom hostname/port"
 msgstr "Usa hostname/porta personalizzati"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:23
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -158,34 +158,34 @@ msgstr ""
 "È necessario avere un account per connettersi\n"
 "alla rete Jabber."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-#: ../data/gui/roster_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:16
 msgid "_Advanced"
 msgstr "_Avanzato"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:25
 msgid "_Finish"
 msgstr "_Fine"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:27
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Hostname:"
 msgstr "Nome dell'_host: "
 
-#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #: ../data/gui/accounts_window.ui.h:62
 msgid "_Jabber ID:"
 msgstr "ID _Jabber:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:28
 #: ../data/gui/accounts_window.ui.h:64
 msgid "_Password:"
 msgstr "_Password:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:29
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:31
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Server:"
 msgstr "_Server:"
 
@@ -296,17 +296,17 @@ msgstr "Nome:"
 #. No configured account
 #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
 #: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592
-#: ../src/notify.py:608
+#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
+#: ../src/notify.py:616
 msgid "Gajim"
 msgstr "Gajim"
 
 #. FIXME: Ugly workaround.
 #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
 #. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:61
-#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121
-#: ../src/roster_window.py:2832 ../src/roster_window.py:5379
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
+#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
 msgid "General"
 msgstr "Generale"
 
@@ -365,7 +365,7 @@ msgstr "Informazioni su di te, archiviate sul server"
 
 #: ../data/gui/accounts_window.ui.h:35
 #: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:830
+#: ../src/dialogs.py:831
 msgid "Jabber ID:"
 msgstr "ID Jabber: "
 
@@ -379,7 +379,7 @@ msgid "Mer_ge accounts"
 msgstr "_Unisci account"
 
 #: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2356
+#: ../src/config.py:2358
 msgid "No key selected"
 msgstr "Nessuna chiave selezionata"
 
@@ -406,7 +406,7 @@ msgid "Priority will change automatically according to your status."
 msgstr "La priorità cambierà automaticamente in funzione del tuo stato."
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5329
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
 msgid "Re_name"
 msgstr "Ri_nomina"
 
@@ -641,38 +641,43 @@ msgid "Deletes Message of the Day"
 msgstr "Elimina il messaggio del giorno"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
+#, fuzzy
+msgid "Edit Archi_ving Preferences"
+msgstr "_Preferenze"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Edit _Privacy Lists..."
 msgstr "Modifica liste _privacy..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sends a message to users currently connected to this server"
 msgstr "Invia un messaggio agli utenti attualmenti connessi a questo server"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Set MOTD..."
 msgstr "Imposta MOTD..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Imposta messaggio del giorno"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Show _XML Console"
 msgstr "Mostra console _XML"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "Update MOTD..."
 msgstr "Aggiorna MOTD..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "Aggiorna il messaggio del giorno"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:11
 msgid "_Administrator"
 msgstr "_Amministratore"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:11
+#: ../data/gui/advanced_menuitem_menu.ui.h:12
 msgid "_Send Server Message..."
 msgstr "_Invia messaggio server..."
 
@@ -706,7 +711,7 @@ msgid "All statuses"
 msgstr "Tutti gli stati"
 
 #: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:233
+#: ../src/common/commands.py:106 ../src/common/helpers.py:239
 #: ../src/tooltips.py:193
 msgid "Away"
 msgstr "Assente"
@@ -759,7 +764,7 @@ msgid "Have "
 msgstr "Ho "
 
 #: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:249
 msgid "Invisible"
 msgstr "Invisibile"
 
@@ -768,7 +773,7 @@ msgid "Launch a command"
 msgstr "Lancia un comando"
 
 #: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:216 ../src/tooltips.py:197
+#: ../src/common/helpers.py:222 ../src/tooltips.py:197
 msgid "Not Available"
 msgstr "Non disponibile"
 
@@ -813,12 +818,13 @@ msgid "_Disable existing sound for this event"
 msgstr "_Disabilita il suono esistente associato all'evento"
 
 #: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in roster"
+#, fuzzy
+msgid "_Disable showing event in notification area"
 msgstr "_Disabilita l'evento di apparizione nella lista contatti"
 
 #: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in systray"
-msgstr "_Disabilita la visualizzazione dell'evento nell'area di notifica"
+msgid "_Disable showing event in roster"
+msgstr "_Disabilita l'evento di apparizione nella lista contatti"
 
 #: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
@@ -829,12 +835,13 @@ msgid "_Open chat window with user"
 msgstr "_Apri una finestra di chat con l'utente"
 
 #: ../data/gui/advanced_notifications_window.ui.h:35
-msgid "_Show event in roster"
+#, fuzzy
+msgid "_Show event in notification area"
 msgstr "Mostra evento nella lista _contatti"
 
 #: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in systray"
-msgstr "_Mostra evento nell'area di notifica"
+msgid "_Show event in roster"
+msgstr "Mostra evento nella lista _contatti"
 
 #: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
@@ -862,6 +869,45 @@ msgstr "Gruppo"
 msgid "when I'm in"
 msgstr "quando sono in"
 
+#: ../data/gui/archiving_preferences_window.ui.h:1
+msgid "<i>Method Auto</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "<i>Method Local</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:3
+msgid "<i>Method Manual</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:4
+#, fuzzy
+msgid "Auto"
+msgstr "Partecipa automaticamente"
+
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Concede"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "Forbid"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:7
+#, fuzzy
+msgid "No"
+msgstr "Nessuno"
+
+#: ../data/gui/archiving_preferences_window.ui.h:8
+#, fuzzy
+msgid "Prefer"
+msgstr "Preferenze"
+
+#: ../data/gui/archiving_preferences_window.ui.h:9
+msgid "Yes"
+msgstr ""
+
 #: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Voce:"
@@ -888,8 +934,8 @@ msgstr "Contatti bloccati"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5348
-#: ../src/roster_window.py:5476 ../src/roster_window.py:5609
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
+#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
 msgid "_Unblock"
 msgstr "_Sblocca"
 
@@ -982,7 +1028,7 @@ msgid "_Start Chat"
 msgstr "_Inizia chat"
 
 #. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4184
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
 msgid "#"
 msgstr "#"
 
@@ -1030,13 +1076,55 @@ msgstr ""
 msgid "9"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:13
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Aggiunge il contatto alla lista"
+
 #: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
+msgid "Browse the chat history (Ctrl+H)"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:15
+#, fuzzy
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "sta seguendo la conversazione"
+
+#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+#, fuzzy
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Clicca per inserire un emoticon (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
+#, fuzzy
+msgid "Show a list of formattings"
+msgstr "Clicca per inserire un emoticon (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Clicca per inserire un emoticon (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:19
+#, fuzzy
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr "Aggiunge il contatto alla lista"
+
+#: ../data/gui/chat_control.ui.h:20
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:21
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
 #: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Invia"
 
-#: ../data/gui/chat_control.ui.h:15 ../data/gui/groupchat_control.ui.h:3
+#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
 msgid "label"
 msgstr ""
 
@@ -1087,8 +1175,8 @@ msgstr "Modifica _gruppi..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5284
-#: ../src/roster_window.py:5444
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
+#: ../src/roster_window.py:5516
 msgid "In_vite to"
 msgstr "In_vita a "
 
@@ -1102,8 +1190,8 @@ msgstr "_Gestisci contatti"
 msgid "Remo_ve"
 msgstr "_Elimina"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5294
-#: ../src/roster_window.py:5533
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
+#: ../src/roster_window.py:5605
 msgid "Send Cus_tom Status"
 msgstr "Invia s_tato personalizzato"
 
@@ -1136,8 +1224,8 @@ msgid "_Allow him/her to see my status"
 msgstr "Permetti di _vedere il mio stato"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5482 ../src/roster_window.py:5612
+#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
+#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
 msgid "_Block"
 msgstr "_Blocca"
 
@@ -1147,8 +1235,8 @@ msgstr "_Proibisci di vedere il mio stato"
 
 #: ../data/gui/contact_context_menu.ui.h:20
 #: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:21
-#: ../src/roster_window.py:5683
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
+#: ../src/roster_window.py:5755
 msgid "_History"
 msgstr "_Cronologia"
 
@@ -1286,7 +1374,7 @@ msgstr "<b>Colori della scheda di stato chat</b>"
 msgid "Account row"
 msgstr "Account"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:925
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
 msgid "Bold"
 msgstr "Grassetto"
 
@@ -1324,7 +1412,7 @@ msgstr "Gruppo"
 msgid "Inactive"
 msgstr "Inattivo"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:926
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
 msgid "Italic"
 msgstr "Corsivo"
 
@@ -1372,7 +1460,7 @@ msgstr "Cambia _oggetto..."
 msgid "Configure _Room..."
 msgstr "Configura la _stanza..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1782
+#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
 msgid "_Bookmark"
 msgstr "Aggiungi _segnalibro"
 
@@ -1432,19 +1520,32 @@ msgstr "_Invia messaggio privato"
 msgid "_Voice"
 msgstr "_Voce"
 
+#: ../data/gui/groupchat_control.ui.h:1
+#, fuzzy
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Aggiungi _segnalibro"
+
+#: ../data/gui/groupchat_control.ui.h:3
+msgid "Change the room's subject (Alt+T)"
+msgstr ""
+
+#: ../data/gui/groupchat_control.ui.h:4
+msgid "Change your nickname (Ctrl+N)"
+msgstr ""
+
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Crea nuovo post"
 
-#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
-msgid "From"
-msgstr "Da"
+#: ../data/gui/groups_post_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:2
+msgid "From:"
+msgstr "Da:"
 
-#. holds subject
-#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
-#: ../src/history_manager.py:219
-msgid "Subject"
-msgstr "Oggetto"
+#: ../data/gui/groups_post_window.ui.h:3
+#: ../data/gui/single_message_window.ui.h:7
+msgid "Subject:"
+msgstr "Oggetto:"
 
 #: ../data/gui/history_manager.ui.h:1
 #, fuzzy
@@ -1469,8 +1570,8 @@ msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Gestore cronologia di Gajim"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3208
-#: ../src/dialogs.py:3305
+#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
+#: ../src/dialogs.py:3321
 msgid "Delete"
 msgstr "Elimina"
 
@@ -1524,12 +1625,75 @@ msgstr "Cerca"
 msgid "_Log conversation history"
 msgstr "_Memorizza cronologia conversazione"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
+msgid "approve"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:2
+msgid "body"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:3
+msgid "concede"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:4
+msgid "expire"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:5
+msgid "false"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:6
+msgid "forbid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:7
+#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+msgid "jid"
+msgstr "jid"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:8
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
+#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
+msgid "message"
+msgstr "messaggio"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
+msgid "oppose"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
+#, fuzzy
+msgid "otr"
+msgstr "_Host:"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:11
+msgid "prefer"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:12
+msgid "require"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:13
+msgid "save"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:14
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
 msgid "Bro_wse Rooms"
 msgstr "C_onsulta"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2180
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
 msgid "Join Group Chat"
 msgstr "Entra in chat di gruppo"
 
@@ -1567,8 +1731,8 @@ msgstr "Server:"
 msgid "_Bookmark this room"
 msgstr "Aggiungi _segnalibro"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1341
-#: ../src/disco.py:1786
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../src/disco.py:1804
 msgid "_Join"
 msgstr "_Entra"
 
@@ -1679,6 +1843,75 @@ msgstr "_Nome utente:"
 msgid "Passphrase"
 msgstr "Passphrase"
 
+#: ../data/gui/plugins_window.ui.h:1
+msgid "&lt;empty&gt;"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:2
+msgid "<empty>"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:3
+#, fuzzy
+msgid "Authors:"
+msgstr "_Autorizza"
+
+#: ../data/gui/plugins_window.ui.h:4
+#, fuzzy
+msgid "Available"
+msgstr "_Disponibile"
+
+#: ../data/gui/plugins_window.ui.h:5
+#, fuzzy
+msgid "Configure"
+msgstr "_Continua"
+
+#: ../data/gui/plugins_window.ui.h:6
+#, fuzzy
+msgid "Descrition:"
+msgstr "Descrizione: %s"
+
+#: ../data/gui/plugins_window.ui.h:7
+#, fuzzy
+msgid "Homepage:"
+msgstr "Homepage:"
+
+#: ../data/gui/plugins_window.ui.h:8
+msgid "Install"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:9
+#, fuzzy
+msgid "Installed"
+msgstr "In stallo"
+
+#: ../data/gui/plugins_window.ui.h:10
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:11
+msgid "Plugins"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:12
+msgid "Uninstall"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:13
+#, fuzzy
+msgid "Version:"
+msgstr "Versione di GTK+:"
+
+#: ../data/gui/plugins_window.ui.h:14
+msgid "button"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:15
+msgid "homepage url"
+msgstr ""
+
 #: ../data/gui/popup_notification_window.ui.h:1
 #, fuzzy
 msgid "Event Type"
@@ -1811,126 +2044,109 @@ msgid "Always"
 msgstr "Assente"
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Always use GNOME default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:32
-msgid "Always use KDE default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:33
-msgid "Always use Xfce default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Chiedi messaggio di stato per:"
 
-#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
 msgid "Audio / Video"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:33
 msgid "Audio input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Audio output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:38
-#, fuzzy
-msgid "Autodetect on every Gajim startup"
-msgstr "C_onnetti all'avvio di Gajim"
-
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:35
 #, fuzzy
 msgid "Chat message:"
 msgstr "Messaggio di _stato:"
 
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:36
 #, fuzzy
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Verifica sempre se Gajim è il client Jabber _predefinito all'avvio"
 
-#: ../data/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:37
 #, fuzzy
 msgid "Composing only"
 msgstr "Scrivendo"
 
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:38
 msgid "Configure color and font of the interface"
 msgstr "Configura colore e tipo di carattere per l'interfaccia"
 
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Messaggio di _stato:"
 
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Nome contatto"
 
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:41
 #, fuzzy
 msgid "Custom"
 msgstr "<b>Personalizzato</b>"
 
-#: ../data/gui/preferences_window.ui.h:46
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Detached roster with chat grouped by account"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Detached roster with detached chats"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:45
 msgid "Detached roster with single chat"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
-#: ../src/config.py:671
+#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
+#: ../src/config.py:665
 msgid "Disabled"
 msgstr "Disabilitato"
 
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:47
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Mostra gli a_vatar dei contatti nella lista contatti"
 
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:48
 msgid "Display _extra email details"
 msgstr "Mostra dettagli email _extra"
 
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:49
 #, fuzzy
 msgid "Display _location of contacts in roster"
 msgstr "Mostra gli a_vatar dei contatti nella lista contatti"
 
-#: ../data/gui/preferences_window.ui.h:54
+#: ../data/gui/preferences_window.ui.h:50
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Mostra gli a_vatar dei contatti nella lista contatti"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display a_vatars of contacts in roster"
 msgstr "Mostra gli a_vatar dei contatti nella lista contatti"
 
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:52
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Mostra gli a_vatar dei contatti nella lista contatti"
 
-#: ../data/gui/preferences_window.ui.h:57
+#: ../data/gui/preferences_window.ui.h:53
 msgid "Display status _messages of contacts in roster"
 msgstr "Mostra i _messaggi di stato dei contatti nella lista contatti"
 
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:54
 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 "
@@ -1940,7 +2156,7 @@ msgstr ""
 "conversazione con un contatto. Qui è possibile specificare che stati di chat "
 "si vogliono visualizzare nella finestra di chat."
 
-#: ../data/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:55
 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 "
@@ -1950,7 +2166,7 @@ msgstr ""
 "conversazione con un contatto. Qui è possibile specificare che stati di chat "
 "si vogliono inviare al contatto."
 
-#: ../data/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:56
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1958,19 +2174,19 @@ msgstr ""
 "Gajim notificherà tramite popup nell'angolo in fondo a destra dello schermo "
 "quando un contatto si disconnette"
 
-#: ../data/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:58
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "Nascondi i pulsanti nella finestra di chat di gruppo."
 
-#: ../data/gui/preferences_window.ui.h:63
+#: ../data/gui/preferences_window.ui.h:59
 #, 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/gui/preferences_window.ui.h:64
+#: ../data/gui/preferences_window.ui.h:60
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1978,19 +2194,19 @@ msgstr ""
 "Se selezionato, Gajim includerà informazioni riguardo al mittente delle "
 "nuove email"
 
-#: ../data/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:61
 #, 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/gui/preferences_window.ui.h:66
+#: ../data/gui/preferences_window.ui.h:62
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1998,7 +2214,7 @@ msgstr ""
 "Se marcato, Gajim mostrerà gli avatar dei contatti nella lista contatti e "
 "nelle chat di gruppo"
 
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -2006,7 +2222,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/gui/preferences_window.ui.h:69
+#: ../data/gui/preferences_window.ui.h:65
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -2014,7 +2230,7 @@ msgstr ""
 "Se marcato, Gajim mostrerà gli avatar dei contatti nella lista contatti e "
 "nelle chat di gruppo"
 
-#: ../data/gui/preferences_window.ui.h:70
+#: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the location of contacts in the roster window"
@@ -2022,7 +2238,7 @@ msgstr ""
 "Se marcato, Gajim mostrerà gli avatar dei contatti nella lista contatti e "
 "nelle chat di gruppo"
 
-#: ../data/gui/preferences_window.ui.h:71
+#: ../data/gui/preferences_window.ui.h:67
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -2030,7 +2246,7 @@ msgstr ""
 "Se marcato, Gajim mostrerà gli avatar dei contatti nella lista contatti e "
 "nelle chat di gruppo"
 
-#: ../data/gui/preferences_window.ui.h:72
+#: ../data/gui/preferences_window.ui.h:68
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -2038,14 +2254,14 @@ msgstr ""
 "Se marcato, Gajim mostrerà gli avatar dei contatti nella lista contatti e "
 "nelle chat di gruppo"
 
-#: ../data/gui/preferences_window.ui.h:73
+#: ../data/gui/preferences_window.ui.h:69
 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/gui/preferences_window.ui.h:74
+#: ../data/gui/preferences_window.ui.h:70
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -2056,14 +2272,14 @@ msgstr ""
 "spamma o disturba. Usare con cautela, poiché verranno bloccati tutti i "
 "messaggi ricevuti da chi non è membro della lista contatti."
 
-#: ../data/gui/preferences_window.ui.h:75
+#: ../data/gui/preferences_window.ui.h:71
 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/gui/preferences_window.ui.h:76
+#: ../data/gui/preferences_window.ui.h:72
 #, fuzzy
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
@@ -2072,7 +2288,7 @@ msgstr ""
 "Se selezionato, Gajim includerà informazioni riguardo al mittente delle "
 "nuove email"
 
-#: ../data/gui/preferences_window.ui.h:77
+#: ../data/gui/preferences_window.ui.h:73
 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, "
@@ -2082,13 +2298,13 @@ msgstr ""
 "(es. un contatto MSN avrà l'icona MSN equivalente per gli stati disponibile, "
 "assente, occupato, ecc...)"
 
-#: ../data/gui/preferences_window.ui.h:78
+#: ../data/gui/preferences_window.ui.h:74
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:79
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2096,102 +2312,102 @@ msgstr ""
 "Se marcato, Gajim sostituirà gli smiley ASCII come ':)' con gli equivalenti "
 "emoticon grafici animati o statici"
 
-#: ../data/gui/preferences_window.ui.h:80
+#: ../data/gui/preferences_window.ui.h:76
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:81
+#: ../data/gui/preferences_window.ui.h:77
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "Rendi compatta la finestra dei _messaggi"
 
-#: ../data/gui/preferences_window.ui.h:82
+#: ../data/gui/preferences_window.ui.h:78
 msgid "Ma_nage..."
 msgstr "_Gestisci..."
 
-#: ../data/gui/preferences_window.ui.h:83
+#: ../data/gui/preferences_window.ui.h:79
 #, fuzzy
 msgid "Never"
 msgstr "_Mai"
 
-#: ../data/gui/preferences_window.ui.h:84
+#: ../data/gui/preferences_window.ui.h:80
 #, fuzzy
 msgid "Notifications"
 msgstr "Demone delle notifiche"
 
-#: ../data/gui/preferences_window.ui.h:85
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Notify me about contacts that sign _in"
 msgstr "Mostra notifica per i contatti che si _connettono"
 
-#: ../data/gui/preferences_window.ui.h:86
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Notify me about contacts that sign _out"
 msgstr "Mostra notifica per i contatti che si _disconnettono"
 
-#: ../data/gui/preferences_window.ui.h:87
+#: ../data/gui/preferences_window.ui.h:83
 #, fuzzy
 msgid "Notify me about it"
 msgstr "_Notifica"
 
-#: ../data/gui/preferences_window.ui.h:88
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notify on new _GMail email"
 msgstr "Notifica le nuove e-mail su _Gmail"
 
-#: ../data/gui/preferences_window.ui.h:89
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Only when pending events"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:90
+#: ../data/gui/preferences_window.ui.h:86
 #, fuzzy
 msgid "Personal Events"
 msgstr "Informazioni personali"
 
-#: ../data/gui/preferences_window.ui.h:91
+#: ../data/gui/preferences_window.ui.h:87
 msgid "Play _sounds"
 msgstr "Riproduci _suoni"
 
-#: ../data/gui/preferences_window.ui.h:92
+#: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
 msgid "Pop it up"
 msgstr "_Mostra"
 
-#: ../data/gui/preferences_window.ui.h:93
+#: ../data/gui/preferences_window.ui.h:89
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: ../data/gui/preferences_window.ui.h:94
+#: ../data/gui/preferences_window.ui.h:90
 msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:96
+#: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
 msgid "STUN server:"
 msgstr "Server:"
 
-#: ../data/gui/preferences_window.ui.h:97
+#: ../data/gui/preferences_window.ui.h:93
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Mostra solo nella lista _contatti"
+msgid "Show notification area icon:"
+msgstr "Usa _icona nell'area di notifica (vassoio di sistema)"
 
-#: ../data/gui/preferences_window.ui.h:98
+#: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
-msgid "Show systray:"
-msgstr "_Mostra evento nell'area di notifica"
+msgid "Show only in roster"
+msgstr "Mostra solo nella lista _contatti"
 
-#: ../data/gui/preferences_window.ui.h:99
+#: ../data/gui/preferences_window.ui.h:95
 msgid "Sign _in"
 msgstr "C_onnessione"
 
-#: ../data/gui/preferences_window.ui.h:100
+#: ../data/gui/preferences_window.ui.h:96
 msgid "Sign _out"
 msgstr "_Disconnessione"
 
-#: ../data/gui/preferences_window.ui.h:101
+#: ../data/gui/preferences_window.ui.h:97
 msgid "Single window for everything"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:102
+#: ../data/gui/preferences_window.ui.h:98
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2199,29 +2415,29 @@ msgstr ""
 "Alcuni messaggi potrebbero includere contenuto ricco (formattazione, colori, "
 "ecc.). Se selezionato, Gajim li mostrerà come messaggi semplici."
 
-#: ../data/gui/preferences_window.ui.h:103
+#: ../data/gui/preferences_window.ui.h:99
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "_Ordina i contatti per stato"
 
-#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
 msgid "Status"
 msgstr "Stato"
 
-#: ../data/gui/preferences_window.ui.h:105
+#: ../data/gui/preferences_window.ui.h:101
 msgid "Status _iconset:"
 msgstr "_Icone di stato:"
 
-#: ../data/gui/preferences_window.ui.h:106
+#: ../data/gui/preferences_window.ui.h:102
 #, fuzzy
 msgid "Style"
 msgstr "In stallo"
 
-#: ../data/gui/preferences_window.ui.h:107
+#: ../data/gui/preferences_window.ui.h:103
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/gui/preferences_window.ui.h:108
+#: ../data/gui/preferences_window.ui.h:104
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2229,7 +2445,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:111
+#: ../data/gui/preferences_window.ui.h:107
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2237,128 +2453,132 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:114
+#: ../data/gui/preferences_window.ui.h:110
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Usa le icone dei _trasporti"
 
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:111
+msgid "Use default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:112
 msgid "Use system _default"
 msgstr "Usa il sistema _predefinito"
 
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:113
 msgid "Video framerate"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:117
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Video input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:118
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Video output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:119
+#: ../data/gui/preferences_window.ui.h:116
 msgid "Video size"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:120
+#: ../data/gui/preferences_window.ui.h:117
 msgid "When new event is received:"
 msgstr "Quando si riceve un nuovo evento:"
 
-#: ../data/gui/preferences_window.ui.h:121
+#: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
 msgid "Your message:"
 msgstr "Messaggio di errore: %s"
 
-#: ../data/gui/preferences_window.ui.h:122
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your nickname:"
 msgstr "_Prima del nickname:"
 
-#: ../data/gui/preferences_window.ui.h:123
+#: ../data/gui/preferences_window.ui.h:120
 #, fuzzy
 msgid "_Away after:"
 msgstr "_Assente automaticamente dopo:"
 
-#: ../data/gui/preferences_window.ui.h:124
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../data/gui/preferences_window.ui.h:125
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Display chat state notifications:"
 msgstr "Notifica dello stato di chat in _entrata:"
 
-#: ../data/gui/preferences_window.ui.h:126
+#: ../data/gui/preferences_window.ui.h:123
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Emoticon:"
 
-#: ../data/gui/preferences_window.ui.h:127
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_File manager:"
 msgstr "_File manager:"
 
-#: ../data/gui/preferences_window.ui.h:128
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_Highlight misspelled words"
 msgstr "_Evidenzia parole errate"
 
-#: ../data/gui/preferences_window.ui.h:129
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignora gli eventi da contatti non appartenenti alla lista"
 
-#: ../data/gui/preferences_window.ui.h:130
+#: ../data/gui/preferences_window.ui.h:127
 #, fuzzy
 msgid "_Ignore rich content in incoming messages"
 msgstr "Ignora la formattazione dei messaggi ricevuti"
 
-#: ../data/gui/preferences_window.ui.h:131
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Log status changes of contacts"
 msgstr "_Registra i cambiamenti di stato dei contatti"
 
-#: ../data/gui/preferences_window.ui.h:132
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Mail client:"
 msgstr "_Client di posta:"
 
-#: ../data/gui/preferences_window.ui.h:133
+#: ../data/gui/preferences_window.ui.h:130
 #, fuzzy
 msgid "_Not available after:"
 msgstr "_Non disponibile automaticamente dopo:"
 
-#: ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Open..."
 msgstr "_Apri..."
 
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Reset to Default Colors"
 msgstr "_Reimposta ai colori di default"
 
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Send chat state notifications:"
 msgstr "Notifica dello stato di chat in usci_ta:"
 
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Status message:"
 msgstr "Messaggio di _stato:"
 
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:140
+#: ../data/gui/preferences_window.ui.h:137
 #, fuzzy
 msgid "in _group chats"
 msgstr "Entra in chat di _gruppo"
 
-#: ../data/gui/preferences_window.ui.h:141
+#: ../data/gui/preferences_window.ui.h:138
 #, fuzzy
 msgid "in _roster"
 msgstr "Non nei contatti"
 
-#: ../data/gui/preferences_window.ui.h:142
+#: ../data/gui/preferences_window.ui.h:139
 msgid "minutes"
 msgstr "minuti"
 
@@ -2411,7 +2631,7 @@ msgstr "ID Jabber"
 msgid "Order:"
 msgstr "Ordine:"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3436
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
 msgid "Privacy List"
 msgstr "Lista privacy"
 
@@ -2646,8 +2866,8 @@ msgstr "Rimuovi l'account da Gajim e dal _server"
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5492 ../src/roster_window.py:5622
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
+#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
 msgid "_Remove"
 msgstr "_Elimina"
 
@@ -2691,58 +2911,62 @@ msgid "Help online"
 msgstr "Aiuto online"
 
 #: ../data/gui/roster_window.ui.h:8
+msgid "P_lugins"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:9
 msgid "Profile, A_vatar"
 msgstr "Profilo, a_vatar"
 
-#: ../data/gui/roster_window.ui.h:9
+#: ../data/gui/roster_window.ui.h:10
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "Mostra contatti _offline"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
 msgid "Show Trans_ports"
 msgstr "Mostra tras_porti"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
 msgid "Show _Offline Contacts"
 msgstr "Mostra contatti _offline"
 
-#: ../data/gui/roster_window.ui.h:12 ../src/statusicon.py:326
+#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
 msgid "Show _Roster"
 msgstr "Mostra lista _contatti"
 
-#: ../data/gui/roster_window.ui.h:13
+#: ../data/gui/roster_window.ui.h:14
 #, 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/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
 #: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Azioni"
 
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
 msgid "_Contents"
 msgstr "_Contenuti"
 
-#: ../data/gui/roster_window.ui.h:18 ../src/disco.py:1502
+#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: ../data/gui/roster_window.ui.h:19
+#: ../data/gui/roster_window.ui.h:20
 msgid "_FAQ"
 msgstr "_Domande frequenti"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: ../data/gui/roster_window.ui.h:22
+#: ../data/gui/roster_window.ui.h:23
 msgid "_Send Single Message..."
 msgstr "Invia _messaggio singolo..."
 
-#: ../data/gui/roster_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:25
 msgid "_View"
 msgstr "_Visualizza"
 
@@ -2759,11 +2983,11 @@ msgid "_Add contact"
 msgstr "_Aggiungi contatto"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5634
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
 msgid "_Information"
 msgstr "_Informazioni"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1353
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
 msgid "_Search"
 msgstr "_Cerca"
 
@@ -2783,10 +3007,6 @@ msgstr "Registra a"
 msgid "_Cancel"
 msgstr "_Annulla"
 
-#: ../data/gui/single_message_window.ui.h:2
-msgid "From:"
-msgstr "Da:"
-
 #: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Rispondi a questo  messaggio"
@@ -2803,10 +3023,6 @@ msgstr "Invia messaggio"
 msgid "Send message and close window"
 msgstr "Invia messaggio e chiudi la finestra"
 
-#: ../data/gui/single_message_window.ui.h:7
-msgid "Subject:"
-msgstr "Oggetto:"
-
 #: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "A:"
@@ -3023,27 +3239,37 @@ msgstr "Messaggistica istantanea Gajim"
 msgid "Jabber IM Client"
 msgstr "Client IM Jabber"
 
-#: ../src/adhoc_commands.py:314
+#: ../src/adhoc_commands.py:323
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Informazioni sul contatto"
 
-#: ../src/adhoc_commands.py:315
+#: ../src/adhoc_commands.py:324
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:351 ../src/adhoc_commands.py:374
+#: ../src/adhoc_commands.py:370
+#, fuzzy
+msgid "Invalid Form"
+msgstr "Voce non valida"
+
+#: ../src/adhoc_commands.py:371
+#, fuzzy
+msgid "The form is not filled correctly."
+msgstr "Il nickname contiene caratteri non consentiti."
+
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:360
+#: ../src/adhoc_commands.py:399
 #, fuzzy
 msgid "Service changed the session identifier."
 msgstr "Il client a %s ha annullato la negoziazione della sessione."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:471
+#: ../src/adhoc_commands.py:513
 msgid "Service returned an error."
 msgstr ""
 
@@ -3068,7 +3294,7 @@ msgstr "Intero"
 msgid "Text"
 msgstr "Testo"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:945
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
 msgid "Color"
 msgstr "Colore"
 
@@ -3105,234 +3331,234 @@ msgstr[1] "Hai ricevuto un nuovo evento:"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "English"
 msgstr "Inglese"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Belarusian"
 msgstr "Bielorusso"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Bulgarian"
 msgstr "Bulgaro"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Breton"
 msgstr "Bretone"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Czech"
 msgstr "Ceco"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "German"
 msgstr "Tedesco"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Greek"
 msgstr "Greco"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "British"
 msgstr "Britannico"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Spanish"
 msgstr "Spagnolo"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Basque"
 msgstr "Basco"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "French"
 msgstr "Francese"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Croatian"
 msgstr "Croato"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian (b)"
 msgstr "Norvegese (b)"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Dutch"
 msgstr "Olandese"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian"
 msgstr "Norvegese"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Polish"
 msgstr "Polacco"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Portuguese"
 msgstr "Portoghese"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Brazilian Portuguese"
 msgstr "Brasiliano"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Russian"
 msgstr "Russo"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Serbian"
 msgstr "Serbo"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Slovak"
 msgstr "Slovacco"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Swedish"
 msgstr "Svedese"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Chinese (Ch)"
 msgstr "Cinese (Ch)"
 
-#: ../src/chat_control.py:479
+#: ../src/chat_control.py:496
 msgid "Spelling language"
 msgstr "Lingua per la correzione ortografica"
 
 #. we are not connected
-#: ../src/chat_control.py:511 ../src/chat_control.py:720
+#: ../src/chat_control.py:528 ../src/chat_control.py:737
 msgid "A connection is not available"
 msgstr "Nessuna connessione disponibile"
 
-#: ../src/chat_control.py:512 ../src/chat_control.py:721
+#: ../src/chat_control.py:529 ../src/chat_control.py:738
 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:927
+#: ../src/chat_control.py:944
 #, fuzzy
 msgid "Underline"
 msgstr "Sottolinea"
 
-#: ../src/chat_control.py:928
+#: ../src/chat_control.py:945
 #, fuzzy
 msgid "Strike"
 msgstr "Servizio"
 
-#: ../src/chat_control.py:951
+#: ../src/chat_control.py:968
 #, fuzzy
 msgid "Font"
 msgstr "_Carattere:"
 
-#: ../src/chat_control.py:960
+#: ../src/chat_control.py:977
 #, fuzzy
 msgid "Clear formating"
 msgstr "Informazioni sul contatto"
 
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1055
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:1039
+#: ../src/chat_control.py:1056
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1503 ../src/chat_control.py:1987
+#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Cifratura attivata"
 
 #. Add to roster
-#: ../src/chat_control.py:1528 ../src/common/contacts.py:158
+#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
 #: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:245 ../src/dialogs.py:1064 ../src/dialogs.py:2078
-#: ../src/dialogs.py:2107 ../src/gui_interface.py:674
+#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
+#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
 #: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1610 ../src/roster_window.py:1612
-#: ../src/roster_window.py:1942 ../src/roster_window.py:3289
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
+#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
+#: ../src/roster_window.py:3382
 msgid "Not in Roster"
 msgstr "Non nei contatti"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1575
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Un elenco dei trasferimenti di file attivi, completati ed annullati"
 
-#: ../src/chat_control.py:1561
+#: ../src/chat_control.py:1578
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1656
+#: ../src/chat_control.py:1677
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:1869
 #, 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:1967 ../src/dialogs.py:4866
+#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1968
+#: ../src/chat_control.py:1991
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1977
+#: ../src/chat_control.py:2000
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Cifratura disattivata"
 
-#: ../src/chat_control.py:2003
+#: ../src/chat_control.py:2026
 msgid "Session WILL be logged"
 msgstr "La sessione SARÀ registrata"
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:2028
 msgid "Session WILL NOT be logged"
 msgstr "La sessione NON SARÀ registrata"
 
 #. encryption %s active
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2051
 #, fuzzy
 msgid "and authenticated"
 msgstr "Usa autenticazione"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2032
+#: ../src/chat_control.py:2055
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Usa autenticazione"
@@ -3340,59 +3566,68 @@ 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:2039
+#: ../src/chat_control.py:2062
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2182
+#: ../src/chat_control.py:2205
 msgid "Session negotiation cancelled"
 msgstr "Negoziazione della sessione annullata"
 
-#: ../src/chat_control.py:2191
+#: ../src/chat_control.py:2215
+msgid "This session WILL be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2217
+#, fuzzy
+msgid "This session WILL NOT be archived on server"
+msgstr "La sessione NON SARÀ registrata"
+
+#: ../src/chat_control.py:2226
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Questo messaggio è cifrato]"
 
-#: ../src/chat_control.py:2194
+#: ../src/chat_control.py:2229
 #, fuzzy
 msgid " and WILL be logged"
 msgstr "La sessione SARÀ registrata"
 
-#: ../src/chat_control.py:2196
+#: ../src/chat_control.py:2231
 #, fuzzy
 msgid " and WILL NOT be logged"
 msgstr "La sessione NON SARÀ registrata"
 
-#: ../src/chat_control.py:2201
+#: ../src/chat_control.py:2236
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2203
+#: ../src/chat_control.py:2238
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Cifratura disattivata"
 
-#: ../src/chat_control.py:2241 ../src/chat_control.py:2254
+#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
 msgid "The following message was NOT encrypted"
 msgstr "Il seguente messaggio NON è stato cifrato"
 
-#: ../src/chat_control.py:2247
+#: ../src/chat_control.py:2288
 #, 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:2519
+#: ../src/chat_control.py:2566
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Hai appena ricevuto un nuovo messaggio da \"%s\""
 
-#: ../src/chat_control.py:2520
+#: ../src/chat_control.py:2567
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3400,23 +3635,21 @@ msgstr ""
 "Se chiudi questa scheda e la cronologia è disabilitata, questo messaggio "
 "verrà perso."
 
-#: ../src/chat_control.py:2663 ../src/common/connection_handlers.py:1635
-#: ../src/common/connection_handlers.py:1758
-#: ../src/common/connection_handlers.py:1960
-#: ../src/common/connection_handlers.py:2110 ../src/common/connection.py:452
+#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
 #: ../src/gajim.py:159 ../src/session.py:138
 #, fuzzy
 msgid "Database Error"
 msgstr "Errore di scrittura su disco"
 
-#: ../src/chat_control.py:2664
+#: ../src/chat_control.py:2714
 #, 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:2906
+#: ../src/chat_control.py:2962
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s è ora %(status)s"
@@ -3430,28 +3663,28 @@ msgstr "creazione database log"
 msgid "creating cache database"
 msgstr "creazione database log"
 
-#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
-#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
-#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
-#: ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
 #, 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:275 ../src/common/check_paths.py:282
-#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
-#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
-#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:333
+#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
+#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
+#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
 msgid "Gajim will now exit"
 msgstr "Gajim sta per uscire"
 
-#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
+#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
 #, 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:342
+#: ../src/common/check_paths.py:351
 #, python-format
 msgid "creating %s directory"
 msgstr "creazione della cartella %s"
@@ -3515,9 +3748,9 @@ msgstr "Scegliere le chat di gruppo da cui vuoi uscire"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:801
-#: ../src/roster_window.py:1614 ../src/roster_window.py:1616
-#: ../src/roster_window.py:5251
+#: ../src/common/helpers.py:57 ../src/roster_window.py:815
+#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
+#: ../src/roster_window.py:5323
 msgid "Groupchats"
 msgstr "Chat di gruppo"
 
@@ -3577,7 +3810,8 @@ msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
 #: ../src/common/config.py:88
-msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgid ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
 #: ../src/common/config.py:93
@@ -3631,9 +3865,9 @@ msgid ""
 msgstr "Lista (separata da spazi) di linee (account e gruppi) raggruppate."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:501
-#: ../src/common/optparser.py:290 ../src/common/optparser.py:486
-#: ../src/common/optparser.py:520 ../src/gui_interface.py:3370
+#: ../src/common/config.py:106 ../src/common/config.py:505
+#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
+#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
 msgid "default"
 msgstr "predefinito"
 
@@ -3853,7 +4087,8 @@ 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:197
-msgid "Notify of events in the system trayicon."
+#, fuzzy
+msgid "Notify of events in the notification area."
 msgstr "Notifica gli eventi nell'area di notifica."
 
 #: ../src/common/config.py:203
@@ -3888,9 +4123,10 @@ msgstr ""
 "chat multi-utente."
 
 #: ../src/common/config.py:221
+#, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
+"setting is taken into account only if notification icon is used."
 msgstr ""
 "Se Vero, esce da Gajim quando il pulsante X del Window Manager viene "
 "cliccato. Questa impostazione è presa in considerazione solo se viene usata "
@@ -4174,7 +4410,7 @@ msgstr ""
 #: ../src/common/config.py:270
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
-"systray icon."
+"notification icon."
 msgstr ""
 
 #: ../src/common/config.py:271
@@ -4347,111 +4583,122 @@ msgstr ""
 msgid "Message that is sent to contacts you want to add"
 msgstr "Inserire i dati del contatto che si vuole aggiungere"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:374
+msgid "Last time we syncronized with logs from server."
+msgstr ""
+
+#: ../src/common/config.py:436
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "OpenPGP è abilitato per questo contatto?"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:437 ../src/common/config.py:440
+#: ../src/common/config.py:438 ../src/common/config.py:441
 msgid "Language for which we want to check misspelled words"
 msgstr "Linguaggio per il quale controllare le parole sbagliate"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:447
 msgid "all or space separated status"
 msgstr "tutto o stati separati da uno spazio"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:448
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', o 'both'"
 
-#: ../src/common/config.py:448 ../src/common/config.py:450
-#: ../src/common/config.py:451 ../src/common/config.py:454
-#: ../src/common/config.py:455
+#: ../src/common/config.py:449 ../src/common/config.py:451
+#: ../src/common/config.py:452 ../src/common/config.py:455
+#: ../src/common/config.py:456
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' o 'both'"
 
-#: ../src/common/config.py:461 ../src/common/pep.py:157
+#: ../src/common/config.py:460
+msgid ""
+"State whether plugins should be activated on exit (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
+msgstr ""
+
+#: ../src/common/config.py:465 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Dormo"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back soon"
 msgstr "Torno presto"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back in some minutes."
 msgstr "Torno tra qualche minuto."
 
-#: ../src/common/config.py:463 ../src/common/pep.py:127
+#: ../src/common/config.py:467 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Mangio"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:467
 msgid "I'm eating, so leave me a message."
 msgstr "Sto mangiando, lascia pure un messaggio."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "I'm watching a movie."
 msgstr "Sto guardando un film."
 
-#: ../src/common/config.py:465 ../src/common/pep.py:186
+#: ../src/common/config.py:469 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Lavoro"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:469
 msgid "I'm working."
 msgstr "Sto lavorando."
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "Phone"
 msgstr "Telefono"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "I'm on the phone."
 msgstr "Sono al telefono."
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "Out"
 msgstr "Fuori"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "I'm out enjoying life."
 msgstr "Sono fuori a divertirmi."
 
-#: ../src/common/config.py:478
+#: ../src/common/config.py:482
 msgid "I'm available."
 msgstr "Sono disponibile."
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:483
 msgid "I'm free for chat."
 msgstr "Solo libero per chat."
 
-#: ../src/common/config.py:480 ../src/config.py:1600
+#: ../src/common/config.py:484 ../src/config.py:1600
 msgid "Be right back."
 msgstr "Torno subito."
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:485
 msgid "I'm not available."
 msgstr "Non sono disponibile."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:486
 msgid "Do not disturb."
 msgstr "Non disturbare."
 
-#: ../src/common/config.py:483 ../src/common/config.py:484
+#: ../src/common/config.py:487 ../src/common/config.py:488
 msgid "Bye!"
 msgstr "Ciao ciao!"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:498
 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."
@@ -4459,182 +4706,94 @@ 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:495
+#: ../src/common/config.py:499
 msgid "Sound to play when any MUC message arrives."
 msgstr "Suono da riprodurre quando un messaggio MUC arriva."
 
-#: ../src/common/config.py:504 ../src/common/optparser.py:304
+#: ../src/common/config.py:508 ../src/common/optparser.py:308
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:290
+#: ../src/common/config.py:512 ../src/common/optparser.py:294
 msgid "grocery"
 msgstr "drogheria"
 
-#: ../src/common/config.py:512
+#: ../src/common/config.py:516
 msgid "human"
 msgstr "umano"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:520
 msgid "marine"
 msgstr "marino"
 
-#: ../src/common/connection_handlers.py:84
+#: ../src/common/connection_handlers.py:94
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Impossibile caricare il modulo idle"
 
-#: ../src/common/connection_handlers.py:117
+#: ../src/common/connection_handlers.py:127
 #, 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:124
+#: ../src/common/connection_handlers.py:134
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "La vCard è stata pubblicata correttamente"
 
-#: ../src/common/connection_handlers.py:125
+#: ../src/common/connection_handlers.py:135
 #, python-format
 msgid "Registration with agent %s succeeded"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:133
-#, fuzzy
-msgid "Registration failed"
-msgstr "Migrazione GUI fallita"
-
-#: ../src/common/connection_handlers.py:133
-#, python-format
-msgid ""
-"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:445
-#: ../src/common/connection_handlers.py:1633
-#: ../src/common/connection_handlers.py:1756
-#: ../src/common/connection_handlers.py:1957
-#: ../src/common/connection_handlers.py:2108 ../src/common/connection.py:449
-#: ../src/gajim.py:341
-msgid "Disk Write Error"
-msgstr "Errore di scrittura su disco"
-
-#: ../src/common/connection_handlers.py:678 ../src/common/connection.py:1472
-#, fuzzy
-msgid "Invisibility not supported"
-msgstr "Dbus non è supportato."
-
-#: ../src/common/connection_handlers.py:679 ../src/common/connection.py:1473
-#, python-format
-msgid "Account %s doesn't support invisibility."
-msgstr ""
-
-#: ../src/common/connection_handlers.py:1446 ../src/common/connection.py:253
-#: ../src/config.py:2091 ../src/config.py:2100 ../src/config.py:2168
-#: ../src/config.py:3560 ../src/dataforms_widget.py:597 ../src/dialogs.py:2931
-msgid "Invalid Jabber ID"
-msgstr "ID Jabber non valido"
-
-#: ../src/common/connection_handlers.py:1447
-msgid "A message from a non-valid JID arrived, it has been ignored."
-msgstr ""
-
-#: ../src/common/connection_handlers.py:1636
-#: ../src/common/connection_handlers.py:1759
-#: ../src/common/connection_handlers.py:1961
-#: ../src/common/connection_handlers.py:2111 ../src/common/connection.py:453
-#: ../src/gajim.py:160 ../src/session.py:139
-#, 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:1805
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Nickname non permesso: %s"
-
-#: ../src/common/connection_handlers.py:1902
-#: ../src/common/connection_handlers.py:1911
-#: ../src/common/connection_handlers.py:1918
-#: ../src/common/connection_handlers.py:1922
-#: ../src/common/connection_handlers.py:1926
-#: ../src/common/connection_handlers.py:1931 ../src/gui_interface.py:139
-msgid "Unable to join group chat"
-msgstr "Non è possibile entrare nella stanza"
-
-#: ../src/common/connection_handlers.py:1903
-#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:1912
-#, python-format
-msgid "You are banned from group chat %s."
-msgstr "Sei stato bandito dalla stanza %s."
-
-#: ../src/common/connection_handlers.py:1919
-#, python-format
-msgid "Group chat %s does not exist."
-msgstr "La stanza %s non esiste."
-
-#: ../src/common/connection_handlers.py:1923
-msgid "Group chat creation is restricted."
-msgstr "Non è permessa la creazione di stanze."
-
-#: ../src/common/connection_handlers.py:1927
-#, 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:1932
-#, 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."
+msgstr ""
 
-#. Room has been destroyed. see
-#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:1976
-msgid "Room has been destroyed"
-msgstr "La stanza è stata cancellata"
+#: ../src/common/connection_handlers.py:143
+#, fuzzy
+msgid "Registration failed"
+msgstr "Migrazione GUI fallita"
 
-#: ../src/common/connection_handlers.py:1984
+#: ../src/common/connection_handlers.py:143
 #, python-format
-msgid "You can join this room instead: %s"
-msgstr "Puoi invece entrare in questa stanza: %s"
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:2020
-msgid "I would like to add you to my roster."
-msgstr "Vorrei aggiungerti ai miei contatti."
+#: ../src/common/connection_handlers.py:466
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
+#: ../src/gajim.py:341
+msgid "Disk Write Error"
+msgstr "Errore di scrittura su disco"
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2041
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "si è ora abbonati a %s"
+#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
+#, fuzzy
+msgid "Invisibility not supported"
+msgstr "Dbus non è supportato."
 
-#: ../src/common/connection_handlers.py:2043
+#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
 #, python-format
-msgid "unsubscribe request from %s"
-msgstr "richiesta di cancellazione abbonamento da %s"
+msgid "Account %s doesn't support invisibility."
+msgstr ""
 
-#: ../src/common/connection_handlers.py:2045
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "è stato ora cancellato l'abbonamento a %s"
+#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
+#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
+#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
+msgid "Invalid Jabber ID"
+msgstr "ID Jabber non valido"
 
-#: ../src/common/connection_handlers.py:2240
+#: ../src/common/connection_handlers.py:1405
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
+#: ../src/gajim.py:160 ../src/session.py:139
 #, python-format
 msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
+"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 ""
-"Il JID %s non rispetta la RFC. Non verrà aggiunto ai contatti. Usare "
-"strumenti di gestione dei contatti come http://jru.jabberstudio.org/ per "
-"rimuoverlo"
 
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
@@ -4767,28 +4926,28 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:254 ../src/dialogs.py:2932
+#: ../src/common/connection.py:256 ../src/dialogs.py:2948
 #, 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:276
+#: ../src/common/connection.py:278
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:281
 #, 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:331
+#: ../src/common/connection.py:333
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Questo messaggio è *cifrato* (vedi :JEP:`27`)]"
 
-#: ../src/common/connection.py:439
+#: ../src/common/connection.py:441
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4797,111 +4956,111 @@ msgstr ""
 "Oggetto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:807
+#: ../src/common/connection.py:809
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Connessione con l'account \"%s\" persa"
 
-#: ../src/common/connection.py:808
+#: ../src/common/connection.py:810
 msgid "Reconnect manually."
 msgstr "Riconnetti manualmente."
 
-#: ../src/common/connection.py:820
+#: ../src/common/connection.py:822
 #, 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:854
+#: ../src/common/connection.py:856
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:867
+#: ../src/common/connection.py:869
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Versione D-Bus sconosciuta: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:882
+#: ../src/common/connection.py:884
 msgid "Invalid answer"
 msgstr "Risposta non valida"
 
-#: ../src/common/connection.py:883
+#: ../src/common/connection.py:885
 #, 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:1165 ../src/common/connection.py:1294
-#: ../src/common/connection.py:1784
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
+#: ../src/common/connection.py:1792
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Non è possibile connettersi a \"%s\""
 
-#: ../src/common/connection.py:1166 ../src/gui_interface.py:755
+#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
 msgid "Check your connection or try again later."
 msgstr "Controllare la connessione o riprovare più tardi."
 
-#: ../src/common/connection.py:1171
+#: ../src/common/connection.py:1173
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Memorizzato in: %s"
 
-#: ../src/common/connection.py:1184
+#: ../src/common/connection.py:1186
 msgid "Connection to proxy failed"
 msgstr "Connessione al proxy fallita"
 
-#: ../src/common/connection.py:1215 ../src/common/connection.py:1274
+#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Non è possibile connettersi a \"%s\""
 
-#: ../src/common/connection.py:1216 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Connessione con l'account \"%s\" persa"
 
-#: ../src/common/connection.py:1241
+#: ../src/common/connection.py:1243
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1244
+#: ../src/common/connection.py:1246
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1248
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Versione D-Bus sconosciuta: %s"
 
-#: ../src/common/connection.py:1295
+#: ../src/common/connection.py:1297
 msgid "Check your connection or try again later"
 msgstr "Controllare la connessione o riprovare più tardi"
 
-#: ../src/common/connection.py:1324
+#: ../src/common/connection.py:1329
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autenticazione con \"%s\" fallita"
 
-#: ../src/common/connection.py:1326
+#: ../src/common/connection.py:1331
 msgid "Please check your login and password for correctness."
 msgstr "Verificare la correttezza di login e password."
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1400
 msgid "Error while removing privacy list"
 msgstr "Errore durante la rimozione della lista privacy"
 
-#: ../src/common/connection.py:1396
+#: ../src/common/connection.py:1401
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4910,41 +5069,41 @@ msgstr ""
 "La lista privacy %s non è stata rimossa. Potrebbe essere attiva in una delle "
 "risorse connesse. Disattivarla e riprovare."
 
-#: ../src/common/connection.py:1650
+#: ../src/common/connection.py:1658
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1653
+#: ../src/common/connection.py:1661
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "_Gestisci contatti"
 
-#: ../src/common/connection.py:1799 ../src/common/connection.py:1822
+#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
 msgid "Not fetched because of invisible status"
 msgstr "Non ottenuto a causa di stato invisibile"
 
-#: ../src/common/connection.py:2254
+#: ../src/common/connection.py:2262
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Migrazione GUI fallita"
 
-#: ../src/common/connection.py:2255
+#: ../src/common/connection.py:2263
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
 #: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:674
+#: ../src/gui_interface.py:551
 msgid "Observers"
 msgstr "Osservatori"
 
 #: ../src/common/contacts.py:139 ../src/common/contacts.py:366
 #: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1499 ../src/gui_interface.py:424
-#: ../src/roster_window.py:840 ../src/roster_window.py:1525
-#: ../src/roster_window.py:1606 ../src/roster_window.py:1608
-#: ../src/roster_window.py:1769
+#: ../src/disco.py:1517 ../src/roster_window.py:854
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
+#: ../src/roster_window.py:2466
 msgid "Transports"
 msgstr "Trasporti"
 
@@ -5174,203 +5333,219 @@ msgstr "Fine settimana"
 msgid "Weekend!"
 msgstr "Fine settimana!"
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:148
+msgid "Username must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:153
 msgid "Invalid character in username."
 msgstr "Carattere non valido nel nome utente."
 
-#: ../src/common/helpers.py:156
-msgid "Server address required."
-msgstr "Indirizzo del server richiesto."
+#: ../src/common/helpers.py:159
+msgid "Server must be between 1 and 1023 chars"
+msgstr ""
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 msgid "Invalid character in hostname."
 msgstr "Carattere non valido nell'hostname."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:166
+msgid "Server address required."
+msgstr "Indirizzo del server richiesto."
+
+#: ../src/common/helpers.py:170
+msgid "Resource must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:175
 msgid "Invalid character in resource."
 msgstr "Carattere non valido nella risorsa."
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:215
 msgid "_Busy"
 msgstr "O_ccupato"
 
-#: ../src/common/helpers.py:211 ../src/tooltips.py:195
+#: ../src/common/helpers.py:217 ../src/tooltips.py:195
 msgid "Busy"
 msgstr "Occupato"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:220
 msgid "_Not Available"
 msgstr "_Non disponibile"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:225
 msgid "_Free for Chat"
 msgstr "_Libero per chat"
 
-#: ../src/common/helpers.py:221 ../src/tooltips.py:191
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Free for Chat"
 msgstr "Libero per chat"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:230
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?transfer status:In pausa"
 
-#: ../src/common/helpers.py:226 ../src/tooltips.py:189
+#: ../src/common/helpers.py:232 ../src/tooltips.py:189
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?transfer status:In pausa"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:234
 msgid "Connecting"
 msgstr "Connessione in corso"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:237
 msgid "A_way"
 msgstr "_Assente"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:242
 msgid "_Offline"
 msgstr "_Offline"
 
-#: ../src/common/helpers.py:238 ../src/tooltips.py:199
+#: ../src/common/helpers.py:244 ../src/tooltips.py:199
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:247
 msgid "_Invisible"
 msgstr "_Invisibile"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:253
 msgid "?contact has status:Unknown"
 msgstr "Sconosciuto"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:255
 msgid "?contact has status:Has errors"
 msgstr "Ci sono errori"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:260
 msgid "?Subscription we already have:None"
 msgstr "Nessuno"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:262
 msgid "To"
 msgstr "A"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
+msgid "From"
+msgstr "Da"
+
+#: ../src/common/helpers.py:266
 msgid "Both"
 msgstr "Entrambi"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:274
 msgid "?Ask (for Subscription):None"
 msgstr "Nulla"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:276
 msgid "Subscribe"
 msgstr "Abbonati"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:285
 msgid "?Group Chat Contact Role:None"
 msgstr "Nessuno"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:288
 msgid "Moderators"
 msgstr "Moderatori"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:290
 msgid "Moderator"
 msgstr "Moderatore"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:293
 msgid "Participants"
 msgstr "Partecipanti"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:295
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:298
 msgid "Visitors"
 msgstr "Visitatori"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:300
 msgid "Visitor"
 msgstr "Visitatore"
 
-#: ../src/common/helpers.py:300 ../src/tooltips.py:210
+#: ../src/common/helpers.py:306 ../src/tooltips.py:210
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Nessuna"
 
-#: ../src/common/helpers.py:302 ../src/tooltips.py:216
+#: ../src/common/helpers.py:308 ../src/tooltips.py:216
 msgid "Owner"
 msgstr "Proprietario"
 
-#: ../src/common/helpers.py:304 ../src/tooltips.py:214
+#: ../src/common/helpers.py:310 ../src/tooltips.py:214
 msgid "Administrator"
 msgstr "Amministratore"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:212
+#: ../src/common/helpers.py:312 ../src/tooltips.py:212
 msgid "Member"
 msgstr "Membro"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:351
 msgid "is paying attention to the conversation"
 msgstr "sta seguendo la conversazione"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:353
 msgid "is doing something else"
 msgstr "sta facendo altro"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:355
 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:352
+#: ../src/common/helpers.py:358
 msgid "paused composing a message"
 msgstr "ha smesso di scrivere"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:360
 msgid "has closed the chat window or tab"
 msgstr "ha chiuso la finestra o scheda di chat"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:619
+#: ../src/common/helpers.py:625
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:622
+#: ../src/common/helpers.py:628
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:626
+#: ../src/common/helpers.py:632
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:629
+#: ../src/common/helpers.py:635
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:633
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:636
+#: ../src/common/helpers.py:642
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:645
 #, python-format
 msgid "%s B"
 msgstr "%s B"
@@ -5413,12 +5588,12 @@ msgstr "Gajim - %s"
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:111
+#: ../src/common/jingle_rtp.py:107
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Configurazione della stanza"
 
-#: ../src/common/jingle_rtp.py:112
+#: ../src/common/jingle_rtp.py:108
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5430,30 +5605,30 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:209
+#: ../src/common/jingle_rtp.py:205
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:210
+#: ../src/common/jingle_rtp.py:206
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Messaggio di errore: %s"
 
-#: ../src/common/jingle_rtp.py:336
+#: ../src/common/jingle_rtp.py:335
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:339
+#: ../src/common/jingle_rtp.py:338
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:382
+#: ../src/common/jingle_rtp.py:381
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:390
+#: ../src/common/jingle_rtp.py:389
 msgid "video output"
 msgstr ""
 
@@ -5530,11 +5705,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "errore: impossibile aprire %s per lettura"
 
-#: ../src/common/optparser.py:299 ../src/common/optparser.py:300
+#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:379
+#: ../src/common/optparser.py:383
 msgid "migrating logs database to indices"
 msgstr "Migrazione database delle cronologie agli indici"
 
@@ -6283,17 +6458,17 @@ msgstr ""
 "file verrà annullato."
 
 #. we're not english
-#: ../src/common/stanza_session.py:303
+#: ../src/common/stanza_session.py:423
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:178
+#: ../src/common/zeroconf/connection_zeroconf.py:181
 msgid "Avahi error"
 msgstr "Errore avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:179
+#: ../src/common/zeroconf/connection_zeroconf.py:182
 #, python-format
 msgid ""
 "%s\n"
@@ -6302,46 +6477,46 @@ msgstr ""
 "%s\n"
 "La messaggistica sulla rete locale potrebbe non funzionare correttamente."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:190
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Controllare se Avahi è installato."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:199
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Could not start local service"
 msgstr "Impossibile avviare il servizio locale"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Impossibile collegarsi alla porta %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-#: ../src/common/zeroconf/connection_zeroconf.py:283
-#: ../src/common/zeroconf/connection_zeroconf.py:294
-#: ../src/common/zeroconf/connection_zeroconf.py:308
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:286
+#: ../src/common/zeroconf/connection_zeroconf.py:297
+#: ../src/common/zeroconf/connection_zeroconf.py:311
 msgid "Please check if avahi-daemon is running."
 msgstr "Controllare se avahi-daemon è in esecuzione."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:282
-#: ../src/common/zeroconf/connection_zeroconf.py:293
-#: ../src/common/zeroconf/connection_zeroconf.py:307
+#: ../src/common/zeroconf/connection_zeroconf.py:285
+#: ../src/common/zeroconf/connection_zeroconf.py:296
+#: ../src/common/zeroconf/connection_zeroconf.py:310
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Impossibile cambiare lo stato dell'account  \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:325
+#: ../src/common/zeroconf/connection_zeroconf.py:328
 #, 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:335
+#: ../src/common/zeroconf/connection_zeroconf.py:338
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Il contatto è offline. Il tuo messaggio non può esser inviato."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:363
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6364,16 +6539,16 @@ msgstr "Messaggi di stato preimpostati"
 msgid "Enabled"
 msgstr "Abilita"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3078
+#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
 msgid "Default"
 msgstr "Predefinito"
 
-#: ../src/config.py:739 ../src/dialogs.py:1395
+#: ../src/config.py:733 ../src/dialogs.py:1409
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Dizionario per lingua %s non disponibile"
 
-#: ../src/config.py:740
+#: ../src/config.py:734
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6391,9 +6566,9 @@ msgid "status message text"
 msgstr "testo del messaggio di stato"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2383 ../src/dialogs.py:2449
-#: ../src/dialogs.py:3215 ../src/disco.py:866 ../src/disco.py:1726
-#: ../src/disco.py:2030 ../src/history_window.py:90
+#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
+#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
+#: ../src/disco.py:2048 ../src/history_window.py:90
 msgid "Name"
 msgstr "Nome"
 
@@ -6431,7 +6606,7 @@ msgstr ""
 "Tutte le finestre di chat e le chat di gruppo saranno chiuse. Desideri "
 "continuare?"
 
-#: ../src/config.py:1976 ../src/config.py:2509 ../src/config.py:2545
+#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
 msgid "You are currently connected to the server"
 msgstr "Si è ora connessi al server"
 
@@ -6466,138 +6641,138 @@ msgstr "Il nome account non può essere vuoto."
 msgid "Account name cannot contain spaces."
 msgstr "Il nome account non può contenere spazi."
 
-#: ../src/config.py:2072
+#: ../src/config.py:2074
 msgid "Rename Account"
 msgstr "Rinomina account"
 
-#: ../src/config.py:2073
+#: ../src/config.py:2075
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Inserisci un nuovo nome per l'account %s"
 
-#: ../src/config.py:2101
+#: ../src/config.py:2103
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Un ID Jabber deve essere nella forma \"utente@nomeserver\"."
 
-#: ../src/config.py:2318 ../src/config.py:3606
+#: ../src/config.py:2320 ../src/config.py:3623
 msgid "Invalid entry"
 msgstr "Voce non valida"
 
-#: ../src/config.py:2319 ../src/config.py:3607
+#: ../src/config.py:2321 ../src/config.py:3624
 msgid "Custom port must be a port number."
 msgstr "Si deve scegliere un numero di porta."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2342
 msgid "Failed to get secret keys"
 msgstr "Fallimento nella ricezione delle chiavi segrete"
 
-#: ../src/config.py:2341
+#: ../src/config.py:2343
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "C'è stato un problema nel recuperare le chiavi segrete OpenPGP."
 
-#: ../src/config.py:2375
+#: ../src/config.py:2377
 msgid "OpenPGP Key Selection"
 msgstr "Scelta chiave OpenPGP"
 
-#: ../src/config.py:2376
+#: ../src/config.py:2378
 msgid "Choose your OpenPGP key"
 msgstr "Scegliere la chiave OpenPGP"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2385
 msgid "No such account available"
 msgstr "Questo account non è disponibile"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2386
 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:2391 ../src/dialogs.py:2136 ../src/dialogs.py:2371
-#: ../src/dialogs.py:2557 ../src/disco.py:511 ../src/profile_window.py:339
+#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
+#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
 msgid "You are not connected to the server"
 msgstr "Non si è connessi al server"
 
-#: ../src/config.py:2392
+#: ../src/config.py:2394
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Senza una connessione, non è possibile modificare le informazioni personali."
 
-#: ../src/config.py:2396
+#: ../src/config.py:2398
 msgid "Your server doesn't support Vcard"
 msgstr "Il server non supporta Vcard"
 
-#: ../src/config.py:2397
+#: ../src/config.py:2399
 msgid "Your server can't save your personal information."
 msgstr "Il server non può salvare le informazioni personali."
 
-#: ../src/config.py:2510 ../src/config.py:2546
+#: ../src/config.py:2512 ../src/config.py:2548
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Per cambiare nome account, è necessario disconnettersi."
 
-#: ../src/config.py:2515
+#: ../src/config.py:2517
 msgid "Account Local already exists."
 msgstr "Nome account già in uso"
 
-#: ../src/config.py:2516
+#: ../src/config.py:2518
 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:2673
+#: ../src/config.py:2675
 #, python-format
 msgid "Edit %s"
 msgstr "Modifica %s"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2677
 #, python-format
 msgid "Register to %s"
 msgstr "Registra a %s"
 
 #. list at the beginning
-#: ../src/config.py:2711
+#: ../src/config.py:2713
 msgid "Ban List"
 msgstr "Lista utenti bloccati"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2714
 msgid "Member List"
 msgstr "Lista membri"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2714
 msgid "Owner List"
 msgstr "Lista proprietari"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2715
 msgid "Administrator List"
 msgstr "Lista amministratori"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2763 ../src/disco.py:873 ../src/history_manager.py:201
+#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2773
+#: ../src/config.py:2789
 msgid "Reason"
 msgstr "Motivo"
 
-#: ../src/config.py:2780
+#: ../src/config.py:2796
 msgid "Nick"
 msgstr "Nickname"
 
-#: ../src/config.py:2786
+#: ../src/config.py:2802
 msgid "Role"
 msgstr "Ruolo"
 
-#: ../src/config.py:2813
+#: ../src/config.py:2829
 msgid "Banning..."
 msgstr "Sto bloccando..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2815
+#: ../src/config.py:2831
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6605,11 +6780,11 @@ msgstr ""
 "<b>Chi si vuole bloccare?</b>\n"
 "\n"
 
-#: ../src/config.py:2817
+#: ../src/config.py:2833
 msgid "Adding Member..."
 msgstr "Aggiunta membro..."
 
-#: ../src/config.py:2818
+#: ../src/config.py:2834
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6617,11 +6792,11 @@ msgstr ""
 "<b>Chi si vuole rendere membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2836
 msgid "Adding Owner..."
 msgstr "Aggiunta proprietario..."
 
-#: ../src/config.py:2821
+#: ../src/config.py:2837
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6629,11 +6804,11 @@ msgstr ""
 "<b>Chi si vuole rendere proprietario?</b>\n"
 "\n"
 
-#: ../src/config.py:2823
+#: ../src/config.py:2839
 msgid "Adding Administrator..."
 msgstr "Aggiunta amministratore..."
 
-#: ../src/config.py:2824
+#: ../src/config.py:2840
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6641,7 +6816,7 @@ msgstr ""
 "<b>Chi si vuole rendere amministratore?</b>\n"
 "\n"
 
-#: ../src/config.py:2825
+#: ../src/config.py:2841
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6659,83 +6834,83 @@ msgstr ""
 "4. dominio (il dominio corrisponde, così come qualsiasi utente@dominio,\n"
 "dominio/risorsa, o indirizzo contenente un sottodominio)."
 
-#: ../src/config.py:2926
+#: ../src/config.py:2943
 #, python-format
 msgid "Removing %s account"
 msgstr "Eliminazione account %s"
 
-#: ../src/config.py:2941
+#: ../src/config.py:2958
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Cifratura disattivata"
 
-#: ../src/config.py:2942
+#: ../src/config.py:2959
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2955 ../src/gui_interface.py:1132
-#: ../src/gui_interface.py:1243
+#: ../src/config.py:2972 ../src/gui_interface.py:311
+#: ../src/gui_interface.py:1048
 msgid "Password Required"
 msgstr "Password richiesta"
 
-#: ../src/config.py:2956 ../src/gui_interface.py:1223
+#: ../src/config.py:2973 ../src/gui_interface.py:1028
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Inserire la password per l'account %s"
 
-#: ../src/config.py:2957 ../src/gui_interface.py:1243
+#: ../src/config.py:2974 ../src/gui_interface.py:1048
 msgid "Save password"
 msgstr "Memorizza password"
 
-#: ../src/config.py:2967
+#: ../src/config.py:2984
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "L'account \"%s\" è connesso al server"
 
-#: ../src/config.py:2968
+#: ../src/config.py:2985
 msgid "If you remove it, the connection will be lost."
 msgstr "Se viene rimosso, la connessione verrà persa."
 
-#: ../src/config.py:2982
+#: ../src/config.py:2999
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Connessione al proxy fallita"
 
-#: ../src/config.py:2983
+#: ../src/config.py:3000
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Cosa fare?"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3001
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Rimuovi l'account solo da _Gajim"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3002
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3078
+#: ../src/config.py:3095
 msgid "?print_status:All"
 msgstr "?print_status:Tutti"
 
-#: ../src/config.py:3079
+#: ../src/config.py:3096
 msgid "Enter and leave only"
 msgstr "Solo ingresso ed uscita"
 
-#: ../src/config.py:3080
+#: ../src/config.py:3097
 msgid "?print_status:None"
 msgstr "Nessuno"
 
-#: ../src/config.py:3150
+#: ../src/config.py:3167
 msgid "New Group Chat"
 msgstr "Nuova chat di gruppo"
 
-#: ../src/config.py:3183
+#: ../src/config.py:3200
 msgid "This bookmark has invalid data"
 msgstr "Questo segnalibro contiene dati non validi"
 
-#: ../src/config.py:3184
+#: ../src/config.py:3201
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6743,29 +6918,29 @@ msgstr ""
 "segnalibro."
 
 #. invalid char
-#: ../src/config.py:3302 ../src/dialogs.py:1934
+#: ../src/config.py:3319 ../src/dialogs.py:1950
 msgid "Invalid nickname"
 msgstr "Nickname non valido"
 
-#: ../src/config.py:3303 ../src/config.py:3317 ../src/config.py:3331
+#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Nickname non permesso: %s"
 
-#: ../src/config.py:3316 ../src/config.py:3582
+#: ../src/config.py:3333 ../src/config.py:3599
 msgid "Invalid server"
 msgstr "Server non valido"
 
-#: ../src/config.py:3330
+#: ../src/config.py:3347
 #, fuzzy
 msgid "Invalid room"
 msgstr "Voce non valida"
 
-#: ../src/config.py:3498
+#: ../src/config.py:3515
 msgid "Account has been added successfully"
 msgstr "L'account è stato aggiunto con successo"
 
-#: ../src/config.py:3499 ../src/config.py:3505
+#: ../src/config.py:3516 ../src/config.py:3522
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6776,33 +6951,33 @@ msgstr ""
 "\", o farlo più tardi scegliendo la voce \"Account\" nel menu \"Modifica\" "
 "della finestra principale."
 
-#: ../src/config.py:3504
+#: ../src/config.py:3521
 msgid "Your new account has been created successfully"
 msgstr "Il nuovo account è stato creato con successo"
 
-#: ../src/config.py:3543
+#: ../src/config.py:3560
 msgid "Invalid username"
 msgstr "Nome utente non valido"
 
-#: ../src/config.py:3545
+#: ../src/config.py:3562
 msgid "You must provide a username to configure this account."
 msgstr "È necessario inserire un nome utente per configurare questo account."
 
-#: ../src/config.py:3583
+#: ../src/config.py:3600
 msgid "Please provide a server on which you want to register."
 msgstr "Per favore fornire il server su cui vuoi registrarti."
 
-#: ../src/config.py:3639 ../src/gui_interface.py:1904
+#: ../src/config.py:3656 ../src/gui_interface.py:1693
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Contatto già presente nella lista contatti"
 
-#: ../src/config.py:3640 ../src/gui_interface.py:1905
+#: ../src/config.py:3657 ../src/gui_interface.py:1694
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3717
+#: ../src/config.py:3734
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6812,7 +6987,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3723 ../src/gui_interface.py:1932
+#: ../src/config.py:3740 ../src/gui_interface.py:1721
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6820,72 +6995,81 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3755 ../src/config.py:3789
+#: ../src/config.py:3772 ../src/config.py:3806
 msgid "An error occurred during account creation"
 msgstr "Si è verificato un errore durante la creazione dell'account"
 
-#: ../src/config.py:3854
+#: ../src/config.py:3871
 msgid "Account name is in use"
 msgstr "Il nome account è già in uso"
 
-#: ../src/config.py:3855
+#: ../src/config.py:3872
 msgid "You already have an account using this name."
 msgstr "Esiste già un account con lo stesso nome"
 
-#: ../src/config.py:4009
+#: ../src/config.py:3991
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/config.py:3992
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#: ../src/config.py:4036
 msgid "Active"
 msgstr "Attivo"
 
-#: ../src/config.py:4017
+#: ../src/config.py:4044
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:4052
+#: ../src/config.py:4079
 msgid "First Message Received"
 msgstr "Primo messaggio ricevuto"
 
-#: ../src/config.py:4053
+#: ../src/config.py:4080
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Prossimo messaggio ricevuto"
 
-#: ../src/config.py:4055
+#: ../src/config.py:4082
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Prossimo messaggio ricevuto"
 
-#: ../src/config.py:4056
+#: ../src/config.py:4083
 msgid "Contact Connected"
 msgstr "Contatto connesso"
 
-#: ../src/config.py:4057
+#: ../src/config.py:4084
 msgid "Contact Disconnected"
 msgstr "Contatto disconnesso"
 
-#: ../src/config.py:4058
+#: ../src/config.py:4085
 msgid "Message Sent"
 msgstr "Messaggio inviato"
 
-#: ../src/config.py:4059
+#: ../src/config.py:4086
 msgid "Group Chat Message Highlight"
 msgstr "Evidenziatura messaggi in chat di gruppo"
 
-#: ../src/config.py:4060
+#: ../src/config.py:4087
 msgid "Group Chat Message Received"
 msgstr "Messaggio ricevuto in chat di gruppo"
 
-#: ../src/config.py:4061
+#: ../src/config.py:4088
 msgid "GMail Email Received"
 msgstr "Email GMail ricevuta"
 
-#: ../src/conversation_textview.py:600
+#: ../src/conversation_textview.py:601
 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:619
+#: ../src/conversation_textview.py:620
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6894,45 +7078,45 @@ 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:739
+#: ../src/conversation_textview.py:740
 #, fuzzy
 msgid "_Quote"
 msgstr "_Esci"
 
-#: ../src/conversation_textview.py:746
+#: ../src/conversation_textview.py:747
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Azioni per \"%s\""
 
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Read _Wikipedia Article"
 msgstr "Leggi l'articolo di _Wikipedia"
 
-#: ../src/conversation_textview.py:763
+#: ../src/conversation_textview.py:765
 msgid "Look it up in _Dictionary"
 msgstr "Controlla nel _Dizionario"
 
-#: ../src/conversation_textview.py:780
+#: ../src/conversation_textview.py:782
 #, 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:793
+#: ../src/conversation_textview.py:795
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Manca un \"%s\" nell'URL di ricerca su web"
 
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 msgid "Web _Search for it"
 msgstr "_Cercalo nel Web"
 
-#: ../src/conversation_textview.py:802
+#: ../src/conversation_textview.py:804
 msgid "Open as _Link"
 msgstr "Apri come _Link"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1296
+#: ../src/conversation_textview.py:1298
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6940,184 +7124,189 @@ msgstr[0] "Ieri"
 msgstr[1] "Ieri"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1344 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Oggetto: %s\n"
 
-#: ../src/dataforms_widget.py:544
+#: ../src/dataforms_widget.py:545
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Impossibile caricare il modulo idle"
 
-#: ../src/dataforms_widget.py:546
+#: ../src/dataforms_widget.py:547
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Dbus non è supportato."
 
-#: ../src/dataforms_widget.py:601
+#: ../src/dataforms_widget.py:562
+msgid "This field is required"
+msgstr ""
+
+#: ../src/dataforms_widget.py:607
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Client IM Jabber"
 
-#: ../src/dataforms_widget.py:602
+#: ../src/dataforms_widget.py:608
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:613
+#: ../src/dataforms_widget.py:619
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:616 ../src/dataforms_widget.py:618
+#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nome contatto: <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "ID Jabber: <i>%s</i>"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:195
 msgid "Group"
 msgstr "Gruppo"
 
-#: ../src/dialogs.py:201
+#: ../src/dialogs.py:202
 msgid "In the group"
 msgstr "Nel gruppo"
 
-#: ../src/dialogs.py:292
+#: ../src/dialogs.py:293
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:297
+#: ../src/dialogs.py:298
 msgid "Contact name"
 msgstr "Nome contatto"
 
-#: ../src/dialogs.py:469
+#: ../src/dialogs.py:470
 msgid "Set Mood"
 msgstr ""
 
-#: ../src/dialogs.py:589
+#: ../src/dialogs.py:590
 #, python-format
 msgid "%s Status Message"
 msgstr "Messaggio di stato %s"
 
-#: ../src/dialogs.py:603
+#: ../src/dialogs.py:604
 msgid "Status Message"
 msgstr "Messaggio di stato"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:794
 msgid "Overwrite Status Message?"
 msgstr "Sovrascrivere messaggio di stato?"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:795
 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:802
+#: ../src/dialogs.py:803
 msgid "Save as Preset Status Message"
 msgstr "Salva come messaggio di stato predefinito"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:804
 msgid "Please type a name for this status message"
 msgstr "Inserire un nome per questo messaggio di stato"
 
-#: ../src/dialogs.py:831
+#: ../src/dialogs.py:832
 msgid "AIM Address:"
 msgstr "Indirizzo AIM:"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:833
 msgid "GG Number:"
 msgstr "Numero GG:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:834
 msgid "ICQ Number:"
 msgstr "Numero ICQ:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:835
 msgid "MSN Address:"
 msgstr "Indirizzo MSN:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:836
 msgid "Yahoo! Address:"
 msgstr "Indirizzo Yahoo!:"
 
-#: ../src/dialogs.py:872
+#: ../src/dialogs.py:873
 #, 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:875
+#: ../src/dialogs.py:876
 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:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
+#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
+#: ../src/dialogs.py:3464
 msgid "Invalid User ID"
 msgstr "ID utente non valido"
 
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1052
 msgid "The user ID must not contain a resource."
 msgstr "L'identificatore dell'utente deve non contenere una risorsa."
 
-#: ../src/dialogs.py:1051
+#: ../src/dialogs.py:1057
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Vorrei aggiungerti ai miei contatti."
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1071
 msgid "Contact already in roster"
 msgstr "Contatto già presente nella lista contatti"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1072
 msgid "This contact is already listed in your roster."
 msgstr "Questo contatto è già presente nella lista contatti."
 
-#: ../src/dialogs.py:1112
+#: ../src/dialogs.py:1118
 msgid "User ID:"
 msgstr "ID utente:"
 
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1189
 msgid "A GTK+ jabber client"
 msgstr "Un client jabber GTK+"
 
-#: ../src/dialogs.py:1176
+#: ../src/dialogs.py:1190
 msgid "GTK+ Version:"
 msgstr "Versione di GTK+:"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1191
 msgid "PyGTK Version:"
 msgstr "Versione di PyGTK:"
 
-#: ../src/dialogs.py:1187
+#: ../src/dialogs.py:1201
 msgid "Current Developers:"
 msgstr "Sviluppatori attuali:"
 
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1203
 msgid "Past Developers:"
 msgstr "Sviluppatori precedenti:"
 
-#: ../src/dialogs.py:1195
+#: ../src/dialogs.py:1209
 msgid "THANKS:"
 msgstr "GRAZIE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1215
 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:1213
+#: ../src/dialogs.py:1227
 msgid "translator-credits"
 msgstr ""
 "Mauro Brenna <malloblenne@gmail.com>\n"
@@ -7125,7 +7314,7 @@ msgstr ""
 "Matteo Dell'Amico <della@linux.it>\n"
 "Daniel Coppi <neoex.dc@gmail.com>"
 
-#: ../src/dialogs.py:1396
+#: ../src/dialogs.py:1410
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7138,271 +7327,271 @@ msgstr ""
 "\n"
 "L'evidenziazione delle parole errate non verrà usata"
 
-#: ../src/dialogs.py:1935 ../src/dialogs.py:2322
+#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
 msgid "The nickname has not allowed characters."
 msgstr "Il nickname contiene caratteri non consentiti."
 
-#: ../src/dialogs.py:2053
+#: ../src/dialogs.py:2069
 #, 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:2056
+#: ../src/dialogs.py:2072
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Richiesta di abbonamento da %s"
 
-#: ../src/dialogs.py:2131 ../src/gui_interface.py:2672
+#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Si è già nella stanza %s"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2153
 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:2178
+#: ../src/dialogs.py:2194
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entra in chat di gruppo con l'account %s"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2325
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Il nome account non è valido"
 
-#: ../src/dialogs.py:2310
+#: ../src/dialogs.py:2326
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Seleziona l'account con cui vuoi effettuare la sincronizzazione"
 
-#: ../src/dialogs.py:2321
+#: ../src/dialogs.py:2337
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Nickname non valido"
 
-#: ../src/dialogs.py:2326 ../src/dialogs.py:2332
-#: ../src/groupchat_control.py:1832
+#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
+#: ../src/groupchat_control.py:1847
 msgid "Invalid group chat Jabber ID"
 msgstr "ID Jabber non valido"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2343
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "Il nome della stanza o del server contiene caratteri non permessi."
 
-#: ../src/dialogs.py:2333 ../src/groupchat_control.py:1833
+#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
 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:2340
+#: ../src/dialogs.py:2356
 msgid "This is not a group chat"
 msgstr "Questa non è una chat di gruppo"
 
-#: ../src/dialogs.py:2341
+#: ../src/dialogs.py:2357
 #, 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:2372
+#: ../src/dialogs.py:2388
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Senza una connessione, non puoi sincronizzare i tuoi contatti."
 
-#: ../src/dialogs.py:2386
+#: ../src/dialogs.py:2402
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2421
+#: ../src/dialogs.py:2437
 msgid "This account is not connected to the server"
 msgstr "Questo account non è connesso al server"
 
-#: ../src/dialogs.py:2422
+#: ../src/dialogs.py:2438
 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:2446
+#: ../src/dialogs.py:2462
 msgid "Synchronise"
 msgstr "Sincronizza"
 
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2523
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Inizia chat con l'account %s"
 
-#: ../src/dialogs.py:2509
+#: ../src/dialogs.py:2525
 msgid "Start Chat"
 msgstr "Inizia chat"
 
-#: ../src/dialogs.py:2510
+#: ../src/dialogs.py:2526
 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:2536 ../src/dialogs.py:2917 ../src/dialogs.py:3129
+#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
 msgid "Connection not available"
 msgstr "Connessione non disponibile"
 
-#: ../src/dialogs.py:2537 ../src/dialogs.py:2918 ../src/dialogs.py:3130
+#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Assicurarsi di essere connesso con \"%s\"."
 
-#: ../src/dialogs.py:2546 ../src/dialogs.py:2549
+#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
 msgid "Invalid JID"
 msgstr "ID Jabber non valido"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2565
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossibile processare \"%s\"."
 
-#: ../src/dialogs.py:2558
+#: ../src/dialogs.py:2574
 msgid "Without a connection, you can not change your password."
 msgstr "Senza una connessione, non è possibile cambiare la password."
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "Invalid password"
 msgstr "Password non valida"
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "You must enter a password."
 msgstr "È necessario inserire una password."
 
-#: ../src/dialogs.py:2581
+#: ../src/dialogs.py:2597
 msgid "Passwords do not match"
 msgstr "Le password non coincidono"
 
-#: ../src/dialogs.py:2582
+#: ../src/dialogs.py:2598
 msgid "The passwords typed in both fields must be identical."
 msgstr "Le password immesse nei due campi devono essere identiche."
 
 #. default value
-#: ../src/dialogs.py:2619 ../src/notify.py:247 ../src/notify.py:473
+#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
 msgid "Contact Signed In"
 msgstr "Contatto connesso"
 
-#: ../src/dialogs.py:2621 ../src/notify.py:255 ../src/notify.py:475
+#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
 msgid "Contact Signed Out"
 msgstr "Contatto disconnesso"
 
 #. chat message
-#: ../src/dialogs.py:2623 ../src/notify.py:277 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
 msgid "New Message"
 msgstr "Nuovo messaggio"
 
 #. single message
-#: ../src/dialogs.py:2623 ../src/notify.py:259 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
 msgid "New Single Message"
 msgstr "Nuovo messaggio singolo"
 
 #. private message
-#: ../src/dialogs.py:2624 ../src/notify.py:265 ../src/notify.py:478
+#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
 msgid "New Private Message"
 msgstr "Nuovo messaggio privato"
 
-#: ../src/dialogs.py:2624 ../src/gui_interface.py:1358 ../src/notify.py:487
+#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
 msgid "New E-mail"
 msgstr "Nuova e-mail"
 
-#: ../src/dialogs.py:2626 ../src/gui_interface.py:1420 ../src/notify.py:480
+#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
 msgid "File Transfer Request"
 msgstr "Richiesta di trasferimento file"
 
-#: ../src/dialogs.py:2628 ../src/gui_interface.py:1320
-#: ../src/gui_interface.py:1389 ../src/notify.py:482
+#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
+#: ../src/gui_interface.py:1186 ../src/notify.py:482
 msgid "File Transfer Error"
 msgstr "Errore nel trasferimento file"
 
-#: ../src/dialogs.py:2630 ../src/gui_interface.py:1466
-#: ../src/gui_interface.py:1489 ../src/gui_interface.py:1506
+#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
+#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
 #: ../src/notify.py:484
 msgid "File Transfer Completed"
 msgstr "Trasferimento file completato"
 
-#: ../src/dialogs.py:2631 ../src/gui_interface.py:1469 ../src/notify.py:485
+#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
 msgid "File Transfer Stopped"
 msgstr "Trasferimento file fermato"
 
-#: ../src/dialogs.py:2633 ../src/gui_interface.py:1152 ../src/notify.py:489
+#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
 msgid "Groupchat Invitation"
 msgstr "Invito a chat di gruppo"
 
-#: ../src/dialogs.py:2635 ../src/notify.py:239 ../src/notify.py:491
+#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
 msgid "Contact Changed Status"
 msgstr "Stato Contatto Cambiato"
 
-#: ../src/dialogs.py:2836
+#: ../src/dialogs.py:2852
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Messaggio singolo con l'account %s"
 
-#: ../src/dialogs.py:2838
+#: ../src/dialogs.py:2854
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Messaggio singolo nell'account %s"
 
-#: ../src/dialogs.py:2840
+#: ../src/dialogs.py:2856
 msgid "Single Message"
 msgstr "Messaggio singolo"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2843
+#: ../src/dialogs.py:2859
 #, python-format
 msgid "Send %s"
 msgstr "Invia %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:2882
 #, python-format
 msgid "Received %s"
 msgstr "Ricevuto %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2889
+#: ../src/dialogs.py:2905
 #, 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:2968
+#: ../src/dialogs.py:2984
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:2985
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s ha scritto:\n"
 
-#: ../src/dialogs.py:3028
+#: ../src/dialogs.py:3044
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML per %s"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3046
 msgid "XML Console"
 msgstr "Console XML"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "add"
 msgstr "In stallo"
 
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "modify"
 msgstr "_Modifica"
 
-#: ../src/dialogs.py:3160
+#: ../src/dialogs.py:3176
 #, fuzzy
 msgid "remove"
 msgstr "_Elimina"
 
-#: ../src/dialogs.py:3188
+#: ../src/dialogs.py:3204
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7410,160 +7599,193 @@ msgid ""
 msgstr "Vorrei aggiungerti alla mia lista contatti."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3204 ../src/dialogs.py:3250
+#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
 #, fuzzy
 msgid "Add"
 msgstr "Indirizzo"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3206 ../src/dialogs.py:3281
+#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
 #, fuzzy
 msgid "Modify"
 msgstr "_Modifica"
 
-#: ../src/dialogs.py:3212
+#: ../src/dialogs.py:3228
 #, fuzzy
 msgid "Jabber ID"
 msgstr "ID Jabber: "
 
-#: ../src/dialogs.py:3218
+#: ../src/dialogs.py:3234
 #, fuzzy
 msgid "Groups"
 msgstr "Gruppo"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3342
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Vorrei aggiungerti ai miei contatti."
 
-#: ../src/dialogs.py:3340
+#: ../src/dialogs.py:3356
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "_Aggiungi contatto"
 
-#: ../src/dialogs.py:3377
+#: ../src/dialogs.py:3393
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Elimina il contatto dalla lista"
 
-#: ../src/dialogs.py:3430
+#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#, python-format
+msgid "Archiving Preferences for %s"
+msgstr ""
+
+#: ../src/dialogs.py:3473
+#, fuzzy
+msgid "Invalid expire value"
+msgstr "Server non valido"
+
+#: ../src/dialogs.py:3474
+msgid "Expire must be a valid positive integer."
+msgstr ""
+
+#: ../src/dialogs.py:3521
+msgid "There is an error with the form"
+msgstr ""
+
+#: ../src/dialogs.py:3732
+msgid "There is an error"
+msgstr ""
+
+#: ../src/dialogs.py:3796
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista privacy <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3434
+#: ../src/dialogs.py:3800
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista privacy per %s"
 
-#: ../src/dialogs.py:3490
+#: ../src/dialogs.py:3856
 #, 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:3495
+#: ../src/dialogs.py:3861
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordine: %s, azione: %s"
 
-#: ../src/dialogs.py:3539
+#: ../src/dialogs.py:3905
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Modifica una regola</b>"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:4016
 msgid "<b>Add a rule</b>"
 msgstr "<b>Aggiungi una regola</b>"
 
-#: ../src/dialogs.py:3750
+#: ../src/dialogs.py:4116
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Lista privacy per %s"
 
-#: ../src/dialogs.py:3752
+#: ../src/dialogs.py:4118
 msgid "Privacy Lists"
 msgstr "Liste privacy"
 
-#: ../src/dialogs.py:3822
+#: ../src/dialogs.py:4188
 msgid "Invalid List Name"
 msgstr "Nome lista non valido"
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4189
 msgid "You must enter a name to create a privacy list."
 msgstr "È necessario inserire una nome per creare una lista privacy"
 
-#: ../src/dialogs.py:3855
+#: ../src/dialogs.py:4221
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Non si è entrati in una chat di gruppo."
 
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4224
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact ti ha invitato a partecipare a una discussione"
 
-#: ../src/dialogs.py:3860
+#: ../src/dialogs.py:4226
 #, 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:3868
+#: ../src/dialogs.py:4234
 #, python-format
 msgid "Comment: %s"
 msgstr "Commento: %s"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4236
 #, fuzzy
 msgid "Do you want to accept the invitation?"
 msgstr "Vuoi inviare questo file a %s:"
 
-#: ../src/dialogs.py:3932
+#: ../src/dialogs.py:4298
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:3942 ../src/dialogs.py:3985 ../src/dialogs.py:4041
+#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
+#: ../src/dialogs.py:4495
 msgid "All files"
 msgstr "Tutti i file"
 
-#: ../src/dialogs.py:3947
+#: ../src/dialogs.py:4313
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:3975
+#: ../src/dialogs.py:4341
 msgid "Choose Sound"
 msgstr "Scegliere il suono"
 
-#: ../src/dialogs.py:3990
+#: ../src/dialogs.py:4356
 msgid "Wav Sounds"
 msgstr "Suoni Wav"
 
-#: ../src/dialogs.py:4028
+#: ../src/dialogs.py:4394
 msgid "Choose Image"
 msgstr "Scegli immagine"
 
-#: ../src/dialogs.py:4046
+#: ../src/dialogs.py:4412
 msgid "Images"
 msgstr "Immagini"
 
-#: ../src/dialogs.py:4113
+#: ../src/dialogs.py:4482
+#, fuzzy
+msgid "Choose Archive"
+msgstr "Scegli immagine"
+
+#: ../src/dialogs.py:4500
+#, fuzzy
+msgid "Zip files"
+msgstr "Tutti i file"
+
+#: ../src/dialogs.py:4525
 #, python-format
 msgid "When %s becomes:"
 msgstr "Quando %s diventa:"
 
-#: ../src/dialogs.py:4115
+#: ../src/dialogs.py:4527
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Creazione notifica speciale per %s"
 
-#: ../src/dialogs.py:4190
+#: ../src/dialogs.py:4602
 msgid "Condition"
 msgstr "Condizione"
 
-#: ../src/dialogs.py:4310
+#: ../src/dialogs.py:4722
 msgid "when I am "
 msgstr "quando io sono "
 
-#: ../src/dialogs.py:4786
+#: ../src/dialogs.py:5198
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7571,39 +7793,39 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4789
+#: ../src/dialogs.py:5201
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4795 ../src/dialogs.py:4879
+#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4801
+#: ../src/dialogs.py:5213
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4806
+#: ../src/dialogs.py:5218
 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:4809 ../src/dialogs.py:4860 ../src/dialogs.py:4873
+#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4814
+#: ../src/dialogs.py:5226
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4825
+#: ../src/dialogs.py:5237
 #, fuzzy
 msgid "Have you verified the contact's identity?"
 msgstr "Verifica l'identità del client remoto"
 
-#: ../src/dialogs.py:4826
+#: ../src/dialogs.py:5238
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7613,44 +7835,44 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4827
+#: ../src/dialogs.py:5239
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4861
+#: ../src/dialogs.py:5273
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4867
+#: ../src/dialogs.py:5279
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4874
+#: ../src/dialogs.py:5286
 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:4880
+#: ../src/dialogs.py:5292
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:4945
+#: ../src/dialogs.py:5357
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4947
+#: ../src/dialogs.py:5359
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4949
+#: ../src/dialogs.py:5361
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4953
+#: ../src/dialogs.py:5365
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7666,25 +7888,25 @@ msgstr "Altri"
 msgid "Conference"
 msgstr "Conferenze"
 
-#: ../src/disco.py:512
+#: ../src/disco.py:513
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 "Senza una connessione, non è possibile consultare i servizi disponibili"
 
-#: ../src/disco.py:589
+#: ../src/disco.py:600
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Ricerca servizi usando l'account %s"
 
-#: ../src/disco.py:591
+#: ../src/disco.py:602
 msgid "Service Discovery"
 msgstr "Ricerca servizi"
 
-#: ../src/disco.py:741
+#: ../src/disco.py:758
 msgid "The service could not be found"
 msgstr "Il servizio non è stato trovato"
 
-#: ../src/disco.py:742
+#: ../src/disco.py:759
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7692,96 +7914,96 @@ msgstr ""
 "Il servizio all'indirizzo immesso non risponde o è inesistente. Controllare "
 "l'indirizzo e riprovare."
 
-#: ../src/disco.py:746 ../src/disco.py:1082
+#: ../src/disco.py:763 ../src/disco.py:1100
 msgid "The service is not browsable"
 msgstr "Non è possibile consultare il servizio"
 
-#: ../src/disco.py:747
+#: ../src/disco.py:764
 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:786 ../src/disco.py:796
+#: ../src/disco.py:804 ../src/disco.py:814
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Server non valido"
 
-#: ../src/disco.py:850
+#: ../src/disco.py:868
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Consulta %s usando l'account %s"
 
-#: ../src/disco.py:894
+#: ../src/disco.py:912
 msgid "_Browse"
 msgstr "C_onsulta"
 
-#: ../src/disco.py:1083
+#: ../src/disco.py:1101
 msgid "This service does not contain any items to browse."
 msgstr "Questo servizio non contiene oggetti da consultare."
 
-#: ../src/disco.py:1323
+#: ../src/disco.py:1341
 msgid "_Execute Command"
 msgstr "_Esegui comando"
 
-#: ../src/disco.py:1333 ../src/disco.py:1504
+#: ../src/disco.py:1351 ../src/disco.py:1522
 msgid "Re_gister"
 msgstr "_Registra"
 
-#: ../src/disco.py:1545
+#: ../src/disco.py:1563
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Analisi %d / %d..."
 
 #. Users column
-#: ../src/disco.py:1736
+#: ../src/disco.py:1754
 msgid "Users"
 msgstr "Utenti"
 
 #. Description column
-#: ../src/disco.py:1744
+#: ../src/disco.py:1762
 msgid "Description"
 msgstr "Descrizione"
 
 #. Id column
-#: ../src/disco.py:1752
+#: ../src/disco.py:1770
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1817 ../src/gui_interface.py:3182
+#: ../src/disco.py:1835 ../src/gui_interface.py:2995
 msgid "Bookmark already set"
 msgstr "Segnalibro già impostato"
 
-#: ../src/disco.py:1818 ../src/gui_interface.py:3183
+#: ../src/disco.py:1836 ../src/gui_interface.py:2996
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "La stanza \"%s\" è già tra i segnalibri."
 
-#: ../src/disco.py:1827 ../src/gui_interface.py:3197
+#: ../src/disco.py:1845 ../src/gui_interface.py:3010
 msgid "Bookmark has been added successfully"
 msgstr "Il segnalibro è stato aggiunto con successo"
 
-#: ../src/disco.py:1828 ../src/gui_interface.py:3198
+#: ../src/disco.py:1846 ../src/gui_interface.py:3011
 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:2039
+#: ../src/disco.py:2057
 msgid "Subscribed"
 msgstr "Abbonati"
 
-#: ../src/disco.py:2047
+#: ../src/disco.py:2065
 msgid "Node"
 msgstr "Nodo"
 
-#: ../src/disco.py:2111
+#: ../src/disco.py:2129
 msgid "New post"
 msgstr "Nuovo post"
 
-#: ../src/disco.py:2117
+#: ../src/disco.py:2135
 msgid "_Subscribe"
 msgstr "A_bbonati"
 
-#: ../src/disco.py:2123
+#: ../src/disco.py:2141
 msgid "_Unsubscribe"
 msgstr "Disa_bbonati"
 
@@ -7972,8 +8194,8 @@ msgstr "Trasforma le espressioni LaTeX comprese in $$ $$."
 #: ../src/features_window.py:95
 #, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
-"in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 "Richiede texlive-latex-base, dvips e imagemagick. Devi impostare 'use_latex' "
 "su Attivato nell'Editor di configurazione avanzata."
@@ -7981,8 +8203,8 @@ msgstr ""
 #: ../src/features_window.py:96
 #, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
+"You have to set 'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 "Richiede texlive-latex-base, dvips e imagemagick. Devi impostare 'use_latex' "
 "su Attivato nell'Editor di configurazione avanzata."
@@ -8144,12 +8366,12 @@ msgstr "Descrizione: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s vuole inviarti un file:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Non è possibile sovrascrivere il file esistente \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -8157,22 +8379,22 @@ msgstr ""
 "Un file con lo stesso nome è già presente e non si ha il permesso per "
 "sovrascriverlo"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 msgid "This file already exists"
 msgstr "Questo file esiste già"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 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:369 ../src/gtkgui_helpers.py:914
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "La cartella \"%s\" non è scrivibile."
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
 msgid "You do not have permission to create files in this directory."
 msgstr "Non si ha il permesso di creare file in questa cartella."
 
@@ -8276,33 +8498,40 @@ msgstr ""
 "Un'altra istanza di Gajim sembra essere in esecuzione\n"
 "Continuare comunque?"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
 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:80
+#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
 msgid "command"
 msgstr "comando"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "mostra aiuto sul comando"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Mostra o nascondi la lista contatti"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Apre una finestra con il prossimo evento in attesa"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
 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-plugin.py:93 ../src/gajim-remote-plugin.py:108
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
+#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
+#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
+#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
 #: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
 #: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
 #: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
@@ -8314,42 +8543,34 @@ msgstr "Scrive la lista contatti. Ogni contatto appare su una linea separata"
 msgid "account"
 msgstr "account"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "mostra solo i contatti dell'account dato"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Scrive un elenco degli account registrati"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
 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:109
+#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
 msgid "status"
 msgstr "stato"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106
 #, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"accoun't previous status"
+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:110 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
-msgid "message"
-msgstr "messaggio"
-
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "messaggio di stato"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8358,49 +8579,21 @@ msgstr ""
 "cambiare lo stato di tutti gli account che hanno marcato l'opzione "
 "\"sincronizza con lo stato globale\""
 
-#: ../src/gajim-remote.py:117
-#, fuzzy
-msgid "Changes the priority of account or accounts"
-msgstr "Cambia lo stato degli account"
-
-#: ../src/gajim-remote.py:119
-#, fuzzy
-msgid "priority"
-msgstr "Priori_tà:"
-
-#: ../src/gajim-remote.py:119
-#, fuzzy
-msgid "priority you want to give to the account"
-msgstr "Voglio _registrare un nuovo account"
-
-#: ../src/gajim-remote.py:121
-#, fuzzy
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-msgstr ""
-"cambia lo stato dell'account \"account\". Se non specificato, prova a "
-"cambiare lo stato di tutti gli account che hanno marcato l'opzione "
-"\"sincronizza con lo stato globale\""
-
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
 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:129
+#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID del contatto con cui si vuole chattare"
 
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
 #: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 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:134
-msgid "message content. The account must be specified or \"\""
-msgstr ""
-
-#: ../src/gajim-remote.py:139
+#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
 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 "
@@ -8410,30 +8603,35 @@ msgstr ""
 "OpenPGP che l'account sono opzionali. Se si vuole impostare solo 'account', "
 "senza 'chiave OpenPGP', impostare 'chiave OpenPGP' a ''."
 
+#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
 #: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID del contatto che riceverà il messaggio"
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
+#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "contenuti messaggi"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "chiave pgp"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 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:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
+#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
 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:152
+#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
 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 "
@@ -8443,109 +8641,285 @@ msgstr ""
 "OpenPGP che l'account sono opzionali. Se si vuole impostare solo 'account', "
 "senza 'chiave OpenPGP', impostare 'chiave OpenPGP' a ''."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "oggetto"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "oggetto del messaggio "
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
 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:168
+#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "JID della stanza che riceverà il messaggio"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Ottiene informazioni dettagliate su un contatto"
 
+#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
+#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
 #: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
 #: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID del contatto"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Ottiene informazioni dettagliate su un contatto"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Nome dell'account"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Invia file ad un contatto"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "file"
 msgstr "file"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Percorso file"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "se specificato, il file verrà inviato usando questo account"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Mostra tutte le preferenze ed i relativi valori"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Imposta il valore di 'chiave' a 'valore'."
 
-#: ../src/gajim-remote.py:202
-msgid "key=value"
-msgstr "chiave=valore"
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+msgid "key=value"
+msgstr "chiave=valore"
+
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+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-plugin.py:191 ../src/gajim-remote.py:207
+msgid "Deletes a preference item"
+msgstr "Elimina un oggetto dalle preferenze"
+
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "key"
+msgstr "chiave"
+
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "name of the preference to be deleted"
+msgstr "nome della preferenza da eliminare"
+
+#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+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-plugin.py:202 ../src/gajim-remote.py:218
+msgid "Removes contact from roster"
+msgstr "Elimina il contatto dalla lista"
+
+#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+msgid "Adds contact to roster"
+msgstr "Aggiunge il contatto alla lista"
+
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+msgid "Adds new contact to this account"
+msgstr "Aggiunge un nuovo contatto a questo account"
+
+#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+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-plugin.py:226
+#, fuzzy
+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-plugin.py:233 ../src/gajim-remote.py:249
+msgid "Returns number of unread messages"
+msgstr "Restituisce il numero di messaggi non letti"
+
+#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+msgid "Opens 'Start Chat' dialog"
+msgstr "Apre la finestra di inizio chat"
+
+#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+msgid "Starts chat, using this account"
+msgstr "Inizia chat usando questo account"
+
+#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+msgid "Sends custom XML"
+msgstr "Invia XML personalizzato"
+
+#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+msgid "XML to send"
+msgstr "XML da inviare"
+
+#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+"L'account al quale l'xml è inviato; se non specificato, l'xml sarà spedito a "
+"tutti gli account."
+
+#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
+msgid "Handle a xmpp:/ uri"
+msgstr "Gestisci un uri xmpp:/"
+
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
+msgid "uri"
+msgstr "uri"
+
+#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+msgid "Join a MUC room"
+msgstr "Entra in una stanza MUC"
+
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+msgid "room"
+msgstr "stanza"
+
+#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+msgid "nick"
+msgstr "nickname"
+
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+msgid "password"
+msgstr "password"
+
+#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#, fuzzy
+msgid "Check if Gajim is running"
+msgstr "Controllare se avahi-daemon è in esecuzione."
+
+#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
+#: ../src/gajim-remote.py:300
+#, fuzzy
+msgid "Shows or hides the ipython window"
+msgstr "Mostra o nascondi la lista contatti"
+
+#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+msgid "Missing argument \"contact_jid\""
+msgstr "Parametro mancante \"contact_jid\""
+
+#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#, python-format
+msgid ""
+"'%s' is not in your roster.\n"
+"Please specify account for sending the message."
+msgstr ""
+"'%s' non appartiene alla lista contatti.\n"
+"Specificare l'account per l'invio del messaggio."
+
+#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+msgid "You have no active account"
+msgstr "Non ci sono account attivi"
+
+#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+msgid "It seems Gajim is not running. So you can't use gajim-remote."
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:412
+#, python-format
+msgid ""
+"Usage: %s %s %s \n"
+"\t %s"
+msgstr ""
+"Utilizzo: %s %s %s \n"
+"\t %s"
+
+#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+msgid "Arguments:"
+msgstr "Parametri:"
+
+#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#, python-format
+msgid "%s not found"
+msgstr "%s non trovato"
 
-#: ../src/gajim-remote.py:202
-msgid "'key' is the name of the preference, 'value' is the value to set it to"
+#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
+#, python-format
+msgid ""
+"Usage: %s command [arguments]\n"
+"Command is one of:\n"
 msgstr ""
-"'chiave' è il nome della preferenza, 'valore' è il valore a cui impostarla"
+"Utilizzo: %s comando [parametri]\n"
+"Il comando è uno fra:\n"
 
-#: ../src/gajim-remote.py:207
-msgid "Deletes a preference item"
-msgstr "Elimina un oggetto dalle preferenze"
+#: ../src/gajim-remote-plugin.py:496
+#, fuzzy, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Troppi parametri. \n"
+"Scrivere \"%s help %s\" per maggiori informazioni"
 
-#: ../src/gajim-remote.py:209
-msgid "key"
-msgstr "chiave"
+#: ../src/gajim-remote-plugin.py:500
+#, fuzzy, python-format
+msgid ""
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Il parametro \"%s\" non è specificato. \n"
+"Scrivere\"%s help %s\" per maggiori informazioni"
 
-#: ../src/gajim-remote.py:209
-msgid "name of the preference to be deleted"
-msgstr "nome della preferenza da eliminare"
+#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
+msgid "Wrong uri"
+msgstr "URI errato"
 
-#: ../src/gajim-remote.py:213
-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:109
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
+msgstr ""
+"uno fra: offline, online, chat, assente, xa, non disturbare, invisibile"
 
-#: ../src/gajim-remote.py:218
-msgid "Removes contact from roster"
-msgstr "Elimina il contatto dalla lista"
+#: ../src/gajim-remote.py:117
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Cambia lo stato degli account"
 
-#: ../src/gajim-remote.py:227
-msgid "Adds contact to roster"
-msgstr "Aggiunge il contatto alla lista"
+#: ../src/gajim-remote.py:119
+#, fuzzy
+msgid "priority"
+msgstr "Priori_tà:"
 
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "jid"
+#: ../src/gajim-remote.py:119
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Voglio _registrare un nuovo account"
 
-#: ../src/gajim-remote.py:230
-msgid "Adds new contact to this account"
-msgstr "Aggiunge un nuovo contatto a questo account"
+#: ../src/gajim-remote.py:121
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"cambia lo stato dell'account \"account\". Se non specificato, prova a "
+"cambiare lo stato di tutti gli account che hanno marcato l'opzione "
+"\"sincronizza con lo stato globale\""
 
-#: ../src/gajim-remote.py:235
-msgid "Returns current status (the global one unless account is specified)"
+#: ../src/gajim-remote.py:134
+msgid "message content. The account must be specified or \"\""
 msgstr ""
-"Restituisce lo stato corrente (quello globale se non è specificato un "
-"account)"
 
 #: ../src/gajim-remote.py:242
 msgid ""
@@ -8554,34 +8928,6 @@ msgstr ""
 "Restituisce il messaggio di stato corrente (quello globale se non è "
 "specificato un account)"
 
-#: ../src/gajim-remote.py:249
-msgid "Returns number of unread messages"
-msgstr "Restituisce il numero di messaggi non letti"
-
-#: ../src/gajim-remote.py:253
-msgid "Opens 'Start Chat' dialog"
-msgstr "Apre la finestra di inizio chat"
-
-#: ../src/gajim-remote.py:255
-msgid "Starts chat, using this account"
-msgstr "Inizia chat usando questo account"
-
-#: ../src/gajim-remote.py:259
-msgid "Sends custom XML"
-msgstr "Invia XML personalizzato"
-
-#: ../src/gajim-remote.py:261
-msgid "XML to send"
-msgstr "XML da inviare"
-
-#: ../src/gajim-remote.py:262
-msgid ""
-"Account in which the xml will be sent; if not specified, xml will be sent to "
-"all accounts"
-msgstr ""
-"L'account al quale l'xml è inviato; se non specificato, l'xml sarà spedito a "
-"tutti gli account."
-
 #: ../src/gajim-remote.py:268
 #, fuzzy
 msgid "Change the avatar"
@@ -8601,14 +8947,6 @@ msgstr ""
 "L'account al quale l'xml è inviato; se non specificato, l'xml sarà spedito a "
 "tutti gli account."
 
-#: ../src/gajim-remote.py:277
-msgid "Handle a xmpp:/ uri"
-msgstr "Gestisci un uri xmpp:/"
-
-#: ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "uri"
-
 #: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr ""
@@ -8623,32 +8961,16 @@ msgstr "Seleziona l'account con cui vuoi effettuare la sincronizzazione"
 msgid "Message content"
 msgstr "contenuti messaggi"
 
-#: ../src/gajim-remote.py:286
-msgid "Join a MUC room"
-msgstr "Entra in una stanza MUC"
-
-#: ../src/gajim-remote.py:288
-msgid "room"
-msgstr "stanza"
-
 #: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "Room JID"
 msgstr "Stanza:"
 
-#: ../src/gajim-remote.py:289
-msgid "nick"
-msgstr "nickname"
-
 #: ../src/gajim-remote.py:289
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Nickname non trovato: %s"
 
-#: ../src/gajim-remote.py:290
-msgid "password"
-msgstr "password"
-
 #: ../src/gajim-remote.py:290
 #, fuzzy
 msgid "Password to enter the room"
@@ -8659,37 +8981,6 @@ msgstr "Le password non coincidono"
 msgid "Account from which you want to enter the room"
 msgstr "Seleziona l'account con cui vuoi effettuare la sincronizzazione"
 
-#: ../src/gajim-remote.py:296
-#, fuzzy
-msgid "Check if Gajim is running"
-msgstr "Controllare se avahi-daemon è in esecuzione."
-
-#: ../src/gajim-remote.py:300
-#, fuzzy
-msgid "Shows or hides the ipython window"
-msgstr "Mostra o nascondi la lista contatti"
-
-#: ../src/gajim-remote.py:327
-msgid "Missing argument \"contact_jid\""
-msgstr "Parametro mancante \"contact_jid\""
-
-#: ../src/gajim-remote.py:348
-#, python-format
-msgid ""
-"'%s' is not in your roster.\n"
-"Please specify account for sending the message."
-msgstr ""
-"'%s' non appartiene alla lista contatti.\n"
-"Specificare l'account per l'invio del messaggio."
-
-#: ../src/gajim-remote.py:351
-msgid "You have no active account"
-msgstr "Non ci sono account attivi"
-
-#: ../src/gajim-remote.py:404
-msgid "It seems Gajim is not running. So you can't use gajim-remote."
-msgstr ""
-
 #: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
@@ -8697,24 +8988,6 @@ msgid ""
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:435
-msgid "Arguments:"
-msgstr "Parametri:"
-
-#: ../src/gajim-remote.py:439
-#, python-format
-msgid "%s not found"
-msgstr "%s non trovato"
-
-#: ../src/gajim-remote.py:445
-#, python-format
-msgid ""
-"Usage: %s command [arguments]\n"
-"Command is one of:\n"
-msgstr ""
-"Utilizzo: %s comando [parametri]\n"
-"Il comando è uno fra:\n"
-
 #: ../src/gajim-remote.py:514
 #, fuzzy, python-format
 msgid ""
@@ -8737,10 +9010,6 @@ msgstr ""
 msgid "No uri given"
 msgstr ""
 
-#: ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "URI errato"
-
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Tema"
@@ -8766,180 +9035,178 @@ msgstr "Non è possibile eliminare il tema corrente"
 msgid "Please first choose another for your current theme."
 msgstr "Scegliere prima un altro tema."
 
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:170
 msgid "Sending private message failed"
 msgstr "Invio messaggio privato fallito"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:171
+#: ../src/groupchat_control.py:172
 #, 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:450
+#: ../src/groupchat_control.py:455
 msgid "Insert Nickname"
 msgstr "Inserisci nickname"
 
-#: ../src/groupchat_control.py:631
+#: ../src/groupchat_control.py:636
 #, fuzzy
 msgid "Conversation with "
 msgstr "Cronologia conversazione"
 
-#: ../src/groupchat_control.py:633
+#: ../src/groupchat_control.py:638
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Connessione"
 
-#. Can be a message (see handle_event_gc_config_change in
-#. gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1272 ../src/gui_interface.py:1080
+#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Tutti i partecipanti possono vedere il tuo JID"
 
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1286
 msgid "Room logging is enabled"
 msgstr "La registrazione dei messaggi della stanza è stata attivata"
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1288
 msgid "A new room has been created"
 msgstr "E' stata creata una nuova stanza"
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1291
 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:1287
+#: ../src/groupchat_control.py:1297
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s è stato cacciato: %(reason)s"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1300
 #, 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:1300
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s è stato bloccato: %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1312
 #, 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:1314 ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
 #, python-format
 msgid "You are now known as %s"
 msgstr "Sei ora conosciuto come %s"
 
-#: ../src/groupchat_control.py:1330 ../src/gui_interface.py:919
+#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s è ora conosciuto come %s"
 
-#: ../src/groupchat_control.py:1372 ../src/groupchat_control.py:1377
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1392
 #, 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:1374
+#: ../src/groupchat_control.py:1383
 msgid "affiliation changed"
 msgstr "l'affiliazione è stata cambiata"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1388
 msgid "room configuration changed to members-only"
 msgstr "la stanza è ora accessibile solo ai membri"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1394
 #, fuzzy
 msgid "system shutdown"
 msgstr "spegnimento del sistema"
 
-#: ../src/groupchat_control.py:1470
+#: ../src/groupchat_control.py:1477
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1474
+#: ../src/groupchat_control.py:1481
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1489
+#: ../src/groupchat_control.py:1496
 #, 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:1493
+#: ../src/groupchat_control.py:1500
 #, 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:1522
+#: ../src/groupchat_control.py:1530
 #, python-format
 msgid "%s has left"
 msgstr "%s se ne è andato"
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1535
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s è entrato nella chat di gruppo"
 
-#: ../src/groupchat_control.py:1529 ../src/gui_interface.py:946
+#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
 #: ../src/history_window.py:447 ../src/notify.py:234
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s è ora %(status)s"
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1774
 #, 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:1761
+#: ../src/groupchat_control.py:1776
 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:1765 ../src/gui_interface.py:1216
-#: ../src/gui_interface.py:1992 ../src/gui_interface.py:2029
-#: ../src/gui_interface.py:2064 ../src/message_window.py:224
-#: ../src/roster_window.py:2739 ../src/roster_window.py:3399
-#: ../src/roster_window.py:4123
+#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
+#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
+#: ../src/gui_interface.py:1853 ../src/message_window.py:224
+#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
+#: ../src/roster_window.py:4195
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Non chiederlo più"
 
-#: ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:1814
 msgid "Changing Subject"
 msgstr "Cambio oggetto"
 
-#: ../src/groupchat_control.py:1800
+#: ../src/groupchat_control.py:1815
 msgid "Please specify the new subject:"
 msgstr "Specificare il nuovo oggetto:"
 
-#: ../src/groupchat_control.py:1807
+#: ../src/groupchat_control.py:1822
 msgid "Changing Nickname"
 msgstr "Cambio nickname"
 
-#: ../src/groupchat_control.py:1808
+#: ../src/groupchat_control.py:1823
 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:1839
+#: ../src/groupchat_control.py:1854
 #, python-format
 msgid "Destroying %s"
 msgstr "Eliminazione %s"
 
-#: ../src/groupchat_control.py:1840
+#: ../src/groupchat_control.py:1855
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8947,22 +9214,22 @@ msgstr ""
 "Stai per cancellare definitivamente questa stanza.\n"
 "Puoi specificare il motivo qui sotto:"
 
-#: ../src/groupchat_control.py:1842
+#: ../src/groupchat_control.py:1857
 msgid "You may also enter an alternate venue:"
 msgstr "Puoi anche inserire un nome alternativo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2028
+#: ../src/groupchat_control.py:2046
 #, python-format
 msgid "Kicking %s"
 msgstr "Sto cacciando %s"
 
-#: ../src/groupchat_control.py:2029 ../src/groupchat_control.py:2356
+#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
 msgid "You may specify a reason below:"
 msgstr "Specifica un motivo qui sotto:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2355
+#: ../src/groupchat_control.py:2373
 #, python-format
 msgid "Banning %s"
 msgstr "Sto bandendo %s"
@@ -8988,56 +9255,65 @@ msgid "Details"
 msgstr "Dettagli"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
+#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Errore: impossibile aprire %s in lettura"
 
-#: ../src/gtkgui_helpers.py:400
+#: ../src/gtkgui_helpers.py:404
 msgid "Error reading file:"
 msgstr "Errore leggendo il file:"
 
-#: ../src/gtkgui_helpers.py:403
+#: ../src/gtkgui_helpers.py:407
 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:444
+#: ../src/gtkgui_helpers.py:448
 #, 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:818
+#: ../src/gtkgui_helpers.py:822
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim non è il client Jabber predefinito"
 
-#: ../src/gtkgui_helpers.py:819
+#: ../src/gtkgui_helpers.py:823
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Si vuole rendere Gajim il client Jabber predefinito?"
 
-#: ../src/gtkgui_helpers.py:820
+#: ../src/gtkgui_helpers.py:824
 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:887
+#: ../src/gtkgui_helpers.py:891
 msgid "Extension not supported"
 msgstr "Dbus non è supportato."
 
-#: ../src/gtkgui_helpers.py:888
+#: ../src/gtkgui_helpers.py:892
 #, 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:924
+#: ../src/gtkgui_helpers.py:928
 msgid "Save Image as..."
 msgstr "Salva immagine come..."
 
-#: ../src/gui_interface.py:140
+#. we are banned
+#. group chat does not exist
+#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
+#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
+#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
+#: ../src/gui_interface.py:348
+msgid "Unable to join group chat"
+msgstr "Non è possibile entrare nella stanza"
+
+#: ../src/gui_interface.py:138
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9048,151 +9324,180 @@ msgstr ""
 "chat di gruppo %s.\n"
 "Specificare un altro nickname sotto:"
 
-#: ../src/gui_interface.py:143
+#: ../src/gui_interface.py:141
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:159
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Accettare questa richiesta?"
 
-#: ../src/gui_interface.py:161
+#: ../src/gui_interface.py:160
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Accettare questa richiesta?"
 
-#: ../src/gui_interface.py:164
+#: ../src/gui_interface.py:163
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Autorizzazione HTTP (%s) per %s (id: %s)"
 
-#: ../src/gui_interface.py:213 ../src/notify.py:493
+#: ../src/gui_interface.py:209 ../src/notify.py:493
 msgid "Connection Failed"
 msgstr "Connessione fallita"
 
-#: ../src/gui_interface.py:606 ../src/gui_interface.py:610
+#: ../src/gui_interface.py:312
+#, 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/gui_interface.py:324
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/gui_interface.py:333
+#, python-format
+msgid "You are banned from group chat %s."
+msgstr "Sei stato bandito dalla stanza %s."
+
+#: ../src/gui_interface.py:338
+#, python-format
+msgid "Group chat %s does not exist."
+msgstr "La stanza %s non esiste."
+
+#: ../src/gui_interface.py:341
+msgid "Group chat creation is restricted."
+msgstr "Non è permessa la creazione di stanze."
+
+#: ../src/gui_interface.py:344
+#, 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/gui_interface.py:349
+#, 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."
+
+#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:621 ../src/gui_interface.py:636
+#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "errore durante l'invio di %s ( %s )"
 
-#: ../src/gui_interface.py:663 ../src/notify.py:495
+#: ../src/gui_interface.py:540 ../src/notify.py:495
 #, fuzzy
 msgid "Subscription request"
 msgstr "Richiesta di abbonamento"
 
-#: ../src/gui_interface.py:688
+#: ../src/gui_interface.py:565
 msgid "Authorization accepted"
 msgstr "Autorizzazione accettata"
 
-#: ../src/gui_interface.py:689
+#: ../src/gui_interface.py:566
 #, 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/gui_interface.py:702
+#: ../src/gui_interface.py:579
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Il contatto \"%s\" ha eliminato il tuo abbonamento verso di lui"
 
-#: ../src/gui_interface.py:703
+#: ../src/gui_interface.py:580
 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/gui_interface.py:727 ../src/notify.py:497
+#: ../src/gui_interface.py:604 ../src/notify.py:497
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "Disa_bbonati"
 
-#: ../src/gui_interface.py:754
+#: ../src/gui_interface.py:631
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Non si può contattare \"%s\""
 
-#: ../src/gui_interface.py:1015
+#: ../src/gui_interface.py:859
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1083
+#: ../src/gui_interface.py:926
 msgid "Room now shows unavailable member"
 msgstr "La stanza ora mostra i membri non disponibili"
 
-#: ../src/gui_interface.py:1085
+#: ../src/gui_interface.py:928
 msgid "room now does not show unavailable members"
 msgstr "la stanza ora non mostra i membri non disponibili"
 
-#: ../src/gui_interface.py:1087
+#: ../src/gui_interface.py:930
 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/gui_interface.py:1091
+#: ../src/gui_interface.py:934
 msgid "Room logging is now enabled"
 msgstr "La registrazione dei messaggi della stanza è stata attivata"
 
-#: ../src/gui_interface.py:1093
+#: ../src/gui_interface.py:936
 msgid "Room logging is now disabled"
 msgstr "La registrazione dei messaggi della stanza è stata disattivata"
 
-#: ../src/gui_interface.py:1095
+#: ../src/gui_interface.py:938
 msgid "Room is now non-anonymous"
 msgstr "La stanza è ora completamente non anonima"
 
-#: ../src/gui_interface.py:1098
+#: ../src/gui_interface.py:941
 msgid "Room is now semi-anonymous"
 msgstr "La stanza è ora semi-anonima"
 
-#: ../src/gui_interface.py:1101
+#: ../src/gui_interface.py:944
 msgid "Room is now fully-anonymous"
 msgstr "La stanza è ora completamente anonima"
 
-#: ../src/gui_interface.py:1133
-#, 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/gui_interface.py:1180
+#: ../src/gui_interface.py:985
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gui_interface.py:1182 ../src/gui_interface.py:1189
+#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Sei connesso senza la chiave OpenPGP."
 
-#: ../src/gui_interface.py:1184
+#: ../src/gui_interface.py:989
 msgid "Your passphrase is incorrect"
 msgstr "Passphrase errata"
 
-#: ../src/gui_interface.py:1188
+#: ../src/gui_interface.py:993
 #, fuzzy
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Passphrase errata"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 #, fuzzy
 msgid "GPG key not trusted"
 msgstr "Non è possibile utilizzare GPG"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
 msgstr ""
 
-#: ../src/gui_interface.py:1226
+#: ../src/gui_interface.py:1031
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not                 correctly started "
@@ -9201,19 +9506,19 @@ msgstr ""
 "Gnome Keyring è installato ma non avviato correttamente (la variabile "
 "d'ambiente è probabilmente impostata in maniera non corretta)"
 
-#: ../src/gui_interface.py:1330
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nuova e-mail su %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1332
+#: ../src/gui_interface.py:1133
 #, 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/gui_interface.py:1345
+#: ../src/gui_interface.py:1146
 #, python-format
 msgid ""
 "\n"
@@ -9223,81 +9528,81 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1418
+#: ../src/gui_interface.py:1215
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vuole inviarti un file."
 
-#: ../src/gui_interface.py:1455 ../src/roster_window.py:1856
+#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Elimina il contatto dalla lista"
 
-#: ../src/gui_interface.py:1458 ../src/roster_window.py:1858
+#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
 #, fuzzy
 msgid "Error opening file"
 msgstr "Errore leggendo il file:"
 
-#: ../src/gui_interface.py:1490
+#: ../src/gui_interface.py:1287
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "%(filename)s ricevuto con successo da %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1494
+#: ../src/gui_interface.py:1291
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Il trasferimento file di %(filename)s da %(name)s è fermo."
 
-#: ../src/gui_interface.py:1507
+#: ../src/gui_interface.py:1304
 #, 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/gui_interface.py:1511
+#: ../src/gui_interface.py:1308
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Trasferimento file di %(filename)s a %(name)s fermato."
 
-#: ../src/gui_interface.py:1623
+#: ../src/gui_interface.py:1426
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gui_interface.py:1630
+#: ../src/gui_interface.py:1433
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "In tutti i _messaggi"
 
-#: ../src/gui_interface.py:1702
+#: ../src/gui_interface.py:1505
 msgid "Username Conflict"
 msgstr "Conflitto di nomi utenti"
 
-#: ../src/gui_interface.py:1703
+#: ../src/gui_interface.py:1506
 msgid "Please type a new username for your local account"
 msgstr "Inserire un nuovo nome utente per l'account locale"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1519
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gui_interface.py:1729
+#: ../src/gui_interface.py:1532
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gui_interface.py:1740
+#: ../src/gui_interface.py:1543
 msgid "Error."
 msgstr "Errore."
 
-#: ../src/gui_interface.py:1768
+#: ../src/gui_interface.py:1556
 msgid "Resource Conflict"
 msgstr "Conflitto tra risorse"
 
-#: ../src/gui_interface.py:1769
+#: ../src/gui_interface.py:1557
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -9305,21 +9610,21 @@ msgstr ""
 "Sei già connesso a questo account con la stessa risorsa. Inseriscine un'altra"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1816
+#: ../src/gui_interface.py:1604
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s vuole inviarti un file."
 
-#: ../src/gui_interface.py:1819
+#: ../src/gui_interface.py:1607
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Richiesta di trasferimento file"
 
-#: ../src/gui_interface.py:1927
+#: ../src/gui_interface.py:1716
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1928
+#: ../src/gui_interface.py:1717
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9327,15 +9632,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1936
+#: ../src/gui_interface.py:1725
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1956
+#: ../src/gui_interface.py:1745
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gui_interface.py:1957
+#: ../src/gui_interface.py:1746
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9346,13 +9651,13 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gui_interface.py:1987 ../src/gui_interface.py:2024
-#: ../src/gui_interface.py:2060
+#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
+#: ../src/gui_interface.py:1849
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Connessione"
 
-#: ../src/gui_interface.py:1988
+#: ../src/gui_interface.py:1777
 #, fuzzy
 msgid ""
 "You are about to connect to the server with an insecure connection. This "
@@ -9360,18 +9665,18 @@ msgid ""
 "want to do that?"
 msgstr "Stai per creare un metacontatto. Continuare?"
 
-#: ../src/gui_interface.py:1991 ../src/gui_interface.py:2028
-#: ../src/gui_interface.py:2063
+#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
+#: ../src/gui_interface.py:1852
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gui_interface.py:2025
+#: ../src/gui_interface.py:1814
 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/gui_interface.py:2061
+#: ../src/gui_interface.py:1850
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9379,58 +9684,58 @@ msgid ""
 msgstr "Stai per creare un metacontatto. Continuare?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2624 ../src/gui_interface.py:2647
+#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Cifratura disattivata"
 
-#: ../src/gui_interface.py:2625
+#: ../src/gui_interface.py:2423
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2648
+#: ../src/gui_interface.py:2446
 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/gui_interface.py:2679 ../src/roster_window.py:3560
+#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
 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/gui_interface.py:3058
+#: ../src/gui_interface.py:2871
 msgid "Could not save your settings and preferences"
 msgstr "Impossibile salvare impostazioni e preferenze"
 
-#: ../src/gui_interface.py:3592
+#: ../src/gui_interface.py:3411
 msgid "Passphrase Required"
 msgstr "Passphrase richiesta"
 
-#: ../src/gui_interface.py:3593
+#: ../src/gui_interface.py:3412
 #, 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/gui_interface.py:3607
+#: ../src/gui_interface.py:3426
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gui_interface.py:3608
+#: ../src/gui_interface.py:3427
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Ti connetterai a %s senza OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3617
+#: ../src/gui_interface.py:3436
 msgid "Wrong Passphrase"
 msgstr "Passphrase errata"
 
-#: ../src/gui_interface.py:3618
+#: ../src/gui_interface.py:3437
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Riscrivere la passphrase GPG o premere Annulla."
 
@@ -9468,6 +9773,11 @@ msgstr "Nickname"
 msgid "Message"
 msgstr "Messaggio"
 
+#. holds subject
+#: ../src/history_manager.py:188 ../src/history_manager.py:219
+msgid "Subject"
+msgstr "Oggetto"
+
 #: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -9569,19 +9879,19 @@ msgstr "Non si è connessi al server"
 msgid "Do you really want to close them all?"
 msgstr "Si vuole davvero eliminare il messaggio selezionato?"
 
-#: ../src/message_window.py:484
+#: ../src/message_window.py:485
 msgid "Chats"
 msgstr "Chat"
 
-#: ../src/message_window.py:486
+#: ../src/message_window.py:487
 msgid "Group Chats"
 msgstr "Chat di gruppo"
 
-#: ../src/message_window.py:488
+#: ../src/message_window.py:489
 msgid "Private Chats"
 msgstr "Chat private"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:495
 msgid "Messages"
 msgstr "Messaggi"
 
@@ -9638,56 +9948,56 @@ msgstr "Nuovo messaggio da %(nickname)s"
 msgid "Ignore"
 msgstr "nove"
 
-#: ../src/profile_window.py:57
+#: ../src/profile_window.py:58
 msgid "Retrieving profile..."
 msgstr "Recupero profilo..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2935
+#: ../src/profile_window.py:111 ../src/roster_window.py:3001
 msgid "File is empty"
 msgstr "Il file è vuoto"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2938
+#: ../src/profile_window.py:114 ../src/roster_window.py:3004
 msgid "File does not exist"
 msgstr "Il file non esiste"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2940 ../src/roster_window.py:2951
+#: ../src/profile_window.py:128 ../src/profile_window.py:144
+#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
 msgid "Could not load image"
 msgstr "Impossibile caricare l'immagine"
 
-#: ../src/profile_window.py:214
+#: ../src/profile_window.py:215
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Informazioni sul contatto"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:216
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Formato: AAAA-MM-GG"
 
-#: ../src/profile_window.py:269
+#: ../src/profile_window.py:270
 msgid "Information received"
 msgstr "Informazioni ricevute"
 
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:341
 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:353
+#: ../src/profile_window.py:354
 msgid "Sending profile..."
 msgstr "Invio del profilo..."
 
-#: ../src/profile_window.py:368
+#: ../src/profile_window.py:369
 msgid "Information NOT published"
 msgstr "Informazione NON pubblicata"
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:376
 msgid "vCard publication failed"
 msgstr "Pubblicazione della vCard fallita"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:377
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9695,51 +10005,51 @@ msgstr ""
 "C'è stato un errore nella pubblicazione delle informazioni personali, "
 "riprovare più tardi."
 
-#: ../src/roster_window.py:256 ../src/roster_window.py:1012
+#: ../src/roster_window.py:262 ../src/roster_window.py:1026
 msgid "Merged accounts"
 msgstr "Account uniti"
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1942
 msgid "Authorization has been sent"
 msgstr "Autorizzazione inviata"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1943
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ora \"%s\" conoscerà il tuo stato."
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1966
 msgid "Subscription request has been sent"
 msgstr "La richiesta di abbonamento è stata inviata"
 
-#: ../src/roster_window.py:1944
+#: ../src/roster_window.py:1967
 #, 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:1958
+#: ../src/roster_window.py:1981
 msgid "Authorization has been removed"
 msgstr "L'autorizzazione è stata rimossa"
 
-#: ../src/roster_window.py:1959
+#: ../src/roster_window.py:1982
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ora \"%s\" ti vedrà sempre come offline."
 
-#: ../src/roster_window.py:1986
+#: ../src/roster_window.py:2009
 msgid "GPG is not usable"
 msgstr "Non è possibile utilizzare GPG"
 
-#: ../src/roster_window.py:1987
+#: ../src/roster_window.py:2010
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Ti connetterai a %s senza OpenPGP."
 
-#: ../src/roster_window.py:2199 ../src/roster_window.py:3496
+#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
 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:2200 ../src/roster_window.py:3497
+#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9747,39 +10057,39 @@ msgstr ""
 "Impostare lo stato invisibile ti farà disconnettere da queste chat di "
 "gruppo. Diventare veramente invisibile?"
 
-#: ../src/roster_window.py:2226
+#: ../src/roster_window.py:2249
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2288
+#: ../src/roster_window.py:2311
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2289
+#: ../src/roster_window.py:2312
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Si è sicuri di voler uscire dalle stanze \"%s\"?"
 
-#: ../src/roster_window.py:2290
+#: ../src/roster_window.py:2313
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2373
+#: ../src/roster_window.py:2396
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Annulla trasferimento file"
 
-#: ../src/roster_window.py:2374
+#: ../src/roster_window.py:2397
 msgid ""
-"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2405 ../src/roster_window.py:2653
+#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
 msgid "You have unread messages"
 msgstr "Ci sono messaggi non letti"
 
-#: ../src/roster_window.py:2406
+#: ../src/roster_window.py:2429
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9788,16 +10098,16 @@ msgstr ""
 "I messaggi saranno disponibili per una lettura successiva solo se la "
 "cronologia è abilitata"
 
-#: ../src/roster_window.py:2654
+#: ../src/roster_window.py:2720
 msgid "You must read them before removing this transport."
 msgstr "Leggere tutti gli eventi pendenti prima di rimuovere questo account."
 
-#: ../src/roster_window.py:2657
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Il trasporto \"%s\" verrà rimosso"
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2724
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9805,11 +10115,11 @@ msgstr ""
 "Non si potranno più inviare e ricevere messaggi verso i contatti di questo "
 "trasporto."
 
-#: ../src/roster_window.py:2661
+#: ../src/roster_window.py:2727
 msgid "Transports will be removed"
 msgstr "I trasporti verranno rimossi"
 
-#: ../src/roster_window.py:2666
+#: ../src/roster_window.py:2732
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9818,69 +10128,69 @@ msgstr ""
 "Non si potranno inviare e ricevere messaggi verso i contatti di questi "
 "trasporti:%s"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2800
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Stai per creare un metacontatto. Continuare?"
 
-#: ../src/roster_window.py:2736
+#: ../src/roster_window.py:2802
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2827
+#: ../src/roster_window.py:2893
 msgid "Rename Contact"
 msgstr "Rinomina contatto"
 
-#: ../src/roster_window.py:2828
+#: ../src/roster_window.py:2894
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Inserire un nuovo nickname per il contatto %s."
 
-#: ../src/roster_window.py:2835
+#: ../src/roster_window.py:2901
 msgid "Rename Group"
 msgstr "Rinomina Gruppo"
 
-#: ../src/roster_window.py:2836
+#: ../src/roster_window.py:2902
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Inserire un nome per il gruppo %s."
 
-#: ../src/roster_window.py:2881
+#: ../src/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Elimina Gruppo"
 
-#: ../src/roster_window.py:2882
+#: ../src/roster_window.py:2948
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Rimuovere il gruppo %s dalla lista?"
 
-#: ../src/roster_window.py:2883
+#: ../src/roster_window.py:2949
 #, 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:2922
+#: ../src/roster_window.py:2988
 msgid "Assign OpenPGP Key"
 msgstr "Assegna chiave OpenPGP"
 
-#: ../src/roster_window.py:2923
+#: ../src/roster_window.py:2989
 msgid "Select a key to apply to the contact"
 msgstr "Seleziona una chiave da applicare al contatto"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3372
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Il contatto \"%s\" sarà rimosso dalla tua lista"
 
-#: ../src/roster_window.py:3308
+#: ../src/roster_window.py:3374
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3313
+#: ../src/roster_window.py:3379
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9889,12 +10199,12 @@ msgstr ""
 "ti vedrà sempre offline."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3319
+#: ../src/roster_window.py:3385
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Cosa fare?"
 
-#: ../src/roster_window.py:3323
+#: ../src/roster_window.py:3389
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9902,16 +10212,16 @@ msgstr ""
 "Eliminando questo contatto ne rimuoverai anche l'autorizzazione. Questi ti "
 "vedrà sempre offline."
 
-#: ../src/roster_window.py:3326
+#: ../src/roster_window.py:3392
 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:3330
+#: ../src/roster_window.py:3396
 msgid "Contacts will be removed from your roster"
 msgstr "Il contatto sarà rimosso dalla tua lista"
 
-#: ../src/roster_window.py:3335
+#: ../src/roster_window.py:3401
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9920,33 +10230,33 @@ msgstr ""
 "Eliminando questi contatti:%s\n"
 "ne verrà rimossa anche l'autorizzazione. Ti vedranno sempre offline."
 
-#: ../src/roster_window.py:3393
+#: ../src/roster_window.py:3459
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want  to continue?"
 msgstr "Stai per creare un metacontatto. Continuare?"
 
-#: ../src/roster_window.py:3395
+#: ../src/roster_window.py:3461
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he or she will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3414
+#: ../src/roster_window.py:3480
 msgid "No account available"
 msgstr "Nessun account disponibile"
 
-#: ../src/roster_window.py:3415
+#: ../src/roster_window.py:3481
 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:4023
+#: ../src/roster_window.py:4095
 msgid "Metacontacts storage not supported by your server"
 msgstr "Il supporto metacontatti non è supportato dal tuo server"
 
-#: ../src/roster_window.py:4025
+#: ../src/roster_window.py:4097
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9955,12 +10265,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:4117
+#: ../src/roster_window.py:4189
 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:4119
+#: ../src/roster_window.py:4191
 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 "
@@ -9970,24 +10280,24 @@ msgstr ""
 "Generalmente si usano quando la stessa persona ha più account jabber o su "
 "vari transport."
 
-#: ../src/roster_window.py:4234
+#: ../src/roster_window.py:4306
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "File non valido"
 
-#: ../src/roster_window.py:4246
+#: ../src/roster_window.py:4318
 #, 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:4361
+#: ../src/roster_window.py:4433
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Invia %s"
 
-#: ../src/roster_window.py:4367
+#: ../src/roster_window.py:4439
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Rendi %s e %s metacontatti"
@@ -9997,146 +10307,146 @@ msgstr "Rendi %s e %s metacontatti"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4816 ../src/roster_window.py:4889
-#: ../src/roster_window.py:4898 ../src/statusicon.py:246
-#: ../src/statusicon.py:293 ../src/statusicon.py:299
+#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
+#: ../src/roster_window.py:4970 ../src/statusicon.py:263
+#: ../src/statusicon.py:310 ../src/statusicon.py:316
 #, python-format
 msgid "using account %s"
 msgstr "usando l'account %s"
 
 #. add
-#: ../src/roster_window.py:4905
+#: ../src/roster_window.py:4977
 #, python-format
 msgid "to %s account"
 msgstr "all'account %s"
 
 #. disco
-#: ../src/roster_window.py:4910
+#: ../src/roster_window.py:4982
 #, python-format
 msgid "using %s account"
 msgstr "usando l'account %s"
 
-#: ../src/roster_window.py:4948 ../src/statusicon.py:309
+#: ../src/roster_window.py:5020 ../src/statusicon.py:326
 msgid "_Manage Bookmarks..."
 msgstr "_Gestione segnalibri..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4968
+#: ../src/roster_window.py:5040
 #, python-format
 msgid "of account %s"
 msgstr "dell'account %s"
 
-#: ../src/roster_window.py:5009
+#: ../src/roster_window.py:5081
 #, python-format
 msgid "for account %s"
 msgstr "per l'account %s"
 
-#: ../src/roster_window.py:5069 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
 msgid "_Change Status Message"
 msgstr "_Cambia messaggio di stato"
 
-#: ../src/roster_window.py:5102
+#: ../src/roster_window.py:5174
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Pubblica"
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5176
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Pubblica"
 
-#: ../src/roster_window.py:5107
+#: ../src/roster_window.py:5179
 #, fuzzy
 msgid "Configure Services..."
 msgstr "Configura la _stanza..."
 
-#: ../src/roster_window.py:5252
+#: ../src/roster_window.py:5324
 msgid "_Maximize All"
 msgstr "_Massimizza tutti"
 
-#: ../src/roster_window.py:5262 ../src/roster_window.py:5436
+#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
 msgid "Send Group M_essage"
 msgstr "Invia _messaggio di gruppo"
 
-#: ../src/roster_window.py:5270
+#: ../src/roster_window.py:5342
 msgid "To all users"
 msgstr "A tutti gli utenti"
 
-#: ../src/roster_window.py:5274
+#: ../src/roster_window.py:5346
 msgid "To all online users"
 msgstr "Utenti _online"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5456
+#: ../src/roster_window.py:5528
 msgid "_Manage Contacts"
 msgstr "_Gestisci contatti"
 
 #. Edit Groups
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5537
 msgid "Edit _Groups"
 msgstr "Modifica _gruppi"
 
 #. Send single message
-#: ../src/roster_window.py:5520
+#: ../src/roster_window.py:5592
 msgid "Send Single Message"
 msgstr "Invia messaggio singolo"
 
 #. Execute Command
-#: ../src/roster_window.py:5567
+#: ../src/roster_window.py:5639
 msgid "Execute Command..."
 msgstr "Esegui comando..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5577
+#: ../src/roster_window.py:5649
 msgid "_Manage Transport"
 msgstr "_Gestisci trasporto"
 
 #. Modify Transport
-#: ../src/roster_window.py:5586
+#: ../src/roster_window.py:5658
 msgid "_Modify Transport"
 msgstr "_Modifica trasporto"
 
 #. Rename
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5668
 msgid "_Rename"
 msgstr "_Rinomina"
 
-#: ../src/roster_window.py:5656
+#: ../src/roster_window.py:5728
 msgid "_Maximize"
 msgstr "_Massimizza"
 
-#: ../src/roster_window.py:5665
+#: ../src/roster_window.py:5737
 #, fuzzy
 msgid "_Reconnect"
 msgstr "_Disconnetti"
 
-#: ../src/roster_window.py:5672
+#: ../src/roster_window.py:5744
 msgid "_Disconnect"
 msgstr "_Disconnetti"
 
 #. History manager
-#: ../src/roster_window.py:5754
+#: ../src/roster_window.py:5833
 msgid "History Manager"
 msgstr "Gestore cronologia"
 
-#: ../src/roster_window.py:5765
+#: ../src/roster_window.py:5844
 msgid "_Join New Group Chat"
 msgstr "_Nuova chat di gruppo"
 
-#: ../src/roster_window.py:5938
+#: ../src/roster_window.py:6019
 msgid "Change Status Message..."
 msgstr "Cambia messaggio di stato..."
 
-#: ../src/search_window.py:94
+#: ../src/search_window.py:105
 msgid "Waiting for results"
 msgstr "Ricerca in corso"
 
-#: ../src/search_window.py:132 ../src/search_window.py:210
+#: ../src/search_window.py:143 ../src/search_window.py:220
 msgid "Error in received dataform"
 msgstr "Errore nella ricezione dei dati"
 
 #. No result
-#: ../src/search_window.py:166 ../src/search_window.py:202
+#: ../src/search_window.py:177 ../src/search_window.py:212
 msgid "No result"
 msgstr "Nessun risultato"
 
@@ -10150,14 +10460,15 @@ msgstr "Errore di scrittura su disco"
 msgid "Subject: %s"
 msgstr "Oggetto: %s"
 
-#: ../src/session.py:433 ../src/session.py:468
+#: ../src/session.py:447 ../src/session.py:491
 msgid "Confirm these session options"
 msgstr "Conferma queste opzioni di sessione"
 
-#: ../src/session.py:435
+#: ../src/session.py:448
 #, fuzzy, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
+"The remote client wants '\n"
+"                            'to negotiate an session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -10169,7 +10480,7 @@ msgstr ""
 "\n"
 "\tQueste opzioni sono accettabili?"
 
-#: ../src/session.py:469
+#: ../src/session.py:492
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10184,16 +10495,16 @@ msgstr ""
 "\n"
 "Continuare la sessione?"
 
-#: ../src/statusicon.py:210
+#: ../src/statusicon.py:227
 msgid "_Change Status Message..."
 msgstr "_Cambia messaggio di stato..."
 
-#: ../src/statusicon.py:322
+#: ../src/statusicon.py:339
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Non nei contatti"
 
-#: ../src/statusicon.py:333
+#: ../src/statusicon.py:350
 msgid "Hide this menu"
 msgstr "Nascondi questo menu"
 
@@ -10332,34 +10643,34 @@ msgstr ""
 "Questo servizio non ha inviato informazioni dettagliate.\n"
 "È probabilmente vecchio o malfunzionante"
 
-#: ../src/vcard.py:251
+#: ../src/vcard.py:265
 msgid "?Client:Unknown"
 msgstr "?Client:Sconosciuto"
 
-#: ../src/vcard.py:253
+#: ../src/vcard.py:267
 msgid "?OS:Unknown"
 msgstr "Sconosciuto"
 
-#: ../src/vcard.py:274
+#: ../src/vcard.py:288
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "?Client:Sconosciuto"
 
-#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
+#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
 #, python-format
 msgid "since %s"
 msgstr "dalle %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:345
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:349
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Applicazioni</b>"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:357
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10367,7 +10678,7 @@ msgstr ""
 "Questo contatto è interessato alle informazioni sulla tua presenza, ma tu "
 "non sei interessato alla sua"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:359
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10375,14 +10686,14 @@ msgstr ""
 "Sei interessato alle informazioni sulla presenza di questo contatto, ma lui/"
 "lei non è interessato/a alla tua"
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:361
 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:349
+#: ../src/vcard.py:363
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10390,21 +10701,61 @@ msgstr ""
 "Non sei interessato alla presenza del contatto, e lui/lei non è interessato "
 "alla tua"
 
-#: ../src/vcard.py:356
+#: ../src/vcard.py:370
 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:358
+#: ../src/vcard.py:372
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
+#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
 msgid " resource with priority "
 msgstr " risorsa con priorità "
 
-#~ msgid "_Available"
-#~ msgstr "_Disponibile"
+#~ msgid "_Disable showing event in systray"
+#~ msgstr "_Disabilita la visualizzazione dell'evento nell'area di notifica"
+
+#~ msgid "_Show event in systray"
+#~ msgstr "_Mostra evento nell'area di notifica"
+
+#, fuzzy
+#~ msgid "Autodetect on every Gajim startup"
+#~ msgstr "C_onnetti all'avvio di Gajim"
+
+#, fuzzy
+#~ msgid "Show systray:"
+#~ msgstr "_Mostra evento nell'area di notifica"
+
+#~ msgid "Nickname not allowed: %s"
+#~ msgstr "Nickname non permesso: %s"
+
+#~ msgid "Room has been destroyed"
+#~ msgstr "La stanza è stata cancellata"
+
+#~ msgid "You can join this room instead: %s"
+#~ msgstr "Puoi invece entrare in questa stanza: %s"
+
+#~ msgid "I would like to add you to my roster."
+#~ msgstr "Vorrei aggiungerti ai miei contatti."
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "si è ora abbonati a %s"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "richiesta di cancellazione abbonamento da %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "è stato ora cancellato l'abbonamento a %s"
+
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "Il JID %s non rispetta la RFC. Non verrà aggiunto ai contatti. Usare "
+#~ "strumenti di gestione dei contatti come http://jru.jabberstudio.org/ per "
+#~ "rimuoverlo"
 
 #~ msgid "Account Modification"
 #~ msgstr "Modifica account"
@@ -10505,26 +10856,6 @@ msgstr " risorsa con priorità "
 #~ msgid "gtk-delete"
 #~ msgstr "gtk-close"
 
-#, fuzzy
-#~ msgid "Add this contact to roster (Ctrl+D)"
-#~ msgstr "Aggiunge il contatto alla lista"
-
-#, fuzzy
-#~ msgid "Invite contacts to the conversation (Ctrl+G)"
-#~ msgstr "sta seguendo la conversazione"
-
-#, fuzzy
-#~ msgid "Show a list of emoticons (Alt+M)"
-#~ msgstr "Clicca per inserire un emoticon (Alt+M)"
-
-#, fuzzy
-#~ msgid "Show a list of formattings"
-#~ msgstr "Clicca per inserire un emoticon (Alt+M)"
-
-#, fuzzy
-#~ msgid "Show a menu of advanced functions (Alt+D)"
-#~ msgstr "Clicca per inserire un emoticon (Alt+M)"
-
 #~ msgid ""
 #~ "All chat states\n"
 #~ "Composing only\n"
@@ -10572,9 +10903,6 @@ msgstr " risorsa con priorità "
 #~ msgid "gtk-cancel"
 #~ msgstr "gtk-close"
 
-#~ msgid "_Preferences"
-#~ msgstr "_Preferenze"
-
 #~ msgid "_Quit"
 #~ msgstr "_Esci"
 
@@ -11077,13 +11405,6 @@ msgstr " risorsa con priorità "
 #~ msgstr ""
 #~ "Supporto gestione sessioni non disponibile (modulo gnome.ui mancante)"
 
-#~ msgid ""
-#~ "Usage: %s %s %s \n"
-#~ "\t %s"
-#~ msgstr ""
-#~ "Utilizzo: %s %s %s \n"
-#~ "\t %s"
-
 #~ msgid "%s - Gajim"
 #~ msgstr "%s - Gajim"
 
@@ -11189,9 +11510,6 @@ msgstr " risorsa con priorità "
 #~ msgstr ""
 #~ "Salva _posizione e dimensione delle finestre di chat e lista contatti"
 
-#~ msgid "Use t_rayicon (aka. notification area icon)"
-#~ msgstr "Usa _icona nell'area di notifica (vassoio di sistema)"
-
 #~ msgid ""
 #~ "When a new event (message, file transfer request etc..) is received, the "
 #~ "following methods may be used to inform you about it. Please note that "
diff --git a/po/ja.po b/po/ja.po
index d87c6fcef961bf3f7a132ff638c156678d29a6d5..eaa9efa7e1202af2a606bd9f19ab189f1ce7b8cb 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -2,11 +2,15 @@
 # Copyright (C) 2009 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.
 #
+#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.13.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 11:28+0200\n"
+"POT-Creation-Date: 2010-10-01 20:39+0200\n"
 "PO-Revision-Date: 2010-03-10 17:59+0900\n"
 "Last-Translator: Mako N. <mako@pasero.net>\n"
 "Language-Team: Japanese\n"
@@ -25,7 +29,7 @@ msgstr "グループチャットに参加する (_G)..."
 msgid "_Add Contact..."
 msgstr "相手先リストに追加する (_C)..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:17
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
 msgid "_Discover Services"
 msgstr "サービスを探索する (_D)"
 
@@ -45,7 +49,7 @@ msgstr "Gmail の受信箱を開く (_O)"
 msgid "_Personal Events"
 msgstr "個人イベント (_P)"
 
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:23
+#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
 msgid "_Start Chat..."
 msgstr "チャットを開始する (_S)..."
 
@@ -77,10 +81,6 @@ msgid "<b>Please select a server</b>"
 msgstr "<b>サーバーを選択してください</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid "@"
-msgstr "@"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
@@ -88,97 +88,97 @@ msgstr ""
 "この証明書を、信頼できる証明書一覧に加えます。\n"
 "この証明書の SHA1 指紋:\n"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:10
 msgid "Anon_ymous authentication"
 msgstr "匿名の認証 (_y)"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Connect when I press Finish"
 msgstr "「完了」を押したらすぐに接続する"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: アカウント作成ウィザード"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "I already have an account I want to _use"
 msgstr "既にアカウントを持っているのでそれを使う (_u)"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I want to _register for a new account"
 msgstr "新しいアカウントを作成する (_r)"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:16
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 #: ../data/gui/accounts_window.ui.h:28
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "チェックをつけると、Gajim はこのアカウントのパスワードを記憶します"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:17
+#: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "管理..."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:18
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
 #: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2263 ../src/config.py:2342
-#: ../src/config.py:2355 ../src/config.py:3596 ../src/config.py:3671
-#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513
-#: ../src/dialogs.py:526 ../src/roster_window.py:2890
-#: ../src/roster_window.py:2896 ../src/roster_window.py:2901
+#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
+#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
+#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
+#: ../src/dialogs.py:527 ../src/roster_window.py:2956
+#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
 msgid "None"
 msgstr "なし"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:19
+#: ../data/gui/account_creation_wizard_window.ui.h:18
 msgid "Prox_y:"
 msgstr "プロキシ (_y)"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #: ../data/gui/accounts_window.ui.h:48
 msgid "Save pass_word"
 msgstr "パスワードを保存する"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:21
+#: ../data/gui/account_creation_wizard_window.ui.h:20
 msgid "Set my profile when I connect"
 msgstr "接続時に自分のプロフィールを設定する"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:22
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Use custom hostname/port"
 msgstr "別のホスト名/ポート番号を使う"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:23
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
 msgstr "Jabber ネットワークに接続するには、アカウントが必要です。"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-#: ../data/gui/roster_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:16
 msgid "_Advanced"
 msgstr "æ‹¡å¼µ (_A)"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:25
 msgid "_Finish"
 msgstr "完了 (_F)"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:27
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Hostname:"
 msgstr "ホスト名 (_H):"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #: ../data/gui/accounts_window.ui.h:62
 msgid "_Jabber ID:"
 msgstr "Jabber ID (_J):"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:28
 #: ../data/gui/accounts_window.ui.h:64
 msgid "_Password:"
 msgstr "パスワード (_P):"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:29
 msgid "_Port:"
 msgstr "ポート番号 (_P):"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:31
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Server:"
 msgstr "サーバー (_S):"
 
@@ -286,17 +286,17 @@ msgstr "名:"
 #. No configured account
 #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
 #: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592
-#: ../src/notify.py:608
+#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
+#: ../src/notify.py:616
 msgid "Gajim"
 msgstr "Gajim"
 
 #. FIXME: Ugly workaround.
 #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
 #. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:61
-#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121
-#: ../src/roster_window.py:2832 ../src/roster_window.py:5379
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
+#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
 msgid "General"
 msgstr "全般"
 
@@ -356,7 +356,7 @@ msgstr "サーバに格納する、あなたに関する情報です"
 
 #: ../data/gui/accounts_window.ui.h:35
 #: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:830
+#: ../src/dialogs.py:831
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -370,7 +370,7 @@ msgid "Mer_ge accounts"
 msgstr "アカウントの統合 (_g)"
 
 #: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2356
+#: ../src/config.py:2358
 msgid "No key selected"
 msgstr "鍵が選択されていません"
 
@@ -397,7 +397,7 @@ msgid "Priority will change automatically according to your status."
 msgstr "優先順位は、在席状況に応じて自動的に変わります。"
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5329
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
 msgid "Re_name"
 msgstr "名前の変更 (_n)"
 
@@ -620,38 +620,43 @@ msgid "Deletes Message of the Day"
 msgstr "今日のメッセージを削除します"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
+#, fuzzy
+msgid "Edit Archi_ving Preferences"
+msgstr "設定 (_P)"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Edit _Privacy Lists..."
 msgstr "プライバシーリストを編集..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sends a message to users currently connected to this server"
 msgstr "現在このサーバーに接続しているユーザーにメッセージを送信する"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Set MOTD..."
 msgstr "MOTD を設定..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "今日のメッセージを設定します"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Show _XML Console"
 msgstr "XML コンソールを表示 (_X)"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "Update MOTD..."
 msgstr "MOTD ã‚’æ›´æ–°..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "今日のメッセージを更新します"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:11
 msgid "_Administrator"
 msgstr "管理人 (_A)"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:11
+#: ../data/gui/advanced_menuitem_menu.ui.h:12
 msgid "_Send Server Message..."
 msgstr "サーバーメッセージを送信 (_S)..."
 
@@ -687,7 +692,7 @@ msgid "All statuses"
 msgstr "すべての状況"
 
 #: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:233
+#: ../src/common/commands.py:106 ../src/common/helpers.py:239
 #: ../src/tooltips.py:193
 msgid "Away"
 msgstr "離席中です"
@@ -742,7 +747,7 @@ msgid "Have "
 msgstr "持っています "
 
 #: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:249
 msgid "Invisible"
 msgstr "隠れています"
 
@@ -752,7 +757,7 @@ msgid "Launch a command"
 msgstr "コマンドを実行する"
 
 #: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:216 ../src/tooltips.py:197
+#: ../src/common/helpers.py:222 ../src/tooltips.py:197
 msgid "Not Available"
 msgstr "不在です"
 
@@ -799,12 +804,13 @@ msgid "_Disable existing sound for this event"
 msgstr "このイベントのサウンドを禁止する (_D)"
 
 #: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in roster"
+#, fuzzy
+msgid "_Disable showing event in notification area"
 msgstr "名簿へのイベントの表示をやめる (_D)"
 
 #: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in systray"
-msgstr "システムトレイへのイベントの表示をやめる (_D)"
+msgid "_Disable showing event in roster"
+msgstr "名簿へのイベントの表示をやめる (_D)"
 
 #: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
@@ -815,12 +821,13 @@ msgid "_Open chat window with user"
 msgstr "ユーザーのチャットウィンドウを開く (_O)"
 
 #: ../data/gui/advanced_notifications_window.ui.h:35
-msgid "_Show event in roster"
+#, fuzzy
+msgid "_Show event in notification area"
 msgstr "イベントを名簿に表示する (_S)"
 
 #: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in systray"
-msgstr "イベントをシステムトレイに表示する (_S)"
+msgid "_Show event in roster"
+msgstr "イベントを名簿に表示する (_S)"
 
 #: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
@@ -849,6 +856,45 @@ msgstr "グループ"
 msgid "when I'm in"
 msgstr ""
 
+#: ../data/gui/archiving_preferences_window.ui.h:1
+msgid "<i>Method Auto</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "<i>Method Local</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:3
+msgid "<i>Method Manual</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:4
+#, fuzzy
+msgid "Auto"
+msgstr "自動参加"
+
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Concede"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "Forbid"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:7
+#, fuzzy
+msgid "No"
+msgstr "なし"
+
+#: ../data/gui/archiving_preferences_window.ui.h:8
+#, fuzzy
+msgid "Prefer"
+msgstr "設定"
+
+#: ../data/gui/archiving_preferences_window.ui.h:9
+msgid "Yes"
+msgstr ""
+
 #: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "エントリー:"
@@ -875,8 +921,8 @@ msgstr "拒否されている相手先"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5348
-#: ../src/roster_window.py:5476 ../src/roster_window.py:5609
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
+#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
 msgid "_Unblock"
 msgstr "拒否の解除 (_U)"
 
@@ -964,7 +1010,7 @@ msgid "_Start Chat"
 msgstr "チャットの開始 (_S)"
 
 #. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4184
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
 msgid "#"
 msgstr "#"
 
@@ -1012,13 +1058,50 @@ msgstr ""
 msgid "9"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:13
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "この相手先を名簿に追加する (Ctrl+D)"
+
 #: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "チャットの履歴を見る (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:15
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "相手先を招待 (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "顔文字の一覧の表示 (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
+msgid "Show a list of formattings"
+msgstr "書式の一覧の表示"
+
+#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "拡張機能の一覧を表示 (Alt+A)"
+
+#: ../data/gui/chat_control.ui.h:19
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr "相手先のプロフィールの表示 (Ctrl+I)"
+
+#: ../data/gui/chat_control.ui.h:20
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:21
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
 #: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "送信 (_S)"
 
-#: ../data/gui/chat_control.ui.h:15 ../data/gui/groupchat_control.ui.h:3
+#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
 msgid "label"
 msgstr ""
 
@@ -1068,8 +1151,8 @@ msgstr "グループの変更 (_G)..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5284
-#: ../src/roster_window.py:5444
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
+#: ../src/roster_window.py:5516
 msgid "In_vite to"
 msgstr "招待 (_v)"
 
@@ -1082,8 +1165,8 @@ msgstr "相手先を招待 (_C)"
 msgid "Remo_ve"
 msgstr "削除 (_R)"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5294
-#: ../src/roster_window.py:5533
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
+#: ../src/roster_window.py:5605
 msgid "Send Cus_tom Status"
 msgstr "個別の在席状況の送信 (_t)"
 
@@ -1116,8 +1199,8 @@ msgid "_Allow him/her to see my status"
 msgstr "自分の在席状況を見られることを許可する (_A)"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5482 ../src/roster_window.py:5612
+#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
+#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
 msgid "_Block"
 msgstr "拒否 (_B)"
 
@@ -1127,8 +1210,8 @@ msgstr "自分の在席状況を見られることを禁止する (_F)"
 
 #: ../data/gui/contact_context_menu.ui.h:20
 #: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:21
-#: ../src/roster_window.py:5683
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
+#: ../src/roster_window.py:5755
 msgid "_History"
 msgstr "履歴 (_H)"
 
@@ -1268,7 +1351,7 @@ msgstr "<b>チャット状態のタブの色</b>"
 msgid "Account row"
 msgstr "アカウント"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:925
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
 msgid "Bold"
 msgstr "太字にする"
 
@@ -1306,7 +1389,7 @@ msgstr "グループ"
 msgid "Inactive"
 msgstr "活動停止中"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:926
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
 msgid "Italic"
 msgstr "イタリック"
 
@@ -1354,7 +1437,7 @@ msgstr "談話室の題の変更 (_S)..."
 msgid "Configure _Room..."
 msgstr "談話室の調整 (_R)..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1782
+#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
 msgid "_Bookmark"
 msgstr "ブックマーク (_B)"
 
@@ -1415,23 +1498,32 @@ msgstr "私信を送る (_S)"
 msgid "_Voice"
 msgstr "発言権 (_V)"
 
+#: ../data/gui/groupchat_control.ui.h:1
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "この談話室をブックマーク (Ctrl+B)"
+
+#: ../data/gui/groupchat_control.ui.h:3
+msgid "Change the room's subject (Alt+T)"
+msgstr "談話室の題の変更 (Alt+T)"
+
+#: ../data/gui/groupchat_control.ui.h:4
+msgid "Change your nickname (Ctrl+N)"
+msgstr "ニックネームの変更 (Ctrl+N)"
+
 #: ../data/gui/groups_post_window.ui.h:1
 #, fuzzy
 msgid "Create new post"
 msgstr "新しいポストの作成"
 
-# #(Mako)helpers.pyは、
-# 相手先の情報で、subscriptionの有無なので、「こちらが承認」としたい
-#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
-#, fuzzy
-msgid "From"
-msgstr "こちらが承認"
+#: ../data/gui/groups_post_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:2
+msgid "From:"
+msgstr "差出人:"
 
-#. holds subject
-#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
-#: ../src/history_manager.py:219
-msgid "Subject"
-msgstr "題"
+#: ../data/gui/groups_post_window.ui.h:3
+#: ../data/gui/single_message_window.ui.h:7
+msgid "Subject:"
+msgstr "件名:"
 
 #: ../data/gui/history_manager.ui.h:1
 msgid ""
@@ -1448,8 +1540,8 @@ msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Gajim 履歴記録マネージャ</b></big>"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3208
-#: ../src/dialogs.py:3305
+#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
+#: ../src/dialogs.py:3321
 msgid "Delete"
 msgstr "削除"
 
@@ -1507,12 +1599,75 @@ msgstr "検索:"
 msgid "_Log conversation history"
 msgstr "会話の履歴を記録 (_L)"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
+msgid "approve"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:2
+msgid "body"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:3
+msgid "concede"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:4
+msgid "expire"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:5
+msgid "false"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:6
+msgid "forbid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:7
+#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+msgid "jid"
+msgstr "jid"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:8
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
+#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
+msgid "message"
+msgstr "メッセージ"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
+msgid "oppose"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
+#, fuzzy
+msgid "otr"
+msgstr "æš‘"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:11
+msgid "prefer"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:12
+msgid "require"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:13
+msgid "save"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:14
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
 msgid "Bro_wse Rooms"
 msgstr "一覧 (_B)"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2180
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
 msgid "Join Group Chat"
 msgstr "グループチャットに参加"
 
@@ -1550,8 +1705,8 @@ msgstr "サーバー:"
 msgid "_Bookmark this room"
 msgstr "この談話室をブックマーク"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1341
-#: ../src/disco.py:1786
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../src/disco.py:1804
 msgid "_Join"
 msgstr "参加 (_J)"
 
@@ -1654,6 +1809,75 @@ msgstr "ユーザー名 (_U):"
 msgid "Passphrase"
 msgstr "パスフレーズ"
 
+#: ../data/gui/plugins_window.ui.h:1
+msgid "&lt;empty&gt;"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:2
+msgid "<empty>"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:3
+#, fuzzy
+msgid "Authors:"
+msgstr "承認する (_t)"
+
+#: ../data/gui/plugins_window.ui.h:4
+#, fuzzy
+msgid "Available"
+msgstr "在席 (_A)"
+
+#: ../data/gui/plugins_window.ui.h:5
+#, fuzzy
+msgid "Configure"
+msgstr "調整 (_C)"
+
+#: ../data/gui/plugins_window.ui.h:6
+#, fuzzy
+msgid "Descrition:"
+msgstr "説明: "
+
+#: ../data/gui/plugins_window.ui.h:7
+#, fuzzy
+msgid "Homepage:"
+msgstr "<b>ホームページ:</b>"
+
+#: ../data/gui/plugins_window.ui.h:8
+msgid "Install"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:9
+#, fuzzy
+msgid "Installed"
+msgstr "滞っています"
+
+#: ../data/gui/plugins_window.ui.h:10
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:11
+msgid "Plugins"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:12
+msgid "Uninstall"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:13
+#, fuzzy
+msgid "Version:"
+msgstr "GTK+ バージョン:"
+
+#: ../data/gui/plugins_window.ui.h:14
+msgid "button"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:15
+msgid "homepage url"
+msgstr ""
+
 #: ../data/gui/popup_notification_window.ui.h:1
 #, fuzzy
 msgid "Event Type"
@@ -1780,124 +2004,107 @@ msgstr "取り込み中でもサウンドを鳴らす (_b)"
 msgid "Always"
 msgstr "離席中です"
 
-#: ../data/gui/preferences_window.ui.h:31
-msgid "Always use GNOME default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:32
-msgid "Always use KDE default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:33
-msgid "Always use Xfce default applications"
-msgstr ""
-
 # (Mako)語順が難しい
-#: ../data/gui/preferences_window.ui.h:34
+#: ../data/gui/preferences_window.ui.h:31
 msgid "Ask status message when I:"
 msgstr "状況メッセージを求めるのは、私が "
 
-#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
 msgid "Audio / Video"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:33
 #, fuzzy
 msgid "Audio input device"
 msgstr "デフォルトのメッセージ"
 
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Audio output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:38
-#, fuzzy
-msgid "Autodetect on every Gajim startup"
-msgstr "Gajim 起動時に接続する (_o)"
-
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:35
 msgid "Chat message:"
 msgstr "チャットメッセージ:"
 
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:36
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "起動時に、Gajim がデフォルトの Jabber クライアントかを調べる (_d)"
 
-#: ../data/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:37
 #, fuzzy
 msgid "Composing only"
 msgstr "入力中"
 
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:38
 msgid "Configure color and font of the interface"
 msgstr "色とフォントの調整"
 
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
 msgid "Contact's message:"
 msgstr "チャットメッセージ:"
 
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "名前"
 
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:41
 #, fuzzy
 msgid "Custom"
 msgstr "<b>カスタム</b>"
 
-#: ../data/gui/preferences_window.ui.h:46
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Detached roster with chat grouped by account"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Detached roster with detached chats"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:45
 msgid "Detached roster with single chat"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
-#: ../src/config.py:671
+#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
+#: ../src/config.py:665
 msgid "Disabled"
 msgstr "無効"
 
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:47
 msgid "Display _activity of contacts in roster"
 msgstr "名簿に相手先の動向を表示する (_a)"
 
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:48
 msgid "Display _extra email details"
 msgstr "メールの詳細を表示する (_e)"
 
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:49
 #, fuzzy
 msgid "Display _location of contacts in roster"
 msgstr "名簿に相手先の気分を表示する (_o)"
 
-#: ../data/gui/preferences_window.ui.h:54
+#: ../data/gui/preferences_window.ui.h:50
 msgid "Display _tunes of contacts in roster"
 msgstr "名簿に相手先の聴いている楽曲を表示する (_t)"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display a_vatars of contacts in roster"
 msgstr "名簿に相手先のアバターを表示する"
 
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display m_ood of contacts in roster"
 msgstr "名簿に相手先の気分を表示する (_o)"
 
-#: ../data/gui/preferences_window.ui.h:57
+#: ../data/gui/preferences_window.ui.h:53
 msgid "Display status _messages of contacts in roster"
 msgstr "名簿に相手先の状況メッセージを表示する"
 
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:54
 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 "
@@ -1906,7 +2113,7 @@ msgstr ""
 "Gajim は、相手先との会話に関連するメタ情報の送受信ができます。ここでは、"
 "チャットウィンドウへのチャット状態の表示について指定します。"
 
-#: ../data/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:55
 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 "
@@ -1915,7 +2122,7 @@ msgstr ""
 "Gajim は、相手先との会話に関連するメタ情報の送受信ができます。ここでは、"
 "チャット状態の他人への送信について指定します。"
 
-#: ../data/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:56
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1923,30 +2130,30 @@ msgstr ""
 "画面の右下のポップアップウィンドウで、相手先がサインアウトしたときに通知しま"
 "す"
 
-#: ../data/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:58
 msgid "Hide all buttons in chat windows"
 msgstr "チャットウィンドウのすべてのボタンを隠します"
 
-#: ../data/gui/preferences_window.ui.h:63
+#: ../data/gui/preferences_window.ui.h:59
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
 msgstr "チェックをつけると、Gajim は使用中の OS を知られることを許可します"
 
-#: ../data/gui/preferences_window.ui.h:64
+#: ../data/gui/preferences_window.ui.h:60
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr "チェックをつけると、Gajim は電子メールの送信者の情報を含めます"
 
-#: ../data/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:61
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "チェックをつけると、Gajim はコンピュータが使われていないとき、在席状況を「離"
 "席中」に変更します"
 
-#: ../data/gui/preferences_window.ui.h:66
+#: ../data/gui/preferences_window.ui.h:62
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1954,7 +2161,7 @@ msgstr ""
 "チェックをつけると、Gajim はコンピュータが長い間使われていないとき、在席状況"
 "を「不在」に変更します"
 
-#: ../data/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1962,7 +2169,7 @@ msgstr ""
 "チェックをつけると、Gajim は名簿ウィンドウとグループチャットに相手先のアバ"
 "ターを表示します"
 
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1970,30 +2177,30 @@ msgstr ""
 "チェックをつけると、Gajim は名簿ウィンドウとグループチャットの相手先名の下に"
 "状況メッセージを表示します"
 
-#: ../data/gui/preferences_window.ui.h:69
+#: ../data/gui/preferences_window.ui.h:65
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr "チェックをつけると、Gajim は名簿ウィンドウに相手先の動向を表示します"
 
-#: ../data/gui/preferences_window.ui.h:70
+#: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the location of contacts in the roster window"
 msgstr "チェックをつけると、Gajim は名簿ウィンドウに相手先の気分を表示します"
 
-#: ../data/gui/preferences_window.ui.h:71
+#: ../data/gui/preferences_window.ui.h:67
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr "チェックをつけると、Gajim は名簿ウィンドウに相手先の気分を表示します"
 
-#: ../data/gui/preferences_window.ui.h:72
+#: ../data/gui/preferences_window.ui.h:68
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "チェックをつけると、Gajim は名簿ウィンドウに相手先の聴いている楽曲を表示しま"
 "す"
 
-#: ../data/gui/preferences_window.ui.h:73
+#: ../data/gui/preferences_window.ui.h:69
 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 "
@@ -2004,7 +2211,7 @@ msgstr ""
 "ていない場合は、この相手先やグループチャットにはデフォルトの言語が適用されま"
 "す。"
 
-#: ../data/gui/preferences_window.ui.h:74
+#: ../data/gui/preferences_window.ui.h:70
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -2013,7 +2220,7 @@ msgstr ""
 "チェックをつけると、Gajim は承認していない相手先からのイベントを無視します。"
 "名簿にない相手先からのすべてのメッセージを拒否しますので、注意してください。"
 
-#: ../data/gui/preferences_window.ui.h:75
+#: ../data/gui/preferences_window.ui.h:71
 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 "
@@ -2023,7 +2230,7 @@ msgstr ""
 "号化 (E2EE) の場合は相手先が記録に同意していなければなりません。そうでなけれ"
 "ば記録しないでください。"
 
-#: ../data/gui/preferences_window.ui.h:76
+#: ../data/gui/preferences_window.ui.h:72
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -2031,7 +2238,7 @@ msgstr ""
 "チェックをつけると、Gajim は GMail 経由で新しいメールを受け取ったとき、通知し"
 "ます"
 
-#: ../data/gui/preferences_window.ui.h:77
+#: ../data/gui/preferences_window.ui.h:73
 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, "
@@ -2041,7 +2248,7 @@ msgstr ""
 "(例: MSN からの相手先にはオンライン、離席、取り込み中...などの対応する MSN の"
 "アイコンがあります)"
 
-#: ../data/gui/preferences_window.ui.h:78
+#: ../data/gui/preferences_window.ui.h:74
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -2049,7 +2256,7 @@ msgstr ""
 "チェックをつけると、Gajim は状況メッセージを要求しません。かわりに対応するデ"
 "フォルトのメッセージが使われます。"
 
-#: ../data/gui/preferences_window.ui.h:79
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2057,45 +2264,45 @@ msgstr ""
 "「無効」でなければ、Gajim は ':)' のようなスマイリーを対応する画像に置き換え"
 "ます"
 
-#: ../data/gui/preferences_window.ui.h:80
+#: ../data/gui/preferences_window.ui.h:76
 msgid "Log _encrypted chat session"
 msgstr "暗号化チャットを記録する (_e)"
 
-#: ../data/gui/preferences_window.ui.h:81
+#: ../data/gui/preferences_window.ui.h:77
 msgid "Ma_ke message windows compact"
 msgstr "メッセージウィンドウを簡潔にする (_k)"
 
-#: ../data/gui/preferences_window.ui.h:82
+#: ../data/gui/preferences_window.ui.h:78
 msgid "Ma_nage..."
 msgstr "設定 (_n)..."
 
-#: ../data/gui/preferences_window.ui.h:83
+#: ../data/gui/preferences_window.ui.h:79
 #, fuzzy
 msgid "Never"
 msgstr "サーバー"
 
-#: ../data/gui/preferences_window.ui.h:84
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Notifications"
 msgstr "通知"
 
-#: ../data/gui/preferences_window.ui.h:85
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Notify me about contacts that sign _in"
 msgstr "相手先のログインを通知する (_i)"
 
-#: ../data/gui/preferences_window.ui.h:86
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Notify me about contacts that sign _out"
 msgstr "相手先のログアウトを通知する (_o)"
 
-#: ../data/gui/preferences_window.ui.h:87
+#: ../data/gui/preferences_window.ui.h:83
 #, fuzzy
 msgid "Notify me about it"
 msgstr "相手先のログアウトを通知する (_o)"
 
-#: ../data/gui/preferences_window.ui.h:88
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notify on new _GMail email"
 msgstr "新しい GMail メールを通知する (_G)"
 
-#: ../data/gui/preferences_window.ui.h:89
+#: ../data/gui/preferences_window.ui.h:85
 #, fuzzy
 msgid "Only when pending events"
 msgstr ""
@@ -2103,57 +2310,57 @@ msgstr ""
 "保留イベントがあるときだけ\n"
 "常に"
 
-#: ../data/gui/preferences_window.ui.h:90
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Personal Events"
 msgstr "個人イベント"
 
-#: ../data/gui/preferences_window.ui.h:91
+#: ../data/gui/preferences_window.ui.h:87
 msgid "Play _sounds"
 msgstr "サウンドを鳴らす (_s)"
 
-#: ../data/gui/preferences_window.ui.h:92
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Pop it up"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:93
+#: ../data/gui/preferences_window.ui.h:89
 msgid "Preferences"
 msgstr "設定"
 
-#: ../data/gui/preferences_window.ui.h:94
+#: ../data/gui/preferences_window.ui.h:90
 msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:96
+#: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
 msgid "STUN server:"
 msgstr "サーバー:"
 
-#: ../data/gui/preferences_window.ui.h:97
+#: ../data/gui/preferences_window.ui.h:93
+msgid "Show notification area icon:"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
 msgid "Show only in roster"
 msgstr "イベントを名簿に表示する (_S)"
 
-#: ../data/gui/preferences_window.ui.h:98
-msgid "Show systray:"
-msgstr "システムトレイに表示:"
-
 # (Mako)"Ask status message when I:" に続く語
-#: ../data/gui/preferences_window.ui.h:99
+#: ../data/gui/preferences_window.ui.h:95
 msgid "Sign _in"
 msgstr "サインインしたとき (_i)"
 
 # (Mako)"Ask status message when I:" に続く語
-#: ../data/gui/preferences_window.ui.h:100
+#: ../data/gui/preferences_window.ui.h:96
 msgid "Sign _out"
 msgstr "サインアウトしたとき (_o)"
 
-#: ../data/gui/preferences_window.ui.h:101
+#: ../data/gui/preferences_window.ui.h:97
 msgid "Single window for everything"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:102
+#: ../data/gui/preferences_window.ui.h:98
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2161,27 +2368,27 @@ msgstr ""
 "メッセージが装飾(書式や色など)を含んでいる場合があります。チェックをつける"
 "と、Gajim はそのままのメッセージ文を表示します。"
 
-#: ../data/gui/preferences_window.ui.h:103
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sort contacts by status"
 msgstr "相手先を在席状況順に並べる"
 
-#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
 msgid "Status"
 msgstr "在席状況"
 
-#: ../data/gui/preferences_window.ui.h:105
+#: ../data/gui/preferences_window.ui.h:101
 msgid "Status _iconset:"
 msgstr "状況アイコン (_i):"
 
-#: ../data/gui/preferences_window.ui.h:106
+#: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "スタイル"
 
-#: ../data/gui/preferences_window.ui.h:107
+#: ../data/gui/preferences_window.ui.h:103
 msgid "T_heme:"
 msgstr "テーマ (_h):"
 
-#: ../data/gui/preferences_window.ui.h:108
+#: ../data/gui/preferences_window.ui.h:104
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2193,7 +2400,7 @@ msgstr ""
 "$S は前の状況メッセージに置き換えられます\n"
 "$T は自動離席の設定時間に置き換えられます"
 
-#: ../data/gui/preferences_window.ui.h:111
+#: ../data/gui/preferences_window.ui.h:107
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2205,124 +2412,128 @@ msgstr ""
 "$S は前の状況メッセージに置き換えられます\n"
 "$T は自動不在の設定時間に置き換えられます"
 
-#: ../data/gui/preferences_window.ui.h:114
+#: ../data/gui/preferences_window.ui.h:110
 msgid "Use _transports icons"
 msgstr "中継先のアイコンを使う (_t)"
 
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:111
+msgid "Use default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:112
 msgid "Use system _default"
 msgstr "システムのデフォルトを使う (_d)"
 
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:113
 msgid "Video framerate"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:117
+#: ../data/gui/preferences_window.ui.h:114
 #, fuzzy
 msgid "Video input device"
 msgstr "デフォルトのメッセージ"
 
-#: ../data/gui/preferences_window.ui.h:118
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Video output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:119
+#: ../data/gui/preferences_window.ui.h:116
 msgid "Video size"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:120
+#: ../data/gui/preferences_window.ui.h:117
 msgid "When new event is received:"
 msgstr "新しいイベントを受信したとき:"
 
-#: ../data/gui/preferences_window.ui.h:121
+#: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
 msgid "Your message:"
 msgstr "エラーメッセージ: %s"
 
-#: ../data/gui/preferences_window.ui.h:122
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your nickname:"
 msgstr "ニックネーム:"
 
-#: ../data/gui/preferences_window.ui.h:123
+#: ../data/gui/preferences_window.ui.h:120
 msgid "_Away after:"
 msgstr "「離席中」にする (_A):"
 
-#: ../data/gui/preferences_window.ui.h:124
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "ブラウザ (_B):"
 
-#: ../data/gui/preferences_window.ui.h:125
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Display chat state notifications:"
 msgstr "チャット状態通知を表示する (_D):"
 
-#: ../data/gui/preferences_window.ui.h:126
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Emoticons:"
 msgstr "感情アイコン (_E):"
 
-#: ../data/gui/preferences_window.ui.h:127
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_File manager:"
 msgstr "ファイルマネージャ (_F):"
 
-#: ../data/gui/preferences_window.ui.h:128
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_Highlight misspelled words"
 msgstr "スペル間違いを強調表示する (_H)"
 
-#: ../data/gui/preferences_window.ui.h:129
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Ignore events from contacts not in the roster"
 msgstr "名簿にない相手先からのイベントを無視する (_I)"
 
-#: ../data/gui/preferences_window.ui.h:130
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore rich content in incoming messages"
 msgstr "受信したメッセージの書式を無視する (_I)"
 
-#: ../data/gui/preferences_window.ui.h:131
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Log status changes of contacts"
 msgstr "相手先の状況変更を記録する (_L)"
 
-#: ../data/gui/preferences_window.ui.h:132
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Mail client:"
 msgstr "メールクライアント (_M):"
 
-#: ../data/gui/preferences_window.ui.h:133
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Not available after:"
 msgstr "「不在」にする (_N):"
 
-#: ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Open..."
 msgstr "開く (_O)..."
 
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Reset to Default Colors"
 msgstr "デフォルトの色に戻す (_R)"
 
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Send chat state notifications:"
 msgstr "チャット状態通知を送信する (_S):"
 
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Status message:"
 msgstr "状況メッセージ (_S):"
 
 # (Mako)あえてカッコ書き
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_URL highlight:"
 msgstr "URL 強調表示 (_U):"
 
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_Window behavior:"
 msgstr "ウィンドウの配置 (_W):"
 
-#: ../data/gui/preferences_window.ui.h:140
+#: ../data/gui/preferences_window.ui.h:137
 msgid "in _group chats"
 msgstr "グループチャットで (_g)"
 
-#: ../data/gui/preferences_window.ui.h:141
+#: ../data/gui/preferences_window.ui.h:138
 #, fuzzy
 msgid "in _roster"
 msgstr "名簿にありません"
 
-#: ../data/gui/preferences_window.ui.h:142
+#: ../data/gui/preferences_window.ui.h:139
 msgid "minutes"
 msgstr "分後"
 
@@ -2376,7 +2587,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "順位:"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3436
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
 msgid "Privacy List"
 msgstr "プライバシーリスト"
 
@@ -2598,8 +2809,8 @@ msgstr "アカウントを Gajim とサーバーからも削除 (_s)"
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5492 ../src/roster_window.py:5622
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
+#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
 msgid "_Remove"
 msgstr "削除 (_R)"
 
@@ -2648,56 +2859,60 @@ msgid "Help online"
 msgstr "ヘルプ(オンライン)"
 
 #: ../data/gui/roster_window.ui.h:8
+msgid "P_lugins"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:9
 msgid "Profile, A_vatar"
 msgstr "プロフィールとアバター"
 
-#: ../data/gui/roster_window.ui.h:9
+#: ../data/gui/roster_window.ui.h:10
 msgid "Show Only _Active Contacts"
 msgstr "アクティブな相手先のみ表示 (_A)"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
 msgid "Show Trans_ports"
 msgstr "中継先を表示 (_p)"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
 msgid "Show _Offline Contacts"
 msgstr "オフラインの相手先を表示 (_O)"
 
-#: ../data/gui/roster_window.ui.h:12 ../src/statusicon.py:326
+#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
 msgid "Show _Roster"
 msgstr "名簿の表示 (_R)"
 
-#: ../data/gui/roster_window.ui.h:13
+#: ../data/gui/roster_window.ui.h:14
 msgid "_Accounts"
 msgstr "アカウント (_A)"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
 #: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "操作 (_A)"
 
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
 msgid "_Contents"
 msgstr "目次 (_C)"
 
-#: ../data/gui/roster_window.ui.h:18 ../src/disco.py:1502
+#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
 msgid "_Edit"
 msgstr "編集 (_E)"
 
-#: ../data/gui/roster_window.ui.h:19
+#: ../data/gui/roster_window.ui.h:20
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Help"
 msgstr "ヘルプ (_H)"
 
-#: ../data/gui/roster_window.ui.h:22
+#: ../data/gui/roster_window.ui.h:23
 msgid "_Send Single Message..."
 msgstr "単発メッセージを送信する (_S)..."
 
-#: ../data/gui/roster_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:25
 msgid "_View"
 msgstr "表示 (_V)"
 
@@ -2715,11 +2930,11 @@ msgid "_Add contact"
 msgstr "相手先リストに追加する (_A)..."
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5634
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
 msgid "_Information"
 msgstr "情報 (_I)"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1353
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
 msgid "_Search"
 msgstr "検索 (_S)"
 
@@ -2740,10 +2955,6 @@ msgstr "登録"
 msgid "_Cancel"
 msgstr "中止 (_C)"
 
-#: ../data/gui/single_message_window.ui.h:2
-msgid "From:"
-msgstr "差出人:"
-
 #: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "このメッセージへの返信"
@@ -2760,10 +2971,6 @@ msgstr "メッセージを送信する"
 msgid "Send message and close window"
 msgstr "メッセージを送信してウィンドウを閉じる"
 
-#: ../data/gui/single_message_window.ui.h:7
-msgid "Subject:"
-msgstr "件名:"
-
 #: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "宛先:"
@@ -2978,25 +3185,35 @@ msgstr "Gajim インスタントメッセンジャ"
 msgid "Jabber IM Client"
 msgstr "Jabber IM クライアント"
 
-#: ../src/adhoc_commands.py:314
+#: ../src/adhoc_commands.py:323
 msgid "Cancel confirmation"
 msgstr "中止の確認"
 
-#: ../src/adhoc_commands.py:315
+#: ../src/adhoc_commands.py:324
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr "コマンドの実行中です。本当に中止してもいいですか ?"
 
-#: ../src/adhoc_commands.py:351 ../src/adhoc_commands.py:374
+#: ../src/adhoc_commands.py:370
+#, fuzzy
+msgid "Invalid Form"
+msgstr "談話室名が正しくありません"
+
+#: ../src/adhoc_commands.py:371
+#, fuzzy
+msgid "The form is not filled correctly."
+msgstr "ニックネームに使用できない文字が含まれています。"
+
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:360
+#: ../src/adhoc_commands.py:399
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:471
+#: ../src/adhoc_commands.py:513
 #, fuzzy
 msgid "Service returned an error."
 msgstr "エラーを返してきました。"
@@ -3022,7 +3239,7 @@ msgstr "æ•´æ•°åž‹"
 msgid "Text"
 msgstr "文字列型"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:945
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
 msgid "Color"
 msgstr "色"
 
@@ -3060,187 +3277,187 @@ msgstr[1] "新しいエントリーを受け取りました (%(count)d が表示
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "English"
 msgstr "英語"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Belarusian"
 msgstr "ベラルーシ語"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Bulgarian"
 msgstr "ブルガリア語"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Breton"
 msgstr "ブルトン語"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Czech"
 msgstr "チェコ語"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "German"
 msgstr "ドイツ語"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Greek"
 msgstr "ギリシア語"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "British"
 msgstr "英語 (イギリス)"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Esperanto"
 msgstr "エスペラント"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Spanish"
 msgstr "スペイン語"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Basque"
 msgstr "バスク語"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "French"
 msgstr "フランス語"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Croatian"
 msgstr "クロアチア語"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Italian"
 msgstr "イタリア語"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian (b)"
 msgstr "ノルウェー語 (b)"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Dutch"
 msgstr "オランダ語"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian"
 msgstr "ノルウェー語"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Polish"
 msgstr "ポーランド語"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Portuguese"
 msgstr "ポルトガル語"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Brazilian Portuguese"
 msgstr "ポルトガル語 (ブラジル)"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Russian"
 msgstr "ロシア語"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Serbian"
 msgstr "セルビア語"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Slovak"
 msgstr "スロバキア語"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Swedish"
 msgstr "スウェーデン語"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Chinese (Ch)"
 msgstr "中国語 (Ch)"
 
-#: ../src/chat_control.py:479
+#: ../src/chat_control.py:496
 msgid "Spelling language"
 msgstr "スペルチェックの言語"
 
 #. we are not connected
-#: ../src/chat_control.py:511 ../src/chat_control.py:720
+#: ../src/chat_control.py:528 ../src/chat_control.py:737
 msgid "A connection is not available"
 msgstr "接続は有効ではありません"
 
-#: ../src/chat_control.py:512 ../src/chat_control.py:721
+#: ../src/chat_control.py:529 ../src/chat_control.py:738
 msgid "Your message can not be sent until you are connected."
 msgstr "接続するまでメッセージは送信されません。"
 
-#: ../src/chat_control.py:927
+#: ../src/chat_control.py:944
 msgid "Underline"
 msgstr "下線"
 
-#: ../src/chat_control.py:928
+#: ../src/chat_control.py:945
 msgid "Strike"
 msgstr "抹消線"
 
-#: ../src/chat_control.py:951
+#: ../src/chat_control.py:968
 msgid "Font"
 msgstr "フォント"
 
-#: ../src/chat_control.py:960
+#: ../src/chat_control.py:977
 msgid "Clear formating"
 msgstr "書式のクリア"
 
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1055
 msgid "Really send file?"
 msgstr "ファイルを送信しますか ?"
 
-#: ../src/chat_control.py:1039
+#: ../src/chat_control.py:1056
 #, 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:1503 ../src/chat_control.py:1987
+#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "GPG 暗号化は有効"
 
 #. Add to roster
-#: ../src/chat_control.py:1528 ../src/common/contacts.py:158
+#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
 #: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:245 ../src/dialogs.py:1064 ../src/dialogs.py:2078
-#: ../src/dialogs.py:2107 ../src/gui_interface.py:674
+#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
+#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
 #: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1610 ../src/roster_window.py:1612
-#: ../src/roster_window.py:1942 ../src/roster_window.py:3289
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
+#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
+#: ../src/roster_window.py:3382
 msgid "Not in Roster"
 msgstr "名簿にありません"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1575
 msgid "This contact does not support file transfer."
 msgstr "この相手先はファイル転送をサポートしていません。"
 
-#: ../src/chat_control.py:1561
+#: ../src/chat_control.py:1578
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr "ファイル転送を行なうには、本当の JID を知っている必要があります。"
 
-#: ../src/chat_control.py:1656
+#: ../src/chat_control.py:1677
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:1869
 #, 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:1967 ../src/dialogs.py:4866
+#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
 msgid "No GPG key assigned"
 msgstr "GPG 鍵が割り当てられていません"
 
-#: ../src/chat_control.py:1968
+#: ../src/chat_control.py:1991
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3248,52 +3465,52 @@ msgstr ""
 "この相手先に GPG 鍵が割り当てられていないため、メッセージを GPG で暗号化する"
 "ことができません。"
 
-#: ../src/chat_control.py:1977
+#: ../src/chat_control.py:2000
 msgid "GPG encryption disabled"
 msgstr "GPG 暗号化は無効"
 
-#: ../src/chat_control.py:2003
+#: ../src/chat_control.py:2026
 msgid "Session WILL be logged"
 msgstr "セッションは記録されます"
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:2028
 msgid "Session WILL NOT be logged"
 msgstr "セッションは記録されません"
 
 # (Mako)暗号化は有効 %s、
 #. encryption %s active
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is"
 msgstr "で"
 
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is NOT"
 msgstr "でなく"
 
 # #. チャットは記録 %s。
 #. chat session %s be logged
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will"
 msgstr "記録されます"
 
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will NOT"
 msgstr "記録されません"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2051
 msgid "and authenticated"
 msgstr "認証されています"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2032
+#: ../src/chat_control.py:2055
 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:2039
+#: ../src/chat_control.py:2062
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3302,23 +3519,32 @@ msgstr ""
 "%(type)s の暗号化は有効%(status)s、%(authenticated)s。\n"
 "チャットは%(logged)s。"
 
-#: ../src/chat_control.py:2182
+#: ../src/chat_control.py:2205
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2191
+#: ../src/chat_control.py:2215
+msgid "This session WILL be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2217
+#, fuzzy
+msgid "This session WILL NOT be archived on server"
+msgstr "セッションは記録されません"
+
+#: ../src/chat_control.py:2226
 msgid "This session is encrypted"
 msgstr "このセッションは暗号化されています"
 
-#: ../src/chat_control.py:2194
+#: ../src/chat_control.py:2229
 msgid " and WILL be logged"
 msgstr " かつ、記録されます"
 
-#: ../src/chat_control.py:2196
+#: ../src/chat_control.py:2231
 msgid " and WILL NOT be logged"
 msgstr " かつ、記録されません"
 
-#: ../src/chat_control.py:2201
+#: ../src/chat_control.py:2236
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3326,40 +3552,38 @@ msgstr ""
 "遠くの相手先の同一性は検証されませんでした。詳しくは盾ボタンをクリックしてく"
 "ださい。"
 
-#: ../src/chat_control.py:2203
+#: ../src/chat_control.py:2238
 msgid "E2E encryption disabled"
 msgstr "終端間暗号化 (E2EE) は無効"
 
-#: ../src/chat_control.py:2241 ../src/chat_control.py:2254
+#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
 msgid "The following message was NOT encrypted"
 msgstr "次のメッセージは暗号化されませんでした:"
 
-#: ../src/chat_control.py:2247
+#: ../src/chat_control.py:2288
 msgid "The following message was encrypted"
 msgstr "次のメッセージは暗号化されました:"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2519
+#: ../src/chat_control.py:2566
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "\"%s\" さんから新しいメッセージを受信しました"
 
-#: ../src/chat_control.py:2520
+#: ../src/chat_control.py:2567
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr ""
 "このタブを閉じると、記録を残さない設定の場合、このメッセージは失われます。"
 
-#: ../src/chat_control.py:2663 ../src/common/connection_handlers.py:1635
-#: ../src/common/connection_handlers.py:1758
-#: ../src/common/connection_handlers.py:1960
-#: ../src/common/connection_handlers.py:2110 ../src/common/connection.py:452
+#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
 #: ../src/gajim.py:159 ../src/session.py:138
 msgid "Database Error"
 msgstr "データベースのエラー"
 
-#: ../src/chat_control.py:2664
+#: ../src/chat_control.py:2714
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3368,7 +3592,7 @@ msgstr ""
 "データベースファイル (%s) を読むことができません。修復するか、または削除(すべ"
 "ての履歴は失われます)してください。"
 
-#: ../src/chat_control.py:2906
+#: ../src/chat_control.py:2962
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s さんは現在、%(status)s"
@@ -3382,28 +3606,28 @@ msgstr "記録データベースを作っています"
 msgid "creating cache database"
 msgstr "記録データベースを作っています"
 
-#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
-#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
-#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
-#: ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s はファイルです。ディレクトリでなければなりません"
 
-#: ../src/common/check_paths.py:275 ../src/common/check_paths.py:282
-#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
-#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
-#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:333
+#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
+#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
+#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
 msgid "Gajim will now exit"
 msgstr "Gajim は終了します"
 
-#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
+#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s はディレクトリです。ファイルでなければなりません"
 
-#: ../src/common/check_paths.py:342
+#: ../src/common/check_paths.py:351
 #, python-format
 msgid "creating %s directory"
 msgstr "ディレクトリ %s を作ります"
@@ -3467,9 +3691,9 @@ msgstr "退出したいグループチャットを選択してください"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:801
-#: ../src/roster_window.py:1614 ../src/roster_window.py:1616
-#: ../src/roster_window.py:5251
+#: ../src/common/helpers.py:57 ../src/roster_window.py:815
+#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
+#: ../src/roster_window.py:5323
 msgid "Groupchats"
 msgstr "グループチャット"
 
@@ -3527,7 +3751,9 @@ msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr "$S は現在の状況メッセージに置き換えられます。$T は自動不在の時間です。"
 
 #: ../src/common/config.py:88
-msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+#, fuzzy
+msgid ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 "いつシステムトレイアイコンを表示するか。'never'(表示しない), 'on_event'(保留"
 "イベントがあるときだけ), 'always'(常に)のいずれか。"
@@ -3578,9 +3804,9 @@ msgid ""
 msgstr "折り畳む(アカウントやグループチャットの)行の一覧(空白で区切る)。"
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:501
-#: ../src/common/optparser.py:290 ../src/common/optparser.py:486
-#: ../src/common/optparser.py:520 ../src/gui_interface.py:3370
+#: ../src/common/config.py:106 ../src/common/config.py:505
+#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
+#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
 msgid "default"
 msgstr "デフォルト"
 
@@ -3796,7 +4022,8 @@ msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC 標準規格で、KiB は 1024 バイト、KB は 1000 バイト。"
 
 #: ../src/common/config.py:197
-msgid "Notify of events in the system trayicon."
+#, fuzzy
+msgid "Notify of events in the notification area."
 msgstr "システムのトレイアイコンでイベントを通知します。"
 
 #: ../src/common/config.py:203
@@ -3833,9 +4060,10 @@ msgid ""
 msgstr "グループチャットで強調表示する語の一覧(セミコロンで区切る)。A"
 
 #: ../src/common/config.py:221
+#, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
+"setting is taken into account only if notification icon is used."
 msgstr ""
 "真なら、ウィンドウマネージャの×ボタンがクリックされた場合に Gajim を終了しま"
 "す。この設定はトレイアイコンが使用されているときのみ適用されます。"
@@ -4111,9 +4339,10 @@ msgid ""
 msgstr "表示された会話の最大行数。古いほうから削除されます。"
 
 #: ../src/common/config.py:270
+#, fuzzy
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
-"systray icon."
+"notification icon."
 msgstr ""
 "真なら、notification-daemon からの通知はシステムトレイアイコンに付けられま"
 "す。"
@@ -4305,11 +4534,15 @@ msgstr ""
 msgid "Message that is sent to contacts you want to add"
 msgstr "追加したい相手先の情報を入力してください"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:374
+msgid "Last time we syncronized with logs from server."
+msgstr ""
+
+#: ../src/common/config.py:436
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "この相手先に OpenPGP を使えるかどうか"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4317,101 +4550,108 @@ msgstr ""
 "Gajim はこの相手先について自動的に(可能なら)暗号化セッションを始めるべきかど"
 "うか"
 
-#: ../src/common/config.py:437 ../src/common/config.py:440
+#: ../src/common/config.py:438 ../src/common/config.py:441
 msgid "Language for which we want to check misspelled words"
 msgstr "スペル間違いを調べたい言語"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:447
 msgid "all or space separated status"
 msgstr "all(すべて)、状況を空白で区切って"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:448
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes'(はい)、'no'(いいえ)、'both'(両方)のいずれか"
 
-#: ../src/common/config.py:448 ../src/common/config.py:450
-#: ../src/common/config.py:451 ../src/common/config.py:454
-#: ../src/common/config.py:455
+#: ../src/common/config.py:449 ../src/common/config.py:451
+#: ../src/common/config.py:452 ../src/common/config.py:455
+#: ../src/common/config.py:456
 msgid "'yes', 'no' or ''"
 msgstr "'yes'(はい)、'no'(いいえ)、''(空白)のいずれか"
 
-#: ../src/common/config.py:461 ../src/common/pep.py:157
+#: ../src/common/config.py:460
+msgid ""
+"State whether plugins should be activated on exit (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
+msgstr ""
+
+#: ../src/common/config.py:465 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "睡眠中"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back soon"
 msgstr "すぐに戻ります"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back in some minutes."
 msgstr "数分後に戻ります。"
 
-#: ../src/common/config.py:463 ../src/common/pep.py:127
+#: ../src/common/config.py:467 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "食事"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:467
 msgid "I'm eating, so leave me a message."
 msgstr "食事のため、しばらく離れます。"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "Movie"
 msgstr "映画"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "I'm watching a movie."
 msgstr "ただいま映画鑑賞中です。"
 
-#: ../src/common/config.py:465 ../src/common/pep.py:186
+#: ../src/common/config.py:469 ../src/common/pep.py:186
 msgid "Working"
 msgstr "仕事中"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:469
 msgid "I'm working."
 msgstr "仕事中です。"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "Phone"
 msgstr "電話中"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "I'm on the phone."
 msgstr "電話中です。"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "Out"
 msgstr "外出中"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "I'm out enjoying life."
 msgstr "出かけています。"
 
-#: ../src/common/config.py:478
+#: ../src/common/config.py:482
 msgid "I'm available."
 msgstr "在席しています。"
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:483
 msgid "I'm free for chat."
 msgstr "チャットできます。"
 
-#: ../src/common/config.py:480 ../src/config.py:1600
+#: ../src/common/config.py:484 ../src/config.py:1600
 msgid "Be right back."
 msgstr "すぐ戻ります。"
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:485
 msgid "I'm not available."
 msgstr "不在です。"
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:486
 msgid "Do not disturb."
 msgstr "邪魔しないでください。"
 
-#: ../src/common/config.py:483 ../src/common/config.py:484
+#: ../src/common/config.py:487 ../src/common/config.py:488
 msgid "Bye!"
 msgstr "バイバイ !"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:498
 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."
@@ -4419,88 +4659,84 @@ msgstr ""
 "グループチャットのメッセージに、muc_highlight_words で設定した語、またはあな"
 "たのニックネームが含まれる場合にサウンドを鳴らします。"
 
-#: ../src/common/config.py:495
+#: ../src/common/config.py:499
 msgid "Sound to play when any MUC message arrives."
 msgstr "グループチャットのメッセージがあった際にサウンドを鳴らします。"
 
-#: ../src/common/config.py:504 ../src/common/optparser.py:304
+#: ../src/common/config.py:508 ../src/common/optparser.py:308
 msgid "green"
 msgstr "green"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:290
+#: ../src/common/config.py:512 ../src/common/optparser.py:294
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:512
+#: ../src/common/config.py:516
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:520
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:84
+#: ../src/common/connection_handlers.py:94
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:117
+#: ../src/common/connection_handlers.py:127
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "中継先 %s の登録情報が一定時間内に到達しませんでした"
 
-#: ../src/common/connection_handlers.py:124
+#: ../src/common/connection_handlers.py:134
 msgid "Registration succeeded"
 msgstr "登録が完了しました"
 
-#: ../src/common/connection_handlers.py:125
+#: ../src/common/connection_handlers.py:135
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "エージェント %s の登録は成功しました"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 msgid "Registration failed"
 msgstr "登録が失敗しました"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 #, 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:445
-#: ../src/common/connection_handlers.py:1633
-#: ../src/common/connection_handlers.py:1756
-#: ../src/common/connection_handlers.py:1957
-#: ../src/common/connection_handlers.py:2108 ../src/common/connection.py:449
+#: ../src/common/connection_handlers.py:466
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
 #: ../src/gajim.py:341
 msgid "Disk Write Error"
 msgstr "ディスクの書き込みエラー"
 
-#: ../src/common/connection_handlers.py:678 ../src/common/connection.py:1472
+#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "「隠れています」はサポートされていません"
 
-#: ../src/common/connection_handlers.py:679 ../src/common/connection.py:1473
+#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
 #, fuzzy, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "アカウント %s は「隠れています」をサポートしていません。"
 
-#: ../src/common/connection_handlers.py:1446 ../src/common/connection.py:253
-#: ../src/config.py:2091 ../src/config.py:2100 ../src/config.py:2168
-#: ../src/config.py:3560 ../src/dataforms_widget.py:597 ../src/dialogs.py:2931
+#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
+#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
+#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID が正しくありません"
 
-#: ../src/common/connection_handlers.py:1447
+#: ../src/common/connection_handlers.py:1405
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr "正しくない JID からメッセージが届きました。無視します。"
 
-#: ../src/common/connection_handlers.py:1636
-#: ../src/common/connection_handlers.py:1759
-#: ../src/common/connection_handlers.py:1961
-#: ../src/common/connection_handlers.py:2111 ../src/common/connection.py:453
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
 #: ../src/gajim.py:160 ../src/session.py:139
 #, python-format
 msgid ""
@@ -4511,89 +4747,6 @@ msgstr ""
 "gajim.org/wiki/DatabaseBackup を参照のこと) か、または削除して (すべての履歴"
 "は失われます) ください。"
 
-#: ../src/common/connection_handlers.py:1805
-#, fuzzy, python-format
-msgid "Nickname not allowed: %s"
-msgstr "ニックネームは許されません: %s"
-
-#: ../src/common/connection_handlers.py:1902
-#: ../src/common/connection_handlers.py:1911
-#: ../src/common/connection_handlers.py:1918
-#: ../src/common/connection_handlers.py:1922
-#: ../src/common/connection_handlers.py:1926
-#: ../src/common/connection_handlers.py:1931 ../src/gui_interface.py:139
-msgid "Unable to join group chat"
-msgstr "グループに参加できません"
-
-#: ../src/common/connection_handlers.py:1903
-#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr "%s の人数制限に達しています"
-
-#: ../src/common/connection_handlers.py:1912
-#, python-format
-msgid "You are banned from group chat %s."
-msgstr "グループチャット %s さんに締め出されています。"
-
-#: ../src/common/connection_handlers.py:1919
-#, python-format
-msgid "Group chat %s does not exist."
-msgstr "グループチャット %s は存在しません。"
-
-#: ../src/common/connection_handlers.py:1923
-msgid "Group chat creation is restricted."
-msgstr "グループチャットの作成は制限されています。"
-
-#: ../src/common/connection_handlers.py:1927
-#, python-format
-msgid "Your registered nickname must be used in group chat %s."
-msgstr "登録したニックネームは、グループチャット %s で使われます。"
-
-#: ../src/common/connection_handlers.py:1932
-#, 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:1976
-msgid "Room has been destroyed"
-msgstr "談話室は閉鎖されました"
-
-#: ../src/common/connection_handlers.py:1984
-#, python-format
-msgid "You can join this room instead: %s"
-msgstr "代わりに次の談話室に参加します: %s"
-
-#: ../src/common/connection_handlers.py:2020
-msgid "I would like to add you to my roster."
-msgstr "あなたを私の名簿に追加したいと思っています。"
-
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2041
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:2043
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:2045
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:2240
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"JID %s は規格(RFC)に合っていません。名簿には追加されません。これを削除するに"
-"は、http://jru.jabberstudio.org/ のような名簿管理ツールを使ってください。"
-
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr "発行者の証明書を取得できません"
@@ -4724,27 +4877,27 @@ msgstr "証明書署名に鍵の使い方が含まれていません"
 msgid "Application verification failure"
 msgstr "検証に失敗しました"
 
-#: ../src/common/connection.py:254 ../src/dialogs.py:2932
+#: ../src/common/connection.py:256 ../src/dialogs.py:2948
 #, 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:276
+#: ../src/common/connection.py:278
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:281
 #, 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:331
+#: ../src/common/connection.py:333
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[このメッセージは *暗号化されています* (参考 :XEP:`27`]"
 
-#: ../src/common/connection.py:439
+#: ../src/common/connection.py:441
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4753,77 +4906,77 @@ msgstr ""
 "件名: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:807
+#: ../src/common/connection.py:809
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "アカウント \"%s\" での接続が切れました"
 
-#: ../src/common/connection.py:808
+#: ../src/common/connection.py:810
 msgid "Reconnect manually."
 msgstr "手動で再接続してください。"
 
-#: ../src/common/connection.py:820
+#: ../src/common/connection.py:822
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: ../src/common/connection.py:854
+#: ../src/common/connection.py:856
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:867
+#: ../src/common/connection.py:869
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "未知の SSL エラー: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:882
+#: ../src/common/connection.py:884
 #, fuzzy
 msgid "Invalid answer"
 msgstr "回答が間違っています"
 
-#: ../src/common/connection.py:883
+#: ../src/common/connection.py:885
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: ../src/common/connection.py:1165 ../src/common/connection.py:1294
-#: ../src/common/connection.py:1784
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
+#: ../src/common/connection.py:1792
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "%s に接続できませんでした"
 
-#: ../src/common/connection.py:1166 ../src/gui_interface.py:755
+#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
 msgid "Check your connection or try again later."
 msgstr "設定を確認するか、時間をおいて試してください。"
 
-#: ../src/common/connection.py:1171
+#: ../src/common/connection.py:1173
 #, python-format
 msgid "Server replied: %s"
 msgstr "サーバの応答: %s"
 
-#: ../src/common/connection.py:1184
+#: ../src/common/connection.py:1186
 msgid "Connection to proxy failed"
 msgstr "プロキシへの接続に失敗"
 
-#: ../src/common/connection.py:1215 ../src/common/connection.py:1274
+#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "アカウント %s に接続できません"
 
-#: ../src/common/connection.py:1216 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "アカウント %s での接続が切れました。再接続を試みます。"
 
-#: ../src/common/connection.py:1241
+#: ../src/common/connection.py:1243
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "%s の証明書の真正性は検証できませんでした。"
 
-#: ../src/common/connection.py:1244
+#: ../src/common/connection.py:1246
 #, python-format
 msgid ""
 "\n"
@@ -4832,7 +4985,7 @@ msgstr ""
 "\n"
 "SSL エラー: <b>%s</b>"
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1248
 #, python-format
 msgid ""
 "\n"
@@ -4841,25 +4994,25 @@ msgstr ""
 "\n"
 "未知の SSL エラー: %d"
 
-#: ../src/common/connection.py:1295
+#: ../src/common/connection.py:1297
 msgid "Check your connection or try again later"
 msgstr "接続を確認するか、または後で再度試してください"
 
 # (Mako) %s はアカウントか
-#: ../src/common/connection.py:1324
+#: ../src/common/connection.py:1329
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "\"%s\" の認証に失敗しました"
 
-#: ../src/common/connection.py:1326
+#: ../src/common/connection.py:1331
 msgid "Please check your login and password for correctness."
 msgstr "整合性のために、ログインとパスワードを確認してください。"
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1400
 msgid "Error while removing privacy list"
 msgstr "プライバシーリストを削除する際のエラー"
 
-#: ../src/common/connection.py:1396
+#: ../src/common/connection.py:1401
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4868,41 +5021,41 @@ msgstr ""
 "プライバシーリスト %s は削除されませんでした。現在の接続に使用されているよう"
 "です。使用をやめてから再び試してください。"
 
-#: ../src/common/connection.py:1650
+#: ../src/common/connection.py:1658
 #, fuzzy, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "送った相手先: %s (%s)"
 
-#: ../src/common/connection.py:1653
+#: ../src/common/connection.py:1661
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "送った相手先:"
 
-#: ../src/common/connection.py:1799 ../src/common/connection.py:1822
+#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
 msgid "Not fetched because of invisible status"
 msgstr ""
 
-#: ../src/common/connection.py:2254
+#: ../src/common/connection.py:2262
 msgid "Unregister failed"
 msgstr "登録解除に失敗"
 
-#: ../src/common/connection.py:2255
+#: ../src/common/connection.py:2263
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr "サーバー %(server)s での登録解除に失敗しました: %(error)s"
 
 # (Mako)承認なしに名簿にある状態
 #: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:674
+#: ../src/gui_interface.py:551
 msgid "Observers"
 msgstr "オブザーバ"
 
 #: ../src/common/contacts.py:139 ../src/common/contacts.py:366
 #: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1499 ../src/gui_interface.py:424
-#: ../src/roster_window.py:840 ../src/roster_window.py:1525
-#: ../src/roster_window.py:1606 ../src/roster_window.py:1608
-#: ../src/roster_window.py:1769
+#: ../src/disco.py:1517 ../src/roster_window.py:854
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
+#: ../src/roster_window.py:2466
 msgid "Transports"
 msgstr "中継先"
 
@@ -5130,206 +5283,225 @@ msgstr "週の終わり"
 msgid "Weekend!"
 msgstr "週末 !"
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:148
+msgid "Username must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:153
 msgid "Invalid character in username."
 msgstr "ユーザー名に不正な文字が含まれています。"
 
-#: ../src/common/helpers.py:156
-msgid "Server address required."
-msgstr "サーバーのアドレスが必要です。"
+#: ../src/common/helpers.py:159
+msgid "Server must be between 1 and 1023 chars"
+msgstr ""
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 msgid "Invalid character in hostname."
 msgstr "ホスト名に不正な文字が含まれています。"
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:166
+msgid "Server address required."
+msgstr "サーバーのアドレスが必要です。"
+
+#: ../src/common/helpers.py:170
+msgid "Resource must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:175
 msgid "Invalid character in resource."
 msgstr "リソースに不正な文字が含まれています。"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:215
 msgid "_Busy"
 msgstr "取り込み中 (_B)"
 
-#: ../src/common/helpers.py:211 ../src/tooltips.py:195
+#: ../src/common/helpers.py:217 ../src/tooltips.py:195
 msgid "Busy"
 msgstr "取り込み中です"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:220
 msgid "_Not Available"
 msgstr "不在 (_N)"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:225
 msgid "_Free for Chat"
 msgstr "チャット可 (_F)"
 
-#: ../src/common/helpers.py:221 ../src/tooltips.py:191
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Free for Chat"
 msgstr "チャットできます"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:230
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "一時停止しました"
 
-#: ../src/common/helpers.py:226 ../src/tooltips.py:189
+#: ../src/common/helpers.py:232 ../src/tooltips.py:189
 #, fuzzy
 msgid "?user status:Available"
 msgstr "一時停止しました"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:234
 msgid "Connecting"
 msgstr "接続中です"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:237
 msgid "A_way"
 msgstr "離席中 (_w)"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:242
 msgid "_Offline"
 msgstr "オフライン (_O)"
 
-#: ../src/common/helpers.py:238 ../src/tooltips.py:199
+#: ../src/common/helpers.py:244 ../src/tooltips.py:199
 msgid "Offline"
 msgstr "オフラインです"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:247
 msgid "_Invisible"
 msgstr "隠れ中 (_I)"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:253
 msgid "?contact has status:Unknown"
 msgstr "不明"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:255
 msgid "?contact has status:Has errors"
 msgstr "エラーが起こっています"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:260
 msgid "?Subscription we already have:None"
 msgstr "なし"
 
 # (Mako)subscription
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:262
 msgid "To"
 msgstr "相手先が承認"
 
-#: ../src/common/helpers.py:260
-msgid "Both"
-msgstr "相互に承認"
-
-#: ../src/common/helpers.py:268
+# #(Mako)helpers.pyは、
+# 相手先の情報で、subscriptionの有無なので、「こちらが承認」としたい
+#: ../src/common/helpers.py:264
+#, fuzzy
+msgid "From"
+msgstr "こちらが承認"
+
+#: ../src/common/helpers.py:266
+msgid "Both"
+msgstr "相互に承認"
+
+#: ../src/common/helpers.py:274
 msgid "?Ask (for Subscription):None"
 msgstr "なし"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:276
 msgid "Subscribe"
 msgstr "申し込み"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:285
 msgid "?Group Chat Contact Role:None"
 msgstr "なし"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:288
 msgid "Moderators"
 msgstr "司会者"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:290
 msgid "Moderator"
 msgstr "司会者"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:293
 msgid "Participants"
 msgstr "参加者"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:295
 msgid "Participant"
 msgstr "参加者"
 
 # (Mako)moderated room で、発言権(voice)を持たない者
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:298
 msgid "Visitors"
 msgstr "傍聴者"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:300
 msgid "Visitor"
 msgstr "傍聴者"
 
-#: ../src/common/helpers.py:300 ../src/tooltips.py:210
+#: ../src/common/helpers.py:306 ../src/tooltips.py:210
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "なし"
 
-#: ../src/common/helpers.py:302 ../src/tooltips.py:216
+#: ../src/common/helpers.py:308 ../src/tooltips.py:216
 msgid "Owner"
 msgstr "主宰者"
 
-#: ../src/common/helpers.py:304 ../src/tooltips.py:214
+#: ../src/common/helpers.py:310 ../src/tooltips.py:214
 msgid "Administrator"
 msgstr "管理人"
 
 # (Mako)「会員」では排他的なニュアンスが強いのでしかたなくカタカナ語で
-#: ../src/common/helpers.py:306 ../src/tooltips.py:212
+#: ../src/common/helpers.py:312 ../src/tooltips.py:212
 msgid "Member"
 msgstr "メンバー"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:351
 msgid "is paying attention to the conversation"
 msgstr "さんはこの会話に目を向けています"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:353
 msgid "is doing something else"
 msgstr "さんは何かほかのことをしています"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:355
 msgid "is composing a message..."
 msgstr "さんがメッセージを書いています..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:352
+#: ../src/common/helpers.py:358
 msgid "paused composing a message"
 msgstr "さんは書く手をちょっと止めています"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:360
 msgid "has closed the chat window or tab"
 msgstr "さんは会話ウインドウを閉じました"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:619
+#: ../src/common/helpers.py:625
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:622
+#: ../src/common/helpers.py:628
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:626
+#: ../src/common/helpers.py:632
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:629
+#: ../src/common/helpers.py:635
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:633
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:636
+#: ../src/common/helpers.py:642
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:645
 #, python-format
 msgid "%s B"
 msgstr "%s B"
@@ -5373,12 +5545,12 @@ msgstr "Gajim - %s"
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:111
+#: ../src/common/jingle_rtp.py:107
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "談話室の構成"
 
-#: ../src/common/jingle_rtp.py:112
+#: ../src/common/jingle_rtp.py:108
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5390,30 +5562,30 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:209
+#: ../src/common/jingle_rtp.py:205
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:210
+#: ../src/common/jingle_rtp.py:206
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "エラーメッセージ: %s"
 
-#: ../src/common/jingle_rtp.py:336
+#: ../src/common/jingle_rtp.py:335
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:339
+#: ../src/common/jingle_rtp.py:338
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:382
+#: ../src/common/jingle_rtp.py:381
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:390
+#: ../src/common/jingle_rtp.py:389
 msgid "video output"
 msgstr ""
 
@@ -5490,11 +5662,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "エラー: 読み込みモードで %s を開けません"
 
-#: ../src/common/optparser.py:299 ../src/common/optparser.py:300
+#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:379
+#: ../src/common/optparser.py:383
 msgid "migrating logs database to indices"
 msgstr ""
 
@@ -6165,7 +6337,7 @@ msgid ""
 msgstr "別の Gajim が起動しているようです。ファイル転送は中止されました。"
 
 #. we're not english
-#: ../src/common/stanza_session.py:303
+#: ../src/common/stanza_session.py:423
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6173,11 +6345,11 @@ msgstr ""
 "[暗号化セッションの途中です。このメッセージを見ているということは、何か失敗し"
 "ています。]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:178
+#: ../src/common/zeroconf/connection_zeroconf.py:181
 msgid "Avahi error"
 msgstr "Avahi エラー"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:179
+#: ../src/common/zeroconf/connection_zeroconf.py:182
 #, python-format
 msgid ""
 "%s\n"
@@ -6186,44 +6358,44 @@ msgstr ""
 "%s\n"
 "ローカルの伝送がうまく働いていないようです。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:190
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Avahi か Bonjour がインストールされているか確認してください。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:199
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Could not start local service"
 msgstr "ローカルのサービスを起動できません"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "ポート %d を開けません。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-#: ../src/common/zeroconf/connection_zeroconf.py:283
-#: ../src/common/zeroconf/connection_zeroconf.py:294
-#: ../src/common/zeroconf/connection_zeroconf.py:308
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:286
+#: ../src/common/zeroconf/connection_zeroconf.py:297
+#: ../src/common/zeroconf/connection_zeroconf.py:311
 msgid "Please check if avahi-daemon is running."
 msgstr "avahi-daemon が起動しているか確認してください。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:282
-#: ../src/common/zeroconf/connection_zeroconf.py:293
-#: ../src/common/zeroconf/connection_zeroconf.py:307
+#: ../src/common/zeroconf/connection_zeroconf.py:285
+#: ../src/common/zeroconf/connection_zeroconf.py:296
+#: ../src/common/zeroconf/connection_zeroconf.py:310
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "アカウント \"%s\" の在席状況を変更できませんでした"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:325
+#: ../src/common/zeroconf/connection_zeroconf.py:328
 msgid "Your message could not be sent."
 msgstr "メッセージを送信できませんでした。"
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:335
+#: ../src/common/zeroconf/connection_zeroconf.py:338
 msgid "Contact is offline. Your message could not be sent."
 msgstr "相手先はオフラインです。メッセージを送信できませんでした。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:363
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "ホストへの接続を確立できませんでした: データ送信中の時間切れです。"
@@ -6242,16 +6414,16 @@ msgstr "デフォルトのメッセージ"
 msgid "Enabled"
 msgstr "有効"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3078
+#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
 msgid "Default"
 msgstr "デフォルト"
 
-#: ../src/config.py:739 ../src/dialogs.py:1395
+#: ../src/config.py:733 ../src/dialogs.py:1409
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "言語 %s の辞書はありません"
 
-#: ../src/config.py:740
+#: ../src/config.py:734
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6269,9 +6441,9 @@ msgid "status message text"
 msgstr "状況メッセージの文"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2383 ../src/dialogs.py:2449
-#: ../src/dialogs.py:3215 ../src/disco.py:866 ../src/disco.py:1726
-#: ../src/disco.py:2030 ../src/history_window.py:90
+#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
+#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
+#: ../src/disco.py:2048 ../src/history_window.py:90
 msgid "Name"
 msgstr "名前"
 
@@ -6306,7 +6478,7 @@ msgstr ""
 "すべてのチャットとグループチャットのウィンドウを閉じます。続けてもいいです"
 "か ?"
 
-#: ../src/config.py:1976 ../src/config.py:2509 ../src/config.py:2545
+#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
 msgid "You are currently connected to the server"
 msgstr "現在サーバーに接続している状態です"
 
@@ -6342,132 +6514,132 @@ msgstr "アカウント名は空白にできません。"
 msgid "Account name cannot contain spaces."
 msgstr "アカウント名にスペースを含めることはできません。"
 
-#: ../src/config.py:2072
+#: ../src/config.py:2074
 msgid "Rename Account"
 msgstr "アカウントの変更"
 
-#: ../src/config.py:2073
+#: ../src/config.py:2075
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "%s さんの新しい名前を入力してください"
 
-#: ../src/config.py:2101
+#: ../src/config.py:2103
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID は \"user@サーバー名\" の形をしていなければなりません。"
 
-#: ../src/config.py:2318 ../src/config.py:3606
+#: ../src/config.py:2320 ../src/config.py:3623
 msgid "Invalid entry"
 msgstr "入力内容が正しくありません"
 
-#: ../src/config.py:2319 ../src/config.py:3607
+#: ../src/config.py:2321 ../src/config.py:3624
 msgid "Custom port must be a port number."
 msgstr "ポートは番号で指定しなければなりません。"
 
-#: ../src/config.py:2340
+#: ../src/config.py:2342
 msgid "Failed to get secret keys"
 msgstr "秘密鍵が見つかりません"
 
-#: ../src/config.py:2341
+#: ../src/config.py:2343
 msgid "There is no OpenPGP secret key available."
 msgstr "利用できる OpenPGP の秘密鍵がありません。"
 
-#: ../src/config.py:2375
+#: ../src/config.py:2377
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP キーの選択"
 
-#: ../src/config.py:2376
+#: ../src/config.py:2378
 msgid "Choose your OpenPGP key"
 msgstr "OpenPGP の鍵を選択してください"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2385
 msgid "No such account available"
 msgstr "そのアカウントは無効です"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2386
 msgid "You must create your account before editing your personal information."
 msgstr "個人情報を編集するには、その前にアカウントを作成しなければなりません。"
 
-#: ../src/config.py:2391 ../src/dialogs.py:2136 ../src/dialogs.py:2371
-#: ../src/dialogs.py:2557 ../src/disco.py:511 ../src/profile_window.py:339
+#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
+#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
 msgid "You are not connected to the server"
 msgstr "サーバに接続していません"
 
-#: ../src/config.py:2392
+#: ../src/config.py:2394
 msgid "Without a connection, you can not edit your personal information."
 msgstr "接続していない状態では個人情報の編集はできません。"
 
-#: ../src/config.py:2396
+#: ../src/config.py:2398
 msgid "Your server doesn't support Vcard"
 msgstr "このサーバーは Vcard をサポートしていません"
 
-#: ../src/config.py:2397
+#: ../src/config.py:2399
 msgid "Your server can't save your personal information."
 msgstr "このサーバーは個人情報を保持できません。"
 
-#: ../src/config.py:2510 ../src/config.py:2546
+#: ../src/config.py:2512 ../src/config.py:2548
 msgid "To disable the account, you must be disconnected."
 msgstr "アカウントの無効にするには、接続を切らなければなりません。"
 
-#: ../src/config.py:2515
+#: ../src/config.py:2517
 msgid "Account Local already exists."
 msgstr "アカウント Local は既に存在しています。"
 
-#: ../src/config.py:2516
+#: ../src/config.py:2518
 #, fuzzy
 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:2673
+#: ../src/config.py:2675
 #, python-format
 msgid "Edit %s"
 msgstr "%s を編集"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2677
 #, python-format
 msgid "Register to %s"
 msgstr "%s を登録"
 
 #. list at the beginning
-#: ../src/config.py:2711
+#: ../src/config.py:2713
 msgid "Ban List"
 msgstr "追放者の一覧"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2714
 msgid "Member List"
 msgstr "メンバーの一覧"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2714
 msgid "Owner List"
 msgstr "主宰者の一覧"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2715
 msgid "Administrator List"
 msgstr "管理人の一覧"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2763 ../src/disco.py:873 ../src/history_manager.py:201
+#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2773
+#: ../src/config.py:2789
 msgid "Reason"
 msgstr "理由"
 
-#: ../src/config.py:2780
+#: ../src/config.py:2796
 msgid "Nick"
 msgstr "ニックネーム"
 
-#: ../src/config.py:2786
+#: ../src/config.py:2802
 msgid "Role"
 msgstr "å½¹"
 
-#: ../src/config.py:2813
+#: ../src/config.py:2829
 msgid "Banning..."
 msgstr "締め出し中..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2815
+#: ../src/config.py:2831
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6475,11 +6647,11 @@ msgstr ""
 "<b>誰を締め出したいですか ?</b>\n"
 "\n"
 
-#: ../src/config.py:2817
+#: ../src/config.py:2833
 msgid "Adding Member..."
 msgstr "メンバーを追加..."
 
-#: ../src/config.py:2818
+#: ../src/config.py:2834
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6487,11 +6659,11 @@ msgstr ""
 "<b>誰をメンバーにしたいですか ?</b>\n"
 "\n"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2836
 msgid "Adding Owner..."
 msgstr "主宰者を追加..."
 
-#: ../src/config.py:2821
+#: ../src/config.py:2837
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6499,11 +6671,11 @@ msgstr ""
 "<b>誰を主宰者にしたいですか ?</b>\n"
 "\n"
 
-#: ../src/config.py:2823
+#: ../src/config.py:2839
 msgid "Adding Administrator..."
 msgstr "管理人を追加..."
 
-#: ../src/config.py:2824
+#: ../src/config.py:2840
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6511,7 +6683,7 @@ msgstr ""
 "<b>誰を管理人にしたいですか ?</b>\n"
 "\n"
 
-#: ../src/config.py:2825
+#: ../src/config.py:2841
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6527,110 +6699,110 @@ msgstr ""
 "4. ドメイン (ドメインの合致。どんな user@domain や domain/resource や\n"
 "サブドメインを含んでも可)"
 
-#: ../src/config.py:2926
+#: ../src/config.py:2943
 #, python-format
 msgid "Removing %s account"
 msgstr "アカウント %s を削除します"
 
-#: ../src/config.py:2941
+#: ../src/config.py:2958
 #, fuzzy
 msgid "Account is disabled"
 msgstr "感情アイコンは無効"
 
-#: ../src/config.py:2942
+#: ../src/config.py:2959
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2955 ../src/gui_interface.py:1132
-#: ../src/gui_interface.py:1243
+#: ../src/config.py:2972 ../src/gui_interface.py:311
+#: ../src/gui_interface.py:1048
 msgid "Password Required"
 msgstr "パスワードが必要です"
 
-#: ../src/config.py:2956 ../src/gui_interface.py:1223
+#: ../src/config.py:2973 ../src/gui_interface.py:1028
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "%s のパスワードを入力してください"
 
-#: ../src/config.py:2957 ../src/gui_interface.py:1243
+#: ../src/config.py:2974 ../src/gui_interface.py:1048
 msgid "Save password"
 msgstr "パスワードを保存する"
 
-#: ../src/config.py:2967
+#: ../src/config.py:2984
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "アカウント \"%s\" はサーバに接続しています"
 
-#: ../src/config.py:2968
+#: ../src/config.py:2985
 msgid "If you remove it, the connection will be lost."
 msgstr "削除すると、接続が失われます。"
 
-#: ../src/config.py:2982
+#: ../src/config.py:2999
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "プロキシへの接続に失敗"
 
-#: ../src/config.py:2983
+#: ../src/config.py:3000
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "何をしたいですか ?"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3001
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "アカウントを Gajim からのみ削除 (_o)"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3002
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3078
+#: ../src/config.py:3095
 msgid "?print_status:All"
 msgstr "すべて"
 
-#: ../src/config.py:3079
+#: ../src/config.py:3096
 msgid "Enter and leave only"
 msgstr "入退室のみ"
 
-#: ../src/config.py:3080
+#: ../src/config.py:3097
 msgid "?print_status:None"
 msgstr "なし"
 
-#: ../src/config.py:3150
+#: ../src/config.py:3167
 msgid "New Group Chat"
 msgstr "新しいグループチャット"
 
-#: ../src/config.py:3183
+#: ../src/config.py:3200
 msgid "This bookmark has invalid data"
 msgstr "このブックマークは不正なデータを含んでいます"
 
-#: ../src/config.py:3184
+#: ../src/config.py:3201
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "サーバーと談話室の欄を正しく入力するか、このブックマークを削除してください。"
 
 #. invalid char
-#: ../src/config.py:3302 ../src/dialogs.py:1934
+#: ../src/config.py:3319 ../src/dialogs.py:1950
 msgid "Invalid nickname"
 msgstr "ニックネームが正しくありません"
 
-#: ../src/config.py:3303 ../src/config.py:3317 ../src/config.py:3331
+#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
 msgid "Character not allowed"
 msgstr "使えない文字です"
 
-#: ../src/config.py:3316 ../src/config.py:3582
+#: ../src/config.py:3333 ../src/config.py:3599
 msgid "Invalid server"
 msgstr "サーバー名が正しくありません"
 
-#: ../src/config.py:3330
+#: ../src/config.py:3347
 msgid "Invalid room"
 msgstr "談話室名が正しくありません"
 
-#: ../src/config.py:3498
+#: ../src/config.py:3515
 msgid "Account has been added successfully"
 msgstr "アカウントは無事に追加されました"
 
-#: ../src/config.py:3499 ../src/config.py:3505
+#: ../src/config.py:3516 ../src/config.py:3522
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menu item under the Edit menu from the main "
@@ -6639,32 +6811,32 @@ msgstr ""
 "「拡張」ボタンで、詳細なオプションの設定ができます。また後で、メインウィンド"
 "ウの「編集」メニューの「アカウント」を選択して設定することができます。"
 
-#: ../src/config.py:3504
+#: ../src/config.py:3521
 msgid "Your new account has been created successfully"
 msgstr "新しいアカウントは無事に作られました"
 
-#: ../src/config.py:3543
+#: ../src/config.py:3560
 msgid "Invalid username"
 msgstr "ユーザー名が正しくありません"
 
-#: ../src/config.py:3545
+#: ../src/config.py:3562
 msgid "You must provide a username to configure this account."
 msgstr "このアカウントを編集するには、ユーザー名を指定しなければなりません。"
 
-#: ../src/config.py:3583
+#: ../src/config.py:3600
 msgid "Please provide a server on which you want to register."
 msgstr "登録したいサーバーを指定してください。"
 
-#: ../src/config.py:3639 ../src/gui_interface.py:1904
+#: ../src/config.py:3656 ../src/gui_interface.py:1693
 msgid "Certificate Already in File"
 msgstr "証明書はファイルにあります"
 
-#: ../src/config.py:3640 ../src/gui_interface.py:1905
+#: ../src/config.py:3657 ../src/gui_interface.py:1694
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "この証明書は既にファイル %s にあります。再び追加することはできません。"
 
-#: ../src/config.py:3717
+#: ../src/config.py:3734
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6679,7 +6851,7 @@ msgstr ""
 "SSL エラー: %(error)s\n"
 "それでもこのサーバーに接続しますか ?"
 
-#: ../src/config.py:3723 ../src/gui_interface.py:1932
+#: ../src/config.py:3740 ../src/gui_interface.py:1721
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6690,63 +6862,73 @@ msgstr ""
 "この証明書の SHA1 指紋:\n"
 "%s"
 
-#: ../src/config.py:3755 ../src/config.py:3789
+#: ../src/config.py:3772 ../src/config.py:3806
 msgid "An error occurred during account creation"
 msgstr "アカウント作成時にエラーが起きました"
 
-#: ../src/config.py:3854
+#: ../src/config.py:3871
 msgid "Account name is in use"
 msgstr "アカウント名は使われています"
 
-#: ../src/config.py:3855
+#: ../src/config.py:3872
 msgid "You already have an account using this name."
 msgstr "この名前のアカウントは既に存在しています。"
 
-#: ../src/config.py:4009
+#: ../src/config.py:3991
+#, fuzzy
+msgid "PEP node was not removed"
+msgstr "PEP node was not removed"
+
+#: ../src/config.py:3992
+#, fuzzy, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr "PEP node %(node)s was not removed: %(message)s"
+
+#: ../src/config.py:4036
 msgid "Active"
 msgstr "有効"
 
-#: ../src/config.py:4017
+#: ../src/config.py:4044
 msgid "Event"
 msgstr "イベント"
 
-#: ../src/config.py:4052
+#: ../src/config.py:4079
 msgid "First Message Received"
 msgstr "最初のメッセージを受信した"
 
-#: ../src/config.py:4053
+#: ../src/config.py:4080
 msgid "Next Message Received Focused"
 msgstr "開いているチャットで、その次のメッセージを受信した"
 
-#: ../src/config.py:4055
+#: ../src/config.py:4082
 msgid "Next Message Received Unfocused"
 msgstr "開いていないチャットで、その次のメッセージを受信した"
 
-#: ../src/config.py:4056
+#: ../src/config.py:4083
 msgid "Contact Connected"
 msgstr "相手先が接続した"
 
-#: ../src/config.py:4057
+#: ../src/config.py:4084
 msgid "Contact Disconnected"
 msgstr "相手先が切断した"
 
-#: ../src/config.py:4058
+#: ../src/config.py:4085
 msgid "Message Sent"
 msgstr "メッセージを送信した"
 
-#: ../src/config.py:4059
+#: ../src/config.py:4086
 msgid "Group Chat Message Highlight"
 msgstr "グループチャットのメッセージの強調"
 
-#: ../src/config.py:4060
+#: ../src/config.py:4087
 msgid "Group Chat Message Received"
 msgstr "グループチャットのメッセージを受信した"
 
-#: ../src/config.py:4061
+#: ../src/config.py:4088
 msgid "GMail Email Received"
 msgstr "GMail メールを受信した"
 
-#: ../src/conversation_textview.py:600
+#: ../src/conversation_textview.py:601
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6756,7 +6938,7 @@ msgstr ""
 "示すものです。もし長時間表示されたままなら、メッセージは\n"
 "失われたと考えられます。"
 
-#: ../src/conversation_textview.py:619
+#: ../src/conversation_textview.py:620
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6764,45 +6946,45 @@ msgstr ""
 "この線より下の文は、このグループチャットを\n"
 "最後に読んだとき以降に発生したものです"
 
-#: ../src/conversation_textview.py:739
+#: ../src/conversation_textview.py:740
 msgid "_Quote"
 msgstr "引用 (_Q)"
 
-#: ../src/conversation_textview.py:746
+#: ../src/conversation_textview.py:747
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "%s に対する操作 (_A)"
 
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Read _Wikipedia Article"
 msgstr "_Wikipedia の項を読む"
 
-#: ../src/conversation_textview.py:763
+#: ../src/conversation_textview.py:765
 msgid "Look it up in _Dictionary"
 msgstr "辞書を引く (_D)"
 
-#: ../src/conversation_textview.py:780
+#: ../src/conversation_textview.py:782
 #, 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:793
+#: ../src/conversation_textview.py:795
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web 検索の URL に \"%s\" が含まれていません"
 
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 msgid "Web _Search for it"
 msgstr "Web で検索する (_S)"
 
-#: ../src/conversation_textview.py:802
+#: ../src/conversation_textview.py:804
 msgid "Open as _Link"
 msgstr "リンクとして開く (_L)"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1296
+#: ../src/conversation_textview.py:1298
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6810,188 +6992,193 @@ msgstr[0] "昨日"
 msgstr[1] "昨日"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1344 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
 #, python-format
 msgid "Subject: %s\n"
 msgstr "件名: %s\n"
 
-#: ../src/dataforms_widget.py:544
+#: ../src/dataforms_widget.py:545
 #, fuzzy
 msgid "Unable to load image"
 msgstr "メッセージを復号できません"
 
-#: ../src/dataforms_widget.py:546
+#: ../src/dataforms_widget.py:547
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "「隠れています」はサポートされていません"
 
-#: ../src/dataforms_widget.py:601
+#: ../src/dataforms_widget.py:562
+msgid "This field is required"
+msgstr ""
+
+#: ../src/dataforms_widget.py:607
 msgid "Jabber ID already in list"
 msgstr "Jabber ID は一覧にあります"
 
-#: ../src/dataforms_widget.py:602
+#: ../src/dataforms_widget.py:608
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 "入力された Jabber ID は既に一覧に載っています。別の Jabber ID を選択してくだ"
 "さい。"
 
 #. Default jid
-#: ../src/dataforms_widget.py:613
+#: ../src/dataforms_widget.py:619
 #, fuzzy
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:616 ../src/dataforms_widget.py:618
+#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
 #, fuzzy, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "相手先名: <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:195
 msgid "Group"
 msgstr "グループ"
 
-#: ../src/dialogs.py:201
+#: ../src/dialogs.py:202
 #, fuzzy
 msgid "In the group"
 msgstr "グループ内"
 
-#: ../src/dialogs.py:292
+#: ../src/dialogs.py:293
 msgid "KeyID"
 msgstr "鍵 ID"
 
-#: ../src/dialogs.py:297
+#: ../src/dialogs.py:298
 msgid "Contact name"
 msgstr "名前"
 
-#: ../src/dialogs.py:469
+#: ../src/dialogs.py:470
 msgid "Set Mood"
 msgstr "気分の設定"
 
-#: ../src/dialogs.py:589
+#: ../src/dialogs.py:590
 #, python-format
 msgid "%s Status Message"
 msgstr "%s の状況メッセージ"
 
-#: ../src/dialogs.py:603
+#: ../src/dialogs.py:604
 msgid "Status Message"
 msgstr "状況メッセージ"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:794
 msgid "Overwrite Status Message?"
 msgstr "状況メッセージを上書きしますか ?"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:795
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "この名前は既に使われています。この状況メッセージを上書きしますか ?"
 
-#: ../src/dialogs.py:802
+#: ../src/dialogs.py:803
 msgid "Save as Preset Status Message"
 msgstr "用意しておく状況メッセージとして保存"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:804
 msgid "Please type a name for this status message"
 msgstr "この状況メッセージの名前を入力してください"
 
-#: ../src/dialogs.py:831
+#: ../src/dialogs.py:832
 msgid "AIM Address:"
 msgstr "AIM アドレス:"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:833
 msgid "GG Number:"
 msgstr "GG 番号:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:834
 msgid "ICQ Number:"
 msgstr "ICQ 番号:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:835
 msgid "MSN Address:"
 msgstr "MSN アドレス:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:836
 msgid "Yahoo! Address:"
 msgstr "Yahoo! アドレス:"
 
-#: ../src/dialogs.py:872
+#: ../src/dialogs.py:873
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "アカウント %s に追加したい相手先の情報を入力してください"
 
-#: ../src/dialogs.py:875
+#: ../src/dialogs.py:876
 msgid "Please fill in the data of the contact you want to add"
 msgstr "追加したい相手先の情報を入力してください"
 
-#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
+#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
+#: ../src/dialogs.py:3464
 msgid "Invalid User ID"
 msgstr "ユーザー ID が正しくありません"
 
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1052
 msgid "The user ID must not contain a resource."
 msgstr "ユーザー ID にはリソースを含めません。"
 
-#: ../src/dialogs.py:1051
+#: ../src/dialogs.py:1057
 msgid "You cannot add yourself to your roster."
 msgstr "あなた自身を名簿に追加することはできません。"
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1071
 msgid "Contact already in roster"
 msgstr "相手先は既に名簿にあります"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1072
 msgid "This contact is already listed in your roster."
 msgstr "この相手先は既に名簿に登録されています。"
 
-#: ../src/dialogs.py:1112
+#: ../src/dialogs.py:1118
 msgid "User ID:"
 msgstr "ユーザー ID:"
 
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1189
 msgid "A GTK+ jabber client"
 msgstr "A GTK+ jabber client"
 
-#: ../src/dialogs.py:1176
+#: ../src/dialogs.py:1190
 msgid "GTK+ Version:"
 msgstr "GTK+ バージョン:"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1191
 msgid "PyGTK Version:"
 msgstr "PyGTK+ バージョン:"
 
-#: ../src/dialogs.py:1187
+#: ../src/dialogs.py:1201
 msgid "Current Developers:"
 msgstr "現在の開発者:"
 
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1203
 msgid "Past Developers:"
 msgstr "過去の開発者:"
 
-#: ../src/dialogs.py:1195
+#: ../src/dialogs.py:1209
 msgid "THANKS:"
 msgstr "謝意:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1215
 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:1213
+#: ../src/dialogs.py:1227
 msgid "translator-credits"
 msgstr "Mako (mako AT pasero.net)"
 
-#: ../src/dialogs.py:1396
+#: ../src/dialogs.py:1410
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7004,271 +7191,271 @@ msgstr ""
 "\n"
 "スペル間違いの強調表示は使われません"
 
-#: ../src/dialogs.py:1935 ../src/dialogs.py:2322
+#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
 msgid "The nickname has not allowed characters."
 msgstr "ニックネームに使用できない文字が含まれています。"
 
-#: ../src/dialogs.py:2053
+#: ../src/dialogs.py:2069
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "アカウント %(account)s に対して、%(jid)s さんからの在席通知の申し込み"
 
-#: ../src/dialogs.py:2056
+#: ../src/dialogs.py:2072
 #, python-format
 msgid "Subscription request from %s"
 msgstr "%s さんから在席通知の申し込み"
 
-#: ../src/dialogs.py:2131 ../src/gui_interface.py:2672
+#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "既にグループチャット %s に参加しています。"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2153
 msgid "You can not join a group chat unless you are connected."
 msgstr "接続しないと、グループチャットに参加できません。"
 
-#: ../src/dialogs.py:2178
+#: ../src/dialogs.py:2194
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "アカウント %s でグループチャットに参加"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2325
 msgid "Invalid Account"
 msgstr "アカウントが正しくありません"
 
-#: ../src/dialogs.py:2310
+#: ../src/dialogs.py:2326
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "グループチャット参加に使用するアカウントを選択してください。"
 
-#: ../src/dialogs.py:2321
+#: ../src/dialogs.py:2337
 msgid "Invalid Nickname"
 msgstr "ニックネームが正しくありません"
 
-#: ../src/dialogs.py:2326 ../src/dialogs.py:2332
-#: ../src/groupchat_control.py:1832
+#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
+#: ../src/groupchat_control.py:1847
 msgid "Invalid group chat Jabber ID"
 msgstr "グループチャットの JID が正しくありません"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2343
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "グループチャットの JID に使えない文字が含まれています。"
 
-#: ../src/dialogs.py:2333 ../src/groupchat_control.py:1833
+#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "グループチャットの JID に使えない文字が含まれています。"
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2356
 msgid "This is not a group chat"
 msgstr "グループチャットではありません"
 
-#: ../src/dialogs.py:2341
+#: ../src/dialogs.py:2357
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s はグループチャット名ではありません。"
 
-#: ../src/dialogs.py:2372
+#: ../src/dialogs.py:2388
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Without a connection, you can not synchronise your contacts."
 
-#: ../src/dialogs.py:2386
+#: ../src/dialogs.py:2402
 msgid "Server"
 msgstr "サーバー"
 
-#: ../src/dialogs.py:2421
+#: ../src/dialogs.py:2437
 msgid "This account is not connected to the server"
 msgstr "このアカウントはサーバに接続していません"
 
-#: ../src/dialogs.py:2422
+#: ../src/dialogs.py:2438
 #, fuzzy
 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:2446
+#: ../src/dialogs.py:2462
 #, fuzzy
 msgid "Synchronise"
 msgstr "Synchronise"
 
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2523
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "アカウント %s でチャットを開始する"
 
-#: ../src/dialogs.py:2509
+#: ../src/dialogs.py:2525
 msgid "Start Chat"
 msgstr "チャットを開始する"
 
-#: ../src/dialogs.py:2510
+#: ../src/dialogs.py:2526
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
 msgstr "チャットしたい相手先のニックネームか Jabber ID を入力してください:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2536 ../src/dialogs.py:2917 ../src/dialogs.py:3129
+#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
 msgid "Connection not available"
 msgstr "接続していません"
 
-#: ../src/dialogs.py:2537 ../src/dialogs.py:2918 ../src/dialogs.py:3130
+#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
 #, fuzzy, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "\"%s\" に接続していることを確認してください。"
 
-#: ../src/dialogs.py:2546 ../src/dialogs.py:2549
+#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
 msgid "Invalid JID"
 msgstr "JID が正しくありません"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2565
 #, fuzzy, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "\"%s\" さんを追加できません"
 
-#: ../src/dialogs.py:2558
+#: ../src/dialogs.py:2574
 msgid "Without a connection, you can not change your password."
 msgstr "接続しないと、パスワードは変更できません。"
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "Invalid password"
 msgstr "パスワードが正しくありません。"
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "You must enter a password."
 msgstr "パスワードを入力してください。"
 
-#: ../src/dialogs.py:2581
+#: ../src/dialogs.py:2597
 msgid "Passwords do not match"
 msgstr "パスワードが一致しません"
 
-#: ../src/dialogs.py:2582
+#: ../src/dialogs.py:2598
 msgid "The passwords typed in both fields must be identical."
 msgstr "ふたつの欄のパスワードは同一でなければなりません。"
 
 #. default value
-#: ../src/dialogs.py:2619 ../src/notify.py:247 ../src/notify.py:473
+#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
 msgid "Contact Signed In"
 msgstr "相手先がサインインしました"
 
-#: ../src/dialogs.py:2621 ../src/notify.py:255 ../src/notify.py:475
+#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
 msgid "Contact Signed Out"
 msgstr "相手先がサインアウトしました"
 
 #. chat message
-#: ../src/dialogs.py:2623 ../src/notify.py:277 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
 msgid "New Message"
 msgstr "新着メッセージ"
 
 #. single message
-#: ../src/dialogs.py:2623 ../src/notify.py:259 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
 msgid "New Single Message"
 msgstr "新着の単発メッセージ"
 
 #. private message
-#: ../src/dialogs.py:2624 ../src/notify.py:265 ../src/notify.py:478
+#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
 msgid "New Private Message"
 msgstr "新着の私信"
 
-#: ../src/dialogs.py:2624 ../src/gui_interface.py:1358 ../src/notify.py:487
+#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
 msgid "New E-mail"
 msgstr "新着メール"
 
-#: ../src/dialogs.py:2626 ../src/gui_interface.py:1420 ../src/notify.py:480
+#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
 msgid "File Transfer Request"
 msgstr "ファイル転送の要求"
 
-#: ../src/dialogs.py:2628 ../src/gui_interface.py:1320
-#: ../src/gui_interface.py:1389 ../src/notify.py:482
+#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
+#: ../src/gui_interface.py:1186 ../src/notify.py:482
 msgid "File Transfer Error"
 msgstr "ファイル転送のエラー"
 
-#: ../src/dialogs.py:2630 ../src/gui_interface.py:1466
-#: ../src/gui_interface.py:1489 ../src/gui_interface.py:1506
+#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
+#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
 #: ../src/notify.py:484
 msgid "File Transfer Completed"
 msgstr "ファイルの転送の完了"
 
-#: ../src/dialogs.py:2631 ../src/gui_interface.py:1469 ../src/notify.py:485
+#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
 msgid "File Transfer Stopped"
 msgstr "ファイルの転送の中断"
 
-#: ../src/dialogs.py:2633 ../src/gui_interface.py:1152 ../src/notify.py:489
+#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
 msgid "Groupchat Invitation"
 msgstr "グループチャットへの招待"
 
-#: ../src/dialogs.py:2635 ../src/notify.py:239 ../src/notify.py:491
+#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
 msgid "Contact Changed Status"
 msgstr "相手先が在席状況を変更"
 
-#: ../src/dialogs.py:2836
+#: ../src/dialogs.py:2852
 #, python-format
 msgid "Single Message using account %s"
 msgstr "account %s で単発メッセージ"
 
-#: ../src/dialogs.py:2838
+#: ../src/dialogs.py:2854
 #, python-format
 msgid "Single Message in account %s"
 msgstr "アカウント %s での単発メッセージ"
 
-#: ../src/dialogs.py:2840
+#: ../src/dialogs.py:2856
 msgid "Single Message"
 msgstr "単発メッセージ"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2843
+#: ../src/dialogs.py:2859
 #, python-format
 msgid "Send %s"
 msgstr "%s を送信する"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:2882
 #, python-format
 msgid "Received %s"
 msgstr "%s を受信"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2889
+#: ../src/dialogs.py:2905
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "差出人"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2968
+#: ../src/dialogs.py:2984
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:2985
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s wrote:\n"
 
-#: ../src/dialogs.py:3028
+#: ../src/dialogs.py:3044
 #, python-format
 msgid "XML Console for %s"
 msgstr "%s の XML コンソール"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3046
 msgid "XML Console"
 msgstr "XML コンソール"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "add"
 msgstr "悲"
 
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "modify"
 msgstr "変更する"
 
-#: ../src/dialogs.py:3160
+#: ../src/dialogs.py:3176
 #, fuzzy
 msgid "remove"
 msgstr "削除 (_v)"
 
-#: ../src/dialogs.py:3188
+#: ../src/dialogs.py:3204
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7276,155 +7463,189 @@ msgid ""
 msgstr "私はあなたを私の連絡先リストに追加しようと思います。"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3204 ../src/dialogs.py:3250
+#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
 msgid "Add"
 msgstr "追加する"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3206 ../src/dialogs.py:3281
+#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
 msgid "Modify"
 msgstr "変更する"
 
-#: ../src/dialogs.py:3212
+#: ../src/dialogs.py:3228
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3218
+#: ../src/dialogs.py:3234
 msgid "Groups"
 msgstr "グループ"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3342
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "彼を追加しますか？"
 
-#: ../src/dialogs.py:3340
+#: ../src/dialogs.py:3356
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "相手先リストに追加 (_A)"
 
-#: ../src/dialogs.py:3377
+#: ../src/dialogs.py:3393
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "相手先を名簿から削除します"
 
-#: ../src/dialogs.py:3430
+#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#, python-format
+msgid "Archiving Preferences for %s"
+msgstr ""
+
+#: ../src/dialogs.py:3473
+#, fuzzy
+msgid "Invalid expire value"
+msgstr "サーバー名が正しくありません"
+
+#: ../src/dialogs.py:3474
+msgid "Expire must be a valid positive integer."
+msgstr ""
+
+#: ../src/dialogs.py:3521
+msgid "There is an error with the form"
+msgstr ""
+
+#: ../src/dialogs.py:3732
+#, fuzzy
+msgid "There is an error"
+msgstr "エラーを返してきました。"
+
+#: ../src/dialogs.py:3796
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "プライバシーリスト <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3434
+#: ../src/dialogs.py:3800
 #, python-format
 msgid "Privacy List for %s"
 msgstr "%s のプライバシーリスト"
 
-#: ../src/dialogs.py:3490
+#: ../src/dialogs.py:3856
 #, 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:3495
+#: ../src/dialogs.py:3861
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "順位: %(order)s, 操作: %(action)s"
 
-#: ../src/dialogs.py:3539
+#: ../src/dialogs.py:3905
 msgid "<b>Edit a rule</b>"
 msgstr "<b>規則の編集</b>"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:4016
 msgid "<b>Add a rule</b>"
 msgstr "<b>規則の追加</b>"
 
-#: ../src/dialogs.py:3750
+#: ../src/dialogs.py:4116
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "%s のプライバシーリスト"
 
-#: ../src/dialogs.py:3752
+#: ../src/dialogs.py:4118
 msgid "Privacy Lists"
 msgstr "プライバシーリスト"
 
-#: ../src/dialogs.py:3822
+#: ../src/dialogs.py:4188
 msgid "Invalid List Name"
 msgstr "リスト名が正しくありません"
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4189
 msgid "You must enter a name to create a privacy list."
 msgstr "プライバシーリストを作成するには、名前を入力しなければなりません。"
 
-#: ../src/dialogs.py:3855
+#: ../src/dialogs.py:4221
 msgid "You are invited to a groupchat"
 msgstr "グループチャットへの招待を受けました"
 
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4224
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact さんがあなたを議論に参加するよう招待しています"
 
-#: ../src/dialogs.py:3860
+#: ../src/dialogs.py:4226
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact さんがあなたをグループチャット %(room_jid)s へ招待しています"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4234
 #, python-format
 msgid "Comment: %s"
 msgstr "コメント: %s"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4236
 msgid "Do you want to accept the invitation?"
 msgstr "招待に応じますか ?"
 
-#: ../src/dialogs.py:3932
+#: ../src/dialogs.py:4298
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:3942 ../src/dialogs.py:3985 ../src/dialogs.py:4041
+#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
+#: ../src/dialogs.py:4495
 msgid "All files"
 msgstr "すべてのファイル"
 
-#: ../src/dialogs.py:3947
+#: ../src/dialogs.py:4313
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:3975
+#: ../src/dialogs.py:4341
 msgid "Choose Sound"
 msgstr "サウンドの選択"
 
-#: ../src/dialogs.py:3990
+#: ../src/dialogs.py:4356
 msgid "Wav Sounds"
 msgstr "WAV サウンド"
 
-#: ../src/dialogs.py:4028
+#: ../src/dialogs.py:4394
 msgid "Choose Image"
 msgstr "画像の選択"
 
-#: ../src/dialogs.py:4046
+#: ../src/dialogs.py:4412
 msgid "Images"
 msgstr "画像"
 
-#: ../src/dialogs.py:4113
+#: ../src/dialogs.py:4482
+#, fuzzy
+msgid "Choose Archive"
+msgstr "画像の選択"
+
+#: ../src/dialogs.py:4500
+#, fuzzy
+msgid "Zip files"
+msgstr "すべてのファイル"
+
+#: ../src/dialogs.py:4525
 #, python-format
 msgid "When %s becomes:"
 msgstr "%s が次のようになったとき:"
 
-#: ../src/dialogs.py:4115
+#: ../src/dialogs.py:4527
 #, fuzzy, python-format
 msgid "Adding Special Notification for %s"
 msgstr "%s の特別通知の追加"
 
-#: ../src/dialogs.py:4190
+#: ../src/dialogs.py:4602
 msgid "Condition"
 msgstr "状態"
 
-#: ../src/dialogs.py:4310
+#: ../src/dialogs.py:4722
 msgid "when I am "
 msgstr ""
 
-#: ../src/dialogs.py:4786
+#: ../src/dialogs.py:5198
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7435,19 +7656,19 @@ msgstr ""
 "\n"
 "このチャットの認証文字列 (SAS)は <b>%(sas)s</b> です。"
 
-#: ../src/dialogs.py:4789
+#: ../src/dialogs.py:5201
 msgid "You have already verified this contact's identity."
 msgstr "相手先の同一性を既に確認しています。"
 
-#: ../src/dialogs.py:4795 ../src/dialogs.py:4879
+#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
 msgid "Contact's identity verified"
 msgstr "相手先の同一性を確認しました"
 
-#: ../src/dialogs.py:4801
+#: ../src/dialogs.py:5213
 msgid "Verify again..."
 msgstr "再検証中..."
 
-#: ../src/dialogs.py:4806
+#: ../src/dialogs.py:5218
 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 "
@@ -7457,19 +7678,19 @@ msgstr ""
 "を送ることができることを確実にするため、その人が本人であることを検証する必要"
 "があります。次のボタンをクリックしてください。"
 
-#: ../src/dialogs.py:4809 ../src/dialogs.py:4860 ../src/dialogs.py:4873
+#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
 msgid "Contact's identity NOT verified"
 msgstr "相手先の同一性を確認していません"
 
-#: ../src/dialogs.py:4814
+#: ../src/dialogs.py:5226
 msgid "Verify..."
 msgstr "検証中..."
 
-#: ../src/dialogs.py:4825
+#: ../src/dialogs.py:5237
 msgid "Have you verified the contact's identity?"
 msgstr "相手先の同一性を確認しましたか ?"
 
-#: ../src/dialogs.py:4826
+#: ../src/dialogs.py:5238
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7483,23 +7704,23 @@ msgstr ""
 "\n"
 "この接続の認証文字列は <b>%(sas)s</b> です。"
 
-#: ../src/dialogs.py:4827
+#: ../src/dialogs.py:5239
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "遠くの相手先と話して、認証文字列(SAS)を確認しましたか ?"
 
-#: ../src/dialogs.py:4861
+#: ../src/dialogs.py:5273
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "この相手先の鍵 (%s) は、Gajim で割り当てられた鍵と <b>一致しません</b>。"
 
-#: ../src/dialogs.py:4867
+#: ../src/dialogs.py:5279
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "この相手先に対して GPG 鍵は割り当てられていません。そのため、メッセージは暗号"
 "化されません。 "
 
-#: ../src/dialogs.py:4874
+#: ../src/dialogs.py:5286
 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."
@@ -7508,7 +7729,7 @@ msgstr ""
 "いません</b>。メッセージは暗号化<b>されません</b>。鍵に信頼を与えるには GPG "
 "クライアントを使ってください。"
 
-#: ../src/dialogs.py:4880
+#: ../src/dialogs.py:5292
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7516,19 +7737,19 @@ msgstr ""
 "この相手先に対して GPG 鍵が割り当てられています。その鍵を信頼して、メッセージ"
 "は暗号化されます。"
 
-#: ../src/dialogs.py:4945
+#: ../src/dialogs.py:5357
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4947
+#: ../src/dialogs.py:5359
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4949
+#: ../src/dialogs.py:5361
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4953
+#: ../src/dialogs.py:5365
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7544,24 +7765,24 @@ msgstr "その他"
 msgid "Conference"
 msgstr "会議室(グループチャット)"
 
-#: ../src/disco.py:512
+#: ../src/disco.py:513
 msgid "Without a connection, you can not browse available services"
 msgstr "接続しないと、サービスを見ることはできません"
 
-#: ../src/disco.py:589
+#: ../src/disco.py:600
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "アカウント %s でサービス探索"
 
-#: ../src/disco.py:591
+#: ../src/disco.py:602
 msgid "Service Discovery"
 msgstr "サービス探索"
 
-#: ../src/disco.py:741
+#: ../src/disco.py:758
 msgid "The service could not be found"
 msgstr "サービスが見つかりません"
 
-#: ../src/disco.py:742
+#: ../src/disco.py:759
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7569,96 +7790,96 @@ msgstr ""
 "あなたが入力したアドレスにサービスが見つからないか、または応答がありません。"
 "アドレスを確認し、もういちどお試しください。"
 
-#: ../src/disco.py:746 ../src/disco.py:1082
+#: ../src/disco.py:763 ../src/disco.py:1100
 msgid "The service is not browsable"
 msgstr "このサービスを見ることはできません"
 
-#: ../src/disco.py:747
+#: ../src/disco.py:764
 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:786 ../src/disco.py:796
+#: ../src/disco.py:804 ../src/disco.py:814
 msgid "Invalid Server Name"
 msgstr "サーバー名が正しくありません"
 
-#: ../src/disco.py:850
+#: ../src/disco.py:868
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "アカウント %(account)s で %(address)s を眺める"
 
-#: ../src/disco.py:894
+#: ../src/disco.py:912
 msgid "_Browse"
 msgstr "一覧 (_B)"
 
-#: ../src/disco.py:1083
+#: ../src/disco.py:1101
 msgid "This service does not contain any items to browse."
 msgstr "このサービスには表示すべき項目がありません。"
 
-#: ../src/disco.py:1323
+#: ../src/disco.py:1341
 msgid "_Execute Command"
 msgstr "コマンド実行 (_E)"
 
-#: ../src/disco.py:1333 ../src/disco.py:1504
+#: ../src/disco.py:1351 ../src/disco.py:1522
 msgid "Re_gister"
 msgstr "登録 (_g)"
 
-#: ../src/disco.py:1545
+#: ../src/disco.py:1563
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "走査中 %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1736
+#: ../src/disco.py:1754
 msgid "Users"
 msgstr "ユーザー数"
 
 #. Description column
-#: ../src/disco.py:1744
+#: ../src/disco.py:1762
 msgid "Description"
 msgstr "説明"
 
 #. Id column
-#: ../src/disco.py:1752
+#: ../src/disco.py:1770
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1817 ../src/gui_interface.py:3182
+#: ../src/disco.py:1835 ../src/gui_interface.py:2995
 msgid "Bookmark already set"
 msgstr "既にブックマーク"
 
-#: ../src/disco.py:1818 ../src/gui_interface.py:3183
+#: ../src/disco.py:1836 ../src/gui_interface.py:2996
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "グループチャット \"%s\" は既にブックマークにあります。"
 
-#: ../src/disco.py:1827 ../src/gui_interface.py:3197
+#: ../src/disco.py:1845 ../src/gui_interface.py:3010
 msgid "Bookmark has been added successfully"
 msgstr "ブックマークが追加されました"
 
-#: ../src/disco.py:1828 ../src/gui_interface.py:3198
+#: ../src/disco.py:1846 ../src/gui_interface.py:3011
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "ブックマークは、名簿の「アクション」メニューから管理できます。"
 
-#: ../src/disco.py:2039
+#: ../src/disco.py:2057
 #, fuzzy
 msgid "Subscribed"
 msgstr "継読中"
 
-#: ../src/disco.py:2047
+#: ../src/disco.py:2065
 #, fuzzy
 msgid "Node"
 msgstr "ノード"
 
 # (Mako)pubsubのところ
-#: ../src/disco.py:2111
+#: ../src/disco.py:2129
 msgid "New post"
 msgstr "新しい投稿"
 
-#: ../src/disco.py:2117
+#: ../src/disco.py:2135
 msgid "_Subscribe"
 msgstr "継読 (_S)"
 
-#: ../src/disco.py:2123
+#: ../src/disco.py:2141
 msgid "_Unsubscribe"
 msgstr "継読の取り消し (_U)"
 
@@ -7830,17 +8051,19 @@ msgid "Transform LaTeX expressions between $$ $$."
 msgstr "$$ $$ で囲まれた LaTeX 表現を変換します。"
 
 #: ../src/features_window.py:95
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
-"in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 "texlive-latex-base と dvipng が必要です。詳細設定エディタ 'use_latex' を"
 "「真」に設定しなければなりません。"
 
 #: ../src/features_window.py:96
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
+"You have to set 'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 "texlive-latex-base と dvipng が必要です(どちらも MikTeX に含まれています)。 "
 "詳細設定エディタ 'use_latex' を「真」に設定しなければなりません。"
@@ -8001,33 +8224,33 @@ msgstr "説明: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s さんがファイルを転送したがっています:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "既存のファイル \"%s\" に上書きできない"
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "この名前のファイルは既に存在し、かつ上書きの権限がありません。"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 msgid "This file already exists"
 msgstr "そのファイルは既に存在しています"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 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:369 ../src/gtkgui_helpers.py:914
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "ディレクトリ \"%s\" に書き込む権限がありません"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
 msgid "You do not have permission to create files in this directory."
 msgstr "このディレクトリにファイルを作成する権限がありません。"
 
@@ -8128,34 +8351,41 @@ msgid ""
 "Run anyway?"
 msgstr "別の Gajim が既に起動しているようですそれでも起動しますか ?"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "指定のコマンドに対するヘルプを表示します"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:80
+#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
 msgid "command"
 msgstr "コマンド"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "コマンドのヘルプを表示します"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "名簿ウィンドウの表示/非表示"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "次の保留イベントをポップアップウィンドウに表示します"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 msgstr ""
 "名簿にある相手先をすべて表示します。それぞれの相手先は空行で区切られます"
 
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
+#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
+#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
+#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
 #: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
 #: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
 #: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
@@ -8167,43 +8397,35 @@ msgstr ""
 msgid "account"
 msgstr "アカウント"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "指定されたアカウントの相手先のみ表示します"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "登録アカウントの一覧の表示します"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "アカウントの在席状況の変更します"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
 msgid "status"
 msgstr "在席状況"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106
 #, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"accoun't previous status"
+msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "次のいずれか: offline (オフライン)、online (オンライン)、chat (チャット可)、"
 "away (離席中)、xa (不在)、dnd (邪魔しないで)、invisible (隠れ中)"
 
-#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
-msgid "message"
-msgstr "メッセージ"
-
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "状況メッセージ"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8212,45 +8434,20 @@ msgstr ""
 "合、\"sync with global status\" オプションが設定されているアカウントすべての"
 "在席状況を変更します。"
 
-#: ../src/gajim-remote.py:117
-msgid "Changes the priority of account or accounts"
-msgstr "アカウントの優先順位を変更します"
-
-#: ../src/gajim-remote.py:119
-msgid "priority"
-msgstr "優先順位"
-
-#: ../src/gajim-remote.py:119
-msgid "priority you want to give to the account"
-msgstr "アカウントに設定したい優先順位"
-
-#: ../src/gajim-remote.py:121
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-msgstr ""
-"アカウントの優先順位を変更します。アカウントが指定されない場合、\"sync with "
-"global status\" オプションの設定されたアカウントすべての優先順位を変更します"
-
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "チャットのダイアログを表示し、相手先にメッセージを送信できます"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "チャットしたい相手先の JID"
 
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
 #: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "指定した場合、相手先はこのアカウントの相手先一覧から選択します"
 
-#: ../src/gajim-remote.py:134
-msgid "message content. The account must be specified or \"\""
-msgstr ""
-"メッセージの内容。アカウントを指定していなければなりません。そうでない場合は"
-"\"\"としなければなりません"
-
-#: ../src/gajim-remote.py:139
+#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
 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 "
@@ -8260,29 +8457,34 @@ msgstr ""
 "らもなくてもかまいません。 'アカウント' だけを設定して 'OpenPGP 鍵' を設定し"
 "たくない場合、'OpenPGP 鍵' は '' としてください。"
 
+#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
 #: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "メッセージを受け取りたい相手先の JID"
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
+#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "メッセージの内容"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "pgp 鍵"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "指定した場合、メッセージはこの公開鍵で暗号化されます"
 
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
+#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "指定した場合、メッセージはこのアカウントを使って送られます"
 
-#: ../src/gajim-remote.py:152
+#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
 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 "
@@ -8292,139 +8494,138 @@ msgstr ""
 "しなくてもかまいません。アカウント(account)だけを指定して'OpenPGP 鍵'を指定し"
 "たくない場合は、'OpenPGP 鍵'は単に '' としてください。"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "件名"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "メッセージの件名"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr "参加しているグループチャットに新しいメッセージを送信します。"
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "メッセージを受け取る談話室そのものの JID"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "相手先の詳細情報を取得します"
 
+#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
+#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
 #: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
 #: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "相手先の JID"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "アカウントの詳細情報を取得します"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "アカウント名"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "相手先にファイルを転送します"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "file"
 msgstr "ファイル"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "ファイルの場所"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "指定した場合、このアカウントを使ってファイルを転送します"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "すべての設定項目とその値の一覧を表示します"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "項目 'key' の値に 'value' を設定します。"
 
 # (Mako)訳さずにそのままにしよう
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "key=value"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'key' は設定項目の名前、'value' はそれに設定したい値"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "設定項目を削除します"
 
 # (Mako)訳さずにそのままにしよう
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
 msgid "key"
 msgstr "key"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "削除する設定項目の名前"
 
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Gajim の設定の現在の状態を .config ファイルに書き出します"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "相手先を名簿から削除します"
 
-#: ../src/gajim-remote.py:227
+#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "相手先を名簿に追加します"
 
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "jid"
-
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "このアカウントに新しい相手先を追加します"
 
-#: ../src/gajim-remote.py:235
+#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "現在の在席状況を返します (もしアカウントが指定されなければ、全体の在席状況を"
 "返します)"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote-plugin.py:226
+#, fuzzy
 msgid ""
-"Returns current status message (the global one unless account is specified)"
+"Returns current status message(the global one unless account is specified)"
 msgstr ""
 "現在の状況メッセージを返します (もしアカウントが指定されなければ、全体の状況"
 "メッセージを返します)"
 
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote-plugin.py:233 ../src/gajim-remote.py:249
 msgid "Returns number of unread messages"
 msgstr "未読メッセージ数を返します"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr "'チャットを開始する' のダイアログを開きます"
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "このアカウントでチャットを開始します"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr "独自の XML を送信します"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr "送信する XML"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8432,90 +8633,44 @@ msgstr ""
 "XML が送信されるアカウント。指定されない場合、XML はすべてのアカウントに送信"
 "されます"
 
-#: ../src/gajim-remote.py:268
-#, fuzzy
-msgid "Change the avatar"
-msgstr "在席状況を変更する"
-
-#: ../src/gajim-remote.py:270
-#, fuzzy
-msgid "Picture to use"
-msgstr "使いたいニックネーム"
-
-#: ../src/gajim-remote.py:271
-#, fuzzy
-msgid ""
-"Account in which the avatar will be set; if not specified, the avatar will "
-"be set for all accounts"
-msgstr ""
-"XML が送信されるアカウント。指定されない場合、XML はすべてのアカウントに送信"
-"されます"
-
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
 msgid "Handle a xmpp:/ uri"
 msgstr "xmpp:/ の URI を取り扱います"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:279
-msgid "URI to handle"
-msgstr "取り扱う URI"
-
-#: ../src/gajim-remote.py:280
-msgid "Account in which you want to handle it"
-msgstr "URI を取り扱うアカウント"
-
-#: ../src/gajim-remote.py:282
-msgid "Message content"
-msgstr "メッセージの内容"
-
-#: ../src/gajim-remote.py:286
+#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
 msgid "Join a MUC room"
 msgstr "談話室に参加します"
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
 msgid "room"
 msgstr "談話室"
 
-#: ../src/gajim-remote.py:288
-msgid "Room JID"
-msgstr "談話室JID"
-
-#: ../src/gajim-remote.py:289
+#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
 msgid "nick"
 msgstr "ニックネーム"
 
-#: ../src/gajim-remote.py:289
-msgid "Nickname to use"
-msgstr "使いたいニックネーム"
-
-#: ../src/gajim-remote.py:290
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
 msgid "password"
 msgstr "パスワード"
 
-#: ../src/gajim-remote.py:290
-msgid "Password to enter the room"
-msgstr "談話室のパスワード"
-
-#: ../src/gajim-remote.py:291
-msgid "Account from which you want to enter the room"
-msgstr "談話室の参加に使うアカウント"
-
-#: ../src/gajim-remote.py:296
+#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
 msgid "Check if Gajim is running"
 msgstr "Gajim が起動しているかチェックします"
 
+#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
 #: ../src/gajim-remote.py:300
 msgid "Shows or hides the ipython window"
 msgstr "ipython ウィンドウの表示/非表示"
 
-#: ../src/gajim-remote.py:327
+#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "引数 \"contact_jid\" がありません"
 
-#: ../src/gajim-remote.py:348
+#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8524,33 +8679,31 @@ msgstr ""
 "'%s' は名簿にありません。\n"
 "メッセージを送るためのアカウントを指定してください。"
 
-#: ../src/gajim-remote.py:351
+#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
 msgid "You have no active account"
 msgstr "有効になっているアカウントがありません"
 
-#: ../src/gajim-remote.py:404
+#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Gajim が起動していないようです。そのため gajim-remote は使えません。"
 
-#: ../src/gajim-remote.py:431
+#: ../src/gajim-remote-plugin.py:412
 #, python-format
 msgid ""
-"Usage: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
+"Usage: %s %s %s \n"
+"\t %s"
 msgstr ""
-"使い方: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
 
-#: ../src/gajim-remote.py:435
+#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
 msgid "Arguments:"
 msgstr "引数:"
 
-#: ../src/gajim-remote.py:439
+#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
 #, python-format
 msgid "%s not found"
 msgstr "%s は見つかりません"
 
-#: ../src/gajim-remote.py:445
+#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8559,6 +8712,126 @@ msgstr ""
 "使い方: %s コマンド [引数]\n"
 "コマンドは次のいずれか:\n"
 
+#: ../src/gajim-remote-plugin.py:496
+#, fuzzy, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"引数が多すぎます。\n"
+"詳しくは \"%(basename)s help %(command)s\" と入力してください"
+
+#: ../src/gajim-remote-plugin.py:500
+#, fuzzy, python-format
+msgid ""
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"引数 \"%(arg)s\" が指定されていません。\n"
+"詳しくは \"%(basename)s help %(command)s\" と入力してください"
+
+#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
+msgid "Wrong uri"
+msgstr "uri が間違っています"
+
+#: ../src/gajim-remote.py:109
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
+msgstr ""
+"次のいずれか: offline (オフライン)、online (オンライン)、chat (チャット可)、"
+"away (離席中)、xa (不在)、dnd (邪魔しないで)、invisible (隠れ中)"
+
+#: ../src/gajim-remote.py:117
+msgid "Changes the priority of account or accounts"
+msgstr "アカウントの優先順位を変更します"
+
+#: ../src/gajim-remote.py:119
+msgid "priority"
+msgstr "優先順位"
+
+#: ../src/gajim-remote.py:119
+msgid "priority you want to give to the account"
+msgstr "アカウントに設定したい優先順位"
+
+#: ../src/gajim-remote.py:121
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"アカウントの優先順位を変更します。アカウントが指定されない場合、\"sync with "
+"global status\" オプションの設定されたアカウントすべての優先順位を変更します"
+
+#: ../src/gajim-remote.py:134
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+"メッセージの内容。アカウントを指定していなければなりません。そうでない場合は"
+"\"\"としなければなりません"
+
+#: ../src/gajim-remote.py:242
+msgid ""
+"Returns current status message (the global one unless account is specified)"
+msgstr ""
+"現在の状況メッセージを返します (もしアカウントが指定されなければ、全体の状況"
+"メッセージを返します)"
+
+#: ../src/gajim-remote.py:268
+#, fuzzy
+msgid "Change the avatar"
+msgstr "在席状況を変更する"
+
+#: ../src/gajim-remote.py:270
+#, fuzzy
+msgid "Picture to use"
+msgstr "使いたいニックネーム"
+
+#: ../src/gajim-remote.py:271
+#, fuzzy
+msgid ""
+"Account in which the avatar will be set; if not specified, the avatar will "
+"be set for all accounts"
+msgstr ""
+"XML が送信されるアカウント。指定されない場合、XML はすべてのアカウントに送信"
+"されます"
+
+#: ../src/gajim-remote.py:279
+msgid "URI to handle"
+msgstr "取り扱う URI"
+
+#: ../src/gajim-remote.py:280
+msgid "Account in which you want to handle it"
+msgstr "URI を取り扱うアカウント"
+
+#: ../src/gajim-remote.py:282
+msgid "Message content"
+msgstr "メッセージの内容"
+
+#: ../src/gajim-remote.py:288
+msgid "Room JID"
+msgstr "談話室JID"
+
+#: ../src/gajim-remote.py:289
+msgid "Nickname to use"
+msgstr "使いたいニックネーム"
+
+#: ../src/gajim-remote.py:290
+msgid "Password to enter the room"
+msgstr "談話室のパスワード"
+
+#: ../src/gajim-remote.py:291
+msgid "Account from which you want to enter the room"
+msgstr "談話室の参加に使うアカウント"
+
+#: ../src/gajim-remote.py:431
+#, python-format
+msgid ""
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
+msgstr ""
+"使い方: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
+
 #: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
@@ -8581,10 +8854,6 @@ msgstr ""
 msgid "No uri given"
 msgstr ""
 
-#: ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "uri が間違っています"
-
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "テーマ"
@@ -8610,185 +8879,183 @@ msgstr "現在のテーマを削除することはできません"
 msgid "Please first choose another for your current theme."
 msgstr "まず、現在のテーマとして別のものを選んでください。"
 
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:170
 msgid "Sending private message failed"
 msgstr "私信の送信に失敗しました"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:171
+#: ../src/groupchat_control.py:172
 #, 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:455
 msgid "Insert Nickname"
 msgstr "ニックネームの挿入"
 
-#: ../src/groupchat_control.py:631
+#: ../src/groupchat_control.py:636
 #, fuzzy
 msgid "Conversation with "
 msgstr "会話"
 
-#: ../src/groupchat_control.py:633
+#: ../src/groupchat_control.py:638
 #, fuzzy
 msgid "Continued conversation"
 msgstr "続いている会話"
 
-#. Can be a message (see handle_event_gc_config_change in
-#. gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1272 ../src/gui_interface.py:1080
+#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
 msgid "Any occupant is allowed to see your full JID"
 msgstr "入室者の誰もがあなたのフルJID を知ることができます"
 
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1286
 msgid "Room logging is enabled"
 msgstr "談話室の記録はとられます"
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1288
 msgid "A new room has been created"
 msgstr "新しい談話室が作成されました"
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1291
 msgid "The server has assigned or modified your roomnick"
 msgstr "サーバーはあなたの談話室ニックネームを割り当て(または変更し)ました"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1287
+#: ../src/groupchat_control.py:1297
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s は蹴り出されました: %(reason)s"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1300
 #, 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:1300
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s は締め出されました: %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1312
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s は %(who)s: によって締め出されました: %(reason)s"
 
-#: ../src/groupchat_control.py:1314 ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
 #, python-format
 msgid "You are now known as %s"
 msgstr "あなたは %s と認識されました"
 
-#: ../src/groupchat_control.py:1330 ../src/gui_interface.py:919
+#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s さんは現在 %(new_nick)s さんと認識されました"
 
-#: ../src/groupchat_control.py:1372 ../src/groupchat_control.py:1377
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1392
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s は退出しました (%(reason)s)"
 
-#: ../src/groupchat_control.py:1374
+#: ../src/groupchat_control.py:1383
 msgid "affiliation changed"
 msgstr "分掌を変更しました"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1388
 msgid "room configuration changed to members-only"
 msgstr "談話室はメンバー制に変更されました"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1394
 msgid "system shutdown"
 msgstr "システムのシャットダウン"
 
-#: ../src/groupchat_control.py:1470
+#: ../src/groupchat_control.py:1477
 #, 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:1474
+#: ../src/groupchat_control.py:1481
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** %(nick)s さんの分掌は %(affiliation)s に設定されました"
 
 # (Mako)ここでの role は「役」
-#: ../src/groupchat_control.py:1489
+#: ../src/groupchat_control.py:1496
 #, 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:1493
+#: ../src/groupchat_control.py:1500
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** %(nick)s さんの役は %(role)s に設定されました"
 
-#: ../src/groupchat_control.py:1522
+#: ../src/groupchat_control.py:1530
 #, python-format
 msgid "%s has left"
 msgstr "%s さんが退出しました"
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1535
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s さんが参加しました"
 
-#: ../src/groupchat_control.py:1529 ../src/gui_interface.py:946
+#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
 #: ../src/history_window.py:447 ../src/notify.py:234
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s さんは現在 %(status)s"
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1774
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "本当にグループチャット \"%s\" から退出してもいいですか ?"
 
-#: ../src/groupchat_control.py:1761
+#: ../src/groupchat_control.py:1776
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "このウィンドウを閉じると、このグループチャットから切断されます。"
 
-#: ../src/groupchat_control.py:1765 ../src/gui_interface.py:1216
-#: ../src/gui_interface.py:1992 ../src/gui_interface.py:2029
-#: ../src/gui_interface.py:2064 ../src/message_window.py:224
-#: ../src/roster_window.py:2739 ../src/roster_window.py:3399
-#: ../src/roster_window.py:4123
+#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
+#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
+#: ../src/gui_interface.py:1853 ../src/message_window.py:224
+#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
+#: ../src/roster_window.py:4195
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "次回から質問しない (_n)"
 
-#: ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:1814
 msgid "Changing Subject"
 msgstr "題の変更"
 
-#: ../src/groupchat_control.py:1800
+#: ../src/groupchat_control.py:1815
 msgid "Please specify the new subject:"
 msgstr "新しい題を入力してください:"
 
-#: ../src/groupchat_control.py:1807
+#: ../src/groupchat_control.py:1822
 msgid "Changing Nickname"
 msgstr "ニックネームの変更"
 
-#: ../src/groupchat_control.py:1808
+#: ../src/groupchat_control.py:1823
 msgid "Please specify the new nickname you want to use:"
 msgstr "使いたい新しいニックネームを入力してください:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1839
+#: ../src/groupchat_control.py:1854
 #, python-format
 msgid "Destroying %s"
 msgstr "%s の閉鎖"
 
-#: ../src/groupchat_control.py:1840
+#: ../src/groupchat_control.py:1855
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8796,22 +9063,22 @@ msgstr ""
 "この談話室を閉鎖しようとしています。\n"
 "下に理由を入力できます:"
 
-#: ../src/groupchat_control.py:1842
+#: ../src/groupchat_control.py:1857
 msgid "You may also enter an alternate venue:"
 msgstr "また、代替の談話室を入力することもできます:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2028
+#: ../src/groupchat_control.py:2046
 #, python-format
 msgid "Kicking %s"
 msgstr "%s を蹴り出し"
 
-#: ../src/groupchat_control.py:2029 ../src/groupchat_control.py:2356
+#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
 msgid "You may specify a reason below:"
 msgstr "下に理由を書くことができます:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2355
+#: ../src/groupchat_control.py:2373
 #, python-format
 msgid "Banning %s"
 msgstr "%s を締め出し"
@@ -8835,57 +9102,66 @@ msgid "Details"
 msgstr "詳細"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
+#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "エラー: 読み込みモードで %s を開けません"
 
-#: ../src/gtkgui_helpers.py:400
+#: ../src/gtkgui_helpers.py:404
 msgid "Error reading file:"
 msgstr "ファイル読み込みエラー:"
 
-#: ../src/gtkgui_helpers.py:403
+#: ../src/gtkgui_helpers.py:407
 msgid "Error parsing file:"
 msgstr "ファイル解析エラー:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:444
+#: ../src/gtkgui_helpers.py:448
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:818
+#: ../src/gtkgui_helpers.py:822
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim はデフォルトの Jabber クライアントではありません"
 
-#: ../src/gtkgui_helpers.py:819
+#: ../src/gtkgui_helpers.py:823
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Gajim をデフォルトの Jabber クライアントにしますか ?"
 
-#: ../src/gtkgui_helpers.py:820
+#: ../src/gtkgui_helpers.py:824
 #, fuzzy
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr "起動時に、Gajim がデフォルトの Jabber クライアントかを常にチェック"
 
-#: ../src/gtkgui_helpers.py:887
+#: ../src/gtkgui_helpers.py:891
 #, fuzzy
 msgid "Extension not supported"
 msgstr "拡張はサポートされていません"
 
-#: ../src/gtkgui_helpers.py:888
+#: ../src/gtkgui_helpers.py:892
 #, 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:924
+#: ../src/gtkgui_helpers.py:928
 msgid "Save Image as..."
 msgstr "画像の保存..."
 
-#: ../src/gui_interface.py:140
+#. we are banned
+#. group chat does not exist
+#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
+#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
+#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
+#: ../src/gui_interface.py:348
+msgid "Unable to join group chat"
+msgstr "グループに参加できません"
+
+#: ../src/gui_interface.py:138
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8896,58 +9172,92 @@ msgstr ""
 "す。\n"
 "別のニックネームを下に入力してください:"
 
-#: ../src/gui_interface.py:143
+#: ../src/gui_interface.py:141
 msgid "Always use this nickname when there is a conflict"
 msgstr "衝突が生じたときはいつもこのニックネームを使う"
 
-#: ../src/gui_interface.py:159
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "この申し込みを承認しますか ?"
 
-#: ../src/gui_interface.py:161
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "アカウント %s への申し込みを承認しますか ?"
 
-#: ../src/gui_interface.py:164
+#: ../src/gui_interface.py:163
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "%(url)s に対する HTTP (%(method)s) の承認 (id: %(id)s)"
 
-#: ../src/gui_interface.py:213 ../src/notify.py:493
+#: ../src/gui_interface.py:209 ../src/notify.py:493
 msgid "Connection Failed"
 msgstr "接続に失敗しました"
 
-#: ../src/gui_interface.py:606 ../src/gui_interface.py:610
+#: ../src/gui_interface.py:312
+#, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "談話室 %s に参加するにはパスワードが必要です。入力してください。"
+
+#: ../src/gui_interface.py:324
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr "%s の人数制限に達しています"
+
+#: ../src/gui_interface.py:333
+#, python-format
+msgid "You are banned from group chat %s."
+msgstr "グループチャット %s さんに締め出されています。"
+
+#: ../src/gui_interface.py:338
+#, python-format
+msgid "Group chat %s does not exist."
+msgstr "グループチャット %s は存在しません。"
+
+#: ../src/gui_interface.py:341
+msgid "Group chat creation is restricted."
+msgstr "グループチャットの作成は制限されています。"
+
+#: ../src/gui_interface.py:344
+#, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "登録したニックネームは、グループチャット %s で使われます。"
+
+#: ../src/gui_interface.py:349
+#, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "あなたはグループチャット %s のメンバー一覧にありません。"
+
+#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "エラー %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:621 ../src/gui_interface.py:636
+#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "%(message)s を送信する際にエラー ( %(error)s )"
 
-#: ../src/gui_interface.py:663 ../src/notify.py:495
+#: ../src/gui_interface.py:540 ../src/notify.py:495
 msgid "Subscription request"
 msgstr "在席通知申込"
 
-#: ../src/gui_interface.py:688
+#: ../src/gui_interface.py:565
 msgid "Authorization accepted"
 msgstr "承認が得られました"
 
-#: ../src/gui_interface.py:689
+#: ../src/gui_interface.py:566
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "相手先 %s さんは、あなたが在席状況を見ることを承認しました。"
 
-#: ../src/gui_interface.py:702
+#: ../src/gui_interface.py:579
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "相手先 \"%s\" さんは、あなたからの申し込みを却下しました。"
 
-#: ../src/gui_interface.py:703
+#: ../src/gui_interface.py:580
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8955,59 +9265,54 @@ msgstr ""
 "この相手先を常にオフラインとして見ることになります。\n"
 "相手先一覧から削除しますか ?"
 
-#: ../src/gui_interface.py:727 ../src/notify.py:497
+#: ../src/gui_interface.py:604 ../src/notify.py:497
 msgid "Unsubscribed"
 msgstr "在席通知の取り消し"
 
-#: ../src/gui_interface.py:754
+#: ../src/gui_interface.py:631
 #, fuzzy, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contact with \"%s\" cannot be established"
 
-#: ../src/gui_interface.py:1015
+#: ../src/gui_interface.py:859
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s さんは題を %(subject)s に設定しました"
 
-#: ../src/gui_interface.py:1083
+#: ../src/gui_interface.py:926
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gui_interface.py:1085
+#: ../src/gui_interface.py:928
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gui_interface.py:1087
+#: ../src/gui_interface.py:930
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:1091
+#: ../src/gui_interface.py:934
 msgid "Room logging is now enabled"
 msgstr "談話室の記録を取ります。"
 
-#: ../src/gui_interface.py:1093
+#: ../src/gui_interface.py:936
 msgid "Room logging is now disabled"
 msgstr "談話室の記録を止めます"
 
-#: ../src/gui_interface.py:1095
+#: ../src/gui_interface.py:938
 msgid "Room is now non-anonymous"
 msgstr "談話室は非匿名です"
 
-#: ../src/gui_interface.py:1098
+#: ../src/gui_interface.py:941
 msgid "Room is now semi-anonymous"
 msgstr "談話室は半匿名です"
 
-#: ../src/gui_interface.py:1101
+#: ../src/gui_interface.py:944
 msgid "Room is now fully-anonymous"
 msgstr "談話室は完全匿名です"
 
-#: ../src/gui_interface.py:1133
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "談話室 %s に参加するにはパスワードが必要です。入力してください。"
-
-#: ../src/gui_interface.py:1180
+#: ../src/gui_interface.py:985
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -9015,23 +9320,23 @@ msgstr ""
 "Gajim は GPG エージェントを使用するよう設定されました。しかし、GPG エージェン"
 "トが起動していないか、あるいはパスフレーズが間違っています。\n"
 
-#: ../src/gui_interface.py:1182 ../src/gui_interface.py:1189
+#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
 msgid "You are currently connected without your OpenPGP key."
 msgstr "現在、OpenPGP 鍵を使わずに接続しています。"
 
-#: ../src/gui_interface.py:1184
+#: ../src/gui_interface.py:989
 msgid "Your passphrase is incorrect"
 msgstr "パスフレーズが違います"
 
-#: ../src/gui_interface.py:1188
+#: ../src/gui_interface.py:993
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "OpenGPG のパスフレーズが違います"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid "GPG key not trusted"
 msgstr "GPG 鍵に信用がありません"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
@@ -9039,7 +9344,7 @@ msgstr ""
 "このチャットの暗号化に使った GPG 鍵には信用がありません。ほんとうにこのメッ"
 "セージを暗号化したいですか ?"
 
-#: ../src/gui_interface.py:1226
+#: ../src/gui_interface.py:1031
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not                 correctly started "
@@ -9048,19 +9353,19 @@ msgstr ""
 "Gnome Keyring はインストールされています。しかし、\t\t\t\t正しく起動できませ"
 "ん (環境変数が正しく設定されていないよ\t\t\t\tうです)。"
 
-#: ../src/gui_interface.py:1330
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "%(gmail_mail_address)s に新着メール"
 
-#: ../src/gui_interface.py:1332
+#: ../src/gui_interface.py:1133
 #, 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/gui_interface.py:1345
+#: ../src/gui_interface.py:1146
 #, fuzzy, python-format
 msgid ""
 "\n"
@@ -9075,43 +9380,43 @@ msgstr ""
 "件名: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1418
+#: ../src/gui_interface.py:1215
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s さんがファイルを転送したがっています。"
 
-#: ../src/gui_interface.py:1455 ../src/roster_window.py:1856
+#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "遠くの相手先が転送を中止しました"
 
-#: ../src/gui_interface.py:1458 ../src/roster_window.py:1858
+#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
 msgid "Error opening file"
 msgstr "ファイルを開く際のエラー"
 
-#: ../src/gui_interface.py:1490
+#: ../src/gui_interface.py:1287
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "%(name)s さんからファイル %(filename)s を受け取りました。"
 
 #. ft stopped
-#: ../src/gui_interface.py:1494
+#: ../src/gui_interface.py:1291
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "%(name)s さんからのファイル %(filename)s の転送を中断しました。"
 
-#: ../src/gui_interface.py:1507
+#: ../src/gui_interface.py:1304
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "%(name)s さんへファイル %(filename)s を送りました。"
 
 #. ft stopped
-#: ../src/gui_interface.py:1511
+#: ../src/gui_interface.py:1308
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "%(name)s さんへのファイル %(filename)s の転送を中断しました。"
 
-#: ../src/gui_interface.py:1623
+#: ../src/gui_interface.py:1426
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -9120,36 +9425,36 @@ msgstr ""
 "%s さんからのメッセージを復号できません\n"
 "改竄の可能性があります。"
 
-#: ../src/gui_interface.py:1630
+#: ../src/gui_interface.py:1433
 msgid "Unable to decrypt message"
 msgstr "メッセージを復号できません"
 
-#: ../src/gui_interface.py:1702
+#: ../src/gui_interface.py:1505
 msgid "Username Conflict"
 msgstr "ユーザー名の重複"
 
-#: ../src/gui_interface.py:1703
+#: ../src/gui_interface.py:1506
 msgid "Please type a new username for your local account"
 msgstr "ローカルのアカウントの新しいユーザー名を入力してください"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1519
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gui_interface.py:1729
+#: ../src/gui_interface.py:1532
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s)"
 
-#: ../src/gui_interface.py:1740
+#: ../src/gui_interface.py:1543
 msgid "Error."
 msgstr "エラー"
 
-#: ../src/gui_interface.py:1768
+#: ../src/gui_interface.py:1556
 msgid "Resource Conflict"
 msgstr "リソースの衝突"
 
-#: ../src/gui_interface.py:1769
+#: ../src/gui_interface.py:1557
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -9158,21 +9463,21 @@ msgstr ""
 "てください"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1816
+#: ../src/gui_interface.py:1604
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s さんがファイルを転送したがっています。"
 
-#: ../src/gui_interface.py:1819
+#: ../src/gui_interface.py:1607
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "ファイル転送の要求"
 
-#: ../src/gui_interface.py:1927
+#: ../src/gui_interface.py:1716
 msgid "Error verifying SSL certificate"
 msgstr "SSL 証明書の検証エラー"
 
-#: ../src/gui_interface.py:1928
+#: ../src/gui_interface.py:1717
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9182,15 +9487,15 @@ msgstr ""
 "jabber サーバーの SSL 証明書の検証にエラーがあります: %(error)s\n"
 "それでもこのサーバーに接続しますか ?"
 
-#: ../src/gui_interface.py:1936
+#: ../src/gui_interface.py:1725
 msgid "Ignore this error for this certificate."
 msgstr "この証明書のこのエラーを無視します。"
 
-#: ../src/gui_interface.py:1956
+#: ../src/gui_interface.py:1745
 msgid "SSL certificate error"
 msgstr "SSL 証明書エラー"
 
-#: ../src/gui_interface.py:1957
+#: ../src/gui_interface.py:1746
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9207,12 +9512,12 @@ msgstr ""
 "\n"
 "それでも接続して、証明書の指紋を更新しますか ?"
 
-#: ../src/gui_interface.py:1987 ../src/gui_interface.py:2024
-#: ../src/gui_interface.py:2060
+#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
+#: ../src/gui_interface.py:1849
 msgid "Insecure connection"
 msgstr "安全でない接続"
 
-#: ../src/gui_interface.py:1988
+#: ../src/gui_interface.py:1777
 #, fuzzy
 msgid ""
 "You are about to connect to the server with an insecure connection. This "
@@ -9222,12 +9527,12 @@ msgstr ""
 "安全でない接続でパスワードを送ろうとしています。それを避けるには PyOpenSSL を"
 "インストールすべきです。あなたがやりたいことですか ?"
 
-#: ../src/gui_interface.py:1991 ../src/gui_interface.py:2028
-#: ../src/gui_interface.py:2063
+#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
+#: ../src/gui_interface.py:1852
 msgid "Yes, I really want to connect insecurely"
 msgstr "はい。安全でないまま接続したいです"
 
-#: ../src/gui_interface.py:2025
+#: ../src/gui_interface.py:1814
 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?"
@@ -9235,7 +9540,7 @@ msgstr ""
 "安全でない接続でパスワードを送ろうとしています。それを避けるには PyOpenSSL を"
 "インストールすべきです。あなたがやりたいことですか ?"
 
-#: ../src/gui_interface.py:2061
+#: ../src/gui_interface.py:1850
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9245,11 +9550,11 @@ msgstr ""
 "ですか ?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2624 ../src/gui_interface.py:2647
+#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
 msgid "Emoticons disabled"
 msgstr "感情アイコンは無効"
 
-#: ../src/gui_interface.py:2625
+#: ../src/gui_interface.py:2423
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -9257,7 +9562,7 @@ msgstr ""
 "指定された感情アイコンのテーマは見つかりません。そのため、感情アイコンは無効"
 "です。"
 
-#: ../src/gui_interface.py:2648
+#: ../src/gui_interface.py:2446
 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 "
@@ -9267,42 +9572,42 @@ msgstr ""
 "ルの書式を更新する必要があるかも知れません。詳しくは http://trac.gajim.org/"
 "wiki/Emoticons をご覧ください。"
 
-#: ../src/gui_interface.py:2679 ../src/roster_window.py:3560
+#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
 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/gui_interface.py:3058
+#: ../src/gui_interface.py:2871
 msgid "Could not save your settings and preferences"
 msgstr "設定を保存できませんでした"
 
-#: ../src/gui_interface.py:3592
+#: ../src/gui_interface.py:3411
 msgid "Passphrase Required"
 msgstr "パスフレーズが必要です"
 
-#: ../src/gui_interface.py:3593
+#: ../src/gui_interface.py:3412
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 "鍵ID %(keyid)s (アカウント %(account)s) の GPG 鍵のパスフレーズを入力してくだ"
 "さい。"
 
-#: ../src/gui_interface.py:3607
+#: ../src/gui_interface.py:3426
 msgid "GPG key expired"
 msgstr "GPG 鍵は失効しています"
 
-#: ../src/gui_interface.py:3608
+#: ../src/gui_interface.py:3427
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "GPG 鍵は失効しています。OpenPGP なしに %s さんに接続します。"
 
 #. ask again
-#: ../src/gui_interface.py:3617
+#: ../src/gui_interface.py:3436
 msgid "Wrong Passphrase"
 msgstr "パスフレーズが間違っています"
 
-#: ../src/gui_interface.py:3618
+#: ../src/gui_interface.py:3437
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 "GPG のパスフレーズをもういちど入力するか、または「中止」を押してください。"
@@ -9341,6 +9646,11 @@ msgstr "ニックネーム"
 msgid "Message"
 msgstr "メッセージ"
 
+#. holds subject
+#: ../src/history_manager.py:188 ../src/history_manager.py:219
+msgid "Subject"
+msgstr "題"
+
 #: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -9432,19 +9742,19 @@ msgstr "タブを閉じようとしています"
 msgid "Do you really want to close them all?"
 msgstr "本当にそれらをすべて閉じてもいいですか ?"
 
-#: ../src/message_window.py:484
+#: ../src/message_window.py:485
 msgid "Chats"
 msgstr "チャット"
 
-#: ../src/message_window.py:486
+#: ../src/message_window.py:487
 msgid "Group Chats"
 msgstr "グループチャット"
 
-#: ../src/message_window.py:488
+#: ../src/message_window.py:489
 msgid "Private Chats"
 msgstr "個人チャット"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:495
 msgid "Messages"
 msgstr "メッセージ"
 
@@ -9500,109 +9810,109 @@ msgstr "%(nickname)s さんからの新着メッセージ"
 msgid "Ignore"
 msgstr "無視する"
 
-#: ../src/profile_window.py:57
+#: ../src/profile_window.py:58
 msgid "Retrieving profile..."
 msgstr "プロフィールを取得中..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2935
+#: ../src/profile_window.py:111 ../src/roster_window.py:3001
 msgid "File is empty"
 msgstr "ファイルが空です"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2938
+#: ../src/profile_window.py:114 ../src/roster_window.py:3004
 msgid "File does not exist"
 msgstr "ファイルがありません"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2940 ../src/roster_window.py:2951
+#: ../src/profile_window.py:128 ../src/profile_window.py:144
+#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
 msgid "Could not load image"
 msgstr "画像を読み込めませんでした"
 
-#: ../src/profile_window.py:214
+#: ../src/profile_window.py:215
 #, fuzzy
 msgid "Wrong date format"
 msgstr "相手先の情報"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:216
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "書式: YYYY-MM-DD"
 
-#: ../src/profile_window.py:269
+#: ../src/profile_window.py:270
 msgid "Information received"
 msgstr "情報を受信しました"
 
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:341
 msgid "Without a connection you can not publish your contact information."
 msgstr "接続しないと、情報を公開できません。"
 
-#: ../src/profile_window.py:353
+#: ../src/profile_window.py:354
 msgid "Sending profile..."
 msgstr "プロフィールを送信しています..."
 
-#: ../src/profile_window.py:368
+#: ../src/profile_window.py:369
 msgid "Information NOT published"
 msgstr "情報は公開されません"
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:376
 msgid "vCard publication failed"
 msgstr "vCard の公開に失敗しました"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:377
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
 msgstr ""
 "個人情報の公開する際にエラーが発生しました。時間をおいて再度試みてください。"
 
-#: ../src/roster_window.py:256 ../src/roster_window.py:1012
+#: ../src/roster_window.py:262 ../src/roster_window.py:1026
 #, fuzzy
 msgid "Merged accounts"
 msgstr "統合アカウント"
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1942
 msgid "Authorization has been sent"
 msgstr "承認が送信されました"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1943
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "現在 \"%s\" さんはあなたの在席状況を知ることができます。"
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1966
 msgid "Subscription request has been sent"
 msgstr "在席通知の申し込みを送信しました"
 
-#: ../src/roster_window.py:1944
+#: ../src/roster_window.py:1967
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "\"%s\" さんがこの申し込みを承認したら、相手先の在席状況を知ることができます。"
 
-#: ../src/roster_window.py:1958
+#: ../src/roster_window.py:1981
 msgid "Authorization has been removed"
 msgstr "承認が取り消されました"
 
-#: ../src/roster_window.py:1959
+#: ../src/roster_window.py:1982
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" さんは常にあなたをオフラインとして見ることになります。"
 
-#: ../src/roster_window.py:1986
+#: ../src/roster_window.py:2009
 msgid "GPG is not usable"
 msgstr "GPG は使用できません"
 
-#: ../src/roster_window.py:1987
+#: ../src/roster_window.py:2010
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "OpenPGP なしに、%s さんに接続します。"
 
-#: ../src/roster_window.py:2199 ../src/roster_window.py:3496
+#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
 msgid "You are participating in one or more group chats"
 msgstr "一つ以上のグループチャットに参加中です。"
 
-#: ../src/roster_window.py:2200 ../src/roster_window.py:3497
+#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9610,38 +9920,38 @@ msgstr ""
 "在席状況を「隠れ中」にすると、グループチャットから退出することになります。ほ"
 "んとうに「隠れ中」にしますか ?"
 
-#: ../src/roster_window.py:2226
+#: ../src/roster_window.py:2249
 msgid "desync'ed"
 msgstr "不揃い"
 
-#: ../src/roster_window.py:2288
+#: ../src/roster_window.py:2311
 msgid "Really quit Gajim?"
 msgstr "本当に Gajim を終了しますか ?"
 
-#: ../src/roster_window.py:2289
+#: ../src/roster_window.py:2312
 msgid "Are you sure you want to quit Gajim?"
 msgstr "本当に Gajim を終了してもいいですか ?"
 
-#: ../src/roster_window.py:2290
+#: ../src/roster_window.py:2313
 msgid "Always close Gajim"
 msgstr "常に Gajim を終了する"
 
-#: ../src/roster_window.py:2373
+#: ../src/roster_window.py:2396
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "ファイルの転送を中止する"
 
-#: ../src/roster_window.py:2374
+#: ../src/roster_window.py:2397
 msgid ""
-"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2405 ../src/roster_window.py:2653
+#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
 msgid "You have unread messages"
 msgstr "未読のメッセージがあります"
 
-#: ../src/roster_window.py:2406
+#: ../src/roster_window.py:2429
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9650,37 +9960,37 @@ msgstr ""
 "履歴が有効になっていて、かつ相手先が名簿にあれば、メッセージは後で読むことが"
 "できます。"
 
-#: ../src/roster_window.py:2654
+#: ../src/roster_window.py:2720
 msgid "You must read them before removing this transport."
 msgstr "この中継先を削除する前に、それらを読まなければなりません。"
 
-#: ../src/roster_window.py:2657
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "中継先 \"%s\" を削除します"
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2724
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr "この中継先をとおして相手先にメッセージを送受信することはできません。"
 
-#: ../src/roster_window.py:2661
+#: ../src/roster_window.py:2727
 msgid "Transports will be removed"
 msgstr "中継先は削除されます"
 
-#: ../src/roster_window.py:2666
+#: ../src/roster_window.py:2732
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "these transports: %s"
 msgstr "もうこれらの中継先 %s から相手先とのメッセージの送受信はできません。"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2800
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "相手先を拒否しようとしています。続行してもいいですか ?"
 
-#: ../src/roster_window.py:2736
+#: ../src/roster_window.py:2802
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -9689,56 +9999,56 @@ msgstr ""
 "ん。"
 
 #. it's jid
-#: ../src/roster_window.py:2827
+#: ../src/roster_window.py:2893
 msgid "Rename Contact"
 msgstr "相手先の名前を変更"
 
-#: ../src/roster_window.py:2828
+#: ../src/roster_window.py:2894
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "相手先 %s さんの新しいニックネームを入力してください"
 
-#: ../src/roster_window.py:2835
+#: ../src/roster_window.py:2901
 msgid "Rename Group"
 msgstr "グループの名前変更"
 
-#: ../src/roster_window.py:2836
+#: ../src/roster_window.py:2902
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "グループ %s の新しい名前を入力してください"
 
-#: ../src/roster_window.py:2881
+#: ../src/roster_window.py:2947
 msgid "Remove Group"
 msgstr "グループの削除"
 
-#: ../src/roster_window.py:2882
+#: ../src/roster_window.py:2948
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "名簿からグループ %s を削除しますか ?"
 
-#: ../src/roster_window.py:2883
+#: ../src/roster_window.py:2949
 msgid "Also remove all contacts in this group from your roster"
 msgstr "名簿のこのグループのすべての相手先も削除します"
 
-#: ../src/roster_window.py:2922
+#: ../src/roster_window.py:2988
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP 鍵の割り当て"
 
-#: ../src/roster_window.py:2923
+#: ../src/roster_window.py:2989
 msgid "Select a key to apply to the contact"
 msgstr "相手先に適用する鍵を選択してください"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3372
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "相手先 \"%s\" さんを名簿から削除します"
 
-#: ../src/roster_window.py:3308
+#: ../src/roster_window.py:3374
 #, 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:3313
+#: ../src/roster_window.py:3379
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9747,11 +10057,11 @@ msgstr ""
 "を常にオフラインとして見ることになります。"
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3319
+#: ../src/roster_window.py:3385
 msgid "Do you want to continue?"
 msgstr "続けますか ?"
 
-#: ../src/roster_window.py:3323
+#: ../src/roster_window.py:3389
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9759,16 +10069,16 @@ msgstr ""
 "この相手先を名簿から削除すると、デフォルトで在席通知の承認も取り消します。相"
 "手先はあなたを常にオフラインとして見ることになります。"
 
-#: ../src/roster_window.py:3326
+#: ../src/roster_window.py:3392
 msgid "I want this contact to know my status after removal"
 msgstr "削除後も、この相手先に自分の在席状況を知らせる"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3330
+#: ../src/roster_window.py:3396
 msgid "Contacts will be removed from your roster"
 msgstr "相手先は名簿から削除されました"
 
-#: ../src/roster_window.py:3335
+#: ../src/roster_window.py:3401
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9778,13 +10088,13 @@ msgstr ""
 "を名簿から削除すると、在席通知の承認も取り消します。相手先はあなたを常にオフ"
 "ラインとして見ることになります。"
 
-#: ../src/roster_window.py:3393
+#: ../src/roster_window.py:3459
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want  to continue?"
 msgstr "独自の在席状況を送信しようとしています。続行してもいいですか ?"
 
-#: ../src/roster_window.py:3395
+#: ../src/roster_window.py:3461
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -9794,54 +10104,54 @@ msgstr ""
 "が在席状況を変更するまでの間です。その後はあなたの全体の在席状況を見ることに"
 "なります。"
 
-#: ../src/roster_window.py:3414
+#: ../src/roster_window.py:3480
 msgid "No account available"
 msgstr "アカウントがありません"
 
-#: ../src/roster_window.py:3415
+#: ../src/roster_window.py:3481
 msgid "You must create an account before you can chat with other contacts."
 msgstr "相手先とチャットを開始する前に、アカウントを作成しなければなりません。"
 
-#: ../src/roster_window.py:4023
+#: ../src/roster_window.py:4095
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: ../src/roster_window.py:4025
+#: ../src/roster_window.py:4097
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: ../src/roster_window.py:4117
+#: ../src/roster_window.py:4189
 #, fuzzy
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "metacontact を作成しようとしています。続行してもいいですか ?"
 
-#: ../src/roster_window.py:4119
+#: ../src/roster_window.py:4191
 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:4234
+#: ../src/roster_window.py:4306
 msgid "Invalid file URI:"
 msgstr "ファイルの URI が正しくありません:"
 
-#: ../src/roster_window.py:4246
+#: ../src/roster_window.py:4318
 #, 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 さんに転送しますか"
 msgstr[1] "このファイルを %s さんに転送しますか"
 
-#: ../src/roster_window.py:4361
+#: ../src/roster_window.py:4433
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "送信する"
 
-#: ../src/roster_window.py:4367
+#: ../src/roster_window.py:4439
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr ""
@@ -9851,145 +10161,145 @@ msgstr ""
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4816 ../src/roster_window.py:4889
-#: ../src/roster_window.py:4898 ../src/statusicon.py:246
-#: ../src/statusicon.py:293 ../src/statusicon.py:299
+#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
+#: ../src/roster_window.py:4970 ../src/statusicon.py:263
+#: ../src/statusicon.py:310 ../src/statusicon.py:316
 #, python-format
 msgid "using account %s"
 msgstr "アカウント %s で"
 
 #. add
-#: ../src/roster_window.py:4905
+#: ../src/roster_window.py:4977
 #, python-format
 msgid "to %s account"
 msgstr "アカウント %s に対して"
 
 #. disco
-#: ../src/roster_window.py:4910
+#: ../src/roster_window.py:4982
 #, python-format
 msgid "using %s account"
 msgstr "アカウント %s で"
 
-#: ../src/roster_window.py:4948 ../src/statusicon.py:309
+#: ../src/roster_window.py:5020 ../src/statusicon.py:326
 msgid "_Manage Bookmarks..."
 msgstr "ブックマークの管理 (_M)..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4968
+#: ../src/roster_window.py:5040
 #, python-format
 msgid "of account %s"
 msgstr "アカウント %s の"
 
-#: ../src/roster_window.py:5009
+#: ../src/roster_window.py:5081
 #, python-format
 msgid "for account %s"
 msgstr "アカウント %s について"
 
-#: ../src/roster_window.py:5069 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
 msgid "_Change Status Message"
 msgstr "状況メッセージの変更 (_C)"
 
-#: ../src/roster_window.py:5102
+#: ../src/roster_window.py:5174
 msgid "Publish Tune"
 msgstr "聴いている楽曲名を公開"
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5176
 #, fuzzy
 msgid "Publish Location"
 msgstr "聴いている楽曲名を公開"
 
-#: ../src/roster_window.py:5107
+#: ../src/roster_window.py:5179
 msgid "Configure Services..."
 msgstr "サービスの構成"
 
 # (Mako)ここでは「復元」の意味か
-#: ../src/roster_window.py:5252
+#: ../src/roster_window.py:5324
 msgid "_Maximize All"
 msgstr "ウィンドウをすべて復元 (_M)"
 
-#: ../src/roster_window.py:5262 ../src/roster_window.py:5436
+#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
 msgid "Send Group M_essage"
 msgstr "メッセージの一斉送信 (_e)"
 
-#: ../src/roster_window.py:5270
+#: ../src/roster_window.py:5342
 msgid "To all users"
 msgstr "すべてのユーザーに"
 
-#: ../src/roster_window.py:5274
+#: ../src/roster_window.py:5346
 msgid "To all online users"
 msgstr "オンラインのすべてのユーザーに"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5456
+#: ../src/roster_window.py:5528
 msgid "_Manage Contacts"
 msgstr "相手先の管理 (_M)"
 
 #. Edit Groups
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5537
 msgid "Edit _Groups"
 msgstr "グループの編集 (_G)"
 
 #. Send single message
-#: ../src/roster_window.py:5520
+#: ../src/roster_window.py:5592
 msgid "Send Single Message"
 msgstr "単発メッセージの送信"
 
 #. Execute Command
-#: ../src/roster_window.py:5567
+#: ../src/roster_window.py:5639
 msgid "Execute Command..."
 msgstr "コマンドを実行する..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5577
+#: ../src/roster_window.py:5649
 msgid "_Manage Transport"
 msgstr "中継先の管理 (_M)"
 
 #. Modify Transport
-#: ../src/roster_window.py:5586
+#: ../src/roster_window.py:5658
 msgid "_Modify Transport"
 msgstr "中継先の変更 (_M)"
 
 #. Rename
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5668
 msgid "_Rename"
 msgstr "名前の変更(_R)"
 
 # (Mako)ここでは「復元」の意味か
-#: ../src/roster_window.py:5656
+#: ../src/roster_window.py:5728
 msgid "_Maximize"
 msgstr "ウィンドウの復元 (_M)"
 
-#: ../src/roster_window.py:5665
+#: ../src/roster_window.py:5737
 msgid "_Reconnect"
 msgstr "再接続 (_R)"
 
-#: ../src/roster_window.py:5672
+#: ../src/roster_window.py:5744
 msgid "_Disconnect"
 msgstr "切断 (_D)"
 
 #. History manager
-#: ../src/roster_window.py:5754
+#: ../src/roster_window.py:5833
 msgid "History Manager"
 msgstr "履歴マネージャ"
 
-#: ../src/roster_window.py:5765
+#: ../src/roster_window.py:5844
 msgid "_Join New Group Chat"
 msgstr "新しいグループチャットに参加 (_J)"
 
-#: ../src/roster_window.py:5938
+#: ../src/roster_window.py:6019
 msgid "Change Status Message..."
 msgstr "状況メッセージを変更する..."
 
-#: ../src/search_window.py:94
+#: ../src/search_window.py:105
 msgid "Waiting for results"
 msgstr "検索しています"
 
-#: ../src/search_window.py:132 ../src/search_window.py:210
+#: ../src/search_window.py:143 ../src/search_window.py:220
 msgid "Error in received dataform"
 msgstr "ファイルを受ける際のエラー"
 
 #. No result
-#: ../src/search_window.py:166 ../src/search_window.py:202
+#: ../src/search_window.py:177 ../src/search_window.py:212
 msgid "No result"
 msgstr "見つかりません"
 
@@ -10002,14 +10312,15 @@ msgstr "ディスクの書き込みエラー"
 msgid "Subject: %s"
 msgstr "件名: %s"
 
-#: ../src/session.py:433 ../src/session.py:468
+#: ../src/session.py:447 ../src/session.py:491
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:435
+#: ../src/session.py:448
 #, fuzzy, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
+"The remote client wants '\n"
+"                            'to negotiate an session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -10021,7 +10332,7 @@ msgstr ""
 "\n"
 "\tAre these options acceptable?"
 
-#: ../src/session.py:469
+#: ../src/session.py:492
 #, fuzzy, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10036,16 +10347,16 @@ msgstr ""
 "\n"
 "Continue with the session?"
 
-#: ../src/statusicon.py:210
+#: ../src/statusicon.py:227
 msgid "_Change Status Message..."
 msgstr "状況メッセージを変更する (_C)..."
 
-#: ../src/statusicon.py:322
+#: ../src/statusicon.py:339
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "名簿で (_r)"
 
-#: ../src/statusicon.py:333
+#: ../src/statusicon.py:350
 msgid "Hide this menu"
 msgstr "このメニューを表示しない"
 
@@ -10185,32 +10496,32 @@ msgstr ""
 "このサービスは詳細情報を返答することができません。\n"
 "古いか、または壊れています"
 
-#: ../src/vcard.py:251
+#: ../src/vcard.py:265
 msgid "?Client:Unknown"
 msgstr "不明"
 
-#: ../src/vcard.py:253
+#: ../src/vcard.py:267
 msgid "?OS:Unknown"
 msgstr "不明"
 
-#: ../src/vcard.py:274
+#: ../src/vcard.py:288
 msgid "?Time:Unknown"
 msgstr "不明"
 
-#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
+#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
 #, python-format
 msgid "since %s"
 msgstr "%s から"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:345
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:349
 msgid "<b>Affiliation:</b>"
 msgstr "<b>分掌:</b>"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:357
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10218,7 +10529,7 @@ msgstr ""
 "この相手先はあなたの在席情報に関心があります。しかし、あなたはこの相手先の在"
 "席情報に関心がありません。"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:359
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10226,39 +10537,65 @@ msgstr ""
 "あなたは相手先の在席情報に関心があります。しかし、相手先はあなたの在席情報に"
 "関心がありません。"
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:361
 msgid "You and the contact are interested in each other's presence information"
 msgstr "あなたと相手先は相互の在席情報に関心があります。"
 
 #. None
-#: ../src/vcard.py:349
+#: ../src/vcard.py:363
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "あなたも相手先も相互の在席情報に関心がありません。"
 
-#: ../src/vcard.py:356
+#: ../src/vcard.py:370
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "あなたからの在席通知の申し込みに対する相手先からの回答を待っています。"
 
-#: ../src/vcard.py:358
+#: ../src/vcard.py:372
 msgid "There is no pending subscription request."
 msgstr "保留中の在席通知の申し込みはありません。"
 
-#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
+#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
 msgid " resource with priority "
 msgstr " リソース。優先順位は "
 
-#~ msgid "_Available"
-#~ msgstr "在席 (_A)"
+#~ msgid "@"
+#~ msgstr "@"
+
+#~ msgid "_Disable showing event in systray"
+#~ msgstr "システムトレイへのイベントの表示をやめる (_D)"
+
+#~ msgid "_Show event in systray"
+#~ msgstr "イベントをシステムトレイに表示する (_S)"
 
 #, fuzzy
-#~ msgid "PEP node was not removed"
-#~ msgstr "PEP node was not removed"
+#~ msgid "Autodetect on every Gajim startup"
+#~ msgstr "Gajim 起動時に接続する (_o)"
+
+#~ msgid "Show systray:"
+#~ msgstr "システムトレイに表示:"
 
 #, fuzzy
-#~ msgid "PEP node %(node)s was not removed: %(message)s"
-#~ msgstr "PEP node %(node)s was not removed: %(message)s"
+#~ msgid "Nickname not allowed: %s"
+#~ msgstr "ニックネームは許されません: %s"
+
+#~ msgid "Room has been destroyed"
+#~ msgstr "談話室は閉鎖されました"
+
+#~ msgid "You can join this room instead: %s"
+#~ msgstr "代わりに次の談話室に参加します: %s"
+
+#~ msgid "I would like to add you to my roster."
+#~ msgstr "あなたを私の名簿に追加したいと思っています。"
+
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "JID %s は規格(RFC)に合っていません。名簿には追加されません。これを削除する"
+#~ "には、http://jru.jabberstudio.org/ のような名簿管理ツールを使ってくださ"
+#~ "い。"
 
 #~ msgid "Account Modification"
 #~ msgstr "アカウントの変更"
@@ -10367,39 +10704,9 @@ msgstr " リソース。優先順位は "
 #~ "SOCKS5\n"
 #~ "BOSH"
 
-#~ msgid "Add this contact to roster (Ctrl+D)"
-#~ msgstr "この相手先を名簿に追加する (Ctrl+D)"
-
-#~ msgid "Bookmark this room (Ctrl+B)"
-#~ msgstr "この談話室をブックマーク (Ctrl+B)"
-
-#~ msgid "Browse the chat history (Ctrl+H)"
-#~ msgstr "チャットの履歴を見る (Ctrl+H)"
-
-#~ msgid "Change the room's subject (Alt+T)"
-#~ msgstr "談話室の題の変更 (Alt+T)"
-
-#~ msgid "Change your nickname (Ctrl+N)"
-#~ msgstr "ニックネームの変更 (Ctrl+N)"
-
-#~ msgid "Invite contacts to the conversation (Ctrl+G)"
-#~ msgstr "相手先を招待 (Ctrl+G)"
-
 #~ msgid "Send a file (Ctrl+F)"
 #~ msgstr "ファイルの送信 (Ctrl+F)"
 
-#~ msgid "Show a list of emoticons (Alt+M)"
-#~ msgstr "顔文字の一覧の表示 (Alt+M)"
-
-#~ msgid "Show a list of formattings"
-#~ msgstr "書式の一覧の表示"
-
-#~ msgid "Show a menu of advanced functions (Alt+A)"
-#~ msgstr "拡張機能の一覧を表示 (Alt+A)"
-
-#~ msgid "Show the contact's profile (Ctrl+I)"
-#~ msgstr "相手先のプロフィールの表示 (Ctrl+I)"
-
 #~ msgid ""
 #~ "All chat states\n"
 #~ "Composing only\n"
@@ -10462,9 +10769,6 @@ msgstr " リソース。優先順位は "
 #~ "from\n"
 #~ "to"
 
-#~ msgid "_Preferences"
-#~ msgstr "設定 (_P)"
-
 #~ msgid "_Quit"
 #~ msgstr "終了 (_Q)"
 
diff --git a/po/kk.po b/po/kk.po
index c335e22b3abcb53da2b6ae08b04b7f4054f61491..bdc32c54b60d06f6d3705cf245dee20702934b0f 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -2,19 +2,23 @@
 # Copyright (C) 2009 gajim team
 # This file is distributed under the same license as the PACKAGE package.
 # Baurzhan Muftakhidinov <baurthefirst@gmail.com>, 2010.
-# 
+#
+#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim.trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 11:28+0200\n"
+"POT-Creation-Date: 2010-10-01 20:39+0200\n"
 "PO-Revision-Date: 2010-08-03 14:02+0600\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
 "Language-Team: Kazakh <kk_KZ@googlegroups.com>\n"
+"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: kk\n"
 "Plural-Forms: nplurals=2; plural= (n != 1);\n"
 "X-Poedit-Language: Kazakh\n"
 "X-Poedit-Country: KAZAKHSTAN\n"
@@ -27,7 +31,7 @@ msgstr "Чат _бөлмесіне кіру..."
 msgid "_Add Contact..."
 msgstr "_Контакт қосу..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:17
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
 msgid "_Discover Services"
 msgstr "Қы_зметтерді қарап шығу"
 
@@ -47,7 +51,7 @@ msgstr "Gmail е-жәшігін а_шу"
 msgid "_Personal Events"
 msgstr "_Жеке әрекеттер"
 
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:23
+#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
 msgid "_Start Chat..."
 msgstr "_Чатты бастау..."
 
@@ -79,10 +83,6 @@ msgid "<b>Please select a server</b>"
 msgstr "<b>Серверді таңдаңыз</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid "@"
-msgstr "@"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
@@ -90,64 +90,64 @@ msgstr ""
 "Бұл сертификатты сенімділер тізіміне қосу.\n"
 "Сертификаттың SHA1 баспасы:\n"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:10
 msgid "Anon_ymous authentication"
 msgstr "Анони_мды аутентификация"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Connect when I press Finish"
 msgstr "Аяқтау басқан кезде, байланыс орнату"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Тіркелгілерді жасау шебері"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "I already have an account I want to _use"
 msgstr "Менде қолданғ_ым келетін тіркелгім бар"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I want to _register for a new account"
 msgstr "Жаңа ті_ркелгіні жасауды қалаймын"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:16
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 #: ../data/gui/accounts_window.ui.h:28
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Белгіленген болса, Gajim бұл тіркелгі үшін парольді сақтап отырады"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:17
+#: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Басқару..."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:18
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
 #: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2263 ../src/config.py:2342
-#: ../src/config.py:2355 ../src/config.py:3596 ../src/config.py:3671
-#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513
-#: ../src/dialogs.py:526 ../src/roster_window.py:2890
-#: ../src/roster_window.py:2896 ../src/roster_window.py:2901
+#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
+#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
+#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
+#: ../src/dialogs.py:527 ../src/roster_window.py:2956
+#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
 msgid "None"
 msgstr "Ешнәрсе"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:19
+#: ../data/gui/account_creation_wizard_window.ui.h:18
 msgid "Prox_y:"
 msgstr "Прокс_и:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #: ../data/gui/accounts_window.ui.h:48
 msgid "Save pass_word"
 msgstr "Пар_ольді сақтау"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:21
+#: ../data/gui/account_creation_wizard_window.ui.h:20
 msgid "Set my profile when I connect"
 msgstr "Мен қосылғанда, профайлымды орнату"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:22
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Use custom hostname/port"
 msgstr "Пайдаланушы хост аты/порт қолдану"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:23
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -155,34 +155,34 @@ msgstr ""
 "Jabber желісіне байланыс орнату үшін сізде\n"
 "тіркелгіңіз болуы керек."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-#: ../data/gui/roster_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:16
 msgid "_Advanced"
 msgstr "Кеңейтіл_ген"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:25
 msgid "_Finish"
 msgstr "_Аяқтау"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:27
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Hostname:"
 msgstr "_Хост аты:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #: ../data/gui/accounts_window.ui.h:62
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:28
 #: ../data/gui/accounts_window.ui.h:64
 msgid "_Password:"
 msgstr "_Пароль:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:29
 msgid "_Port:"
 msgstr "_Порт:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:31
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Server:"
 msgstr "_Сервер:"
 
@@ -239,8 +239,12 @@ msgid "Chan_ge Password"
 msgstr "Парольді өз_герту"
 
 #: ../data/gui/accounts_window.ui.h:14
-msgid "Check this so Gajim will ask you before sending your password over an insecure connection."
-msgstr "Қауіпсіз емес байланыс арқылы парольді жіберу алдында Gajim сізді сұрау үшін осыны белгілеңіз."
+msgid ""
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
+msgstr ""
+"Қауіпсіз емес байланыс арқылы парольді жіберу алдында Gajim сізді сұрау үшін "
+"осыны белгілеңіз."
 
 #: ../data/gui/accounts_window.ui.h:15
 msgid "Choose Client Cert"
@@ -256,7 +260,8 @@ msgstr "Тіркелгі паролін өзгерту үшін шертіңіз
 
 #: ../data/gui/accounts_window.ui.h:18
 msgid "Click to request authorization to all contacts of another account"
-msgstr "Басқа тіркелгінің барлық контакттарынан авторизация сұрау үшін шертіңіз"
+msgstr ""
+"Басқа тіркелгінің барлық контакттарынан авторизация сұрау үшін шертіңіз"
 
 #: ../data/gui/accounts_window.ui.h:19
 msgid "Client certificate"
@@ -283,47 +288,66 @@ msgstr "Аты:"
 #. No configured account
 #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
 #: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592
-#: ../src/notify.py:608
+#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
+#: ../src/notify.py:616
 msgid "Gajim"
 msgstr "Gajim"
 
 #. FIXME: Ugly workaround.
-#. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to
-#. General)
+#. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
 #. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:61
-#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121
-#: ../src/roster_window.py:2832 ../src/roster_window.py:5379
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
+#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
 msgid "General"
 msgstr "Жалпы"
 
 #: ../data/gui/accounts_window.ui.h:26
-msgid "If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working."
-msgstr "Белгіленген болса, Gajim сіздің IP-ден басқа көбірек IP-ді таратады, файлдармен алмасудың істеп кетудің шансы көбірек болады."
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Белгіленген болса, Gajim сіздің IP-ден басқа көбірек IP-ді таратады, "
+"файлдармен алмасудың істеп кетудің шансы көбірек болады."
 
 #: ../data/gui/accounts_window.ui.h:27
 msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Белгіленген болса, Gajim парольді seahorse сияқты GPG агентінен алып отырады"
+msgstr ""
+"Белгіленген болса, Gajim парольді seahorse сияқты GPG агентінен алып отырады"
 
 #: ../data/gui/accounts_window.ui.h:29
-msgid "If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection"
-msgstr "Белгіленген болса, байланыс үзуіне әкелетін күту уақытының бітуін алдын-алу үшін Gajim keep-alive дестелерін жіберіп отырады"
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"Белгіленген болса, байланыс үзуіне әкелетін күту уақытының бітуін алдын-алу "
+"үшін Gajim keep-alive дестелерін жіберіп отырады"
 
 #: ../data/gui/accounts_window.ui.h:30
-msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account"
-msgstr "Белгіленген болса, Gajim қосылған кезде бұл тіркелгі үшін байланысты автоорнатады"
+msgid ""
+"If checked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
+msgstr ""
+"Белгіленген болса, Gajim қосылған кезде бұл тіркелгі үшін байланысты "
+"автоорнатады"
 
 #: ../data/gui/accounts_window.ui.h:31
-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 accordingly"
-msgstr "Белгіленген болса, глобалды қалып-күйіңіздің өзгеруі (ростер терезесі астындағы мәзір) осы тіркелгінің қалып-күйін сәйкес өзгертеді"
+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 "
+"accordingly"
+msgstr ""
+"Белгіленген болса, глобалды қалып-күйіңіздің өзгеруі (ростер терезесі "
+"астындағы мәзір) осы тіркелгінің қалып-күйін сәйкес өзгертеді"
 
 #: ../data/gui/accounts_window.ui.h:32
 msgid ""
-"If the default port that is used for incoming messages is unfitting for your setup you can select another one here.\n"
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
 "You might consider to change possible firewall settings."
 msgstr ""
-"Кіріс хабарламалары үшін бастапқы порт сізге келмесе, басқа портты осында таңдай аласыз.\n"
+"Кіріс хабарламалары үшін бастапқы порт сізге келмесе, басқа портты осында "
+"таңдай аласыз.\n"
 "Сонымен қатар файрвол баптауларын өзгертсеңіз де болады."
 
 #: ../data/gui/accounts_window.ui.h:34
@@ -332,7 +356,7 @@ msgstr "Сіз туралы ақпарат, серверде сақталған
 
 #: ../data/gui/accounts_window.ui.h:35
 #: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:830
+#: ../src/dialogs.py:831
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -346,7 +370,7 @@ msgid "Mer_ge accounts"
 msgstr "Тіркел_гілерді біріктіру"
 
 #: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2356
+#: ../src/config.py:2358
 msgid "No key selected"
 msgstr "Кілт таңдалмады"
 
@@ -359,15 +383,21 @@ msgid "Priori_ty:"
 msgstr "Приорите_т:"
 
 #: ../data/gui/accounts_window.ui.h:42
-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 client with the highest priority gets the events"
-msgstr "Приоритет - Jabber желісіндегі бір тіркелгіден бірнеше жерден серверге қосулы тұрса, қай клиент хабарламаны алатындығын анықтауда қолданылады; Приоритеті жоғарырақ клиент хабарламаны алады"
+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 "
+"client with the highest priority gets the events"
+msgstr ""
+"Приоритет - Jabber желісіндегі бір тіркелгіден бірнеше жерден серверге "
+"қосулы тұрса, қай клиент хабарламаны алатындығын анықтауда қолданылады; "
+"Приоритеті жоғарырақ клиент хабарламаны алады"
 
 #: ../data/gui/accounts_window.ui.h:43
 msgid "Priority will change automatically according to your status."
 msgstr "Приоритет сіздің қалып-күйіңізге байланысты автоөзгертіледі."
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5329
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
 msgid "Re_name"
 msgstr "Аты_н ауыстыру"
 
@@ -376,8 +406,17 @@ msgid "Resour_ce:"
 msgstr "Ресур_с:"
 
 #: ../data/gui/accounts_window.ui.h:46
-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 same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)"
-msgstr "Ресурс - Jabber желісіндегі бір тіркелгіден бірнеше жерден серверге қосулы тұрса, бір JID-ті ажырату үшін серверге жіберілетін жол. Мысалы, сіз бір тіркелгіге бір уақытта 'Үй' мен 'Жұмыс' ресурстарымен қосыла аласыз. Приоритеті жоғарырақ ресурс хабарламаларды алады (төменнен қараңыз)."
+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 "
+"same server with the same account. So you might be connected in the same "
+"account with resource 'Home' and 'Work' at the same time. The resource which "
+"has the highest priority will get the events. (see below)"
+msgstr ""
+"Ресурс - Jabber желісіндегі бір тіркелгіден бірнеше жерден серверге қосулы "
+"тұрса, бір JID-ті ажырату үшін серверге жіберілетін жол. Мысалы, сіз бір "
+"тіркелгіге бір уақытта 'Үй' мен 'Жұмыс' ресурстарымен қосыла аласыз. "
+"Приоритеті жоғарырақ ресурс хабарламаларды алады (төменнен қараңыз)."
 
 #: ../data/gui/accounts_window.ui.h:47
 msgid "Save conversation _logs for all contacts"
@@ -560,7 +599,8 @@ msgstr "<b>Анықтамасы</b>"
 
 #: ../data/gui/advanced_configuration_window.ui.h:2
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
-msgstr "<b>ЕСКЕРТУ:</b> Кейбір баптаулар іске асу үшін, Gajim-ді қайта қосуыңыз керек"
+msgstr ""
+"<b>ЕСКЕРТУ:</b> Кейбір баптаулар іске асу үшін, Gajim-ді қайта қосуыңыз керек"
 
 #: ../data/gui/advanced_configuration_window.ui.h:3
 msgid "Advanced Configuration Editor"
@@ -579,38 +619,44 @@ msgid "Deletes Message of the Day"
 msgstr "Осы күннің хабарламасын өшіреді"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
+#, fuzzy
+msgid "Edit Archi_ving Preferences"
+msgstr "_Баптаулар"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Edit _Privacy Lists..."
 msgstr "_Жекелік тізімдерін түзету..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sends a message to users currently connected to this server"
-msgstr "Бұл серверге қазір қосулы тұрған барлық пайдаланушыларға хабарлама жібереді"
+msgstr ""
+"Бұл серверге қазір қосулы тұрған барлық пайдаланушыларға хабарлама жібереді"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Set MOTD..."
 msgstr "MOTD орнату..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Осы күннің хабарламасын орнатады"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Show _XML Console"
 msgstr "XML _консолін көрсету"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "Update MOTD..."
 msgstr "MOTD жаңарту..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "Осы күннің хабарламасын жаңартады"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:11
 msgid "_Administrator"
 msgstr "Ә_кімші"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:11
+#: ../data/gui/advanced_menuitem_menu.ui.h:12
 msgid "_Send Server Message..."
 msgstr "_Сервер хабарламасын жіберу..."
 
@@ -644,7 +690,7 @@ msgid "All statuses"
 msgstr "Барлық күйлер"
 
 #: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:233
+#: ../src/common/commands.py:106 ../src/common/helpers.py:239
 #: ../src/tooltips.py:193
 msgid "Away"
 msgstr "Кетіп қалған"
@@ -690,7 +736,7 @@ msgid "Have "
 msgstr "Бар "
 
 #: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:249
 msgid "Invisible"
 msgstr "Жасырын"
 
@@ -699,7 +745,7 @@ msgid "Launch a command"
 msgstr "Команданы орындау"
 
 #: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:216 ../src/tooltips.py:197
+#: ../src/common/helpers.py:222 ../src/tooltips.py:197
 msgid "Not Available"
 msgstr "Қол жетерсіз"
 
@@ -724,8 +770,11 @@ msgid "When "
 msgstr "Қашан"
 
 #: ../data/gui/advanced_notifications_window.ui.h:27
-msgid "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr "_Есептер панелінде чат терезісі жыпылықтауы үшін терезелер басқарушысының UrgencyHint белсенді қылу"
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
+msgstr ""
+"_Есептер панелінде чат терезісі жыпылықтауы үшін терезелер басқарушысының "
+"UrgencyHint белсенді қылу"
 
 #: ../data/gui/advanced_notifications_window.ui.h:28
 msgid "_Disable auto opening chat window"
@@ -740,12 +789,13 @@ msgid "_Disable existing sound for this event"
 msgstr "Бұ_л оқиға үшін бар дыбысты сөндіру"
 
 #: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in roster"
+#, fuzzy
+msgid "_Disable showing event in notification area"
 msgstr "_Оқиғаны ростерде көрсетуді сөндіру"
 
 #: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in systray"
-msgstr "Оқ_иғаны трейде көрсетуді сөндіру"
+msgid "_Disable showing event in roster"
+msgstr "_Оқиғаны ростерде көрсетуді сөндіру"
 
 #: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
@@ -756,12 +806,13 @@ msgid "_Open chat window with user"
 msgstr "Па_йдаланушымен чат терезесін ашу"
 
 #: ../data/gui/advanced_notifications_window.ui.h:35
-msgid "_Show event in roster"
+#, fuzzy
+msgid "_Show event in notification area"
 msgstr "Оқиға_ны ростерде көрсету"
 
 #: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in systray"
-msgstr "Оқиған_ы трейде көрсету"
+msgid "_Show event in roster"
+msgstr "Оқиға_ны ростерде көрсету"
 
 #: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
@@ -787,6 +838,45 @@ msgstr "топ(тар)"
 msgid "when I'm in"
 msgstr "Мен келесіде болғанда: "
 
+#: ../data/gui/archiving_preferences_window.ui.h:1
+msgid "<i>Method Auto</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "<i>Method Local</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:3
+msgid "<i>Method Manual</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:4
+#, fuzzy
+msgid "Auto"
+msgstr "Автоматты түрде кіру"
+
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Concede"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "Forbid"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:7
+#, fuzzy
+msgid "No"
+msgstr "Ешнәрсе"
+
+#: ../data/gui/archiving_preferences_window.ui.h:8
+#, fuzzy
+msgid "Prefer"
+msgstr "Баптаулар"
+
+#: ../data/gui/archiving_preferences_window.ui.h:9
+msgid "Yes"
+msgstr ""
+
 #: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Жазба:"
@@ -813,8 +903,8 @@ msgstr "Блокталған контакттар"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5348
-#: ../src/roster_window.py:5476 ../src/roster_window.py:5609
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
+#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
 msgid "_Unblock"
 msgstr "Б_локтамау"
 
@@ -902,7 +992,7 @@ msgid "_Start Chat"
 msgstr "Чатты ба_стау"
 
 #. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4184
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
 msgid "#"
 msgstr "#"
 
@@ -950,14 +1040,51 @@ msgstr "8"
 msgid "9"
 msgstr "9"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is
-#. supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:13
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Бұл контактты ростерге қосу (Ctrl+D)"
+
 #: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Чат тарихын қарап шығу (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:15
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Контактты сөйлесуге шақыру (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Смайликтер тізімін көрсету (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
+#, fuzzy
+msgid "Show a list of formattings"
+msgstr "Смайликтер тізімін көрсету (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Смайликтер тізімін көрсету (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:19
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr "Контакт профайлын көрсету (Ctrl+I)"
+
+#: ../data/gui/chat_control.ui.h:20
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:21
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
 #: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Жіберу"
 
-#: ../data/gui/chat_control.ui.h:15 ../data/gui/groupchat_control.ui.h:3
+#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
 msgid "label"
 msgstr "белгі"
 
@@ -1007,8 +1134,8 @@ msgstr "_Топтарды түзету..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5284
-#: ../src/roster_window.py:5444
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
+#: ../src/roster_window.py:5516
 msgid "In_vite to"
 msgstr "_Шақыру"
 
@@ -1020,8 +1147,8 @@ msgstr "Контакттарды _шақыру"
 msgid "Remo_ve"
 msgstr "Ө_шіру"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5294
-#: ../src/roster_window.py:5533
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
+#: ../src/roster_window.py:5605
 msgid "Send Cus_tom Status"
 msgstr "_Ол үшін қалып-күйді орнату"
 
@@ -1054,8 +1181,8 @@ msgid "_Allow him/her to see my status"
 msgstr "Оға_н менің қалып-күйімді көруді рұқсат ету"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5482 ../src/roster_window.py:5612
+#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
+#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
 msgid "_Block"
 msgstr "_Блоктау"
 
@@ -1065,8 +1192,8 @@ msgstr "Оған _менің қалып-күйімді көруді рұқсат
 
 #: ../data/gui/contact_context_menu.ui.h:20
 #: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:21
-#: ../src/roster_window.py:5683
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
+#: ../src/roster_window.py:5755
 msgid "_History"
 msgstr "Тар_ихы"
 
@@ -1152,15 +1279,20 @@ msgstr "Тізімнен файлдармен алмасуды өшіру."
 
 #: ../data/gui/filetransfers.ui.h:9
 msgid "Removes completed, cancelled and failed file transfers from the list"
-msgstr "Тізімнен аяқталған, бас тартылған және сәтсіз аяқталған алмасуларды өшіреді"
+msgstr ""
+"Тізімнен аяқталған, бас тартылған және сәтсіз аяқталған алмасуларды өшіреді"
 
 #: ../data/gui/filetransfers.ui.h:10
 msgid "Shows a list of file transfers between you and others"
 msgstr "Сіз бен басқалар арасындағы файл алмасуларды көрсетеді"
 
 #: ../data/gui/filetransfers.ui.h:11
-msgid "This action removes single file transfer from the list. If the transfer is active, it is first stopped and then removed"
-msgstr "Бұл әрекет тізімнен бір файлдармен алмасуды өшіреді. Ол алмасу белсенді болса, алдымен тоқтатылады, содан кейін өшіріледі"
+msgid ""
+"This action removes single file transfer from the list. If the transfer is "
+"active, it is first stopped and then removed"
+msgstr ""
+"Бұл әрекет тізімнен бір файлдармен алмасуды өшіреді. Ол алмасу белсенді "
+"болса, алдымен тоқтатылады, содан кейін өшіріледі"
 
 #: ../data/gui/filetransfers.ui.h:12
 msgid "When a file transfer is complete show a popup notification"
@@ -1194,7 +1326,7 @@ msgstr "<b>Чаттары бар беттер түсі</b>"
 msgid "Account row"
 msgstr "Тіркелгі бағаны"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:925
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
 msgid "Bold"
 msgstr "Қалың"
 
@@ -1230,7 +1362,7 @@ msgstr "Топ бағаны"
 msgid "Inactive"
 msgstr "Белсенді емес"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:926
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
 msgid "Italic"
 msgstr "Көлбеу"
 
@@ -1278,7 +1410,7 @@ msgstr "_Тақырыпты өзгерту..."
 msgid "Configure _Room..."
 msgstr "_Бөлмені баптау..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1782
+#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
 msgid "_Bookmark"
 msgstr "_Бетбелгі"
 
@@ -1338,35 +1470,51 @@ msgstr "_Жеке хабарламаны жіберу..."
 msgid "_Voice"
 msgstr "_Даусы бар"
 
+#: ../data/gui/groupchat_control.ui.h:1
+#, fuzzy
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "_Бөлмені бетбелгілерге қосу"
+
+#: ../data/gui/groupchat_control.ui.h:3
+msgid "Change the room's subject (Alt+T)"
+msgstr "Бөлме тақырыбын өзгерту (Alt+T)"
+
+#: ../data/gui/groupchat_control.ui.h:4
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Сіздің ник атыңызды өзгерту (Ctrl+N)"
+
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Жаңа хабарламаны жасау"
 
-#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
-msgid "From"
-msgstr "Одан"
+#: ../data/gui/groups_post_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:2
+msgid "From:"
+msgstr "Кімнен:"
 
-#. holds subject
-#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
-#: ../src/history_manager.py:219
-msgid "Subject"
-msgstr "Тақырып"
+#: ../data/gui/groups_post_window.ui.h:3
+#: ../data/gui/single_message_window.ui.h:7
+msgid "Subject:"
+msgstr "Тақырыбы:"
 
 #: ../data/gui/history_manager.ui.h:1
 msgid ""
 "<b>WARNING:</b>\n"
-"If you plan to do massive deletions, please make sure Gajim is not running. Generally avoid deletions with contacts you currently chat with."
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
 msgstr ""
 "<b>ЕСКЕРТУ:</b>\n"
-"Топтап өшіруді жоспарласаңыз, Gajim-ның қосылмай тұрғанына көз жеткізіңіз. Жалпы айтқанда, ағымда сөйлесіп жатқан контакттар тарихын өшіруден бас тартыңыз."
+"Топтап өшіруді жоспарласаңыз, Gajim-ның қосылмай тұрғанына көз жеткізіңіз. "
+"Жалпы айтқанда, ағымда сөйлесіп жатқан контакттар тарихын өшіруден бас "
+"тартыңыз."
 
 #: ../data/gui/history_manager.ui.h:3
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Gajim тарихы логтар менеджеріне қош келдіңіз</b></big>"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3208
-#: ../src/dialogs.py:3305
+#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
+#: ../src/dialogs.py:3321
 msgid "Delete"
 msgstr "Өшіру"
 
@@ -1380,13 +1528,17 @@ msgstr "Gajim тарихы логтар менеджері"
 
 #: ../data/gui/history_manager.ui.h:7
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for such functionality, use the history window instead.\n"
+"This log manager is not intended for log viewing. If you are looking for "
+"such functionality, use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left and/or search database from below."
+"Use this program to delete or export logs. You can select logs from the left "
+"and/or search database from below."
 msgstr ""
-"Бұл логтар басқарушысы логтарды қарау үшін арналмаған. Ол үшін тарих терезесін қолданыңыз.\n"
+"Бұл логтар басқарушысы логтарды қарау үшін арналмаған. Ол үшін тарих "
+"терезесін қолданыңыз.\n"
 "\n"
-"Осыны логтарды өшіру не экспорттау үшін қолданыңыз. Логтарды сол жақтан таңдауға болады, және/немесе дерекқордан іздеуге болады."
+"Осыны логтарды өшіру не экспорттау үшін қолданыңыз. Логтарды сол жақтан "
+"таңдауға болады, және/немесе дерекқордан іздеуге болады."
 
 #: ../data/gui/history_manager.ui.h:10
 msgid "_Search Database"
@@ -1417,11 +1569,75 @@ msgstr "Іздеу:"
 msgid "_Log conversation history"
 msgstr "Чат тарихын _логқа сақтау"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
+msgid "approve"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:2
+#, fuzzy
+msgid "body"
+msgstr "әркім"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:3
+msgid "concede"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:4
+msgid "expire"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:5
+msgid "false"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:6
+msgid "forbid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:7
+#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+msgid "jid"
+msgstr "jid"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:8
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
+#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
+msgid "message"
+msgstr "хабарлама"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
+msgid "oppose"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
+#, fuzzy
+msgid "otr"
+msgstr "Ыстық"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:11
+msgid "prefer"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:12
+msgid "require"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:13
+msgid "save"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:14
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/join_groupchat_window.ui.h:2
 msgid "Bro_wse Rooms"
 msgstr "Бөлмелерді қара_п шығу"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2180
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
 msgid "Join Group Chat"
 msgstr "Бөлмеге кіру"
 
@@ -1457,8 +1673,8 @@ msgstr "Сервер:"
 msgid "_Bookmark this room"
 msgstr "_Бөлмені бетбелгілерге қосу"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1341
-#: ../src/disco.py:1786
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../src/disco.py:1804
 msgid "_Join"
 msgstr "_Кіру"
 
@@ -1468,7 +1684,8 @@ msgstr "Автоматты түрде кіру"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:2
 msgid "If checked, Gajim will join this group chat on startup"
-msgstr "Белгіленген болса, Gajim қосылғанда бұл чат бөлмесіне автоматты түрде кіреді"
+msgstr ""
+"Белгіленген болса, Gajim қосылғанда бұл чат бөлмесіне автоматты түрде кіреді"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
@@ -1558,6 +1775,75 @@ msgstr "_Пайдаланушы аты:"
 msgid "Passphrase"
 msgstr "Пароль"
 
+#: ../data/gui/plugins_window.ui.h:1
+msgid "&lt;empty&gt;"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:2
+msgid "<empty>"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:3
+#, fuzzy
+msgid "Authors:"
+msgstr "А_вторизация беру"
+
+#: ../data/gui/plugins_window.ui.h:4
+#, fuzzy
+msgid "Available"
+msgstr "Қол жетерсіз"
+
+#: ../data/gui/plugins_window.ui.h:5
+#, fuzzy
+msgid "Configure"
+msgstr "Бап_тау"
+
+#: ../data/gui/plugins_window.ui.h:6
+#, fuzzy
+msgid "Descrition:"
+msgstr "Анықтамасы: "
+
+#: ../data/gui/plugins_window.ui.h:7
+#, fuzzy
+msgid "Homepage:"
+msgstr "<b>Үй парағы:</b>"
+
+#: ../data/gui/plugins_window.ui.h:8
+msgid "Install"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:9
+#, fuzzy
+msgid "Installed"
+msgstr "Тежеліп қалған"
+
+#: ../data/gui/plugins_window.ui.h:10
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:11
+msgid "Plugins"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:12
+msgid "Uninstall"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:13
+#, fuzzy
+msgid "Version:"
+msgstr "GTK+ нұсқасы:"
+
+#: ../data/gui/plugins_window.ui.h:14
+msgid "button"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:15
+msgid "homepage url"
+msgstr ""
+
 #: ../data/gui/popup_notification_window.ui.h:1
 msgid "Event Type"
 msgstr "Оқиға түрі"
@@ -1598,8 +1884,7 @@ msgstr "<b>Чат қалып-күй хабарламалары</b>"
 msgid "<b>Connection</b>"
 msgstr "<b>Байланыс</b>"
 
-#. a header for custom browser/client/file manager. so translate sth like:
-#. Custom Settings
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:10
 msgid "<b>Custom</b>"
 msgstr "<b>Таңдауыңызша</b>"
@@ -1677,255 +1962,320 @@ msgid "Always"
 msgstr "Әрқашан"
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Always use GNOME default applications"
-msgstr "GNOME негізгі қолданбаларын қолдану"
-
-#: ../data/gui/preferences_window.ui.h:32
-msgid "Always use KDE default applications"
-msgstr "KDE негізгі қолданбаларын қолдану"
-
-#: ../data/gui/preferences_window.ui.h:33
-msgid "Always use Xfce default applications"
-msgstr "Xfce негізгі қолданбаларын қолдану"
-
-#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Күй хабарламасын сұрау:"
 
-#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
 msgid "Audio / Video"
 msgstr "Аудио / Видео"
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:33
 msgid "Audio input device"
 msgstr "Аудио енгізу құрылғысы"
 
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Audio output device"
 msgstr "Аудио шығару құрылғысы"
 
-#: ../data/gui/preferences_window.ui.h:38
-msgid "Autodetect on every Gajim startup"
-msgstr "Gajim қосылғанда, әр рет автоанықтау"
-
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:35
 msgid "Chat message:"
 msgstr "Чат хабарламасы:"
 
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:36
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Gajim әр рет қосылғанда н_егізгі Jabber клиенті ма, соны тексеру"
 
-#: ../data/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:37
 msgid "Composing only"
 msgstr "Тек жазу"
 
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:38
 msgid "Configure color and font of the interface"
 msgstr "Интерфейстің түстерін мен қарібін баптау"
 
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:39
 msgid "Contact's message:"
 msgstr "Контакт хабарламасы:"
 
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:40
 msgid "Contact's nickname:"
 msgstr "Контакт аты:"
 
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:41
 msgid "Custom"
 msgstr "Таңдауыңызша"
 
-#: ../data/gui/preferences_window.ui.h:46
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Detached roster with chat grouped by account"
 msgstr "Бөлек ростер мен тіркелгі бойынша топталған чаттар"
 
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Detached roster with chat grouped by type"
 msgstr "Бөлек ростер мен түрі бойынша топталған чаттар"
 
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Detached roster with detached chats"
 msgstr "Бөлек ростер мен бөлек чаттар"
 
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:45
 msgid "Detached roster with single chat"
 msgstr "Бөлек ростер мен бір чат"
 
-#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
-#: ../src/config.py:671
+#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
+#: ../src/config.py:665
 msgid "Disabled"
 msgstr "Сөндірулі"
 
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:47
 msgid "Display _activity of contacts in roster"
 msgstr "Ростердегі контакттардың немен _айналысқанын көрсету"
 
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:48
 msgid "Display _extra email details"
 msgstr "_Пошта ақпаратын толығырақ көрсету"
 
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:49
 msgid "Display _location of contacts in roster"
 msgstr "Ростерде_гі контакттардың орналасуын көрсету"
 
-#: ../data/gui/preferences_window.ui.h:54
+#: ../data/gui/preferences_window.ui.h:50
 msgid "Display _tunes of contacts in roster"
 msgstr "Ростердегі контакттардың т_ындайтынын көрсету"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display a_vatars of contacts in roster"
 msgstr "Ростердегі контакттардың а_ватарларын көрсету"
 
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display m_ood of contacts in roster"
 msgstr "Ростерде_гі контакттардың көңіл-күйлерін көрсету"
 
-#: ../data/gui/preferences_window.ui.h:57
+#: ../data/gui/preferences_window.ui.h:53
 msgid "Display status _messages of contacts in roster"
 msgstr "Ростердегі _контакттардың қалып-күй хабарламаларын көрсету"
 
-#: ../data/gui/preferences_window.ui.h:58
-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 display in chat windows."
-msgstr "Контактпен сөйлесу кезінде Gajim ол сөйлесуге қатысты мета-ақпаратты жібере мен қабылдай алады. Чат терезелерінде қай чат күйлерін көрсетуді осында таңдай аласыз."
+#: ../data/gui/preferences_window.ui.h:54
+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 "
+"display in chat windows."
+msgstr ""
+"Контактпен сөйлесу кезінде Gajim ол сөйлесуге қатысты мета-ақпаратты жібере "
+"мен қабылдай алады. Чат терезелерінде қай чат күйлерін көрсетуді осында "
+"таңдай аласыз."
 
-#: ../data/gui/preferences_window.ui.h:59
-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 send to the other party."
-msgstr "Контактпен сөйлесу кезінде Gajim ол сөйлесуге қатысты мета-ақпаратты жібере мен қабылдай алады. Екінші жаққа қай чат күйлерін жіберуді осында таңдай аласыз."
+#: ../data/gui/preferences_window.ui.h:55
+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 "
+"send to the other party."
+msgstr ""
+"Контактпен сөйлесу кезінде Gajim ол сөйлесуге қатысты мета-ақпаратты жібере "
+"мен қабылдай алады. Екінші жаққа қай чат күйлерін жіберуді осында таңдай "
+"аласыз."
 
-#: ../data/gui/preferences_window.ui.h:60
-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/gui/preferences_window.ui.h:56
+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/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:58
 msgid "Hide all buttons in chat windows"
 msgstr "Чат терезесіндегі барлық батырмаларды жасыру"
 
+#: ../data/gui/preferences_window.ui.h:59
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr ""
+"Белгіленген болса, Gajim басқаларға сіздің операциялық жүйеңізді анықтауға "
+"рұқсат етеді"
+
+#: ../data/gui/preferences_window.ui.h:60
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+"Белгіленген болса, Gajim жаңа эл. пошталар туралы хабарға жіберуші туралы "
+"ақпаратын қосады"
+
+#: ../data/gui/preferences_window.ui.h:61
+msgid ""
+"If checked, Gajim will change status to Away when the computer is unused."
+msgstr ""
+"Белгіленген болса, Gajim компьютеріңіз қолданылмаса, қалып-күйіңізді Кетіп "
+"қалғанға ауыстырады."
+
+#: ../data/gui/preferences_window.ui.h:62
+msgid ""
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
+msgstr ""
+"Белгіленген болса, Gajim компьютеріңіз одан да көп қолданылмаса, қалып-"
+"күйіңізді Қолжетерсізге ауыстырады."
+
 #: ../data/gui/preferences_window.ui.h:63
-msgid "If checked, Gajim will allow others to detect the operation system you are using"
-msgstr "Белгіленген болса, Gajim басқаларға сіздің операциялық жүйеңізді анықтауға рұқсат етеді"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Белгіленген болса, Gajim ростердегі мен топ чаттағы контакттар үшін "
+"аватарларын көрсетеді"
 
 #: ../data/gui/preferences_window.ui.h:64
-msgid "If checked, Gajim will also include information about the sender of the new emails"
-msgstr "Белгіленген болса, Gajim жаңа эл. пошталар туралы хабарға жіберуші туралы ақпаратын қосады"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
+msgstr ""
+"Белгіленген болса, Gajim ростердегі мен топ чаттағы контакттар үшін қалып-"
+"күй хабарламаларын көрсетеді"
 
 #: ../data/gui/preferences_window.ui.h:65
-msgid "If checked, Gajim will change status to Away when the computer is unused."
-msgstr "Белгіленген болса, Gajim компьютеріңіз қолданылмаса, қалып-күйіңізді Кетіп қалғанға ауыстырады."
+msgid ""
+"If checked, Gajim will display the activity of contacts in the roster window"
+msgstr ""
+"Белгіленген болса, Gajim ростердегі контакттар үшін белсенділігін көрсетеді"
 
 #: ../data/gui/preferences_window.ui.h:66
-msgid "If checked, Gajim will change status to Not Available when the computer has not been used even longer"
-msgstr "Белгіленген болса, Gajim компьютеріңіз одан да көп қолданылмаса, қалып-күйіңізді Қолжетерсізге ауыстырады."
+msgid ""
+"If checked, Gajim will display the location of contacts in the roster window"
+msgstr "Белгіленген болса, Gajim ростерде контакттардың орналасуын көрсетеді"
 
 #: ../data/gui/preferences_window.ui.h:67
-msgid "If checked, Gajim will display avatars of contacts in roster window and in group chats"
-msgstr "Белгіленген болса, Gajim ростердегі мен топ чаттағы контакттар үшін аватарларын көрсетеді"
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr ""
+"Белгіленген болса, Gajim ростердегі контакттар үшін көңіл-күйін көрсетеді"
 
 #: ../data/gui/preferences_window.ui.h:68
-msgid "If checked, Gajim will display status messages of contacts under the contact name in roster window and in group chats"
-msgstr "Белгіленген болса, Gajim ростердегі мен топ чаттағы контакттар үшін қалып-күй хабарламаларын көрсетеді"
+msgid ""
+"If checked, Gajim will display the tunes of contacts in the roster window"
+msgstr "Белгіленген болса, Gajim ростердегі контакттар үшін өленін көрсетеді"
 
 #: ../data/gui/preferences_window.ui.h:69
-msgid "If checked, Gajim will display the activity of contacts in the roster window"
-msgstr "Белгіленген болса, Gajim ростердегі контакттар үшін белсенділігін көрсетеді"
+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 ""
+"Белгіленген болса, Gajim чат терезелерінің енгізу өрістеріндегі емле "
+"қателерін түспен ерекшелейді. Егер өрісте оң жақ шерту арқылы тіл ерекше "
+"көрсетілмесе, сол контакт не топ чаты үшін бастапқы тіл қолданылады."
 
 #: ../data/gui/preferences_window.ui.h:70
-msgid "If checked, Gajim will display the location of contacts in the roster window"
-msgstr "Белгіленген болса, Gajim ростерде контакттардың орналасуын көрсетеді"
+msgid ""
+"If checked, Gajim will ignore incoming events from unauthorized contacts. "
+"Use with caution, because it blocks all messages from any contact that is "
+"not in the roster"
+msgstr ""
+"Белгіленген болса, Gajim авторизацияланбаған контакттар жіберген "
+"хабарламаларды елемейді. Байқап қолданыңыз, өйткені ростерде емес "
+"контакттардың барлығы блокталады"
 
 #: ../data/gui/preferences_window.ui.h:71
-msgid "If checked, Gajim will display the mood of contacts in the roster window"
-msgstr "Белгіленген болса, Gajim ростердегі контакттар үшін көңіл-күйін көрсетеді"
+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 ""
+"Белгіленген болса, Gajim шифрленген хабарламаларды тарихқа сақтайды. E2E "
+"шифрленуі қолданылса, тарихқа сақтау үшін қашықтағы жақ өз рұқсатын беруі "
+"керек екендігін ескеріңіз."
 
 #: ../data/gui/preferences_window.ui.h:72
-msgid "If checked, Gajim will display the tunes of contacts in the roster window"
-msgstr "Белгіленген болса, Gajim ростердегі контакттар үшін өленін көрсетеді"
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"Белгіленген болса, жаңа GMail эл. поштасы алынған кезде Gajim қалқымалы "
+"хабарламаны көрсетеді"
 
 #: ../data/gui/preferences_window.ui.h:73
-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 "Белгіленген болса, Gajim чат терезелерінің енгізу өрістеріндегі емле қателерін түспен ерекшелейді. Егер өрісте оң жақ шерту арқылы тіл ерекше көрсетілмесе, сол контакт не топ чаты үшін бастапқы тіл қолданылады."
+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, "
+"etc...)"
+msgstr ""
+"Белгіленген болса, Gajim хаттамаға тән қалып-күй таңбашаларын қолданады. "
+"(Мыс. Mail.ru пайдаланушылары үшін сәйкес Mail.ru Agent таңбашалары "
+"көрсетіледі)"
 
 #: ../data/gui/preferences_window.ui.h:74
-msgid "If checked, Gajim will ignore incoming events from unauthorized contacts. Use with caution, because it blocks all messages from any contact that is not in the roster"
-msgstr "Белгіленген болса, Gajim авторизацияланбаған контакттар жіберген хабарламаларды елемейді. Байқап қолданыңыз, өйткені ростерде емес контакттардың барлығы блокталады"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+msgstr ""
+"Қосулы тұрса, Gajim қалып-күй хабарламасын сұрамайды, бастапқы мәндері "
+"қолданылады."
 
 #: ../data/gui/preferences_window.ui.h:75
-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 "Белгіленген болса, Gajim шифрленген хабарламаларды тарихқа сақтайды. E2E шифрленуі қолданылса, тарихқа сақтау үшін қашықтағы жақ өз рұқсатын беруі керек екендігін ескеріңіз."
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Сөндірілмеген болса, Gajim барлық ascii ':)' түрдегі смайликтерді сәйкес "
+"сурет смайликтерімен алмастырады"
 
 #: ../data/gui/preferences_window.ui.h:76
-msgid "If checked, Gajim will show a notification when a new e-mail is received via GMail"
-msgstr "Белгіленген болса, жаңа GMail эл. поштасы алынған кезде Gajim қалқымалы хабарламаны көрсетеді"
-
-#: ../data/gui/preferences_window.ui.h:77
-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, etc...)"
-msgstr "Белгіленген болса, Gajim хаттамаға тән қалып-күй таңбашаларын қолданады. (Мыс. Mail.ru пайдаланушылары үшін сәйкес Mail.ru Agent таңбашалары көрсетіледі)"
-
-#: ../data/gui/preferences_window.ui.h:78
-msgid "If enabled, Gajim will not ask for a status message. The specified default message will be used instead."
-msgstr "Қосулы тұрса, Gajim қалып-күй хабарламасын сұрамайды, бастапқы мәндері қолданылады."
-
-#: ../data/gui/preferences_window.ui.h:79
-msgid "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons"
-msgstr "Сөндірілмеген болса, Gajim барлық ascii ':)' түрдегі смайликтерді сәйкес сурет смайликтерімен алмастырады"
-
-#: ../data/gui/preferences_window.ui.h:80
 msgid "Log _encrypted chat session"
 msgstr "_Шифрленген чат тарихын жазу"
 
-#: ../data/gui/preferences_window.ui.h:81
+#: ../data/gui/preferences_window.ui.h:77
 msgid "Ma_ke message windows compact"
 msgstr "Ха_барламалар терезесін ықшам қылу"
 
-#: ../data/gui/preferences_window.ui.h:82
+#: ../data/gui/preferences_window.ui.h:78
 msgid "Ma_nage..."
 msgstr "Б_асқару..."
 
-#: ../data/gui/preferences_window.ui.h:83
+#: ../data/gui/preferences_window.ui.h:79
 msgid "Never"
 msgstr "Ешқашан"
 
-#: ../data/gui/preferences_window.ui.h:84
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Notifications"
 msgstr "Хабарламалар"
 
-#: ../data/gui/preferences_window.ui.h:85
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Notify me about contacts that sign _in"
 msgstr "Жаңа кір_гендер туралы хабарлау"
 
-#: ../data/gui/preferences_window.ui.h:86
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Notify me about contacts that sign _out"
 msgstr "Жаңа _шыққандар туралы хабарлау"
 
-#: ../data/gui/preferences_window.ui.h:87
+#: ../data/gui/preferences_window.ui.h:83
 msgid "Notify me about it"
 msgstr "Ол туралы маған хабарлау"
 
-#: ../data/gui/preferences_window.ui.h:88
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notify on new _GMail email"
 msgstr "Жаңа GMail по_штасы туралы хабарлау"
 
-#: ../data/gui/preferences_window.ui.h:89
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Only when pending events"
 msgstr "Оқиғалар бар болса ғана"
 
-#: ../data/gui/preferences_window.ui.h:90
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Personal Events"
 msgstr "Жеке әрекеттер"
 
-#: ../data/gui/preferences_window.ui.h:91
+#: ../data/gui/preferences_window.ui.h:87
 msgid "Play _sounds"
 msgstr "Дыбы_старды ойнату"
 
-#: ../data/gui/preferences_window.ui.h:92
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Pop it up"
 msgstr "Оны қалқымалы хабарламада шығару"
 
-#: ../data/gui/preferences_window.ui.h:93
+#: ../data/gui/preferences_window.ui.h:89
 msgid "Preferences"
 msgstr "Баптаулар"
 
-#: ../data/gui/preferences_window.ui.h:94
+#: ../data/gui/preferences_window.ui.h:90
 msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
@@ -1933,187 +2283,200 @@ msgstr ""
 "STUN серверінің хост аты. Көрсетілмеген болса, Gajim серверден\n"
 "оны іздеп көреді."
 
-#: ../data/gui/preferences_window.ui.h:96
+#: ../data/gui/preferences_window.ui.h:92
 msgid "STUN server:"
 msgstr "STUN сервері:"
 
-#: ../data/gui/preferences_window.ui.h:97
+#: ../data/gui/preferences_window.ui.h:93
+msgid "Show notification area icon:"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:94
 msgid "Show only in roster"
 msgstr "Тек ростерде көрсету"
 
-#: ../data/gui/preferences_window.ui.h:98
-msgid "Show systray:"
-msgstr "Трейде көрсету:"
-
-#: ../data/gui/preferences_window.ui.h:99
+#: ../data/gui/preferences_window.ui.h:95
 msgid "Sign _in"
 msgstr "Мен _кірген"
 
-#: ../data/gui/preferences_window.ui.h:100
+#: ../data/gui/preferences_window.ui.h:96
 msgid "Sign _out"
 msgstr "Мен _шыққан кезде"
 
-#: ../data/gui/preferences_window.ui.h:101
+#: ../data/gui/preferences_window.ui.h:97
 msgid "Single window for everything"
 msgstr "Барлығы үшін де бір терезе"
 
-#: ../data/gui/preferences_window.ui.h:102
-msgid "Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text."
-msgstr "Кейбір хабарламаларда кеңейтілген құрама болуы мүмкін (пішімдеу, түстер, т.б.). Белгіленген болса, Gajim тек таза мәтінді көрсетеді."
+#: ../data/gui/preferences_window.ui.h:98
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"Кейбір хабарламаларда кеңейтілген құрама болуы мүмкін (пішімдеу, түстер, т."
+"б.). Белгіленген болса, Gajim тек таза мәтінді көрсетеді."
 
-#: ../data/gui/preferences_window.ui.h:103
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sort contacts by status"
 msgstr "Контакттарды қалып-күй бойынша сұрыптау"
 
-#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
 msgid "Status"
 msgstr "Күй"
 
-#: ../data/gui/preferences_window.ui.h:105
+#: ../data/gui/preferences_window.ui.h:101
 msgid "Status _iconset:"
 msgstr "Кү_й таңбашалары:"
 
-#: ../data/gui/preferences_window.ui.h:106
+#: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Стиль"
 
-#: ../data/gui/preferences_window.ui.h:107
+#: ../data/gui/preferences_window.ui.h:103
 msgid "T_heme:"
 msgstr "Т_емасы:"
 
-#: ../data/gui/preferences_window.ui.h:108
+#: ../data/gui/preferences_window.ui.h:104
 msgid ""
-"The auto away status message. If empty, Gajim will not change the current status message\n"
+"The auto away status message. If empty, Gajim will not change the current "
+"status message\n"
 "$S will be replaced by previous status message\n"
 "$T will be replaced by auto-away timeout"
 msgstr ""
-"Авто Кетіп қалған қалып-күй хабарламасы. Бос болса, Gajim ағымдағы күй хабарламасын өзгертпейді\n"
+"Авто Кетіп қалған қалып-күй хабарламасы. Бос болса, Gajim ағымдағы күй "
+"хабарламасын өзгертпейді\n"
 "$S алдыңғы күй хабарласымен, ал\n"
 "$T авто кетіп қалған уақыт шамасымен алмастырылады"
 
-#: ../data/gui/preferences_window.ui.h:111
+#: ../data/gui/preferences_window.ui.h:107
 msgid ""
-"The auto not available status message. If empty, Gajim will not change the current status message\n"
+"The auto not available status message. If empty, Gajim will not change the "
+"current status message\n"
 "$S will be replaced by previous status message\n"
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
-"Авто Қолжетерсіз қалып-күй хабарламасы. Бос болса, Gajim ағымдағы күй хабарламасын өзгертпейді\n"
+"Авто Қолжетерсіз қалып-күй хабарламасы. Бос болса, Gajim ағымдағы күй "
+"хабарламасын өзгертпейді\n"
 "$S алдыңғы күй хабарласымен, ал\n"
 "$T авто қолжетерсіз уақыт шамасымен алмастырылады"
 
-#: ../data/gui/preferences_window.ui.h:114
+#: ../data/gui/preferences_window.ui.h:110
 msgid "Use _transports icons"
 msgstr "_Транспорт таңбашаларын қолдану"
 
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:111
+#, fuzzy
+msgid "Use default applications"
+msgstr "KDE негізгі қолданбаларын қолдану"
+
+#: ../data/gui/preferences_window.ui.h:112
 msgid "Use system _default"
 msgstr "Жүйе _негізгілерін қолдану"
 
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:113
 msgid "Video framerate"
 msgstr "Видеоның кадр/сек қасиеті"
 
-#: ../data/gui/preferences_window.ui.h:117
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Video input device"
 msgstr "Видео енгізу құрылғысы"
 
-#: ../data/gui/preferences_window.ui.h:118
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Video output device"
 msgstr "Видео шығару құрылғысы"
 
-#: ../data/gui/preferences_window.ui.h:119
+#: ../data/gui/preferences_window.ui.h:116
 msgid "Video size"
 msgstr "Видео өлшемі"
 
-#: ../data/gui/preferences_window.ui.h:120
+#: ../data/gui/preferences_window.ui.h:117
 msgid "When new event is received:"
 msgstr "Жаңа оқиға кезінде:"
 
-#: ../data/gui/preferences_window.ui.h:121
+#: ../data/gui/preferences_window.ui.h:118
 msgid "Your message:"
 msgstr "Хабарламаңыз:"
 
-#: ../data/gui/preferences_window.ui.h:122
+#: ../data/gui/preferences_window.ui.h:119
 msgid "Your nickname:"
 msgstr "Ник атыңыз:"
 
-#: ../data/gui/preferences_window.ui.h:123
+#: ../data/gui/preferences_window.ui.h:120
 msgid "_Away after:"
 msgstr "_Кетіп қалған:"
 
-#: ../data/gui/preferences_window.ui.h:124
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Браузер:"
 
-#: ../data/gui/preferences_window.ui.h:125
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Display chat state notifications:"
 msgstr "Ча_т күй өзгеруін көрсету:"
 
-#: ../data/gui/preferences_window.ui.h:126
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Emoticons:"
 msgstr "Сма_йликтер:"
 
-#: ../data/gui/preferences_window.ui.h:127
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_File manager:"
 msgstr "Фай_лдар басқарушысы:"
 
-#: ../data/gui/preferences_window.ui.h:128
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_Highlight misspelled words"
 msgstr "Қа_те сөздерді түспен ерекшелеу"
 
-#: ../data/gui/preferences_window.ui.h:129
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ростердегі емес контакттардан оқиғаларды елемеу"
 
-#: ../data/gui/preferences_window.ui.h:130
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore rich content in incoming messages"
 msgstr "Ке_лген хабарламада кеңейтілген құраманы елемеу"
 
-#: ../data/gui/preferences_window.ui.h:131
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Log status changes of contacts"
 msgstr "К_онтакттардың күй өзгерісін тарихқа жазу"
 
-#: ../data/gui/preferences_window.ui.h:132
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Mail client:"
 msgstr "_Пошта қолданбасы:"
 
-#: ../data/gui/preferences_window.ui.h:133
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Not available after:"
 msgstr "Қ_ол жетерсіз:"
 
-#: ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Open..."
 msgstr "А_шу..."
 
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Reset to Default Colors"
 msgstr "Бас_тапқы түстерге тастау"
 
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Send chat state notifications:"
 msgstr "_Чат күй өзгеруін жіберу:"
 
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Status message:"
 msgstr "_Күй хабарламасы:"
 
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_URL highlight:"
 msgstr "URL ерек_шелеу:"
 
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_Window behavior:"
 msgstr "Т_ерезе түрі:"
 
-#: ../data/gui/preferences_window.ui.h:140
+#: ../data/gui/preferences_window.ui.h:137
 msgid "in _group chats"
 msgstr "_чат бөлмелерінде"
 
-#: ../data/gui/preferences_window.ui.h:141
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _roster"
 msgstr "р_остерде"
 
-#: ../data/gui/preferences_window.ui.h:142
+#: ../data/gui/preferences_window.ui.h:139
 msgid "minutes"
 msgstr "минуттан кейін"
 
@@ -2165,7 +2528,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Реті:"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3436
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
 msgid "Privacy List"
 msgstr "Жекелік тізімі"
 
@@ -2372,14 +2735,18 @@ msgstr "Тіркелгіні Gajim _мен серверден өшіру"
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5492 ../src/roster_window.py:5622
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
+#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
 msgid "_Remove"
 msgstr "Өші_ру"
 
 #: ../data/gui/roster_item_exchange_window.ui.h:1
-msgid "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in your roster."
-msgstr "<b>someone@somewhere.com</b> сіздің ростеріңізге бірнеше контактты<b>қосқысы</b> келеді."
+msgid ""
+"<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
+"your roster."
+msgstr ""
+"<b>someone@somewhere.com</b> сіздің ростеріңізге бірнеше "
+"контактты<b>қосқысы</b> келеді."
 
 #: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
@@ -2415,57 +2782,60 @@ msgid "Help online"
 msgstr "Интернеттен көмекті қарау"
 
 #: ../data/gui/roster_window.ui.h:8
+msgid "P_lugins"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:9
 msgid "Profile, A_vatar"
 msgstr "Профайл, а_ватар"
 
-#: ../data/gui/roster_window.ui.h:9
+#: ../data/gui/roster_window.ui.h:10
 msgid "Show Only _Active Contacts"
 msgstr "Те_к белсенді контакттарды көрсету"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
 msgid "Show Trans_ports"
 msgstr "Транс_порттарды көрсету"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
 msgid "Show _Offline Contacts"
 msgstr "Желіде _еместерді көрсету"
 
-#: ../data/gui/roster_window.ui.h:12 ../src/statusicon.py:326
+#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
 msgid "Show _Roster"
 msgstr "_Ростерді көрсету"
 
-#: ../data/gui/roster_window.ui.h:13
+#: ../data/gui/roster_window.ui.h:14
 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/gui/roster_window.ui.h:14
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/roster_window.ui.h:15
 #: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "Әрек_ет"
 
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
 msgid "_Contents"
 msgstr "Құра_масы"
 
-#: ../data/gui/roster_window.ui.h:18 ../src/disco.py:1502
+#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
 msgid "_Edit"
 msgstr "Тү_зету"
 
-#: ../data/gui/roster_window.ui.h:19
+#: ../data/gui/roster_window.ui.h:20
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Help"
 msgstr "_Көмек"
 
-#: ../data/gui/roster_window.ui.h:22
+#: ../data/gui/roster_window.ui.h:23
 msgid "_Send Single Message..."
 msgstr "Бі_р хабарламаны жіберу..."
 
-#: ../data/gui/roster_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:25
 msgid "_View"
 msgstr "_Түрі"
 
@@ -2482,11 +2852,11 @@ msgid "_Add contact"
 msgstr "_Контакт қосу"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5634
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
 msgid "_Information"
 msgstr "_Ақпараты"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1353
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
 msgid "_Search"
 msgstr "І_здеу"
 
@@ -2506,10 +2876,6 @@ msgstr "Қайда тіркелу:"
 msgid "_Cancel"
 msgstr "_Бас тарту"
 
-#: ../data/gui/single_message_window.ui.h:2
-msgid "From:"
-msgstr "Кімнен:"
-
 #: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Бұл хабарламаға жауап беру"
@@ -2526,10 +2892,6 @@ msgstr "Хабарламаны жіберу"
 msgid "Send message and close window"
 msgstr "Хабарламаны жіберу мен терезені жабу"
 
-#: ../data/gui/single_message_window.ui.h:7
-msgid "Subject:"
-msgstr "Тақырыбы:"
-
 #: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Кімге:"
@@ -2551,8 +2913,12 @@ msgid "Authorize contact so he or she can know when you're connected"
 msgstr "Контакт сіздің желіде бар болуын білуі үшін оны авторизациялаңыз"
 
 #: ../data/gui/subscription_request_window.ui.h:3
-msgid "Deny authorization from contact so he or she cannot know when you're connected"
-msgstr "Контакт сіздің желіде бар болуын білмеуі үшін оның авторизацияға сұранымын блоктаңыз"
+msgid ""
+"Deny authorization from contact so he or she cannot know when you're "
+"connected"
+msgstr ""
+"Контакт сіздің желіде бар болуын білмеуі үшін оның авторизацияға сұранымын "
+"блоктаңыз"
 
 #: ../data/gui/subscription_request_window.ui.h:4
 msgid "Subscription Request"
@@ -2689,9 +3055,7 @@ msgstr "Бар болу stanzas жасыру"
 msgid "Info/Query"
 msgstr "Ақпарат/Сұрау"
 
-#. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad
-#. idea unless you are sure your lang has this somehow else translated (NOTE:
-#. xml still will still say <iq in your language (of course))
+#. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
 #: ../data/gui/xml_console_window.ui.h:13
 msgid "_IQ"
 msgstr "_IQ"
@@ -2736,24 +3100,36 @@ msgstr "Gajim жедел хабарласу"
 msgid "Jabber IM Client"
 msgstr "Jabber IM Клиенті"
 
-#: ../src/adhoc_commands.py:314
+#: ../src/adhoc_commands.py:323
 msgid "Cancel confirmation"
 msgstr "Растауды тайдыру"
 
-#: ../src/adhoc_commands.py:315
-msgid "You are in process of executing command. Do you really want to cancel it?"
-msgstr "Сіз қазір команданы орындаудасыз. Одан баст тартуды шынымен қалайсыз ба?"
+#: ../src/adhoc_commands.py:324
+msgid ""
+"You are in process of executing command. Do you really want to cancel it?"
+msgstr ""
+"Сіз қазір команданы орындаудасыз. Одан баст тартуды шынымен қалайсыз ба?"
+
+#: ../src/adhoc_commands.py:370
+#, fuzzy
+msgid "Invalid Form"
+msgstr "Қате бөлме"
 
-#: ../src/adhoc_commands.py:351 ../src/adhoc_commands.py:374
+#: ../src/adhoc_commands.py:371
+#, fuzzy
+msgid "The form is not filled correctly."
+msgstr "Ник аты ішінде рұқсат етілмеген таңбалар бар."
+
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
 msgid "Service sent malformed data"
 msgstr "Қызмет қате ақпаратты жіберген"
 
-#: ../src/adhoc_commands.py:360
+#: ../src/adhoc_commands.py:399
 msgid "Service changed the session identifier."
 msgstr "Қызмет сессия анықтағышын өзгерткен."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:471
+#: ../src/adhoc_commands.py:513
 msgid "Service returned an error."
 msgstr "Қызмет қатені қайтарған."
 
@@ -2778,7 +3154,7 @@ msgstr "Бүтін сан"
 msgid "Text"
 msgstr "Мәтін"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:945
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
 msgid "Color"
 msgstr "Түс"
 
@@ -2813,234 +3189,238 @@ msgstr[1] "Сізде жаңа мәліметтер бар (және %d көрс
 #. 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)
+#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "English"
 msgstr "Ағылшын"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Belarusian"
 msgstr "Беларус"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Bulgarian"
 msgstr "Болгар"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Breton"
 msgstr "Бретон"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Czech"
 msgstr "Чех"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "German"
 msgstr "Неміс"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Greek"
 msgstr "Грек"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "British"
 msgstr "Британиялық"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Esperanto"
 msgstr "Эсперанто"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Spanish"
 msgstr "Испаниялық"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Basque"
 msgstr "Баск"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "French"
 msgstr "Француз"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Croatian"
 msgstr "Хорватиялық"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Italian"
 msgstr "Италияндық"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian (b)"
 msgstr "Норвегиялық (b)"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Dutch"
 msgstr "Голландия"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian"
 msgstr "Норвегиялық"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Polish"
 msgstr "Поляк"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Portuguese"
 msgstr "Португалдық"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Brazilian Portuguese"
 msgstr "Бразилия португалдық"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Russian"
 msgstr "Орыс"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Serbian"
 msgstr "Сербиялық"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Slovak"
 msgstr "Словак"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Swedish"
 msgstr "Швециялық"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Chinese (Ch)"
 msgstr "Қытай (Ch)"
 
-#: ../src/chat_control.py:479
+#: ../src/chat_control.py:496
 msgid "Spelling language"
 msgstr "Емле тілі"
 
 #. we are not connected
-#: ../src/chat_control.py:511 ../src/chat_control.py:720
+#: ../src/chat_control.py:528 ../src/chat_control.py:737
 msgid "A connection is not available"
 msgstr "Байланыс қолжетерсіз"
 
-#: ../src/chat_control.py:512 ../src/chat_control.py:721
+#: ../src/chat_control.py:529 ../src/chat_control.py:738
 msgid "Your message can not be sent until you are connected."
 msgstr "Хабарламаңыз байланыс орнатпағанша жіберілмейді."
 
-#: ../src/chat_control.py:927
+#: ../src/chat_control.py:944
 msgid "Underline"
 msgstr "Асты сызылған"
 
-#: ../src/chat_control.py:928
+#: ../src/chat_control.py:945
 msgid "Strike"
 msgstr "Сызылған"
 
-#: ../src/chat_control.py:951
+#: ../src/chat_control.py:968
 msgid "Font"
 msgstr "Қаріп"
 
-#: ../src/chat_control.py:960
+#: ../src/chat_control.py:977
 msgid "Clear formating"
 msgstr "Пішімдеуді тазарту"
 
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1055
 msgid "Really send file?"
 msgstr "Файлды шынымен жіберу керек пе?"
 
-#: ../src/chat_control.py:1039
+#: ../src/chat_control.py:1056
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr "Егер сіз файлды %s-қа жіберсеңіз, ол сіздің шын Jabber ID-ді білетін болады."
+msgstr ""
+"Егер сіз файлды %s-қа жіберсеңіз, ол сіздің шын Jabber ID-ді білетін болады."
 
-#: ../src/chat_control.py:1503 ../src/chat_control.py:1987
+#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
 msgid "GPG encryption enabled"
 msgstr "GPG шифрлеу қосулы"
 
 #. Add to roster
-#: ../src/chat_control.py:1528 ../src/common/contacts.py:158
+#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
 #: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:245 ../src/dialogs.py:1064 ../src/dialogs.py:2078
-#: ../src/dialogs.py:2107 ../src/gui_interface.py:674
+#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
+#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
 #: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1610 ../src/roster_window.py:1612
-#: ../src/roster_window.py:1942 ../src/roster_window.py:3289
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
+#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
+#: ../src/roster_window.py:3382
 msgid "Not in Roster"
 msgstr "Ростерде емес"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1575
 msgid "This contact does not support file transfer."
 msgstr "Контакт файлдармен алмасуды қолдамайды."
 
-#: ../src/chat_control.py:1561
+#: ../src/chat_control.py:1578
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr "Контактқа файлды жіберу үшін сізге оның шын JID-н білу керек."
 
-#: ../src/chat_control.py:1656
+#: ../src/chat_control.py:1677
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s қалып-күйі : %(state)s, себебі: %(reason)s"
 
-#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:1869
 #, 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:1967 ../src/dialogs.py:4866
+#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
 msgid "No GPG key assigned"
 msgstr "GPG кілті көрсетілмеген"
 
-#: ../src/chat_control.py:1968
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages with GPG."
-msgstr "Бұл конттактқа ешбір GPG кілті көрсетілмеген. Сол үшін хабарламаларды GPG көмегімен шифрлей алмайсыз."
+#: ../src/chat_control.py:1991
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+msgstr ""
+"Бұл конттактқа ешбір GPG кілті көрсетілмеген. Сол үшін хабарламаларды GPG "
+"көмегімен шифрлей алмайсыз."
 
-#: ../src/chat_control.py:1977
+#: ../src/chat_control.py:2000
 msgid "GPG encryption disabled"
 msgstr "GPG шифрлеуі сөндірулі"
 
-#: ../src/chat_control.py:2003
+#: ../src/chat_control.py:2026
 msgid "Session WILL be logged"
 msgstr "Сессия тарихы САҚТАЛАДЫ"
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:2028
 msgid "Session WILL NOT be logged"
 msgstr "Сессия тарихы САҚТАЛАМАЙДЫ"
 
 #. encryption %s active
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is"
 msgstr "белсенді"
 
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is NOT"
 msgstr "белсенді ЕМЕС"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will"
 msgstr "сақталады"
 
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will NOT"
 msgstr "сақталМАЙды"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2051
 msgid "and authenticated"
 msgstr "аутентификацияланған"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2032
+#: ../src/chat_control.py:2055
 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:2039
+#: ../src/chat_control.py:2062
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3049,62 +3429,81 @@ msgstr ""
 "%(type)s түрдегі шифрлену %(status)s және %(authenticated)s.\n"
 "Сөйлесу сессия тарихыңыз %(logged)s."
 
-#: ../src/chat_control.py:2182
+#: ../src/chat_control.py:2205
 msgid "Session negotiation cancelled"
 msgstr "Сессияны бастаудан бас тартылды"
 
-#: ../src/chat_control.py:2191
+#: ../src/chat_control.py:2215
+msgid "This session WILL be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2217
+#, fuzzy
+msgid "This session WILL NOT be archived on server"
+msgstr "Сессия тарихы САҚТАЛАМАЙДЫ"
+
+#: ../src/chat_control.py:2226
 msgid "This session is encrypted"
 msgstr "Бұл сессия шифрленген"
 
-#: ../src/chat_control.py:2194
+#: ../src/chat_control.py:2229
 msgid " and WILL be logged"
 msgstr " және оның тарихы САҚТАЛАДЫ"
 
-#: ../src/chat_control.py:2196
+#: ../src/chat_control.py:2231
 msgid " and WILL NOT be logged"
 msgstr " және оның тарихы САҚТАЛМАЙАДЫ"
 
-#: ../src/chat_control.py:2201
-msgid "Remote contact's identity not verified. Click the shield button for more details."
-msgstr "Қашықтағы контакттың шындылығы расталмаған. Көбірек білу үшін таңбашаға шертіңіз."
+#: ../src/chat_control.py:2236
+msgid ""
+"Remote contact's identity not verified. Click the shield button for more "
+"details."
+msgstr ""
+"Қашықтағы контакттың шындылығы расталмаған. Көбірек білу үшін таңбашаға "
+"шертіңіз."
 
-#: ../src/chat_control.py:2203
+#: ../src/chat_control.py:2238
 msgid "E2E encryption disabled"
 msgstr "E2E шифрлену сөндірулі"
 
-#: ../src/chat_control.py:2241 ../src/chat_control.py:2254
+#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
 msgid "The following message was NOT encrypted"
 msgstr "Келесі хабарлама шифрленген ЕМЕС болған"
 
-#: ../src/chat_control.py:2247
+#: ../src/chat_control.py:2288
 msgid "The following message was encrypted"
 msgstr "Келесі хабарлама шифрленген болған"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2519
+#: ../src/chat_control.py:2566
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Сіз жаңа ғана \"%s\" жіберген жаңа хабарламаны алдыңыз"
 
-#: ../src/chat_control.py:2520
-msgid "If you close this tab and you have history disabled, this message will be lost."
-msgstr "Егер сіз бұл бетті жауып, тарихты сақтау сөндірілген болса, бұл хабарлама жоғалтылады."
+#: ../src/chat_control.py:2567
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Егер сіз бұл бетті жауып, тарихты сақтау сөндірілген болса, бұл хабарлама "
+"жоғалтылады."
 
-#: ../src/chat_control.py:2663 ../src/common/connection_handlers.py:1635
-#: ../src/common/connection_handlers.py:1758
-#: ../src/common/connection_handlers.py:1960
-#: ../src/common/connection_handlers.py:2110 ../src/common/connection.py:452
+#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
 #: ../src/gajim.py:159 ../src/session.py:138
 msgid "Database Error"
 msgstr "Дерекқор қатесі"
 
-#: ../src/chat_control.py:2664
+#: ../src/chat_control.py:2714
 #, python-format
-msgid "The database file (%s) cannot be read. Try to repair it or remove it (all history will be lost)."
-msgstr "Дерекқор файлын (%s) оқу мүмкін емес. Оны қалпына келтіріп көріңіз не өшіріңіз (бар тарих жоғалады)."
+msgid ""
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
+"history will be lost)."
+msgstr ""
+"Дерекқор файлын (%s) оқу мүмкін емес. Оны қалпына келтіріп көріңіз не "
+"өшіріңіз (бар тарих жоғалады)."
 
-#: ../src/chat_control.py:2906
+#: ../src/chat_control.py:2962
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s қазір %(status)s"
@@ -3117,28 +3516,28 @@ msgstr "логтар дерекқорын жасау"
 msgid "creating cache database"
 msgstr "кэш дерекқорын жасау"
 
-#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
-#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
-#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
-#: ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s файл екен, алайда бума болуы тиіс еді"
 
-#: ../src/common/check_paths.py:275 ../src/common/check_paths.py:282
-#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
-#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
-#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:333
+#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
+#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
+#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
 msgid "Gajim will now exit"
 msgstr "Gajim қазір өз жұмысын аяқтайды"
 
-#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
+#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s бума екен, алайда файл болуы керек еді"
 
-#: ../src/common/check_paths.py:342
+#: ../src/common/check_paths.py:351
 #, python-format
 msgid "creating %s directory"
 msgstr "'%s' бумасын жасау"
@@ -3202,9 +3601,9 @@ msgstr "Шығу үшін топ чаттарын таңдаңыз"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:801
-#: ../src/roster_window.py:1614 ../src/roster_window.py:1616
-#: ../src/roster_window.py:5251
+#: ../src/common/helpers.py:57 ../src/roster_window.py:815
+#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
+#: ../src/roster_window.py:5323
 msgid "Groupchats"
 msgstr "Топтық чаттар"
 
@@ -3246,7 +3645,9 @@ msgstr "$S (Кетіп қалған, $T минуттан көп белсенді
 
 #: ../src/common/config.py:82
 msgid "$S will be replaced by current status message, $T by autoaway time."
-msgstr "$S ағымдағы күй хабарласымен, ал $T авто қолжетерсіз уақыт шамасымен алмастырылады."
+msgstr ""
+"$S ағымдағы күй хабарласымен, ал $T авто қолжетерсіз уақыт шамасымен "
+"алмастырылады."
 
 #: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
@@ -3258,11 +3659,17 @@ msgstr "$S (Қол жетерсіз, $T минуттан көп белсенді
 
 #: ../src/common/config.py:85
 msgid "$S will be replaced by current status message, $T by autoxa time."
-msgstr "$S ағымдағы күй хабарласымен, ал $T авто кеңейтілген қолжетерсізге уақыт шамасымен алмастырылады."
+msgstr ""
+"$S ағымдағы күй хабарласымен, ал $T авто кеңейтілген қолжетерсізге уақыт "
+"шамасымен алмастырылады."
 
 #: ../src/common/config.py:88
-msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
-msgstr "Трей таңбашасын қашан көрсету керек. Мүмкін мәндері: 'never', 'on_event', 'always'."
+#, fuzzy
+msgid ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+msgstr ""
+"Трей таңбашасын қашан көрсету керек. Мүмкін мәндері: 'never', 'on_event', "
+"'always'."
 
 #: ../src/common/config.py:93
 msgid "Incoming nickname color."
@@ -3305,13 +3712,15 @@ msgid "Status message text font."
 msgstr "Күй хабарламасы мәтін қарібі."
 
 #: ../src/common/config.py:105
-msgid "List (space separated) of rows (accounts and groups) that are collapsed."
-msgstr "Жиналған жолдар (тіркелгілер мен топтар) тізімі (бос аралықпен ажыратылсын)."
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+"Жиналған жолдар (тіркелгілер мен топтар) тізімі (бос аралықпен ажыратылсын)."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:501
-#: ../src/common/optparser.py:290 ../src/common/optparser.py:486
-#: ../src/common/optparser.py:520 ../src/gui_interface.py:3370
+#: ../src/common/config.py:106 ../src/common/config.py:505
+#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
+#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
 msgid "default"
 msgstr "бастапқысы"
 
@@ -3330,32 +3739,63 @@ msgstr ""
 "'never' - уақытты ешқашан көрсетпеу."
 
 #: ../src/common/config.py:114
-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 "Чаттарда уақытты Қызық Сағат көмегімен шығару. Қызықтылық мәні 1 мен 4 арасында, 0 ол сағатты сөндіреді. 1 тура сағат үшін, 4 ең тура емес үшін. Бұл тек print_time опциясы 'sometimes' мәнінде болса ғана қолданылады."
+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 ""
+"Чаттарда уақытты Қызық Сағат көмегімен шығару. Қызықтылық мәні 1 мен 4 "
+"арасында, 0 ол сағатты сөндіреді. 1 тура сағат үшін, 4 ең тура емес үшін. "
+"Бұл тек print_time опциясы 'sometimes' мәнінде болса ғана қолданылады."
 
 #: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "* / _ жұптарын мүмкін пішімдеу таңбалары ретінде қарастыру."
 
 #: ../src/common/config.py:118
-msgid "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr "Белсенді болса, */_ өшірілмейді. Мысалы, *abc* жуан қаріппен көрсетіледі, бірақ * * өшірілмейді."
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"Белсенді болса, */_ өшірілмейді. Мысалы, *abc* жуан қаріппен көрсетіледі, "
+"бірақ * * өшірілмейді."
 
 #: ../src/common/config.py:121
-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 "HTML жіберу үшін ReStructured text markup қолдану, және таңдалған болса, ascii пішімдеу. Синтаксисі үшін, http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html  қараңыз (Осыны қолданам десеңіз, docutils орнатыңыз)"
+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 ""
+"HTML жіберу үшін ReStructured text markup қолдану, және таңдалған болса, "
+"ascii пішімдеу. Синтаксисі үшін, http://docutils.sourceforge.net/docs/ref/"
+"rst/restructuredtext.html  қараңыз (Осыны қолданам десеңіз, docutils "
+"орнатыңыз)"
 
 #: ../src/common/config.py:130
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr "Топтық чатта ник аттарын автотолықтыру (tab пернесі) қолдану кезінде ник атының артына қосылатын таңба."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Топтық чатта ник аттарын автотолықтыру (tab пернесі) қолдану кезінде ник "
+"атының артына қосылатын таңба."
 
 #: ../src/common/config.py:131
-msgid "Character to propose to add after desired nickname when desired nickname is used by someone else in group chat."
-msgstr "Таңдалған ник атын чатта біреу қолданып тұрса, ол ник аты артына қосуға ұсынылатын таңба."
+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:159
-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 "Бұл опция сізге сөйлесулердегі уақыт көрсетілуін баптауға мүмкіндік береді. Мысалы, \"[%H:%M] \" болса, \"[сағат:минут] \" ретінде көрсетіледі. Көбірек білу үшін python құжаттамасынан strftime үшін ақпаратты қараңыз: http://docs.python.org/lib/module-time.html"
+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 ""
+"Бұл опция сізге сөйлесулердегі уақыт көрсетілуін баптауға мүмкіндік береді. "
+"Мысалы, \"[%H:%M] \" болса, \"[сағат:минут] \" ретінде көрсетіледі. Көбірек "
+"білу үшін python құжаттамасынан strftime үшін ақпаратты қараңыз: http://docs."
+"python.org/lib/module-time.html"
 
 #: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
@@ -3366,16 +3806,23 @@ msgid "Characters that are printed after the nickname in conversations"
 msgstr "Сөйлесулерде ник атынан кейін қойылатын таңбалар"
 
 #: ../src/common/config.py:164
-msgid "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
-msgstr "Жаңа эл. пошта келген кезде жөнелтілетін команданы көрсетіңіз, мыс.: /usr/bin/getmail -q"
+msgid ""
+"Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
+msgstr ""
+"Жаңа эл. пошта келген кезде жөнелтілетін команданы көрсетіңіз, мыс.: /usr/"
+"bin/getmail -q"
 
 #: ../src/common/config.py:166
 msgid "Add * and [n] in roster title?"
 msgstr "Ростер атауына * мен [n] қосу керек пе?"
 
 #: ../src/common/config.py:167
-msgid "How many lines to remember from previous conversation when a chat tab/window is reopened."
-msgstr "Чат беті/терезесі қайта ашылған кезде алдыңғы сөйлесуден қанша тарих жолын есте сақтау керек."
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr ""
+"Чат беті/терезесі қайта ашылған кезде алдыңғы сөйлесуден қанша тарих жолын "
+"есте сақтау керек."
 
 #: ../src/common/config.py:168
 msgid "How many minutes should last lines from previous conversation last."
@@ -3387,15 +3834,25 @@ msgstr "Топ чатына кірген кезде серверден қанш
 
 #: ../src/common/config.py:170
 msgid "How many minutes back to request logs when a entering a groupchat."
-msgstr "Топ чатына кірген кезде қанша минут бұрынғы сөйлесулердің тарих жолдарын сұрау керек."
+msgstr ""
+"Топ чатына кірген кезде қанша минут бұрынғы сөйлесулердің тарих жолдарын "
+"сұрау керек."
 
 #: ../src/common/config.py:171
-msgid "How many seconds to wait before trying to autorejoin to a conference you are being disconnected from. Set to 0 to disable autorejoining."
-msgstr "Конференциядан шыққан кезде қанша минуттан кейін оған авто түрде кіру талабын жасау. Өздігінен кіруді сөндіру үшін 0-ге орнатыңыз."
+msgid ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
+msgstr ""
+"Конференциядан шыққан кезде қанша минуттан кейін оған авто түрде кіру "
+"талабын жасау. Өздігінен кіруді сөндіру үшін 0-ге орнатыңыз."
 
 #: ../src/common/config.py:173
-msgid "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour)."
-msgstr "Хабарламаларды Ctrl+Enter басқанда жіберу, ал Enter жаңа жолға өтеді (Mirabilis ICQ клиенті сияқты)."
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Хабарламаларды Ctrl+Enter басқанда жіберу, ал Enter жаңа жолға өтеді "
+"(Mirabilis ICQ клиенті сияқты)."
 
 #: ../src/common/config.py:175
 msgid "How many lines to store for Ctrl+KeyUP."
@@ -3403,55 +3860,95 @@ msgstr "Ctrl+KeyUP үшін қанша тарих жолын сақтау кер
 
 #: ../src/common/config.py:178
 #, python-format
-msgid "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary."
-msgstr "%s бар таңдауыңызша сілтеме, бұл жерде %s - сөз не мәтін, немесе 'WIKTIONARY', яғни, wiktionary қолдану."
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"%s бар таңдауыңызша сілтеме, бұл жерде %s - сөз не мәтін, немесе "
+"'WIKTIONARY', яғни, wiktionary қолдану."
 
 #: ../src/common/config.py:181
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Белгіленсе, Gajim-ді қашықтан gajim-remote қолданып басқаруға болады."
 
 #: ../src/common/config.py:182
-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 False and they sync with global status) based upon the status of the network connection."
-msgstr "Белсенді болса, NetworkManager жіберген D-Bus сигналдарын тыңдау мен тіркелгілердің қалып-күйлерін желілік байланыс күйіне сәйкес орнату (тек оларда listen_to_network_manager сөндірілмеген және олар глобалды қалып-күймен сихрондалса)."
+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 "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+"Белсенді болса, NetworkManager жіберген D-Bus сигналдарын тыңдау мен "
+"тіркелгілердің қалып-күйлерін желілік байланыс күйіне сәйкес орнату (тек "
+"оларда listen_to_network_manager сөндірілмеген және олар глобалды қалып-"
+"күймен сихрондалса)."
 
 #: ../src/common/config.py:183
-msgid "Sent chat state notifications. Can be one of all, composing_only, disabled."
-msgstr "Сөйлесудің күйі туралы хабарлау. Мүмкін нұсқалары: all (барлығы), composing_only (тек жазу туралы), disabled (сөндірілген)."
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+"Сөйлесудің күйі туралы хабарлау. Мүмкін нұсқалары: all (барлығы), "
+"composing_only (тек жазу туралы), disabled (сөндірілген)."
 
 #: ../src/common/config.py:184
-msgid "Displayed chat state notifications in chat windows. Can be one of all, composing_only, disabled."
-msgstr "Чат терезесінде сөйлесудің күйін көрсету. Мүмкін нұсқалары: all (барлығы), composing_only (тек жазу туралы), disabled (сөндірілген)."
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+"Чат терезесінде сөйлесудің күйін көрсету. Мүмкін нұсқалары: all (барлығы), "
+"composing_only (тек жазу туралы), disabled (сөндірілген)."
 
 #: ../src/common/config.py:186
-msgid "When not printing time for every message (print_time==sometimes), print it every x minutes."
-msgstr "Әр хабарлама үшін уақытты көрсетпеу кезде (print_time==sometimes), оны әр x минут сайын көрсету."
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+"Әр хабарлама үшін уақытты көрсетпеу кезде (print_time==sometimes), оны әр x "
+"минут сайын көрсету."
 
 #: ../src/common/config.py:187
 msgid "Ask before closing a group chat tab/window."
 msgstr "Топ чат беті/терезесін жабу алдында сұрау."
 
 #: ../src/common/config.py:188
-msgid "Always ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Бұл тізімдегі бөлмелерді жабу алдында әрқашан сұрау. Бөлмелер бос аралықпен ажыратылсын."
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Бұл тізімдегі бөлмелерді жабу алдында әрқашан сұрау. Бөлмелер бос аралықпен "
+"ажыратылсын."
 
 #: ../src/common/config.py:189
-msgid "Never ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Бұл тізімдегі бөлмелерді жабу алдында ешқашан сұрамау. Бөлмелер бос аралықпен ажыратылсын."
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Бұл тізімдегі бөлмелерді жабу алдында ешқашан сұрамау. Бөлмелер бос "
+"аралықпен ажыратылсын."
 
 #: ../src/common/config.py:190
-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 "Беттері бар терезені жабу алдында сұрау, егер ақпаратты жоғалту мүмкіндігі болса (чат, жеке чат, қайырылмайтын топтық чат)"
+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:193
-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 "Жергілікті интерфейстерге қоса, үтірмен ажыратылған хост аттары, адрес/порттар бағдарлауы кезінде Файлдармен алмасу үшін оларды жібереміз."
+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:195
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC стандарты КиБ = 1024 байт, ал КБ = 1000 байтқа тең деп айтады."
 
 #: ../src/common/config.py:197
-msgid "Notify of events in the system trayicon."
+#, fuzzy
+msgid "Notify of events in the notification area."
 msgstr "Оқиғалар жөнінде трейде көрсету."
 
 #: ../src/common/config.py:203
@@ -3467,48 +3964,93 @@ msgid "Show close button in tab?"
 msgstr "Бет үшін жабу батырмасын көрсету керек пе?"
 
 #: ../src/common/config.py:206
-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 numbers are more secure, but take longer to calculate when you start a session."
-msgstr "Diffie-Hellman қолдану үшін modp топтар тізімі, үлкенірек баптау бірінші болсын, үтірмен ажыратылсын. Дұрыс топтар 1, 2, 5, 14, 15, 16, 17 және 18. Үлкенірек нөмірлер қауіпсіздігі жоғарырақ, бірақ сессияны бастау кезінде оны есептеу үшін көбірек уақыт кетеді."
+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 "
+"numbers are more secure, but take longer to calculate when you start a "
+"session."
+msgstr ""
+"Diffie-Hellman қолдану үшін modp топтар тізімі, үлкенірек баптау бірінші "
+"болсын, үтірмен ажыратылсын. Дұрыс топтар 1, 2, 5, 14, 15, 16, 17 және 18. "
+"Үлкенірек нөмірлер қауіпсіздігі жоғарырақ, бірақ сессияны бастау кезінде оны "
+"есептеу үшін көбірек уақыт кетеді."
 
 #: ../src/common/config.py:215
 msgid "Preview new messages in notification popup?"
 msgstr "Жаңа хабарламаларды қалқымалы терезеде көрсету керек пе?"
 
 #: ../src/common/config.py:220
-msgid "A semicolon-separated list of words that will be highlighted in group chats."
-msgstr "Топтық чаттарда түспен ерекшелеу үшін сөздер тізімі, нүктелі үтірмен ажыратылсын."
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+msgstr ""
+"Топтық чаттарда түспен ерекшелеу үшін сөздер тізімі, нүктелі үтірмен "
+"ажыратылсын."
 
 #: ../src/common/config.py:221
-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 "Белсенді болса, Терезелер басқарушысы ұсынған X батырмасын шерткенеде Gajim жұмысын аяқтайды. Тек трей таңбашасы қосулы болу керек."
+#, fuzzy
+msgid ""
+"If True, quits Gajim when X button of Window Manager is clicked. This "
+"setting is taken into account only if notification icon is used."
+msgstr ""
+"Белсенді болса, Терезелер басқарушысы ұсынған X батырмасын шерткенеде Gajim "
+"жұмысын аяқтайды. Тек трей таңбашасы қосулы болу керек."
 
 #: ../src/common/config.py:222
-msgid "If True, Gajim will check if it's the default jabber client on each startup."
-msgstr "Белсенді болса, Gajim әр қосылған кезде жүйеде негізгі jabber клиенті ма, соны тексереді."
+msgid ""
+"If True, Gajim will check if it's the default jabber client on each startup."
+msgstr ""
+"Белсенді болса, Gajim әр қосылған кезде жүйеде негізгі jabber клиенті ма, "
+"соны тексереді."
 
 #: ../src/common/config.py:223
-msgid "If True, Gajim will display an icon on each tab containing unread messages. Depending on the theme, this icon may be animated."
-msgstr "Белгіленген болса, Gajim оқылмаған хабарламалар бар әр бетте таңбашаны көрсетеді. Темаға байланысты, таңбашаның анимациясы болуы мүмкін."
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"Белгіленген болса, Gajim оқылмаған хабарламалар бар әр бетте таңбашаны "
+"көрсетеді. Темаға байланысты, таңбашаның анимациясы болуы мүмкін."
 
 #: ../src/common/config.py:224
-msgid "If True, Gajim will display the status message, if not empty, for every contact under the contact name in roster window."
-msgstr "Белгіленген болса, Gajim ростерде әр контакт астында оның қалып-күй хабарламасын көрсетеді, егер ол бар болса."
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+msgstr ""
+"Белгіленген болса, Gajim ростерде әр контакт астында оның қалып-күй "
+"хабарламасын көрсетеді, егер ол бар болса."
 
 #: ../src/common/config.py:230
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr "Ростердегі аватар орналасуын орнатады. left не right бола алады"
 
 #: ../src/common/config.py:231
-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 әр контакттан аватарды сұрайды, егер оның соңғы рет аватары болмаса, не кэштегі аватар тым ескі болса."
+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:232
-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 "Сөндірілген болса, Gajim чаттарда контакт өз күйін не күй хабарламасын өзгертсе, күй жолын енді жазбайды."
+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 ""
+"Сөндірілген болса, Gajim чаттарда контакт өз күйін не күй хабарламасын "
+"өзгертсе, күй жолын енді жазбайды."
 
 #: ../src/common/config.py:233
-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 status and/or his or her status message. If \"all\" Gajim will print all status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves group chat."
-msgstr "\"none\", \"all\" не \"in_and_out\" бола алады. Егер \"none\" болса, Gajim топтық чаттарда мүше өз күйін не күй хабарламасын өзгертсе, күй хабарламасы жолын шығармайды. Егер \"all\" болса, Gajim барлық күй хабарламаларын көрсетеді. Егер \"in_and_out\" болса, Gajim тек БІРЕУ топтық чатқа кірді/шықты хабарламаларын көрсетеді."
+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 "
+"status and/or his or her status message. If \"all\" Gajim will print all "
+"status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
+"group chat."
+msgstr ""
+"\"none\", \"all\" не \"in_and_out\" бола алады. Егер \"none\" болса, Gajim "
+"топтық чаттарда мүше өз күйін не күй хабарламасын өзгертсе, күй хабарламасы "
+"жолын шығармайды. Егер \"all\" болса, Gajim барлық күй хабарламаларын "
+"көрсетеді. Егер \"in_and_out\" болса, Gajim тек БІРЕУ топтық чатқа кірді/"
+"шықты хабарламаларын көрсетеді."
 
 #: ../src/common/config.py:235
 msgid "Background color of contacts when they just signed in."
@@ -3519,8 +4061,11 @@ msgid "Background color of contacts when they just signed out."
 msgstr "Жаңа шыққан контакт аты үшін фон түсі."
 
 #: ../src/common/config.py:238
-msgid "If True, restored messages will use a smaller font than the default one."
-msgstr "Белсенді болса, тарихтан алынған хабарламалар қаріпі қалыптыдан кішірек болады."
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+"Белсенді болса, тарихтан алынған хабарламалар қаріпі қалыптыдан кішірек "
+"болады."
 
 #: ../src/common/config.py:239
 msgid "Don't show avatar for the transport itself."
@@ -3531,29 +4076,44 @@ msgid "Don't show roster in the system taskbar."
 msgstr "Ростерді жүйелік есептер панелінде көрсетпеу."
 
 #: ../src/common/config.py:241
-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 "Белсенді болса және GTK+ мен PyGTK нұсқалары кем дегенде 2.8 болса, кезекте оқиға бар болса, терезе шегі жыпылықтайды."
+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 ""
+"Белсенді болса және GTK+ мен PyGTK нұсқалары кем дегенде 2.8 болса, кезекте "
+"оқиға бар болса, терезе шегі жыпылықтайды."
 
 #: ../src/common/config.py:243
-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 presences."
-msgstr "Jabberd1.4 парольмен қорғалған топтық чатқа біреу кірген кезде sha ақпаратын ұнатпайды. Топтық чаттың бар болу хабарламаларында sha ақпаратын көрсетпеу үшін бұл опцияны сөндіріңіз."
+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 "
+"presences."
+msgstr ""
+"Jabberd1.4 парольмен қорғалған топтық чатқа біреу кірген кезде sha ақпаратын "
+"ұнатпайды. Топтық чаттың бар болу хабарламаларында sha ақпаратын көрсетпеу "
+"үшін бұл опцияны сөндіріңіз."
 
 #. always, never, peracct, pertype should not be translated
 #: ../src/common/config.py:246
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
-"'always_with_roster' - Like 'always' but the messages are in a single window along with the roster.\n"
+"'always_with_roster' - Like 'always' but the messages are in a single window "
+"along with the roster.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a specific window."
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"specific window."
 msgstr ""
 "Жаңа хабарламалар көрсетілетін терезені басқару.\n"
 "'always' - Барлық хабарламалар бір терезеге жіберіледі.\n"
-"'always_with_roster' - 'always' сияқты, бірақ хабарламалар бар бір терезе ростермен бір терезені құрайды.\n"
+"'always_with_roster' - 'always' сияқты, бірақ хабарламалар бар бір терезе "
+"ростермен бір терезені құрайды.\n"
 "'never' - Барлық хабарламалар жеке терезелерінде.\n"
 "'peracct' - Әр тіркелгі үшін хабарламалар жеке терезеде.\n"
-"'pertype' - Хабарламалар түрі бойынша (мыс. чат не топтық чаттар) терезеге жіберіледі."
+"'pertype' - Хабарламалар түрі бойынша (мыс. чат не топтық чаттар) терезеге "
+"жіберіледі."
 
 #: ../src/common/config.py:247
 msgid "If False, you will no longer see the avatar in the chat window."
@@ -3580,8 +4140,12 @@ msgid "Hides the group chat occupants list in group chat window."
 msgstr "Топтық чат терезесінде мүшелер тізімін жасырады"
 
 #: ../src/common/config.py:253
-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 "Чатта, алдыңғы хабарламадағы адам емес болмаса ғана, жол басынан контакт атын көрсету."
+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:254
 msgid "Indentation when using merge consecutive nickname."
@@ -3592,132 +4156,235 @@ msgid "Smooth scroll message in conversation window"
 msgstr "Сөйлесу терезесінде хабарламаны жай айналдыру"
 
 #: ../src/common/config.py:256
-msgid "List of colors, separated by \":\", that will be used to color nicknames in group chats."
-msgstr "\":\" арқылы бөлінген түстер тізімі, топ чатында никтер түстері ретінде пайдалану үшін."
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
+msgstr ""
+"\":\" арқылы бөлінген түстер тізімі, топ чатында никтер түстері ретінде "
+"пайдалану үшін."
 
 #: ../src/common/config.py:257
 msgid "Ctrl-Tab go to next composing tab when none is unread."
-msgstr "Оқылмағандар болмаса, Ctrl-Tab басу арқылы келесі жазылудағы бетке өтеді."
+msgstr ""
+"Оқылмағандар болмаса, Ctrl-Tab басу арқылы келесі жазылудағы бетке өтеді."
 
 #: ../src/common/config.py:258
-msgid "Should we show the confirm metacontacts creation dialog or not? Empty string means we never show the dialog."
-msgstr "Метаконтакттарды жасауды растау сұхбатын көрсету керек пе? Бос жол терезені ешқашан көрсетпеуді белгілейді."
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+"Метаконтакттарды жасауды растау сұхбатын көрсету керек пе? Бос жол терезені "
+"ешқашан көрсетпеуді белгілейді."
 
 #: ../src/common/config.py:259
-msgid "Should we show the confirm block contact dialog or not? Empty string means we never show the dialog."
-msgstr "Контактты блоктауды растау сұхбатын көрсету керек пе? Бос жол терезені ешқашан көрсетпеуді белгілейді."
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Контактты блоктауды растау сұхбатын көрсету керек пе? Бос жол терезені "
+"ешқашан көрсетпеуді белгілейді."
 
 #: ../src/common/config.py:260
-msgid "Should we show the confirm custom status dialog or not? Empty string means we never show the dialog."
-msgstr "Таңдауыңызша күйді растау сұхбатын көрсету керек пе? Бос жол терезені ешқашан көрсетпеуді белгілейді."
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Таңдауыңызша күйді растау сұхбатын көрсету керек пе? Бос жол терезені "
+"ешқашан көрсетпеуді белгілейді."
 
 #: ../src/common/config.py:261
-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 "Қосулы тұрса, тіркелгіні баптау терезесінде сіз приоритеттің теріс мәнің орната аласыз. АБАЙЛАҢЫЗ, теріс приоритетпен отырған кезде, серверден бірде-бір хабарламаны АЛМАЙСЫЗ."
+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:262
-msgid "If True, Gajim will use Gnome Keyring (if available) to store account passwords."
-msgstr "Белсенді болса, Gajim тіркелгі парольдерін сақтау үшін Gnome Keyring (егер қолжетерлік болса) қолданады."
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+"Белсенді болса, Gajim тіркелгі парольдерін сақтау үшін Gnome Keyring (егер "
+"қолжетерлік болса) қолданады."
 
 #: ../src/common/config.py:263
-msgid "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store account passwords."
-msgstr "Белсенді болса, Gajim тіркелгі парольдерін сақтау үшін KDE Wallet (егер kwalletcli қолжетерлік болса) қолданады."
+msgid ""
+"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+"account passwords."
+msgstr ""
+"Белсенді болса, Gajim тіркелгі парольдерін сақтау үшін KDE Wallet (егер "
+"kwalletcli қолжетерлік болса) қолданады."
 
 #: ../src/common/config.py:264
-msgid "If True, Gajim will show number of online and total contacts in account and group rows."
-msgstr "Қосулы тұрса, Gajim желідегі мен барлық контакттар санын тіркелгі мен топтар жолында көрсетеді."
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+"Қосулы тұрса, Gajim желідегі мен барлық контакттар санын тіркелгі мен топтар "
+"жолында көрсетеді."
 
 #: ../src/common/config.py:265
-msgid "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages as if they were of this type"
-msgstr "Бос, 'chat' не 'normal' түрде бола алады. Бос емес болса, кірген хабарламалардың барлығын осы түрде деп есептеу"
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+msgstr ""
+"Бос, 'chat' не 'normal' түрде бола алады. Бос емес болса, кірген "
+"хабарламалардың барлығын осы түрде деп есептеу"
 
 #: ../src/common/config.py:266
-msgid "If True, Gajim will scroll and select the contact who sent you the last message, if chat window is not already opened."
-msgstr "Қосулы болса, Gajim сізге соңғы болып хабарламаны жіберген контактты белгілейді, егер чат терезесі ашылған болмаса."
+msgid ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+"Қосулы болса, Gajim сізге соңғы болып хабарламаны жіберген контактты "
+"белгілейді, егер чат терезесі ашылған болмаса."
 
 #: ../src/common/config.py:267
-msgid "If True, Gajim will convert string between $$ and $$ to an image using dvips and convert before insterting it in chat window."
-msgstr "Қосулы болса, Gajim $$ және $$ таңбалары арасындағы жолды чат терезесіне орналастырмас бұрын, dvips пен convert көмегімен суретке айналдырады."
+msgid ""
+"If True, Gajim will convert string between $$ and $$ to an image using dvips "
+"and convert before insterting it in chat window."
+msgstr ""
+"Қосулы болса, Gajim $$ және $$ таңбалары арасындағы жолды чат терезесіне "
+"орналастырмас бұрын, dvips пен convert көмегімен суретке айналдырады."
 
 #: ../src/common/config.py:268
 msgid "Time of inactivity needed before the change status window closes down."
-msgstr "Күйді өзгерту терезесі жабылу үшін керек белсенді еместік уақыт шамасы."
+msgstr ""
+"Күйді өзгерту терезесі жабылу үшін керек белсенді еместік уақыт шамасы."
 
 #: ../src/common/config.py:269
-msgid "Maximum number of lines that are printed in conversations. Oldest lines are cleared."
-msgstr "Сөйлесулерде көрсетілетін жолдардың максимал саны. Ескі жолдар өшіріледі."
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
+msgstr ""
+"Сөйлесулерде көрсетілетін жолдардың максимал саны. Ескі жолдар өшіріледі."
 
 #: ../src/common/config.py:270
-msgid "If True, notification windows from notification-daemon will be attached to systray icon."
-msgstr "Қосулы болса, notification-daemon жіберген хабарламалар терезелері жүйелік трейден көрсетіледі."
+#, fuzzy
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"notification icon."
+msgstr ""
+"Қосулы болса, notification-daemon жіберген хабарламалар терезелері жүйелік "
+"трейден көрсетіледі."
 
 #: ../src/common/config.py:271
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Белсенді еместігіне екі тексеру арасындағы уақыт."
 
 #: ../src/common/config.py:272
-msgid "Change the value to change the size of latex formulas displayed. The higher is larger."
-msgstr "Көрсетілетін latex формулалар өлшемдерін өзгерту. Жоғары мән үлкенін білдіреді."
+msgid ""
+"Change the value to change the size of latex formulas displayed. The higher "
+"is larger."
+msgstr ""
+"Көрсетілетін latex формулалар өлшемдерін өзгерту. Жоғары мән үлкенін "
+"білдіреді."
 
 #: ../src/common/config.py:273
-msgid "Valid uri schemes. Only schemes in this list will be accepted as \"real\" uri. (mailto and xmpp are handled separately)"
-msgstr "Дұрыс uri схемелары. Тек осы тізімдегі схемалар ғана \"шын\" uri ретінде қабылданады. (mailto және xmpp бөлек өнделеді)"
+msgid ""
+"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
+"uri. (mailto and xmpp are handled separately)"
+msgstr ""
+"Дұрыс uri схемелары. Тек осы тізімдегі схемалар ғана \"шын\" uri ретінде "
+"қабылданады. (mailto және xmpp бөлек өнделеді)"
 
 #: ../src/common/config.py:274
-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 "Тіркелгіге байланыс орнатылған кезде барлық желіде емес контакттардан желіде емес күй хабарламасын сұрау. ЕСКЕРТУ: Бұл көп сұранымдардың жіберілуіне әкеп соғады!"
+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:275
 msgid "If True, completion in groupchats will be like a shell auto-completion"
-msgstr "Қосулы тұрса, топ чаттардағы мәтінді автотолықтыру қоршамдағыдай іске асады"
+msgstr ""
+"Қосулы тұрса, топ чаттардағы мәтінді автотолықтыру қоршамдағыдай іске асады"
 
 #: ../src/common/config.py:276
-msgid "When is self contact row displayed. Can be \"always\", \"when_other_resource\" or \"never\""
-msgstr "Өз контакт жолы қашан көрсетіледі. Келесіден біреу болсын: \"always\", \"when_other_resource\" немесе \"never\""
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+"Өз контакт жолы қашан көрсетіледі. Келесіден біреу болсын: \"always\", "
+"\"when_other_resource\" немесе \"never\""
 
 #: ../src/common/config.py:281
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
-msgstr "Осыған қоса, jingle шығыс видеосының кадр/сек қасиетін автоөзгерту. Мысалы: 10/1 не 25/2"
+msgstr ""
+"Осыған қоса, jingle шығыс видеосының кадр/сек қасиетін автоөзгерту. Мысалы: "
+"10/1 не 25/2"
 
 #: ../src/common/config.py:282
 msgid "Optionally resize jingle output video. Example: 320x240"
-msgstr "Осыған қоса, jingle шығыс видеосының өлшемін автоөзгерту. Мысалы: 320x240"
+msgstr ""
+"Осыған қоса, jingle шығыс видеосының өлшемін автоөзгерту. Мысалы: 320x240"
 
 #: ../src/common/config.py:285
-msgid "If True, Gajim will try to use a STUN server when using jingle. The one in \"stun_server\" option, or the one given by the jabber server."
-msgstr "Қосулы түрса, jingle қолдану кезде Gajim STUN серверін қолдануға тырысады. Ол сервер \"stun_server\" опциясында көрсетіледі не оны jabber сервердің өзі береді."
+msgid ""
+"If True, Gajim will try to use a STUN server when using jingle. The one in "
+"\"stun_server\" option, or the one given by the jabber server."
+msgstr ""
+"Қосулы түрса, jingle қолдану кезде Gajim STUN серверін қолдануға тырысады. "
+"Ол сервер \"stun_server\" опциясында көрсетіледі не оны jabber сервердің өзі "
+"береді."
 
 #: ../src/common/config.py:286
 msgid "STUN server to use when using jingle"
 msgstr "STUN сервері, jingle қолдану үшін"
 
 #: ../src/common/config.py:287
-msgid "If True, Gajim will show affiliation of groupchat occupants by adding a colored square to the status icon"
-msgstr "Қосулы тұрса, топ чаттарындағы қатысушылардың қатысу деңгейін көрсету үшін, Gajim күй таңбашаларына кішкене ғана түсті шаршы қосады"
+msgid ""
+"If True, Gajim will show affiliation of groupchat occupants by adding a "
+"colored square to the status icon"
+msgstr ""
+"Қосулы тұрса, топ чаттарындағы қатысушылардың қатысу деңгейін көрсету үшін, "
+"Gajim күй таңбашаларына кішкене ғана түсті шаршы қосады"
 
 #: ../src/common/config.py:300
-msgid "Priority will change automatically according to your status. Priorities are defined in autopriority_* options."
-msgstr "Приоритет күйіңізге сәйкес автоөзгертіледі. Приоритеттер autopriority_* опцияларында бапталған."
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+"Приоритет күйіңізге сәйкес автоөзгертіледі. Приоритеттер autopriority_* "
+"опцияларында бапталған."
 
 #: ../src/common/config.py:308
-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 "Қайта автоқосылу үшін қолданылатын күйі. Келесіден біреу: желіде, чатқа дайын, кетіп қалған, кеңейтілген кетіп қалған, мазамды алмаңыз, жасырын. ЕСКЕРТУ: бұл опция тек restore_last_status опциясы сөндірілген болса ғана қолданылады"
+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 ""
+"Қайта автоқосылу үшін қолданылатын күйі. Келесіден біреу: желіде, чатқа "
+"дайын, кетіп қалған, кеңейтілген кетіп қалған, мазамды алмаңыз, жасырын. "
+"ЕСКЕРТУ: бұл опция тек restore_last_status опциясы сөндірілген болса ғана "
+"қолданылады"
 
 #: ../src/common/config.py:309
 msgid "If enabled, restore the last status that was used."
 msgstr "Қосулы тұрса, соңғы қалып-күй қалпына келтіріледі."
 
 #: ../src/common/config.py:311
-msgid "If True, Contacts requesting authorization will be automatically accepted."
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
 msgstr "Белсенді болса, жазылуды сұраған контакттар авто қабылданады."
 
 #: ../src/common/config.py:312
-msgid "If False, this account will be disabled and will not appear in roster window."
-msgstr "Сөндірілген болса, бұл тіркелгі сөндіріледі және ростерде көрсетілмейтін болады."
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr ""
+"Сөндірілген болса, бұл тіркелгі сөндіріледі және ростерде көрсетілмейтін "
+"болады."
 
 #: ../src/common/config.py:315
-msgid "If disabled, don't sign presences with GPG key, even if GPG is configured."
-msgstr "Сөндірілген болса, бар болу хабарламаларды GPG кілтімен жазбау, GPG бапталған болса да."
+msgid ""
+"If disabled, don't sign presences with GPG key, even if GPG is configured."
+msgstr ""
+"Сөндірілген болса, бар болу хабарламаларды GPG кілтімен жазбау, GPG "
+"бапталған болса да."
 
 #: ../src/common/config.py:317
 msgid "Enable ESessions encryption for this account."
@@ -3728,20 +4395,30 @@ msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Қолжетерлік болса, Gajim шифрленген сессияны бастау керек пе?"
 
 #: ../src/common/config.py:319
-msgid "Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain"
-msgstr "Көру үшін байланыс түрлерінің реттелген тізімі (арасы бос аралық). Құрамында tls, ssl не plain бола алады"
+msgid ""
+"Ordered list (space separated) of connection type to try. Can contain tls, "
+"ssl or plain"
+msgstr ""
+"Көру үшін байланыс түрлерінің реттелген тізімі (арасы бос аралық). Құрамында "
+"tls, ssl не plain бола алады"
 
 #: ../src/common/config.py:320
-msgid "Show a warning dialog before sending password on an plaintext connection."
-msgstr "Парольдерді шифрленбеген байланыс арқылы беру алдында ескерту сұхбатын көрсету."
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection."
+msgstr ""
+"Парольдерді шифрленбеген байланыс арқылы беру алдында ескерту сұхбатын "
+"көрсету."
 
 #: ../src/common/config.py:321
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Қалыпты SSL жинығын қолдану алдында ескерту сұхбатын көрсету."
 
 #: ../src/common/config.py:322
-msgid "Show a warning dialog before sending PLAIN password over a plain conenction."
-msgstr "ШИФРЛЕНБЕГЕН парольдерді шифрленбеген байланыс арқылы беру алдында ескерту сұхбатын көрсету."
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain conenction."
+msgstr ""
+"ШИФРЛЕНБЕГЕН парольдерді шифрленбеген байланыс арқылы беру алдында ескерту "
+"сұхбатын көрсету."
 
 #: ../src/common/config.py:324
 msgid "Space separated list of ssl errors to ignore."
@@ -3756,8 +4433,12 @@ msgid "XMPP ping sent after inactivity"
 msgstr "Белсенді еместіктен кейін XMPP ping жіберліген"
 
 #: ../src/common/config.py:338
-msgid "How many seconds to wait for the answer of ping alive packet before we try to reconnect."
-msgstr "Байланысты қайта орнатпас бұрын, ping alive дестесіне жауапты қанша секунд күту керек."
+msgid ""
+"How many seconds to wait for the answer of ping alive packet before we try "
+"to reconnect."
+msgstr ""
+"Байланысты қайта орнатпас бұрын, ping alive дестесіне жауапты қанша секунд "
+"күту керек."
 
 #. yes, no, ask
 #: ../src/common/config.py:342
@@ -3765,8 +4446,12 @@ msgid "Jabberd2 workaround"
 msgstr "Jabberd2 жұмысы"
 
 #: ../src/common/config.py:345
-msgid "If checked, Gajim will use your IP and proxies defined in file_transfer_proxies option for file transfer."
-msgstr "Белгіленген болса, Gajim файлдармен алмасулар үшін сіздің IP бен file_transfer_proxies опциясындағы прокси адрестерін қолданады."
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+"Белгіленген болса, Gajim файлдармен алмасулар үшін сіздің IP бен "
+"file_transfer_proxies опциясындағы прокси адрестерін қолданады."
 
 #: ../src/common/config.py:359
 msgid "Answer to receipt requests"
@@ -3777,282 +4462,226 @@ msgid "Sent receipt requests"
 msgstr "Алу сұранымы жіберілді"
 
 #: ../src/common/config.py:370
-msgid "When negotiating an encrypted session, should Gajim assume you want your messages to be logged?"
-msgstr "Шифрленген сессия кезінде Gajim хабарламаларыңызды тарихқа сақтауы керек пе?"
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+"Шифрленген сессия кезінде Gajim хабарламаларыңызды тарихқа сақтауы керек пе?"
 
 #: ../src/common/config.py:373
 msgid "Message that is sent to contacts you want to add"
 msgstr "Қосқыңыз келетін контакттарға жіберілетін хабарлама"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:374
+msgid "Last time we syncronized with logs from server."
+msgstr ""
+
+#: ../src/common/config.py:436
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Бұл контакт үшін OpenPGP қосулы тұр ма?"
 
-#: ../src/common/config.py:436
-msgid "Should Gajim automatically start an encrypted session with this contact when possible?"
+#: ../src/common/config.py:437
+msgid ""
+"Should Gajim automatically start an encrypted session with this contact when "
+"possible?"
 msgstr "Қолжетерлік болса, Gajim шифрленген сессияны жасау керек пе?"
 
-#: ../src/common/config.py:437 ../src/common/config.py:440
+#: ../src/common/config.py:438 ../src/common/config.py:441
 msgid "Language for which we want to check misspelled words"
 msgstr "Қай тілде емлені тексеру керек"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:447
 msgid "all or space separated status"
 msgstr "барлық не бос аралықпен ажыратылған күй"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:448
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', немесе 'both'"
 
-#: ../src/common/config.py:448 ../src/common/config.py:450
-#: ../src/common/config.py:451 ../src/common/config.py:454
-#: ../src/common/config.py:455
+#: ../src/common/config.py:449 ../src/common/config.py:451
+#: ../src/common/config.py:452 ../src/common/config.py:455
+#: ../src/common/config.py:456
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' немесе ''"
 
-#: ../src/common/config.py:461 ../src/common/pep.py:157
+#: ../src/common/config.py:460
+msgid ""
+"State whether plugins should be activated on exit (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
+msgstr ""
+
+#: ../src/common/config.py:465 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Ұйқыда"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back soon"
 msgstr "Жақында ораламын"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back in some minutes."
 msgstr "Бірнеше минутта ораламын."
 
-#: ../src/common/config.py:463 ../src/common/pep.py:127
+#: ../src/common/config.py:467 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Тамақ ішуде"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:467
 msgid "I'm eating, so leave me a message."
 msgstr "Мен тамақ ішудемін, хабарламаңызды қалдырыңыз."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "Movie"
 msgstr "Кино"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "I'm watching a movie."
 msgstr "Кино көрудемін."
 
-#: ../src/common/config.py:465 ../src/common/pep.py:186
+#: ../src/common/config.py:469 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Жұмыс істеудемін"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:469
 msgid "I'm working."
 msgstr "Мен жұмыс істеп отырмын."
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "I'm on the phone."
 msgstr "Мен телефонмен сөйлесудемін."
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "Out"
 msgstr "Жоқ"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "I'm out enjoying life."
 msgstr "Мен өмірмен рахаттанып отырмын."
 
-#: ../src/common/config.py:478
+#: ../src/common/config.py:482
 msgid "I'm available."
 msgstr "Мен бармын."
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:483
 msgid "I'm free for chat."
 msgstr "Мен чат үшін дайынмын."
 
-#: ../src/common/config.py:480 ../src/config.py:1600
+#: ../src/common/config.py:484 ../src/config.py:1600
 msgid "Be right back."
 msgstr "Жақында боламын."
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:485
 msgid "I'm not available."
 msgstr "Мен жоқпын."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:486
 msgid "Do not disturb."
 msgstr "Мазамды алмаңыз."
 
-#: ../src/common/config.py:483 ../src/common/config.py:484
+#: ../src/common/config.py:487 ../src/common/config.py:488
 msgid "Bye!"
 msgstr "Қош!"
 
-#: ../src/common/config.py:494
-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_highlight_words ішінде көрсетілген сөздердің біреуі не сіздің ник атыңыз кездескен кезде ойналатын дыбыс."
+#: ../src/common/config.py:498
+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_highlight_words ішінде көрсетілген сөздердің "
+"біреуі не сіздің ник атыңыз кездескен кезде ойналатын дыбыс."
 
-#: ../src/common/config.py:495
+#: ../src/common/config.py:499
 msgid "Sound to play when any MUC message arrives."
 msgstr "MUC хабарламасы келген кезде ойналатын дыбыс."
 
-#: ../src/common/config.py:504 ../src/common/optparser.py:304
+#: ../src/common/config.py:508 ../src/common/optparser.py:308
 msgid "green"
 msgstr "green"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:290
+#: ../src/common/config.py:512 ../src/common/optparser.py:294
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:512
+#: ../src/common/config.py:516
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:520
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:84
+#: ../src/common/connection_handlers.py:94
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Қолданыстағы емес модульді жүктеу сәтсіз"
 
-#: ../src/common/connection_handlers.py:117
+#: ../src/common/connection_handlers.py:127
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "%s транспорты үшін тіркелу ақпараты уақытында келмеген"
 
-#: ../src/common/connection_handlers.py:124
+#: ../src/common/connection_handlers.py:134
 msgid "Registration succeeded"
 msgstr "Тіркелу сәтті аяқталды"
 
-#: ../src/common/connection_handlers.py:125
+#: ../src/common/connection_handlers.py:135
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "%s агенті көмегімен тіркелу сәтті аяқталды"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 msgid "Registration failed"
 msgstr "Тіркелу сәтсіз"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 #, python-format
-msgid "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
-msgstr "%(agent)s агенті көмегімен тіркелу %(error)s қатесімен аяқталды: %(error_msg)s"
+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:445
-#: ../src/common/connection_handlers.py:1633
-#: ../src/common/connection_handlers.py:1756
-#: ../src/common/connection_handlers.py:1957
-#: ../src/common/connection_handlers.py:2108 ../src/common/connection.py:449
+#: ../src/common/connection_handlers.py:466
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
 #: ../src/gajim.py:341
 msgid "Disk Write Error"
 msgstr "Дискке жазу қатесі"
 
-#: ../src/common/connection_handlers.py:678 ../src/common/connection.py:1472
+#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
 msgid "Invisibility not supported"
 msgstr "Жасырын болуға қолдау жоқ"
 
-#: ../src/common/connection_handlers.py:679 ../src/common/connection.py:1473
+#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "%s тіркелгісі жасырын болуды қолдамайды."
 
-#: ../src/common/connection_handlers.py:1446 ../src/common/connection.py:253
-#: ../src/config.py:2091 ../src/config.py:2100 ../src/config.py:2168
-#: ../src/config.py:3560 ../src/dataforms_widget.py:597 ../src/dialogs.py:2931
+#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
+#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
+#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
 msgid "Invalid Jabber ID"
 msgstr "Қате Jabber ID"
 
-#: ../src/common/connection_handlers.py:1447
+#: ../src/common/connection_handlers.py:1405
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr "Қате JID жіберген хабарлама алынды, оны елемейміз."
 
-#: ../src/common/connection_handlers.py:1636
-#: ../src/common/connection_handlers.py:1759
-#: ../src/common/connection_handlers.py:1961
-#: ../src/common/connection_handlers.py:2111 ../src/common/connection.py:453
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
 #: ../src/gajim.py:160 ../src/session.py:139
 #, 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 "Дерекқор файлын (%s) оқі мүмкін емес. Оны қалпына келтіріп көріңіз (see http://trac.gajim.org/wiki/DatabaseBackup) не өшіріңіз (бар тарих жоғалады)."
-
-#: ../src/common/connection_handlers.py:1805
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Ник атына рұқсат жоқ: %s"
-
-#: ../src/common/connection_handlers.py:1902
-#: ../src/common/connection_handlers.py:1911
-#: ../src/common/connection_handlers.py:1918
-#: ../src/common/connection_handlers.py:1922
-#: ../src/common/connection_handlers.py:1926
-#: ../src/common/connection_handlers.py:1931 ../src/gui_interface.py:139
-msgid "Unable to join group chat"
-msgstr "Чат бөлмесіне кіру мүмкін емес"
-
-#: ../src/common/connection_handlers.py:1903
-#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr "%s үшін пайдаланушылар саны максималды санына жетті"
-
-#: ../src/common/connection_handlers.py:1912
-#, python-format
-msgid "You are banned from group chat %s."
-msgstr "Сізді %s топ чатынан бандаған."
-
-#: ../src/common/connection_handlers.py:1919
-#, python-format
-msgid "Group chat %s does not exist."
-msgstr "%s топтық чаты жоқ."
-
-#: ../src/common/connection_handlers.py:1923
-msgid "Group chat creation is restricted."
-msgstr "Топтық чаттарды жасау рұқсат етілмеген."
-
-#: ../src/common/connection_handlers.py:1927
-#, python-format
-msgid "Your registered nickname must be used in group chat %s."
-msgstr "Сіздің тіркелген ник атыңыз %s топ чатында қолданылуы керек."
-
-#: ../src/common/connection_handlers.py:1932
-#, 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:1976
-msgid "Room has been destroyed"
-msgstr "Бөлме жойылған"
-
-#: ../src/common/connection_handlers.py:1984
-#, python-format
-msgid "You can join this room instead: %s"
-msgstr "Оның орнына мына бөлмеге кіре аласыз: %s"
-
-#: ../src/common/connection_handlers.py:2020
-msgid "I would like to add you to my roster."
-msgstr "Мен өз ростеріме сізді қосқым келеді"
-
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2041
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "біз қазір %s контактына жазылғанбыз"
-
-#: ../src/common/connection_handlers.py:2043
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "%s жіберген жазылудан бас тарту сұранымы"
-
-#: ../src/common/connection_handlers.py:2045
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "біз қазір %s контактына жазылмағанбыз"
-
-#: ../src/common/connection_handlers.py:2240
-#, python-format
-msgid "JID %s is not RFC compliant. It will not be added to your roster. Use roster management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr "%s JID-і  RFC-мен үйлесімді емес. Ол сіздің ростеріңізге қосылмайды. Оны өшіру үшін http://jru.jabberstudio.org/ сияқты ростерді басқару құралдарын қолданыңыз"
+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 ""
+"Дерекқор файлын (%s) оқі мүмкін емес. Оны қалпына келтіріп көріңіз (see "
+"http://trac.gajim.org/wiki/DatabaseBackup) не өшіріңіз (бар тарих жоғалады)."
 
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
@@ -4168,11 +4797,15 @@ msgstr "Сертификатты ұсынушының сәйкес еместі
 
 #: ../src/common/connection.py:96
 msgid "Authority and subject key identifier mismatch"
-msgstr "Сертификаттау орталығы мен иесі кілттерінің идентификаторлары өзара сәйкес емес"
+msgstr ""
+"Сертификаттау орталығы мен иесі кілттерінің идентификаторлары өзара сәйкес "
+"емес"
 
 #: ../src/common/connection.py:97
 msgid "Authority and issuer serial number mismatch"
-msgstr "Сертификаттау орталығы мен ұсынушы кілттерінің идентификаторлары өзара сәйкес емес"
+msgstr ""
+"Сертификаттау орталығы мен ұсынушы кілттерінің идентификаторлары өзара "
+"сәйкес емес"
 
 #: ../src/common/connection.py:98
 msgid "Key usage does not include certificate signing"
@@ -4182,27 +4815,28 @@ msgstr "Кілтті қолдану сертификаттарға қолтаң
 msgid "Application verification failure"
 msgstr "Қолданбаны растау қатесі"
 
-#: ../src/common/connection.py:254 ../src/dialogs.py:2932
+#: ../src/common/connection.py:256 ../src/dialogs.py:2948
 #, 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:276
+#: ../src/common/connection.py:278
 msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr "Қашықтағы бар болу хабарламасында қолтаңба жоқ және кілт көрсетілмеген."
+msgstr ""
+"Қашықтағы бар болу хабарламасында қолтаңба жоқ және кілт көрсетілмеген."
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:281
 #, 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:331
+#: ../src/common/connection.py:333
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Бұл хабарлама *шифрленген* (Қараңыз :XEP:`27`]"
 
-#: ../src/common/connection.py:439
+#: ../src/common/connection.py:441
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4211,76 +4845,76 @@ msgstr ""
 "Тақырыбы: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:807
+#: ../src/common/connection.py:809
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "\"%s\" тіркелгісімен байланыс үзілді"
 
-#: ../src/common/connection.py:808
+#: ../src/common/connection.py:810
 msgid "Reconnect manually."
 msgstr "Қолмен қайта байланысты орнату."
 
-#: ../src/common/connection.py:820
+#: ../src/common/connection.py:822
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "%(name)s сервері тіркелу сұранымына қате жауап берген: %(error)s"
 
-#: ../src/common/connection.py:854
+#: ../src/common/connection.py:856
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "%s сервері басқа тіркелу формасын ұсынды"
 
-#: ../src/common/connection.py:867
+#: ../src/common/connection.py:869
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Белгісіз SSL қатесі: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:882
+#: ../src/common/connection.py:884
 msgid "Invalid answer"
 msgstr "Қате жауап"
 
-#: ../src/common/connection.py:883
+#: ../src/common/connection.py:885
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr " %(name)s қызметі тіркелуге сұранымына қате жауап берген: %(error)s"
 
-#: ../src/common/connection.py:1165 ../src/common/connection.py:1294
-#: ../src/common/connection.py:1784
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
+#: ../src/common/connection.py:1792
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "\"%s\" үшін байланыс орнату мүмкін емес"
 
-#: ../src/common/connection.py:1166 ../src/gui_interface.py:755
+#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
 msgid "Check your connection or try again later."
 msgstr "Байланысты тексеріңіз не кейін қайталап көріңіз."
 
-#: ../src/common/connection.py:1171
+#: ../src/common/connection.py:1173
 #, python-format
 msgid "Server replied: %s"
 msgstr "Сервер жауабы: %s"
 
-#: ../src/common/connection.py:1184
+#: ../src/common/connection.py:1186
 msgid "Connection to proxy failed"
 msgstr "Проксиге байланыс орнату сәтсіз аяқталды"
 
-#: ../src/common/connection.py:1215 ../src/common/connection.py:1274
+#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "%s тіркелгісіне байланыс орнату сәтсіз аяқталды"
 
-#: ../src/common/connection.py:1216 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "%s тіркелгісімен байланыс үзілген. Қайтадан орнатып көреміз."
 
-#: ../src/common/connection.py:1241
+#: ../src/common/connection.py:1243
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "%s сертификатының нақтылығы қате болуы мүмкін."
 
-#: ../src/common/connection.py:1244
+#: ../src/common/connection.py:1246
 #, python-format
 msgid ""
 "\n"
@@ -4289,7 +4923,7 @@ msgstr ""
 "\n"
 "SSL Қатесі: <b>%s</b>"
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1248
 #, python-format
 msgid ""
 "\n"
@@ -4298,61 +4932,65 @@ msgstr ""
 "\n"
 "Белгісіз SSL қатесі: %d"
 
-#: ../src/common/connection.py:1295
+#: ../src/common/connection.py:1297
 msgid "Check your connection or try again later"
 msgstr "Байланысты тексеріңіз не кейін қайталап көріңіз"
 
-#: ../src/common/connection.py:1324
+#: ../src/common/connection.py:1329
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "\"%s\" үішн аутентификация сәтсіз"
 
-#: ../src/common/connection.py:1326
+#: ../src/common/connection.py:1331
 msgid "Please check your login and password for correctness."
 msgstr "Тіркелгі атын мен пароліңізді тексеріңіз."
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1400
 msgid "Error while removing privacy list"
 msgstr "Жекелік тізімін өшіру кезінде қате кетті"
 
-#: ../src/common/connection.py:1396
+#: ../src/common/connection.py:1401
 #, 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 "%s жекелік тізімі өшірілмеген. Байланысқан ресурстарыңыздың біреу үшін болуы мүмкін. Оны сөндіріп, қайталар көріңіз."
+msgid ""
+"Privacy list %s has not been removed. It is maybe active in one of your "
+"connected resources. Deactivate it and try again."
+msgstr ""
+"%s жекелік тізімі өшірілмеген. Байланысқан ресурстарыңыздың біреу үшін болуы "
+"мүмкін. Оны сөндіріп, қайталар көріңіз."
 
-#: ../src/common/connection.py:1650
+#: ../src/common/connection.py:1658
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Жіберген контакт: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1653
+#: ../src/common/connection.py:1661
 msgid "Sent contacts:"
 msgstr "Жіберілген контакттар:"
 
-#: ../src/common/connection.py:1799 ../src/common/connection.py:1822
+#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
 msgid "Not fetched because of invisible status"
 msgstr "Жасырын қалып-күй нәтижесінде алынбаған"
 
-#: ../src/common/connection.py:2254
+#: ../src/common/connection.py:2262
 msgid "Unregister failed"
 msgstr "Тіркелгіні өшіру сәтсіз"
 
-#: ../src/common/connection.py:2255
+#: ../src/common/connection.py:2263
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr "%(server)s серверінен тіркелгіні өшіру сәтсіз: %(error)s"
 
 #: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:674
+#: ../src/gui_interface.py:551
 msgid "Observers"
 msgstr "Байқаушылар"
 
 #: ../src/common/contacts.py:139 ../src/common/contacts.py:366
 #: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1499 ../src/gui_interface.py:424
-#: ../src/roster_window.py:840 ../src/roster_window.py:1525
-#: ../src/roster_window.py:1606 ../src/roster_window.py:1608
-#: ../src/roster_window.py:1769
+#: ../src/disco.py:1517 ../src/roster_window.py:854
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
+#: ../src/roster_window.py:2466
 msgid "Transports"
 msgstr "Қызметтер"
 
@@ -4388,7 +5026,9 @@ msgstr "Дерекқорды оқу мүмкін емес."
 
 #: ../src/common/exceptions.py:56
 msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr "Қызмет қолжетерсіз: Gajim қосулы емес, не remote_control False мәніне орнатылған"
+msgstr ""
+"Қызмет қолжетерсіз: Gajim қосулы емес, не remote_control False мәніне "
+"орнатылған"
 
 #: ../src/common/exceptions.py:67
 msgid "D-Bus is not present on this machine or python module is missing"
@@ -4460,8 +5100,7 @@ msgstr "он"
 msgid "eleven"
 msgstr "он бір"
 
-#. Strings to use for the output. %(0)s will be replaced with the preceding
-#. hour
+#. 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"). '''
 #: ../src/common/fuzzyclock.py:44
 #, python-format
@@ -4576,201 +5215,217 @@ msgstr "Апта аяғы"
 msgid "Weekend!"
 msgstr "Демалыс!"
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:148
+msgid "Username must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:153
 msgid "Invalid character in username."
 msgstr "Пайдаланушы атындағы қате таңба."
 
-#: ../src/common/helpers.py:156
-msgid "Server address required."
-msgstr "Сервер адресі керек."
+#: ../src/common/helpers.py:159
+msgid "Server must be between 1 and 1023 chars"
+msgstr ""
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 msgid "Invalid character in hostname."
 msgstr "Хост атындағы қате таңба."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:166
+msgid "Server address required."
+msgstr "Сервер адресі керек."
+
+#: ../src/common/helpers.py:170
+msgid "Resource must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:175
 msgid "Invalid character in resource."
 msgstr "Ресурс атындағы қате таңба."
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:215
 msgid "_Busy"
 msgstr "_Бос емес"
 
-#: ../src/common/helpers.py:211 ../src/tooltips.py:195
+#: ../src/common/helpers.py:217 ../src/tooltips.py:195
 msgid "Busy"
 msgstr "Бос емес"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:220
 msgid "_Not Available"
 msgstr "Қо_л жетерсіз"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:225
 msgid "_Free for Chat"
 msgstr "_Чатқа дайын"
 
-#: ../src/common/helpers.py:221 ../src/tooltips.py:191
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Free for Chat"
 msgstr "Чатқа дайын"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:230
 msgid "?user status:_Available"
 msgstr "?user status:_Осында"
 
-#: ../src/common/helpers.py:226 ../src/tooltips.py:189
+#: ../src/common/helpers.py:232 ../src/tooltips.py:189
 msgid "?user status:Available"
 msgstr "?user status:Осында"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:234
 msgid "Connecting"
 msgstr "Байланыс орнату"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:237
 msgid "A_way"
 msgstr "К_етіп қалған"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:242
 msgid "_Offline"
 msgstr "Желі_де емес"
 
-#: ../src/common/helpers.py:238 ../src/tooltips.py:199
+#: ../src/common/helpers.py:244 ../src/tooltips.py:199
 msgid "Offline"
 msgstr "Желіде емес"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:247
 msgid "_Invisible"
 msgstr "_Жасырын"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:253
 msgid "?contact has status:Unknown"
 msgstr "?контакт күйі:Белгісіз"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:255
 msgid "?contact has status:Has errors"
 msgstr "?контакт күйі:Қателері бар"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:260
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Жоқ"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:262
 msgid "To"
 msgstr "Оған"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
+msgid "From"
+msgstr "Одан"
+
+#: ../src/common/helpers.py:266
 msgid "Both"
 msgstr "Екеуі де"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:274
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Жоқ"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:276
 msgid "Subscribe"
 msgstr "Жазылу"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:285
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Жоқ"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:288
 msgid "Moderators"
 msgstr "Модераторлар"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:290
 msgid "Moderator"
 msgstr "Модератор"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:293
 msgid "Participants"
 msgstr "Қатысушылар"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:295
 msgid "Participant"
 msgstr "Қатысушы"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:298
 msgid "Visitors"
 msgstr "Қонақтар"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:300
 msgid "Visitor"
 msgstr "Қонақ"
 
-#: ../src/common/helpers.py:300 ../src/tooltips.py:210
+#: ../src/common/helpers.py:306 ../src/tooltips.py:210
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Жоқ"
 
-#: ../src/common/helpers.py:302 ../src/tooltips.py:216
+#: ../src/common/helpers.py:308 ../src/tooltips.py:216
 msgid "Owner"
 msgstr "Иесі"
 
-#: ../src/common/helpers.py:304 ../src/tooltips.py:214
+#: ../src/common/helpers.py:310 ../src/tooltips.py:214
 msgid "Administrator"
 msgstr "Әкімші"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:212
+#: ../src/common/helpers.py:312 ../src/tooltips.py:212
 msgid "Member"
 msgstr "Мүше"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:351
 msgid "is paying attention to the conversation"
 msgstr "хабарламаға көңіл аударды"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:353
 msgid "is doing something else"
 msgstr "басқа нәрсемен айналысуда"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:355
 msgid "is composing a message..."
 msgstr "хабарлама жазып тұр..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:352
+#: ../src/common/helpers.py:358
 msgid "paused composing a message"
 msgstr "хабарлама жазуды аялдатқан"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:360
 msgid "has closed the chat window or tab"
 msgstr "чат терезесін не бетін жапты"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:619
+#: ../src/common/helpers.py:625
 #, python-format
 msgid "%s GiB"
 msgstr "%s Гиб"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:622
+#: ../src/common/helpers.py:628
 #, python-format
 msgid "%s GB"
 msgstr "%s ГБ"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:626
+#: ../src/common/helpers.py:632
 #, python-format
 msgid "%s MiB"
 msgstr "%s МиБ"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:629
+#: ../src/common/helpers.py:635
 #, python-format
 msgid "%s MB"
 msgstr "%s МБ"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:633
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s KiB"
 msgstr "%s КиБ"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:636
+#: ../src/common/helpers.py:642
 #, python-format
 msgid "%s KB"
 msgstr "%s КБ"
 
 #. B means bytes
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:645
 #, python-format
 msgid "%s B"
 msgstr "%s Б"
@@ -4813,12 +5468,12 @@ msgstr "Gajim - %s"
 msgid "Hello, I am $name."
 msgstr "Сәлем, мен - $name."
 
-#: ../src/common/jingle_rtp.py:111
+#: ../src/common/jingle_rtp.py:107
 #, python-format
 msgid "%s configuration error"
 msgstr "%s баптау қатесі"
 
-#: ../src/common/jingle_rtp.py:112
+#: ../src/common/jingle_rtp.py:108
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -4837,11 +5492,11 @@ msgstr ""
 "Қатесі:\n"
 "%s"
 
-#: ../src/common/jingle_rtp.py:209
+#: ../src/common/jingle_rtp.py:205
 msgid "GStreamer error"
 msgstr "GStreamer қатесі"
 
-#: ../src/common/jingle_rtp.py:210
+#: ../src/common/jingle_rtp.py:206
 #, python-format
 msgid ""
 "Error: %s\n"
@@ -4850,19 +5505,19 @@ msgstr ""
 "Қате: %s\n"
 "Жөндеу: %s"
 
-#: ../src/common/jingle_rtp.py:336
+#: ../src/common/jingle_rtp.py:335
 msgid "audio input"
 msgstr "аудио кірісі"
 
-#: ../src/common/jingle_rtp.py:339
+#: ../src/common/jingle_rtp.py:338
 msgid "audio output"
 msgstr "аудио шығысы"
 
-#: ../src/common/jingle_rtp.py:382
+#: ../src/common/jingle_rtp.py:381
 msgid "video input"
 msgstr "видео кірісі"
 
-#: ../src/common/jingle_rtp.py:390
+#: ../src/common/jingle_rtp.py:389
 msgid "video output"
 msgstr "видео шығысы"
 
@@ -4938,11 +5593,11 @@ msgstr "X Window System (Xv жоқ)"
 msgid "error: cannot open %s for reading"
 msgstr "қате: оқу үшін %s ашу мүмкін емес"
 
-#: ../src/common/optparser.py:299 ../src/common/optparser.py:300
+#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
 msgid "cyan"
 msgstr "көгілдір"
 
-#: ../src/common/optparser.py:379
+#: ../src/common/optparser.py:383
 msgid "migrating logs database to indices"
 msgstr "тарих дерекқорын индекстарға көшірту"
 
@@ -5607,19 +6262,27 @@ msgid "Unable to bind to port %s."
 msgstr "%s портын басқару мүмкін емес."
 
 #: ../src/common/socks5.py:92
-msgid "Maybe you have another running instance of Gajim. File Transfer will be cancelled."
-msgstr "Сізде Gajim бірнеше рет қосулы тұрған шығар. Файлдармен алмасудан бас тартылады."
+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:303
-msgid "[This is part of an encrypted session. If you see this message, something went wrong.]"
-msgstr "[Бұл - шифрленген сессияның бір бөлігі. Осы хабарламаны көріп тұрсаңыз, бір нәрсе қате болып тұр.]"
+#: ../src/common/stanza_session.py:423
+msgid ""
+"[This is part of an encrypted session. If you see this message, something "
+"went wrong.]"
+msgstr ""
+"[Бұл - шифрленген сессияның бір бөлігі. Осы хабарламаны көріп тұрсаңыз, бір "
+"нәрсе қате болып тұр.]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:178
+#: ../src/common/zeroconf/connection_zeroconf.py:181
 msgid "Avahi error"
 msgstr "Avahi қатесі"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:179
+#: ../src/common/zeroconf/connection_zeroconf.py:182
 #, python-format
 msgid ""
 "%s\n"
@@ -5628,46 +6291,48 @@ msgstr ""
 "%s\n"
 "Link-local хабарламалары дұрыс істемеуі мүмкін."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:190
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Avahi не Bonjour орнатулы тұрғанды тексеріңіз."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:199
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Could not start local service"
 msgstr "Жергілікті қызметті қосу мүмкін емес"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "%d портын басқару мүмкін емес."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-#: ../src/common/zeroconf/connection_zeroconf.py:283
-#: ../src/common/zeroconf/connection_zeroconf.py:294
-#: ../src/common/zeroconf/connection_zeroconf.py:308
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:286
+#: ../src/common/zeroconf/connection_zeroconf.py:297
+#: ../src/common/zeroconf/connection_zeroconf.py:311
 msgid "Please check if avahi-daemon is running."
 msgstr "avahi-daemon қосулы тұрғанын тексеріңіз."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:282
-#: ../src/common/zeroconf/connection_zeroconf.py:293
-#: ../src/common/zeroconf/connection_zeroconf.py:307
+#: ../src/common/zeroconf/connection_zeroconf.py:285
+#: ../src/common/zeroconf/connection_zeroconf.py:296
+#: ../src/common/zeroconf/connection_zeroconf.py:310
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "\"%s\" тіркелгісінің күйін өзгерту мүмкін емес"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:325
+#: ../src/common/zeroconf/connection_zeroconf.py:328
 msgid "Your message could not be sent."
 msgstr "Хабарламаңызды жіберуге мүмкіндік жоқ"
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:335
+#: ../src/common/zeroconf/connection_zeroconf.py:338
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Контакт желіде емес. Хабарламаңызды жіберу мүмкін емес."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
-msgid "Connection to host could not be established: Timeout while sending data."
-msgstr "Хостпен байланысты орнату мүмкін емес: Ақпаратты жіберудің уақыты шықты."
+#: ../src/common/zeroconf/connection_zeroconf.py:363
+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
@@ -5683,19 +6348,23 @@ msgstr "Хабарлама"
 msgid "Enabled"
 msgstr "Қосулы"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3078
+#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
 msgid "Default"
 msgstr "Бастапқысы"
 
-#: ../src/config.py:739 ../src/dialogs.py:1395
+#: ../src/config.py:733 ../src/dialogs.py:1409
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "%s тілі үшін сөздік қолжетерсіз"
 
-#: ../src/config.py:740
+#: ../src/config.py:734
 #, python-format
-msgid "You have to install %s dictionary to use spellchecking, or choose another language by setting the speller_language option."
-msgstr "Емлені тексеру үшін сізге %s сөздігін орнату керек, не speller_language опциясы көмегімен басқа тілді таңдаңыз."
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+"Емлені тексеру үшін сізге %s сөздігін орнату керек, не speller_language "
+"опциясы көмегімен басқа тілді таңдаңыз."
 
 #: ../src/config.py:1214
 msgid "status message title"
@@ -5706,9 +6375,9 @@ msgid "status message text"
 msgstr "қалып-күй хабарлама мәтіні"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2383 ../src/dialogs.py:2449
-#: ../src/dialogs.py:3215 ../src/disco.py:866 ../src/disco.py:1726
-#: ../src/disco.py:2030 ../src/history_window.py:90
+#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
+#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
+#: ../src/disco.py:2048 ../src/history_window.py:90
 msgid "Name"
 msgstr "Аты"
 
@@ -5730,7 +6399,8 @@ msgstr "Оқылмаған оқиғалар"
 
 #: ../src/config.py:1934
 msgid "Read all pending events before removing this account."
-msgstr "Осы тіркелгіні өшіру алдында барлық кезекте тұрған оқиғаларды оқып шығу."
+msgstr ""
+"Осы тіркелгіні өшіру алдында барлық кезекте тұрған оқиғаларды оқып шығу."
 
 #: ../src/config.py:1963
 #, python-format
@@ -5741,7 +6411,7 @@ msgstr "Сізде %s тіркелгісінен чаттар ашулы тұр"
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Барлық чаттар мен топ чаттары жабылады. Жалғастыруды қалайсыз ба?"
 
-#: ../src/config.py:1976 ../src/config.py:2509 ../src/config.py:2545
+#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
 msgid "You are currently connected to the server"
 msgstr "Қазір серверге қосулы тұрсыз"
 
@@ -5758,7 +6428,9 @@ msgid "Account Name Already Used"
 msgstr "Тіркелгі осы аты қолданылуда"
 
 #: ../src/config.py:1988
-msgid "This name is already used by another of your accounts. Please choose another name."
+msgid ""
+"This name is already used by another of your accounts. Please choose another "
+"name."
 msgstr "Бұл тіркелгі аты қазір қолданылуда. Басқасын таңдаңыз."
 
 #: ../src/config.py:1992 ../src/config.py:1996
@@ -5773,131 +6445,133 @@ msgstr "Тіркелгі аты бос болмауы керек"
 msgid "Account name cannot contain spaces."
 msgstr "Тіркелгі атында бос орындар болмауы керек."
 
-#: ../src/config.py:2072
+#: ../src/config.py:2074
 msgid "Rename Account"
 msgstr "Тіркелгі атын ауыстыру"
 
-#: ../src/config.py:2073
+#: ../src/config.py:2075
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "%s тіркелгісі үшін жаңа атын енгізіңіз"
 
-#: ../src/config.py:2101
+#: ../src/config.py:2103
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID келесідей \"user@servername\" түрінде болуы керек."
 
-#: ../src/config.py:2318 ../src/config.py:3606
+#: ../src/config.py:2320 ../src/config.py:3623
 msgid "Invalid entry"
 msgstr "Қате мән"
 
-#: ../src/config.py:2319 ../src/config.py:3607
+#: ../src/config.py:2321 ../src/config.py:3624
 msgid "Custom port must be a port number."
 msgstr "Таңдауыңызша порт нөмірі түрінде берілуі тиіс."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2342
 msgid "Failed to get secret keys"
 msgstr "Құпия кілттерді алу сәтсіз"
 
-#: ../src/config.py:2341
+#: ../src/config.py:2343
 msgid "There is no OpenPGP secret key available."
 msgstr "Қолжетерлік OpenPGP құпия кілті жоқ."
 
-#: ../src/config.py:2375
+#: ../src/config.py:2377
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP кілтін таңдау"
 
-#: ../src/config.py:2376
+#: ../src/config.py:2378
 msgid "Choose your OpenPGP key"
 msgstr "Өзіңіздің OpenPGP кілтіңізді таңдаңыз"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2385
 msgid "No such account available"
 msgstr "Ондай тіркелгі жоқ"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2386
 msgid "You must create your account before editing your personal information."
 msgstr "Жеке ақпаратыңызды түзету алдында сізге тіркелгі жасау керек."
 
-#: ../src/config.py:2391 ../src/dialogs.py:2136 ../src/dialogs.py:2371
-#: ../src/dialogs.py:2557 ../src/disco.py:511 ../src/profile_window.py:339
+#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
+#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
 msgid "You are not connected to the server"
 msgstr "Сервермен байланысты орнатқан жоқсыз"
 
-#: ../src/config.py:2392
+#: ../src/config.py:2394
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Байланысты орнатпасаңыз, жеке ақпаратыңызды түзете алмайсыз."
 
-#: ../src/config.py:2396
+#: ../src/config.py:2398
 msgid "Your server doesn't support Vcard"
 msgstr "Серверіңіз Vcard-ты қолдамайды"
 
-#: ../src/config.py:2397
+#: ../src/config.py:2399
 msgid "Your server can't save your personal information."
 msgstr "Серверіңіз сіздің жеке ақпаратыңызды сақтай алмайды."
 
-#: ../src/config.py:2510 ../src/config.py:2546
+#: ../src/config.py:2512 ../src/config.py:2548
 msgid "To disable the account, you must be disconnected."
 msgstr "Тіркелгіні сөндіру үшін, оның желімен байланысын аяқтаңыз."
 
-#: ../src/config.py:2515
+#: ../src/config.py:2517
 msgid "Account Local already exists."
 msgstr "Local тіркелгісі бар болыр тұр."
 
-#: ../src/config.py:2516
+#: ../src/config.py:2518
 msgid "Please rename or remove it before enabling link-local messaging."
-msgstr "Link-local хабарламаларды іске қосу алдында оның атын ауыстырыңыз не өшіріңіз."
+msgstr ""
+"Link-local хабарламаларды іске қосу алдында оның атын ауыстырыңыз не "
+"өшіріңіз."
 
-#: ../src/config.py:2673
+#: ../src/config.py:2675
 #, python-format
 msgid "Edit %s"
 msgstr "Түзету %s"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2677
 #, python-format
 msgid "Register to %s"
 msgstr "%s үшін тіркелу"
 
 #. list at the beginning
-#: ../src/config.py:2711
+#: ../src/config.py:2713
 msgid "Ban List"
 msgstr "Блок тізім"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2714
 msgid "Member List"
 msgstr "Қатысушылар тізімі"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2714
 msgid "Owner List"
 msgstr "Иелер тізімі"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2715
 msgid "Administrator List"
 msgstr "Әкімшілер тізімі"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2763 ../src/disco.py:873 ../src/history_manager.py:201
+#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2773
+#: ../src/config.py:2789
 msgid "Reason"
 msgstr "Себебі"
 
-#: ../src/config.py:2780
+#: ../src/config.py:2796
 msgid "Nick"
 msgstr "Ник"
 
-#: ../src/config.py:2786
+#: ../src/config.py:2802
 msgid "Role"
 msgstr "Ролі"
 
-#: ../src/config.py:2813
+#: ../src/config.py:2829
 msgid "Banning..."
 msgstr "Блоктау..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2815
+#: ../src/config.py:2831
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -5905,11 +6579,11 @@ msgstr ""
 "<b>Кімді банға жібергіңіз келеді?</b>\n"
 "\n"
 
-#: ../src/config.py:2817
+#: ../src/config.py:2833
 msgid "Adding Member..."
 msgstr "Қатысушыны қосу..."
 
-#: ../src/config.py:2818
+#: ../src/config.py:2834
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -5917,11 +6591,11 @@ msgstr ""
 "<b>Кімді мүше қылғыңыз келеді?</b>\n"
 "\n"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2836
 msgid "Adding Owner..."
 msgstr "Иені қосу..."
 
-#: ../src/config.py:2821
+#: ../src/config.py:2837
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -5929,11 +6603,11 @@ msgstr ""
 "<b>Кімді ие қылғыңыз келеді?</b>\n"
 "\n"
 
-#: ../src/config.py:2823
+#: ../src/config.py:2839
 msgid "Adding Administrator..."
 msgstr "Әкімшіні қосу..."
 
-#: ../src/config.py:2824
+#: ../src/config.py:2840
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -5941,7 +6615,7 @@ msgstr ""
 "<b>Кімді әкімші қылғыңыз келеді?</b>\n"
 "\n"
 
-#: ../src/config.py:2825
+#: ../src/config.py:2841
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -5957,134 +6631,141 @@ msgstr ""
 "4. domain (доменнің өзі сәйкес, және әр user@domain,\n"
 "domain/resource, және субдомені бар адрес сәйкес келеді)."
 
-#: ../src/config.py:2926
+#: ../src/config.py:2943
 #, python-format
 msgid "Removing %s account"
 msgstr "%s тіркелгісі өшірілуде"
 
-#: ../src/config.py:2941
+#: ../src/config.py:2958
 msgid "Account is disabled"
 msgstr "Тіркелгі сөндірулі"
 
-#: ../src/config.py:2942
+#: ../src/config.py:2959
 msgid "To unregister from a server, account must be enabled."
 msgstr "Серверден тіркелуді өшіру үшін тіркелгі қосулы тқұру керек."
 
-#: ../src/config.py:2955 ../src/gui_interface.py:1132
-#: ../src/gui_interface.py:1243
+#: ../src/config.py:2972 ../src/gui_interface.py:311
+#: ../src/gui_interface.py:1048
 msgid "Password Required"
 msgstr "Пароль керек"
 
-#: ../src/config.py:2956 ../src/gui_interface.py:1223
+#: ../src/config.py:2973 ../src/gui_interface.py:1028
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "%s тіркелгіңіз үшін парольді енгізіңіз"
 
-#: ../src/config.py:2957 ../src/gui_interface.py:1243
+#: ../src/config.py:2974 ../src/gui_interface.py:1048
 msgid "Save password"
 msgstr "Парольді сақтау"
 
-#: ../src/config.py:2967
+#: ../src/config.py:2984
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "\"%s\" тіркелгісі серверге қосылған"
 
-#: ../src/config.py:2968
+#: ../src/config.py:2985
 msgid "If you remove it, the connection will be lost."
 msgstr "Оны өшірсеңіз, байланыс жойылады."
 
-#: ../src/config.py:2982
+#: ../src/config.py:2999
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "%s серверімен байланыс орнату сәтсіз"
 
-#: ../src/config.py:2983
+#: ../src/config.py:3000
 msgid "What would you like to do?"
 msgstr "Сіз не істегіңіз келеді?"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3001
 msgid "Remove only from Gajim"
 msgstr "Тіркелгіні тек Gajim ішінен өшіру"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3002
 msgid "Don't remove anything. I'll try again later"
 msgstr "Ешнәрсе өшірмеу. Кейін қайталап көремін"
 
-#: ../src/config.py:3078
+#: ../src/config.py:3095
 msgid "?print_status:All"
 msgstr "?print_status:Барлық"
 
-#: ../src/config.py:3079
+#: ../src/config.py:3096
 msgid "Enter and leave only"
 msgstr "Тек кіру мен шығу"
 
-#: ../src/config.py:3080
+#: ../src/config.py:3097
 msgid "?print_status:None"
 msgstr "?print_status:Жоқ"
 
-#: ../src/config.py:3150
+#: ../src/config.py:3167
 msgid "New Group Chat"
 msgstr "Жаңа чат бөлмесі"
 
-#: ../src/config.py:3183
+#: ../src/config.py:3200
 msgid "This bookmark has invalid data"
 msgstr "Бұл бетбелгінің ақпараты қате"
 
-#: ../src/config.py:3184
-msgid "Please be sure to fill out server and room fields or remove this bookmark."
+#: ../src/config.py:3201
+msgid ""
+"Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Сервер мен бөлме өрістерін толтырыңыз немесе бетбелгіні өшіріңіз."
 
 #. invalid char
-#: ../src/config.py:3302 ../src/dialogs.py:1934
+#: ../src/config.py:3319 ../src/dialogs.py:1950
 msgid "Invalid nickname"
 msgstr "Ник қате"
 
-#: ../src/config.py:3303 ../src/config.py:3317 ../src/config.py:3331
+#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
 msgid "Character not allowed"
 msgstr "Таңба рұқсат етілмеген"
 
-#: ../src/config.py:3316 ../src/config.py:3582
+#: ../src/config.py:3333 ../src/config.py:3599
 msgid "Invalid server"
 msgstr "Сервер қате"
 
-#: ../src/config.py:3330
+#: ../src/config.py:3347
 msgid "Invalid room"
 msgstr "Қате бөлме"
 
-#: ../src/config.py:3498
+#: ../src/config.py:3515
 msgid "Account has been added successfully"
 msgstr "Тіркелгі сәтті қосылды"
 
-#: ../src/config.py:3499 ../src/config.py:3505
-msgid "You can set advanced account options by pressing the Advanced button, or later by choosing the Accounts menu item under the Edit menu from the main window."
-msgstr "Тіркелгінің кеңейтілген баптауларын орнату үшін Кеңейтілген батырмасын қолданыңыз, немесе бас терезесіндегі Түзету мәзіріндегі Тіркелгілер нұсқасын таңдап, кейін де жасай аласыз."
+#: ../src/config.py:3516 ../src/config.py:3522
+msgid ""
+"You can set advanced account options by pressing the Advanced button, or "
+"later by choosing the Accounts menu item under the Edit menu from the main "
+"window."
+msgstr ""
+"Тіркелгінің кеңейтілген баптауларын орнату үшін Кеңейтілген батырмасын "
+"қолданыңыз, немесе бас терезесіндегі Түзету мәзіріндегі Тіркелгілер нұсқасын "
+"таңдап, кейін де жасай аласыз."
 
-#: ../src/config.py:3504
+#: ../src/config.py:3521
 msgid "Your new account has been created successfully"
 msgstr "Сіздің жаңа тіркелгіңіз сәтті жасалды"
 
-#: ../src/config.py:3543
+#: ../src/config.py:3560
 msgid "Invalid username"
 msgstr "Пайдаланушы аты қате"
 
-#: ../src/config.py:3545
+#: ../src/config.py:3562
 msgid "You must provide a username to configure this account."
 msgstr "Бұл тіркелгіні баптау үшін пайдаланушы атын көрсетуіңіз керек."
 
-#: ../src/config.py:3583
+#: ../src/config.py:3600
 msgid "Please provide a server on which you want to register."
 msgstr "Тіркелгіңіз келетін серверді көрсетіңіз."
 
-#: ../src/config.py:3639 ../src/gui_interface.py:1904
+#: ../src/config.py:3656 ../src/gui_interface.py:1693
 msgid "Certificate Already in File"
 msgstr "Сертификат файлда бар болып тұр"
 
-#: ../src/config.py:3640 ../src/gui_interface.py:1905
+#: ../src/config.py:3657 ../src/gui_interface.py:1694
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Сертификат %s файлында бар болып тұр, сол үшін қайта қосылмайды."
 
-#: ../src/config.py:3717
+#: ../src/config.py:3734
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6099,7 +6780,7 @@ msgstr ""
 "SSL қатесі: %(error)s\n"
 "Сонда да серверге байланысты орнатуды қалайсыз ба?"
 
-#: ../src/config.py:3723 ../src/gui_interface.py:1932
+#: ../src/config.py:3740 ../src/gui_interface.py:1721
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6110,63 +6791,72 @@ msgstr ""
 "Сертификаттың SHA1 баспасы:\n"
 "%s"
 
-#: ../src/config.py:3755 ../src/config.py:3789
+#: ../src/config.py:3772 ../src/config.py:3806
 msgid "An error occurred during account creation"
 msgstr "Жасау кезінде қате кетті"
 
-#: ../src/config.py:3854
+#: ../src/config.py:3871
 msgid "Account name is in use"
 msgstr "Тіркелгі аты қолдануда"
 
-#: ../src/config.py:3855
+#: ../src/config.py:3872
 msgid "You already have an account using this name."
 msgstr "Сізде осы атын қолданып тұрған тіркелгі бар болып тұр."
 
-#: ../src/config.py:4009
+#: ../src/config.py:3991
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/config.py:3992
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#: ../src/config.py:4036
 msgid "Active"
 msgstr "Белсенді"
 
-#: ../src/config.py:4017
+#: ../src/config.py:4044
 msgid "Event"
 msgstr "Оқиға"
 
-#: ../src/config.py:4052
+#: ../src/config.py:4079
 msgid "First Message Received"
 msgstr "Бірінші хабарлама алынды"
 
-#: ../src/config.py:4053
+#: ../src/config.py:4080
 msgid "Next Message Received Focused"
 msgstr "Келесі  хабарлама фокусы бар терезеде алынды"
 
-#: ../src/config.py:4055
+#: ../src/config.py:4082
 msgid "Next Message Received Unfocused"
 msgstr "Келесі  хабарлама фокусы жоқ терезеде алынды"
 
-#: ../src/config.py:4056
+#: ../src/config.py:4083
 msgid "Contact Connected"
 msgstr "Контакт байланысқан"
 
-#: ../src/config.py:4057
+#: ../src/config.py:4084
 msgid "Contact Disconnected"
 msgstr "Контакт байланыспаған"
 
-#: ../src/config.py:4058
+#: ../src/config.py:4085
 msgid "Message Sent"
 msgstr "Хабарлама жіберілді"
 
-#: ../src/config.py:4059
+#: ../src/config.py:4086
 msgid "Group Chat Message Highlight"
 msgstr "Сізді біреу бөлмеде еске алған"
 
-#: ../src/config.py:4060
+#: ../src/config.py:4087
 msgid "Group Chat Message Received"
 msgstr "Бөлмеде хабарлама алынды"
 
-#: ../src/config.py:4061
+#: ../src/config.py:4088
 msgid "GMail Email Received"
 msgstr "GMail Email алынды"
 
-#: ../src/conversation_textview.py:600
+#: ../src/conversation_textview.py:601
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6176,7 +6866,7 @@ msgstr ""
 "жақ алмағанын көрсетеді. Бұл таңбаша ұзақ\n"
 "уақыт бойы тұрса, хабарлама жоғалған сияқты."
 
-#: ../src/conversation_textview.py:619
+#: ../src/conversation_textview.py:620
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6184,44 +6874,44 @@ msgstr ""
 "Осы сызықтан кейінгі мәтін сіз осы чатқа соңғы рет\n"
 "көңіл аударғаныңыздан кейін айтылған"
 
-#: ../src/conversation_textview.py:739
+#: ../src/conversation_textview.py:740
 msgid "_Quote"
 msgstr "_Дәйексөз"
 
-#: ../src/conversation_textview.py:746
+#: ../src/conversation_textview.py:747
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "\"%s\" үшін әре_кет"
 
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Read _Wikipedia Article"
 msgstr "_Википедия мақаласын оқу"
 
-#: ../src/conversation_textview.py:763
+#: ../src/conversation_textview.py:765
 msgid "Look it up in _Dictionary"
 msgstr "_Сөздіктен іздеу"
 
-#: ../src/conversation_textview.py:780
+#: ../src/conversation_textview.py:782
 #, 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:793
+#: ../src/conversation_textview.py:795
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Келесі нәрсе вебтен іздеу сілтемесі емес: \"%s\""
 
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 msgid "Web _Search for it"
 msgstr "Ол ү_шін веб іздеу"
 
-#: ../src/conversation_textview.py:802
+#: ../src/conversation_textview.py:804
 msgid "Open as _Link"
 msgstr "Сіл_теме ретінде ашу"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1296
+#: ../src/conversation_textview.py:1298
 #, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6229,284 +6919,294 @@ msgstr[0] "Кеше"
 msgstr[1] "%i күн бұрын"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1344 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тақырыбы: %s\n"
 
-#: ../src/dataforms_widget.py:544
+#: ../src/dataforms_widget.py:545
 msgid "Unable to load image"
 msgstr "Суретті жүктеу мүмкін емес"
 
-#: ../src/dataforms_widget.py:546
+#: ../src/dataforms_widget.py:547
 #, python-format
 msgid "Media type not supported: %s"
 msgstr "Медиаға қолдау жоқ: %s"
 
-#: ../src/dataforms_widget.py:601
+#: ../src/dataforms_widget.py:562
+msgid "This field is required"
+msgstr ""
+
+#: ../src/dataforms_widget.py:607
 msgid "Jabber ID already in list"
 msgstr "Jabber ID тізімде бар болып тұр"
 
-#: ../src/dataforms_widget.py:602
+#: ../src/dataforms_widget.py:608
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Сіз енгізген Jabber ID тізімде бар болып тұр. Басқасын таңдаңыз."
 
 #. Default jid
-#: ../src/dataforms_widget.py:613
+#: ../src/dataforms_widget.py:619
 msgid "new@jabber.id"
 msgstr "жаңа@jabber.id"
 
-#: ../src/dataforms_widget.py:616 ../src/dataforms_widget.py:618
+#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "жаңа%d@jabber.id"
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Контакт аты: <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:195
 msgid "Group"
 msgstr "Топ"
 
-#: ../src/dialogs.py:201
+#: ../src/dialogs.py:202
 msgid "In the group"
 msgstr "Топта"
 
-#: ../src/dialogs.py:292
+#: ../src/dialogs.py:293
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:297
+#: ../src/dialogs.py:298
 msgid "Contact name"
 msgstr "Контакт аты"
 
-#: ../src/dialogs.py:469
+#: ../src/dialogs.py:470
 msgid "Set Mood"
 msgstr "Көңіл-күйді орнату"
 
-#: ../src/dialogs.py:589
+#: ../src/dialogs.py:590
 #, python-format
 msgid "%s Status Message"
 msgstr "%s күй хабарламасы"
 
-#: ../src/dialogs.py:603
+#: ../src/dialogs.py:604
 msgid "Status Message"
 msgstr "Күй хабарламасы"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:794
 msgid "Overwrite Status Message?"
 msgstr "Күй хабарламасын алмастыру керек пе?"
 
-#: ../src/dialogs.py:794
-msgid "This name is already used. Do you want to overwrite this status message?"
-msgstr "Бұл атау қолдануда. Бұл қалып-күй хабарламасын алмастыруды қалайсыз ба?"
+#: ../src/dialogs.py:795
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
+msgstr ""
+"Бұл атау қолдануда. Бұл қалып-күй хабарламасын алмастыруды қалайсыз ба?"
 
-#: ../src/dialogs.py:802
+#: ../src/dialogs.py:803
 msgid "Save as Preset Status Message"
 msgstr "Орнатылған хабарлама ретінде сақтау"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:804
 msgid "Please type a name for this status message"
 msgstr " Бұл қалып-күй хабарламасы үшін атын енгізіңіз"
 
-#: ../src/dialogs.py:831
+#: ../src/dialogs.py:832
 msgid "AIM Address:"
 msgstr "AIM адресі:"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:833
 msgid "GG Number:"
 msgstr "GG нөмірі:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:834
 msgid "ICQ Number:"
 msgstr "ICQ нөмірі:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:835
 msgid "MSN Address:"
 msgstr "MSN адресі:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:836
 msgid "Yahoo! Address:"
 msgstr "Yahoo! адресі:"
 
-#: ../src/dialogs.py:872
+#: ../src/dialogs.py:873
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "%s тіркелгісіне қосқыңыз келетін контакт ақпаратын енгізіңіз"
 
-#: ../src/dialogs.py:875
+#: ../src/dialogs.py:876
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Қосықыңыз келетін контакт ақпаратын енгізіңіз"
 
-#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
+#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
+#: ../src/dialogs.py:3464
 msgid "Invalid User ID"
 msgstr "Пайдаланушы ID-і қате"
 
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1052
 msgid "The user ID must not contain a resource."
 msgstr "Пайдаланушы ID-і ішінде ресурс болмау керек."
 
-#: ../src/dialogs.py:1051
+#: ../src/dialogs.py:1057
 msgid "You cannot add yourself to your roster."
 msgstr "Өзіңізді өз ростеріңізге қоса алмайсыз."
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1071
 msgid "Contact already in roster"
 msgstr "Контакт ростерде бар болып тұр"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1072
 msgid "This contact is already listed in your roster."
 msgstr "Контакт ростердіңізде бар болып тұр."
 
-#: ../src/dialogs.py:1112
+#: ../src/dialogs.py:1118
 msgid "User ID:"
 msgstr "Пайдаланушы ID-і:"
 
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1189
 msgid "A GTK+ jabber client"
 msgstr "GTK+ jabber клиенті"
 
-#: ../src/dialogs.py:1176
+#: ../src/dialogs.py:1190
 msgid "GTK+ Version:"
 msgstr "GTK+ нұсқасы:"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1191
 msgid "PyGTK Version:"
 msgstr "PyGTK нұсқасы:"
 
-#: ../src/dialogs.py:1187
+#: ../src/dialogs.py:1201
 msgid "Current Developers:"
 msgstr "Ағымдағы жасаушылар:"
 
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1203
 msgid "Past Developers:"
 msgstr "Бұрынғы жасаушылар:"
 
-#: ../src/dialogs.py:1195
+#: ../src/dialogs.py:1209
 msgid "THANKS:"
 msgstr "Алғыс сөз:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1215
 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:1213
+#: ../src/dialogs.py:1227
 msgid "translator-credits"
 msgstr "Baurzhan Muftakhidinov <baurthefirst@gmail.com>, 2009-2010"
 
-#: ../src/dialogs.py:1396
+#: ../src/dialogs.py:1410
 #, python-format
 msgid ""
-"You have to install %s dictionary to use spellchecking, or choose another language by setting the speller_language option.\n"
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option.\n"
 "\n"
 "Highlighting misspelled words feature will not be used"
 msgstr ""
-"Емлені тексеру үшін сізге %s сөздігін орнату керек, не speller_language опциясы көмегімен басқа тілді таңдаңыз.\n"
+"Емлені тексеру үшін сізге %s сөздігін орнату керек, не speller_language "
+"опциясы көмегімен басқа тілді таңдаңыз.\n"
 "\n"
 "Қате жазылған сөздерді түспен ерекшелеу мүмкіндігі енді қолданылмайды"
 
-#: ../src/dialogs.py:1935 ../src/dialogs.py:2322
+#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
 msgid "The nickname has not allowed characters."
 msgstr "Ник аты ішінде рұқсат етілмеген таңбалар бар."
 
-#: ../src/dialogs.py:2053
+#: ../src/dialogs.py:2069
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "%(account)s тіркелгісінен жазылуға сұраным түсті, кімнен: %(jid)s"
 
-#: ../src/dialogs.py:2056
+#: ../src/dialogs.py:2072
 #, python-format
 msgid "Subscription request from %s"
 msgstr "%s жіберген жазылуға сұраным"
 
-#: ../src/dialogs.py:2131 ../src/gui_interface.py:2672
+#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Сіз %s топтық чатына қатысудасыз"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2153
 msgid "You can not join a group chat unless you are connected."
 msgstr "Байланыс орнатпасаңыз, топтық чатқа кіре алмайсыз."
 
-#: ../src/dialogs.py:2178
+#: ../src/dialogs.py:2194
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "%s тіркелгісімен топтық чатқа кіру"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2325
 msgid "Invalid Account"
 msgstr "Қате тіркелгі"
 
-#: ../src/dialogs.py:2310
-msgid "You have to choose an account from which you want to join the groupchat."
+#: ../src/dialogs.py:2326
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
 msgstr "Топ чатына кіруге қолданылатын тіркелгіні көрсетіңіз."
 
-#: ../src/dialogs.py:2321
+#: ../src/dialogs.py:2337
 msgid "Invalid Nickname"
 msgstr "Ник аты қате"
 
-#: ../src/dialogs.py:2326 ../src/dialogs.py:2332
-#: ../src/groupchat_control.py:1832
+#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
+#: ../src/groupchat_control.py:1847
 msgid "Invalid group chat Jabber ID"
 msgstr "Топтық чаттың Jabber ID-і зате"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2343
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "Jabber ID-ін as бөлме@сервер түрінде көрсетіңіз."
 
-#: ../src/dialogs.py:2333 ../src/groupchat_control.py:1833
+#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Топ чат Jabber ID ішінде рұқсат етілмеген таңбалар бар."
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2356
 msgid "This is not a group chat"
 msgstr "Бұл топтық чат"
 
-#: ../src/dialogs.py:2341
+#: ../src/dialogs.py:2357
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s топтық чаттың аты емес."
 
-#: ../src/dialogs.py:2372
+#: ../src/dialogs.py:2388
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Байланыс орнатылмаса, контакттарды синхрондай алмайсыз."
 
-#: ../src/dialogs.py:2386
+#: ../src/dialogs.py:2402
 msgid "Server"
 msgstr "Сервер"
 
-#: ../src/dialogs.py:2421
+#: ../src/dialogs.py:2437
 msgid "This account is not connected to the server"
 msgstr "Бұл тіркелгі серверге байланыс орнатылмаған"
 
-#: ../src/dialogs.py:2422
+#: ../src/dialogs.py:2438
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Байланыспаған тіркелгімен синхрондай алмайсыз."
 
-#: ../src/dialogs.py:2446
+#: ../src/dialogs.py:2462
 msgid "Synchronise"
 msgstr "Синхрондау"
 
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2523
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "%s тіркелгісін қолданып чатты бастау"
 
-#: ../src/dialogs.py:2509
+#: ../src/dialogs.py:2525
 msgid "Start Chat"
 msgstr "Чатты бастау"
 
-#: ../src/dialogs.py:2510
+#: ../src/dialogs.py:2526
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6515,318 +7215,355 @@ msgstr ""
 "төмендегі өріске жазыңыз:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2536 ../src/dialogs.py:2917 ../src/dialogs.py:3129
+#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
 msgid "Connection not available"
 msgstr "Байланыс қолжетерсіз"
 
-#: ../src/dialogs.py:2537 ../src/dialogs.py:2918 ../src/dialogs.py:3130
+#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "\"%s\" үшін байланыс орнатылғанына көз жеткізіңіз."
 
-#: ../src/dialogs.py:2546 ../src/dialogs.py:2549
+#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
 msgid "Invalid JID"
 msgstr "Қате JID"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2565
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "\"%s\" өңдеу мүмкін емес."
 
-#: ../src/dialogs.py:2558
+#: ../src/dialogs.py:2574
 msgid "Without a connection, you can not change your password."
 msgstr "Байланыс орнатылмаса, пароліңізді өзгерте алмайсыз."
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "Invalid password"
 msgstr "Пароль қате"
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "You must enter a password."
 msgstr "Парольді енгізуіңіз керек."
 
-#: ../src/dialogs.py:2581
+#: ../src/dialogs.py:2597
 msgid "Passwords do not match"
 msgstr "Парольдер өзара сәйкес келмейді"
 
-#: ../src/dialogs.py:2582
+#: ../src/dialogs.py:2598
 msgid "The passwords typed in both fields must be identical."
 msgstr "Екі өрістегі де парольдер өзара сәйкес болуы тиіс."
 
 #. default value
-#: ../src/dialogs.py:2619 ../src/notify.py:247 ../src/notify.py:473
+#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
 msgid "Contact Signed In"
 msgstr "Контакт кірді"
 
-#: ../src/dialogs.py:2621 ../src/notify.py:255 ../src/notify.py:475
+#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
 msgid "Contact Signed Out"
 msgstr "Контакт шықты"
 
 #. chat message
-#: ../src/dialogs.py:2623 ../src/notify.py:277 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
 msgid "New Message"
 msgstr "Жаңа хабарлама"
 
 #. single message
-#: ../src/dialogs.py:2623 ../src/notify.py:259 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
 msgid "New Single Message"
 msgstr "Жаңа бір хабарлама"
 
 #. private message
-#: ../src/dialogs.py:2624 ../src/notify.py:265 ../src/notify.py:478
+#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
 msgid "New Private Message"
 msgstr "Жаңа жеке хабарлама"
 
-#: ../src/dialogs.py:2624 ../src/gui_interface.py:1358 ../src/notify.py:487
+#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
 msgid "New E-mail"
 msgstr "Жаңа E-mail"
 
-#: ../src/dialogs.py:2626 ../src/gui_interface.py:1420 ../src/notify.py:480
+#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
 msgid "File Transfer Request"
 msgstr "Файл алмасуға сұраным"
 
-#: ../src/dialogs.py:2628 ../src/gui_interface.py:1320
-#: ../src/gui_interface.py:1389 ../src/notify.py:482
+#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
+#: ../src/gui_interface.py:1186 ../src/notify.py:482
 msgid "File Transfer Error"
 msgstr "Файл алмасу қатесі"
 
-#: ../src/dialogs.py:2630 ../src/gui_interface.py:1466
-#: ../src/gui_interface.py:1489 ../src/gui_interface.py:1506
+#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
+#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
 #: ../src/notify.py:484
 msgid "File Transfer Completed"
 msgstr "Файлдармен алмасу аяқталды"
 
-#: ../src/dialogs.py:2631 ../src/gui_interface.py:1469 ../src/notify.py:485
+#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
 msgid "File Transfer Stopped"
 msgstr "Файл алмасу тоқтатылған"
 
-#: ../src/dialogs.py:2633 ../src/gui_interface.py:1152 ../src/notify.py:489
+#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
 msgid "Groupchat Invitation"
 msgstr "Топ чатына шақыру"
 
-#: ../src/dialogs.py:2635 ../src/notify.py:239 ../src/notify.py:491
+#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
 msgid "Contact Changed Status"
 msgstr "Контакт қалып-күйін өзгертті"
 
-#: ../src/dialogs.py:2836
+#: ../src/dialogs.py:2852
 #, python-format
 msgid "Single Message using account %s"
 msgstr "%s тіркелгісін қолданып, дара хабарлама"
 
-#: ../src/dialogs.py:2838
+#: ../src/dialogs.py:2854
 #, python-format
 msgid "Single Message in account %s"
 msgstr "%s тіркелгісінде дара хабарлама"
 
-#: ../src/dialogs.py:2840
+#: ../src/dialogs.py:2856
 msgid "Single Message"
 msgstr "Дара хабарлама"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2843
+#: ../src/dialogs.py:2859
 #, python-format
 msgid "Send %s"
 msgstr "Жіберу %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:2882
 #, python-format
 msgid "Received %s"
 msgstr "Алынған %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2889
+#: ../src/dialogs.py:2905
 #, 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:2968
+#: ../src/dialogs.py:2984
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:2985
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s жазған:\n"
 
-#: ../src/dialogs.py:3028
+#: ../src/dialogs.py:3044
 #, python-format
 msgid "XML Console for %s"
 msgstr "%s үшін XML консолі"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3046
 msgid "XML Console"
 msgstr "XML консолі"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 msgid "add"
 msgstr "қосу"
 
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 msgid "modify"
 msgstr "түзету"
 
-#: ../src/dialogs.py:3160
+#: ../src/dialogs.py:3176
 msgid "remove"
 msgstr "өшіру"
 
-#: ../src/dialogs.py:3188
+#: ../src/dialogs.py:3204
 #, python-format
-msgid "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your roster."
-msgstr "<b>%(jid)s</b> ростеріңіздегі кейбір контакттарды <b>%(action)s</b> келеді."
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
+msgstr ""
+"<b>%(jid)s</b> ростеріңіздегі кейбір контакттарды <b>%(action)s</b> келеді."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3204 ../src/dialogs.py:3250
+#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
 msgid "Add"
 msgstr "Қосу"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3206 ../src/dialogs.py:3281
+#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
 msgid "Modify"
 msgstr "Түзету"
 
-#: ../src/dialogs.py:3212
+#: ../src/dialogs.py:3228
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3218
+#: ../src/dialogs.py:3234
 msgid "Groups"
 msgstr "Топтар"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3342
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s маған сізді менің ростеріме қосуды ұсынған."
 
-#: ../src/dialogs.py:3340
+#: ../src/dialogs.py:3356
 #, python-format
 msgid "Added  %s contacts"
 msgstr "%s контак қосылған"
 
-#: ../src/dialogs.py:3377
+#: ../src/dialogs.py:3393
 #, python-format
 msgid "Removed  %s contacts"
 msgstr "%s контакт өшірілген"
 
-#: ../src/dialogs.py:3430
+#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#, python-format
+msgid "Archiving Preferences for %s"
+msgstr ""
+
+#: ../src/dialogs.py:3473
+#, fuzzy
+msgid "Invalid expire value"
+msgstr "Сервердің аты қате"
+
+#: ../src/dialogs.py:3474
+msgid "Expire must be a valid positive integer."
+msgstr ""
+
+#: ../src/dialogs.py:3521
+msgid "There is an error with the form"
+msgstr ""
+
+#: ../src/dialogs.py:3732
+#, fuzzy
+msgid "There is an error"
+msgstr "Қызмет қатені қайтарған."
+
+#: ../src/dialogs.py:3796
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Жекелік тізімі <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3434
+#: ../src/dialogs.py:3800
 #, python-format
 msgid "Privacy List for %s"
 msgstr "%s үшін жекелік тізімі"
 
-#: ../src/dialogs.py:3490
+#: ../src/dialogs.py:3856
 #, 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:3495
+#: ../src/dialogs.py:3861
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Реті: %(order)s, әрекеті: %(action)s"
 
-#: ../src/dialogs.py:3539
+#: ../src/dialogs.py:3905
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Ережені түзету</b>"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:4016
 msgid "<b>Add a rule</b>"
 msgstr "<b>Ережені қосу</b>"
 
-#: ../src/dialogs.py:3750
+#: ../src/dialogs.py:4116
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "%s үшін жекелік тізімдері"
 
-#: ../src/dialogs.py:3752
+#: ../src/dialogs.py:4118
 msgid "Privacy Lists"
 msgstr "Жекелік тізімдер"
 
-#: ../src/dialogs.py:3822
+#: ../src/dialogs.py:4188
 msgid "Invalid List Name"
 msgstr "Тізім аты қате"
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4189
 msgid "You must enter a name to create a privacy list."
 msgstr "Жекелік тізімін жасау үшін оның атын енгізуіңіз керек."
 
-#: ../src/dialogs.py:3855
+#: ../src/dialogs.py:4221
 msgid "You are invited to a groupchat"
 msgstr "Сізді топтық чатқа шақырған"
 
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4224
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact сізді талқылауға қатысуға шақырған"
 
-#: ../src/dialogs.py:3860
+#: ../src/dialogs.py:4226
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact сізді %(room_jid)s топ чатына қатысуға шақырған"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4234
 #, python-format
 msgid "Comment: %s"
 msgstr "Түсіндірме: %s"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4236
 msgid "Do you want to accept the invitation?"
 msgstr "Шақыруды қабылдайсыз ба?"
 
-#: ../src/dialogs.py:3932
+#: ../src/dialogs.py:4298
 msgid "Choose Client Cert #PCKS12"
 msgstr "Клиент сертификатын таңдау #PCKS12"
 
-#: ../src/dialogs.py:3942 ../src/dialogs.py:3985 ../src/dialogs.py:4041
+#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
+#: ../src/dialogs.py:4495
 msgid "All files"
 msgstr "Барлық файлдар"
 
-#: ../src/dialogs.py:3947
+#: ../src/dialogs.py:4313
 msgid "PKCS12 Files"
 msgstr "PKCS12 файлдары"
 
-#: ../src/dialogs.py:3975
+#: ../src/dialogs.py:4341
 msgid "Choose Sound"
 msgstr "Дыбысты таңдаңыз"
 
-#: ../src/dialogs.py:3990
+#: ../src/dialogs.py:4356
 msgid "Wav Sounds"
 msgstr "Wav дыбыстары"
 
-#: ../src/dialogs.py:4028
+#: ../src/dialogs.py:4394
 msgid "Choose Image"
 msgstr "Суретті таңдау"
 
-#: ../src/dialogs.py:4046
+#: ../src/dialogs.py:4412
 msgid "Images"
 msgstr "Суреттер"
 
-#: ../src/dialogs.py:4113
+#: ../src/dialogs.py:4482
+#, fuzzy
+msgid "Choose Archive"
+msgstr "Суретті таңдау"
+
+#: ../src/dialogs.py:4500
+#, fuzzy
+msgid "Zip files"
+msgstr "Барлық файлдар"
+
+#: ../src/dialogs.py:4525
 #, python-format
 msgid "When %s becomes:"
 msgstr "%s келесідей болғанда:"
 
-#: ../src/dialogs.py:4115
+#: ../src/dialogs.py:4527
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "%s үшін арнайы ескертуді орнату"
 
-#: ../src/dialogs.py:4190
+#: ../src/dialogs.py:4602
 msgid "Condition"
 msgstr "Күйі"
 
-#: ../src/dialogs.py:4310
+#: ../src/dialogs.py:4722
 msgid "when I am "
 msgstr "Мен болғанда:"
 
-#: ../src/dialogs.py:4786
+#: ../src/dialogs.py:5198
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6837,82 +7574,106 @@ msgstr ""
 "\n"
 "Бұл сессияның Short Authentication String келесі: <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4789
+#: ../src/dialogs.py:5201
 msgid "You have already verified this contact's identity."
 msgstr "Бұл контакт шынайылығын растағансыз."
 
-#: ../src/dialogs.py:4795 ../src/dialogs.py:4879
+#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
 msgid "Contact's identity verified"
 msgstr "Контакт шынайылығы расталған"
 
-#: ../src/dialogs.py:4801
+#: ../src/dialogs.py:5213
 msgid "Verify again..."
 msgstr "Қайтадан растау..."
 
-#: ../src/dialogs.py:4806
-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 "Хабарламаларыңызды <b>тек</b> тиісті адам оқи алатынына толығымен сенімді болу үшін, оның идентификациясын төмендегі батырмаға шерту арқылы растаңыз."
+#: ../src/dialogs.py:5218
+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 ""
+"Хабарламаларыңызды <b>тек</b> тиісті адам оқи алатынына толығымен сенімді "
+"болу үшін, оның идентификациясын төмендегі батырмаға шерту арқылы растаңыз."
 
-#: ../src/dialogs.py:4809 ../src/dialogs.py:4860 ../src/dialogs.py:4873
+#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
 msgid "Contact's identity NOT verified"
 msgstr "Контакт шынайылығы РАСТАЛМАҒАН"
 
-#: ../src/dialogs.py:4814
+#: ../src/dialogs.py:5226
 msgid "Verify..."
 msgstr "Тексеру..."
 
-#: ../src/dialogs.py:4825
+#: ../src/dialogs.py:5237
 msgid "Have you verified the contact's identity?"
 msgstr "Контакт шынайылығын тексеріп көргенсіз бе?"
 
-#: ../src/dialogs.py:4826
+#: ../src/dialogs.py:5238
 #, python-format
 msgid ""
-"To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> directly (in person or on the phone) and verify that they see the same Short Authentication String (SAS) as you.\n"
+"To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
+"directly (in person or on the phone) and verify that they see the same Short "
+"Authentication String (SAS) as you.\n"
 "\n"
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
-"Белгісіз адаммен сөйлесуге жол бермеу үшін, сізге <b>%(jid)s</b> контактымен тура сөйлесіп (кездесіп не телефон арқылы), екеуіңіз де бірдей Short Authentication String (SAS) көретініңізге көз жеткізу керек.\n"
+"Белгісіз адаммен сөйлесуге жол бермеу үшін, сізге <b>%(jid)s</b> контактымен "
+"тура сөйлесіп (кездесіп не телефон арқылы), екеуіңіз де бірдей Short "
+"Authentication String (SAS) көретініңізге көз жеткізу керек.\n"
 "\n"
 "Бұл сессияның Short Authentication String келесі: <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4827
+#: ../src/dialogs.py:5239
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Қашықтағы адаммен тура сөйлесіп, SAS-ты растағансыз ба?"
 
-#: ../src/dialogs.py:4861
+#: ../src/dialogs.py:5273
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr "Контакт кілті (%s) Gajim ішінде көрсетілгенге <b>сәйкес келмейді</b>."
 
-#: ../src/dialogs.py:4867
+#: ../src/dialogs.py:5279
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
-msgstr "Бұл контактқа ешбір GPG кілті көрсетілмеген. Сол үшін хабарламаларды шифрлей алмайсыз."
+msgstr ""
+"Бұл контактқа ешбір GPG кілті көрсетілмеген. Сол үшін хабарламаларды шифрлей "
+"алмайсыз."
 
-#: ../src/dialogs.py:4874
-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 "Бұл контактқа GPG кілті көрсетілген, бірақ <b>сіз ол кілтке сенбейсіз</b>, сол үшін хабарламаларды шифрлеу <b>мүмкін емес</b>. Бұл кілтті растау үшін өзіңіздің GPG клиентін қолданыңыз."
+#: ../src/dialogs.py:5286
+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 ""
+"Бұл контактқа GPG кілті көрсетілген, бірақ <b>сіз ол кілтке сенбейсіз</b>, "
+"сол үшін хабарламаларды шифрлеу <b>мүмкін емес</b>. Бұл кілтті растау үшін "
+"өзіңіздің GPG клиентін қолданыңыз."
 
-#: ../src/dialogs.py:4880
-msgid "GPG Key is assigned to this contact, and you trust his key, so messages will be encrypted."
-msgstr "Бұл контактқа GPG кілті көрсетілген, және сіз ол кілтке сенесіз, сол үшін хабарламалар шифрленеді."
+#: ../src/dialogs.py:5292
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
+msgstr ""
+"Бұл контактқа GPG кілті көрсетілген, және сіз ол кілтке сенесіз, сол үшін "
+"хабарламалар шифрленеді."
 
-#: ../src/dialogs.py:4945
+#: ../src/dialogs.py:5357
 msgid "an audio and video"
 msgstr "аудио мен видео"
 
-#: ../src/dialogs.py:4947
+#: ../src/dialogs.py:5359
 msgid "an audio"
 msgstr "аудио"
 
-#: ../src/dialogs.py:4949
+#: ../src/dialogs.py:5361
 msgid "a video"
 msgstr "видео"
 
-#: ../src/dialogs.py:4953
+#: ../src/dialogs.py:5365
 #, python-format
-msgid "%(contact)s wants to start %(type)s session with you. Do you want to answer the call?"
-msgstr "%(contact)s сізбен %(type)s сессияны бастағысы келеді. Қоңырау соғуға жауап бересіз бе?"
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
+msgstr ""
+"%(contact)s сізбен %(type)s сессияны бастағысы келеді. Қоңырау соғуға жауап "
+"бересіз бе?"
 
 #: ../src/disco.py:119
 msgid "Others"
@@ -6923,114 +7684,119 @@ msgstr "Басқалар"
 msgid "Conference"
 msgstr "Конференция"
 
-#: ../src/disco.py:512
+#: ../src/disco.py:513
 msgid "Without a connection, you can not browse available services"
 msgstr "Байланысты орнатпасаңыз, қолжетерлік қызметтерді қарай алмайсыз"
 
-#: ../src/disco.py:589
+#: ../src/disco.py:600
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "%s тіркелгісі үшін қызметтерді қарап шығу"
 
-#: ../src/disco.py:591
+#: ../src/disco.py:602
 msgid "Service Discovery"
 msgstr "Қызметтерді қарап шығу"
 
-#: ../src/disco.py:741
+#: ../src/disco.py:758
 msgid "The service could not be found"
 msgstr "Қызмет табылмады"
 
-#: ../src/disco.py:742
-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:759
+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:746 ../src/disco.py:1082
+#: ../src/disco.py:763 ../src/disco.py:1100
 msgid "The service is not browsable"
 msgstr "Қызмет қарау үшін қол жетерсіз"
 
-#: ../src/disco.py:747
+#: ../src/disco.py:764
 msgid "This type of service does not contain any items to browse."
 msgstr "Қызметтің осы түрінде қарауға болатын ешнәрсе жоқ."
 
-#: ../src/disco.py:786 ../src/disco.py:796
+#: ../src/disco.py:804 ../src/disco.py:814
 msgid "Invalid Server Name"
 msgstr "Сервердің аты қате"
 
-#: ../src/disco.py:850
+#: ../src/disco.py:868
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "%(address)s қарау, %(account)s тіркелгісі"
 
-#: ../src/disco.py:894
+#: ../src/disco.py:912
 msgid "_Browse"
 msgstr "Қара_п шығу"
 
-#: ../src/disco.py:1083
+#: ../src/disco.py:1101
 msgid "This service does not contain any items to browse."
 msgstr "Бұл қызметте қарап шығуға болатын ешнәрсе жоқ."
 
-#: ../src/disco.py:1323
+#: ../src/disco.py:1341
 msgid "_Execute Command"
 msgstr "К_оманда орындау"
 
-#: ../src/disco.py:1333 ../src/disco.py:1504
+#: ../src/disco.py:1351 ../src/disco.py:1522
 msgid "Re_gister"
 msgstr "_Тіркелу"
 
-#: ../src/disco.py:1545
+#: ../src/disco.py:1563
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Қаралуда %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1736
+#: ../src/disco.py:1754
 msgid "Users"
 msgstr "Пайдаланушылар"
 
 #. Description column
-#: ../src/disco.py:1744
+#: ../src/disco.py:1762
 msgid "Description"
 msgstr "Сипаттамасы"
 
 #. Id column
-#: ../src/disco.py:1752
+#: ../src/disco.py:1770
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1817 ../src/gui_interface.py:3182
+#: ../src/disco.py:1835 ../src/gui_interface.py:2995
 msgid "Bookmark already set"
 msgstr "Бетбелгі орнатылған болып тұр"
 
-#: ../src/disco.py:1818 ../src/gui_interface.py:3183
+#: ../src/disco.py:1836 ../src/gui_interface.py:2996
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "\"%s\" чат бөлмесі бетбелгілеріңізде бар болып тұр."
 
-#: ../src/disco.py:1827 ../src/gui_interface.py:3197
+#: ../src/disco.py:1845 ../src/gui_interface.py:3010
 msgid "Bookmark has been added successfully"
 msgstr "Бетбелгі сәтті қосылды"
 
-#: ../src/disco.py:1828 ../src/gui_interface.py:3198
+#: ../src/disco.py:1846 ../src/gui_interface.py:3011
 msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "Өзіңіздің бетбелгілеріңізді ростердегі Әрекеттер мәзірінен басқара аласыз."
+msgstr ""
+"Өзіңіздің бетбелгілеріңізді ростердегі Әрекеттер мәзірінен басқара аласыз."
 
-#: ../src/disco.py:2039
+#: ../src/disco.py:2057
 msgid "Subscribed"
 msgstr "Жазылған"
 
-#: ../src/disco.py:2047
+#: ../src/disco.py:2065
 msgid "Node"
 msgstr "Node"
 
-#: ../src/disco.py:2111
+#: ../src/disco.py:2129
 msgid "New post"
 msgstr "Жаңа хабарлама"
 
-#: ../src/disco.py:2117
+#: ../src/disco.py:2135
 msgid "_Subscribe"
 msgstr "Жаз_ылу"
 
-#: ../src/disco.py:2123
+#: ../src/disco.py:2141
 msgid "_Unsubscribe"
 msgstr "Жа_зылудан бас тарту"
 
@@ -7039,8 +7805,11 @@ msgid "SSL certificat validation"
 msgstr "SSL сертификатын растау"
 
 #: ../src/features_window.py:50
-msgid "A library used to validate server certificates to ensure a secure connection."
-msgstr "Қауіпсіз байланыстарды орнату үшін сервер сертификатын растауда қолданылатын жинақ."
+msgid ""
+"A library used to validate server certificates to ensure a secure connection."
+msgstr ""
+"Қауіпсіз байланыстарды орнату үшін сервер сертификатын растауда қолданылатын "
+"жинақ."
 
 #: ../src/features_window.py:51 ../src/features_window.py:52
 msgid "Requires python-pyopenssl."
@@ -7052,7 +7821,9 @@ msgstr "Bonjour / Zeroconf"
 
 #: ../src/features_window.py:54
 msgid "Serverless chatting with autodetected clients in a local network."
-msgstr "Жергілікті желіден клиенттерді авто анықтап, серверсіз-ақ хабарламалармен алмасу."
+msgstr ""
+"Жергілікті желіден клиенттерді авто анықтап, серверсіз-ақ хабарламалармен "
+"алмасу."
 
 #: ../src/features_window.py:55
 msgid "Requires python-avahi."
@@ -7166,8 +7937,11 @@ msgid "Passive popups notifying for new events."
 msgstr "Жаңа оқиғалар жөнінде қалқымалы хабарламаларды көрсету."
 
 #: ../src/features_window.py:87
-msgid "Requires python-notify or instead python-dbus in conjunction with notification-daemon."
-msgstr "Талап етеді: python-notify не бірге python-dbus пен notification-daemon."
+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
 msgid "Automatic status"
@@ -7175,7 +7949,8 @@ msgstr "Өздігінен қалып-күйді орнату"
 
 #: ../src/features_window.py:90
 msgid "Ability to measure idle time, in order to set auto status."
-msgstr "Қалып-күйді өзгерту үшін белсенді емес уақыт шамасын анықтау мүмкіндігі."
+msgstr ""
+"Қалып-күйді өзгерту үшін белсенді емес уақыт шамасын анықтау мүмкіндігі."
 
 #: ../src/features_window.py:91
 msgid "Requires libxss library."
@@ -7194,12 +7969,23 @@ msgid "Transform LaTeX expressions between $$ $$."
 msgstr "$$ $$ арасында LaTeX өрнектерін түрлендіру."
 
 #: ../src/features_window.py:95
-msgid "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True in the Advanced Configuration Editor."
-msgstr "Талап етеді : texlive-latex-base пен dvipng. Сізге кеңейтілген баптаулар түзеткішінде 'use_latex' опциясын True мәніне орнату керек."
+#, fuzzy
+msgid ""
+"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
+msgstr ""
+"Талап етеді : texlive-latex-base пен dvipng. Сізге кеңейтілген баптаулар "
+"түзеткішінде 'use_latex' опциясын True мәніне орнату керек."
 
 #: ../src/features_window.py:96
-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 "Талап етеді : texlive-latex-base пен dvipng (Барлығы да MikTeX ішінде). Сізге кеңейтілген баптаулар түзеткішінде 'use_latex' опциясын True мәніне орнату керек."
+#, fuzzy
+msgid ""
+"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
+"You have to set 'use_latex' to True in the Advanced Configuration Editor."
+msgstr ""
+"Талап етеді : texlive-latex-base пен dvipng (Барлығы да MikTeX ішінде). "
+"Сізге кеңейтілген баптаулар түзеткішінде 'use_latex' опциясын True мәніне "
+"орнату керек."
 
 #: ../src/features_window.py:97
 msgid "End to End message encryption"
@@ -7218,8 +8004,12 @@ msgid "RST Generator"
 msgstr "RST генераторы"
 
 #: ../src/features_window.py:102
-msgid "Generate XHTML output from RST code (see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html)."
-msgstr "RST кодынан XHTML шығысын жасайды (http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html қараңыз)."
+msgid ""
+"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
+msgstr ""
+"RST кодынан XHTML шығысын жасайды (http://docutils.sourceforge.net/docs/ref/"
+"rst/restructuredtext.html қараңыз)."
 
 #: ../src/features_window.py:103 ../src/features_window.py:104
 msgid "Requires python-docutils."
@@ -7347,31 +8137,33 @@ msgstr "Анықтамасы: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s сізге файлды жібергісі келеді:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Бар файлды \"%s\" үстінен жазу мүмкін емес"
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
-msgid "A file with this name already exists and you do not have permission to overwrite it."
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
+msgid ""
+"A file with this name already exists and you do not have permission to "
+"overwrite it."
 msgstr "Аттас файл бар болып тұр және сізде оны үстінен жазу құқығыңыз жоқ."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 msgid "This file already exists"
 msgstr "Бұл файл бар болып тұр"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 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:369 ../src/gtkgui_helpers.py:914
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "\"%s\" бумасына жазу мүмкін емес"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
 msgid "You do not have permission to create files in this directory."
 msgstr "Сізде ол бумада файлдарды жасауға құқығыңыз жоқ."
 
@@ -7450,8 +8242,11 @@ msgstr "Gajim қосылу үшін pywin32 талап етеді"
 
 #: ../src/gajim.py:200
 #, python-format
-msgid "Please make sure that Pywin32 is installed on your system. You can get it at %s"
-msgstr "Жүйеңізде Pywin32 орнатылғанына көз жеткізіңіз. Оны %s жерінен алуға болады"
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+"Жүйеңізде Pywin32 орнатылғанына көз жеткізіңіз. Оны %s жерінен алуға болады"
 
 #. set the icon to all newly opened wind
 #: ../src/gajim.py:316
@@ -7466,31 +8261,41 @@ msgstr ""
 "Gajim қосулы тұрған сияқты\n"
 "Бәрібір жіберу керек пе?"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "Көрсетілген команда үшін көмекті көрсетеді"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:80
+#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
 msgid "command"
 msgstr "команда"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "команда көмегін көрсету"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Ростер терезесін көрсетеді не жасырады"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Келесі кезектегі оқиға бар қалқымалы терезені көрсетеді"
 
-#: ../src/gajim-remote.py:93
-msgid "Prints a list of all contacts in the roster. Each contact appears on a separate line"
-msgstr "Ростердегі бар контакттар тізімін шығарады. Әр контакт бөлек жолда болады"
-
+#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
+msgid ""
+"Prints a list of all contacts in the roster. Each contact appears on a "
+"separate line"
+msgstr ""
+"Ростердегі бар контакттар тізімін шығарады. Әр контакт бөлек жолда болады"
+
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
+#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
+#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
+#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
 #: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
 #: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
 #: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
@@ -7502,309 +8307,276 @@ msgstr "Ростердегі бар контакттар тізімін шыға
 msgid "account"
 msgstr "тіркелгі"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "тек көрсетілген тіркелгі контакттарын көрсету"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Бар тіркелгілер тізімін шығарады"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "Тіркелгі не тіркелгілердің қалып-күйін өзгерту"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
 msgid "status"
 msgstr "күйі"
 
-#: ../src/gajim-remote.py:109
-msgid "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use accoun't previous status"
-msgstr "келесіден біреу: желіде емес, осында, кетіп қалған, кеңейтілген кетіп қалған, мазамды алмаңыз, жасырын. Орнатылмаса, тіркелгінің алдыңғы күйі қолданылады"
-
-#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
-msgid "message"
-msgstr "хабарлама"
+#: ../src/gajim-remote-plugin.py:106
+#, fuzzy
+msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+msgstr ""
+"келесіден біреу: желіде емес, осында, кетіп қалған, кеңейтілген кетіп "
+"қалған, мазамды алмаңыз, жасырын. Орнатылмаса, тіркелгінің алдыңғы күйі "
+"қолданылады"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "қалып-күй хабарламасы"
 
-#: ../src/gajim-remote.py:111
-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 "\"Тіркелгі\" тіркелгісінің қалып-күйін өзгертеді. Көрсетілмесе, \"sync with global status\" опциясы орнатылған барлық тіркелгілерге әсер етеді"
-
-#: ../src/gajim-remote.py:117
-msgid "Changes the priority of account or accounts"
-msgstr "Бір не бірнеше тіркелгі үшін приоритетті өзгертеді"
-
-#: ../src/gajim-remote.py:119
-msgid "priority"
-msgstr "приоритет"
-
-#: ../src/gajim-remote.py:119
-msgid "priority you want to give to the account"
-msgstr "тіркелгіге бергіңіз келетін приоритет"
-
-#: ../src/gajim-remote.py:121
-msgid "change the priority of the given account. If not specified, change status of all accounts that have \"sync with global status\" option set"
-msgstr "көрсетілген тіркелгінің қалып-күйін өзгерту. Көрсетілмесе, барлық \"sync with global status\" опциясы орнатылған тіркелгілерге әсер етеді"
+#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
+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 ""
+"\"Тіркелгі\" тіркелгісінің қалып-күйін өзгертеді. Көрсетілмесе, \"sync with "
+"global status\" опциясы орнатылған барлық тіркелгілерге әсер етеді"
 
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Контактқа хабарлама жібере алатыныңыздай чат сұхбатын көрсетеді"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "Сөйлесуді бастағыңыз келетін контакттың JID-і"
 
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
 #: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "көрсетілсе, контакттар бұл тіркелгінің тізімінен алынады"
 
-#: ../src/gajim-remote.py:134
-msgid "message content. The account must be specified or \"\""
-msgstr "хабарлама құрамасы. Тіркелгі көрсетілуі не \"\" болуы керек"
-
-#: ../src/gajim-remote.py:139
-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 key', just set 'OpenPGP key' to ''."
-msgstr "Ростердегі контактқа жаңа чат хабарламасын жіберу. OpenPGP кілті мен тіркелгіні көрсету міндетті емес. Егер сіз 'OpenPGP key'-сіз тек 'account'-ты орнатқыңыз келсе, 'OpenPGP key' мәнін '' етіп орнатыңыз."
+#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
+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 "
+"key', just set 'OpenPGP key' to ''."
+msgstr ""
+"Ростердегі контактқа жаңа чат хабарламасын жіберу. OpenPGP кілті мен "
+"тіркелгіні көрсету міндетті емес. Егер сіз 'OpenPGP key'-сіз тек 'account'-"
+"ты орнатқыңыз келсе, 'OpenPGP key' мәнін '' етіп орнатыңыз."
 
+#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
 #: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "Хабарламаны алатын контакттың JID-і"
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
+#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "хабарлама құрамасы"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "pgp кілті"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "көрсетілсе, хабарлама бұл ортақ кілтпен шифрленеді"
 
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
+#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "көрсетілсе, хабарлама бұл тіркелгіні қолданып жіберіледі"
 
-#: ../src/gajim-remote.py:152
-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 key', just set 'OpenPGP key' to ''."
-msgstr "Ростердегі контактқа жаңа дара хабарламасын жіберу. OpenPGP кілті мен тіркелгіні көрсету міндетті емес. Егер сіз 'OpenPGP key'-сіз тек 'account'-ты орнатқыңыз келсе, 'OpenPGP key' мәнін '' етіп орнатыңыз."
+#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
+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 "
+"key', just set 'OpenPGP key' to ''."
+msgstr ""
+"Ростердегі контактқа жаңа дара хабарламасын жіберу. OpenPGP кілті мен "
+"тіркелгіні көрсету міндетті емес. Егер сіз 'OpenPGP key'-сіз тек 'account'-"
+"ты орнатқыңыз келсе, 'OpenPGP key' мәнін '' етіп орнатыңыз."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "тақырып"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "хабарлама тақырыбы"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Сіз кірген топ чатына жаңа хабарламаны жіберу."
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "хабарламаны алатын бөлменің JID-і"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Контакттың толық ақпаратын алу"
 
+#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
+#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
 #: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
 #: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "Контакт JID-і"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Тіркелгінің толық ақпаратын алу"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Тіркелгі аты"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Контактқа файлды жібереді"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "file"
 msgstr "файл"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Файл орналасуы"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "көрсетілсе, файл бұл тіркелгіні қолданып жіберіледі"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Барлық баптаулар мен олардың мәндерін тізіп шығу"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "'key' мәнін 'value' етіп орнатады."
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "key=value"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'key' - баптаудың аты, 'value' - орнатылатын мәні"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Баптау элементін өшіру"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
 msgid "key"
 msgstr "кілт"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "өшірілетін баптау аты"
 
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Gajim ағымдағы баптауларын .config файлына жазу"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "Ростерден контактты өшіреді"
 
-#: ../src/gajim-remote.py:227
+#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "Ростерге контактты қосады"
 
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "jid"
-
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "Бұл тіркелгіге жаңа контактты қосады"
 
-#: ../src/gajim-remote.py:235
+#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
-msgstr "Ағымдағы қалып-күйді қайтарады (тіркелгі көрсетілмесе, жалпыны қолданады)"
+msgstr ""
+"Ағымдағы қалып-күйді қайтарады (тіркелгі көрсетілмесе, жалпыны қолданады)"
 
-#: ../src/gajim-remote.py:242
-msgid "Returns current status message (the global one unless account is specified)"
-msgstr "Ағымдағы қалып-күй хабарламасын қайтарады (тіркелгі көрсетілмесе, жалпыны қолданады)"
+#: ../src/gajim-remote-plugin.py:226
+#, fuzzy
+msgid ""
+"Returns current status message(the global one unless account is specified)"
+msgstr ""
+"Ағымдағы қалып-күй хабарламасын қайтарады (тіркелгі көрсетілмесе, жалпыны "
+"қолданады)"
 
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote-plugin.py:233 ../src/gajim-remote.py:249
 msgid "Returns number of unread messages"
 msgstr "Оқылмаған хабарламалар саның қайтарады"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr "'Чатты бастау' сұхбат терезесін ашады"
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "Бұл тіркелгіні пайдаланып чатты бастау"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr "Таңдауыңызша XML жіберу"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr "Жіберілетін XML"
 
-#: ../src/gajim-remote.py:262
-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:268
-msgid "Change the avatar"
-msgstr "Аватарды өзгерту"
-
-#: ../src/gajim-remote.py:270
-msgid "Picture to use"
-msgstr "Қолдану үшін сурет"
-
-#: ../src/gajim-remote.py:271
-msgid "Account in which the avatar will be set; if not specified, the avatar will be set for all accounts"
-msgstr "Аватар орнатылатын тіркелгі; көрсетілмесе, аватар барлық тіркелгілерге орнатылады"
+#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+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:277
+#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
 msgid "Handle a xmpp:/ uri"
 msgstr "\"xmpp:/\" түріндегі сілтемені өңдеу"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:279
-msgid "URI to handle"
-msgstr "Өнделетін сілтеме"
-
-#: ../src/gajim-remote.py:280
-msgid "Account in which you want to handle it"
-msgstr "Өндеу үшін тіркелгі"
-
-#: ../src/gajim-remote.py:282
-msgid "Message content"
-msgstr "Хабарлама құрамасы"
-
-#: ../src/gajim-remote.py:286
+#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
 msgid "Join a MUC room"
 msgstr "Чат бөлмесіне кіру"
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
 msgid "room"
 msgstr "бөлме"
 
-#: ../src/gajim-remote.py:288
-msgid "Room JID"
-msgstr "Бөлме JID-і"
-
-#: ../src/gajim-remote.py:289
+#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
 msgid "nick"
 msgstr "ник"
 
-#: ../src/gajim-remote.py:289
-msgid "Nickname to use"
-msgstr "Қолданылатын ник"
-
-#: ../src/gajim-remote.py:290
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
 msgid "password"
 msgstr "пароль"
 
-#: ../src/gajim-remote.py:290
-msgid "Password to enter the room"
-msgstr "Бөлмеге кіру үшін керек пароль"
-
-#: ../src/gajim-remote.py:291
-msgid "Account from which you want to enter the room"
-msgstr "Бөлмеге кіру үшін қолданылатын тіркелгі"
-
-#: ../src/gajim-remote.py:296
+#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
 msgid "Check if Gajim is running"
 msgstr "Gajim қосулы тұрғанына көз жеткізіңіз"
 
+#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
 #: ../src/gajim-remote.py:300
 msgid "Shows or hides the ipython window"
 msgstr "ipython терезесін көрсетеді не жасырады"
 
-#: ../src/gajim-remote.py:327
+#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "\"contact_jid\" аргументі жоқ"
 
-#: ../src/gajim-remote.py:348
+#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -7813,33 +8585,31 @@ msgstr ""
 "'%s' ростеріңізде жоқ.\n"
 "Хабарламаны жіберу үшін тіркелгіні көрсетіңіз."
 
-#: ../src/gajim-remote.py:351
+#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
 msgid "You have no active account"
 msgstr "Сізде белсенді тіркелгі жоқ"
 
-#: ../src/gajim-remote.py:404
+#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Gajim қосулы емес сияқты. Сол үшін gajim-remote қолдануға болмайды."
 
-#: ../src/gajim-remote.py:431
+#: ../src/gajim-remote-plugin.py:412
 #, python-format
 msgid ""
-"Usage: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
+"Usage: %s %s %s \n"
+"\t %s"
 msgstr ""
-"Қолданылуы: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
 
-#: ../src/gajim-remote.py:435
+#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
 msgid "Arguments:"
 msgstr "Аргументтер:"
 
-#: ../src/gajim-remote.py:439
+#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
 #, python-format
 msgid "%s not found"
 msgstr "%s табылмады"
 
-#: ../src/gajim-remote.py:445
+#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -7848,6 +8618,122 @@ msgstr ""
 "Қолданылуы: %s команда [аргументтері]\n"
 "Команда - келесілердің біреуі:\n"
 
+#: ../src/gajim-remote-plugin.py:496
+#, fuzzy, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Аргументтер тым көп. \n"
+"Көбірек білу үшін \"%(basename)s help %(command)s\" енгізіңіз"
+
+#: ../src/gajim-remote-plugin.py:500
+#, fuzzy, python-format
+msgid ""
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"\"%(arg)s\" аргументі көрсетілмеген. \n"
+"Көбірек білу үшін \"%(basename)s help %(command)s\" енгізіңіз"
+
+#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
+msgid "Wrong uri"
+msgstr "Қате uri"
+
+#: ../src/gajim-remote.py:109
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
+msgstr ""
+"келесіден біреу: желіде емес, осында, кетіп қалған, кеңейтілген кетіп "
+"қалған, мазамды алмаңыз, жасырын. Орнатылмаса, тіркелгінің алдыңғы күйі "
+"қолданылады"
+
+#: ../src/gajim-remote.py:117
+msgid "Changes the priority of account or accounts"
+msgstr "Бір не бірнеше тіркелгі үшін приоритетті өзгертеді"
+
+#: ../src/gajim-remote.py:119
+msgid "priority"
+msgstr "приоритет"
+
+#: ../src/gajim-remote.py:119
+msgid "priority you want to give to the account"
+msgstr "тіркелгіге бергіңіз келетін приоритет"
+
+#: ../src/gajim-remote.py:121
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"көрсетілген тіркелгінің қалып-күйін өзгерту. Көрсетілмесе, барлық \"sync "
+"with global status\" опциясы орнатылған тіркелгілерге әсер етеді"
+
+#: ../src/gajim-remote.py:134
+msgid "message content. The account must be specified or \"\""
+msgstr "хабарлама құрамасы. Тіркелгі көрсетілуі не \"\" болуы керек"
+
+#: ../src/gajim-remote.py:242
+msgid ""
+"Returns current status message (the global one unless account is specified)"
+msgstr ""
+"Ағымдағы қалып-күй хабарламасын қайтарады (тіркелгі көрсетілмесе, жалпыны "
+"қолданады)"
+
+#: ../src/gajim-remote.py:268
+msgid "Change the avatar"
+msgstr "Аватарды өзгерту"
+
+#: ../src/gajim-remote.py:270
+msgid "Picture to use"
+msgstr "Қолдану үшін сурет"
+
+#: ../src/gajim-remote.py:271
+msgid ""
+"Account in which the avatar will be set; if not specified, the avatar will "
+"be set for all accounts"
+msgstr ""
+"Аватар орнатылатын тіркелгі; көрсетілмесе, аватар барлық тіркелгілерге "
+"орнатылады"
+
+#: ../src/gajim-remote.py:279
+msgid "URI to handle"
+msgstr "Өнделетін сілтеме"
+
+#: ../src/gajim-remote.py:280
+msgid "Account in which you want to handle it"
+msgstr "Өндеу үшін тіркелгі"
+
+#: ../src/gajim-remote.py:282
+msgid "Message content"
+msgstr "Хабарлама құрамасы"
+
+#: ../src/gajim-remote.py:288
+msgid "Room JID"
+msgstr "Бөлме JID-і"
+
+#: ../src/gajim-remote.py:289
+msgid "Nickname to use"
+msgstr "Қолданылатын ник"
+
+#: ../src/gajim-remote.py:290
+msgid "Password to enter the room"
+msgstr "Бөлмеге кіру үшін керек пароль"
+
+#: ../src/gajim-remote.py:291
+msgid "Account from which you want to enter the room"
+msgstr "Бөлмеге кіру үшін қолданылатын тіркелгі"
+
+#: ../src/gajim-remote.py:431
+#, python-format
+msgid ""
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
+msgstr ""
+"Қолданылуы: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
+
 #: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
@@ -7870,10 +8756,6 @@ msgstr ""
 msgid "No uri given"
 msgstr "Ешбір uri берілмеген"
 
-#: ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Қате uri"
-
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Тақырыбы"
@@ -7899,175 +8781,175 @@ msgstr "Ағымдағы теманы өшіре алмайсыз"
 msgid "Please first choose another for your current theme."
 msgstr "Алдымен ағымдағы ретінде басқа теманы таңдаңыз."
 
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:170
 msgid "Sending private message failed"
 msgstr "Жеке хабарламаны жіберу сәтсіз"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:171
+#: ../src/groupchat_control.py:172
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
-msgstr "Сіз енді \"%(room)s\" топ чатында емессіз, немесе \"%(nick)s\" кетіп қалған."
+msgstr ""
+"Сіз енді \"%(room)s\" топ чатында емессіз, немесе \"%(nick)s\" кетіп қалған."
 
-#: ../src/groupchat_control.py:450
+#: ../src/groupchat_control.py:455
 msgid "Insert Nickname"
 msgstr "Ник кірістіру"
 
-#: ../src/groupchat_control.py:631
+#: ../src/groupchat_control.py:636
 msgid "Conversation with "
 msgstr "Сөйлесу - "
 
-#: ../src/groupchat_control.py:633
+#: ../src/groupchat_control.py:638
 msgid "Continued conversation"
 msgstr "Жалғастырылған сөйлесу"
 
-#. Can be a message (see handle_event_gc_config_change in
-#. gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1272 ../src/gui_interface.py:1080
+#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Әр қатысушы сіздің толық JID-ды көре алады"
 
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1286
 msgid "Room logging is enabled"
 msgstr "Бөлме тарихын сақтау қосулы"
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1288
 msgid "A new room has been created"
 msgstr "Жаңа бөлме жасалған"
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1291
 msgid "The server has assigned or modified your roomnick"
 msgstr "Сервер сізге бөлме никті таңдаған не сіздегісін өзгерткен"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1287
+#: ../src/groupchat_control.py:1297
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s тебілген болса керек: %(reason)s"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1300
 #, 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:1300
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s бандалған болса керек: %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1312
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(who)s қазір %(nick)s қатысушысын бандаған: %(reason)s"
 
-#: ../src/groupchat_control.py:1314 ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
 #, python-format
 msgid "You are now known as %s"
 msgstr "Бұдан былай %s ретінде белгілі боласыз"
 
-#: ../src/groupchat_control.py:1330 ../src/gui_interface.py:919
+#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s енді %(new_nick)s ретінде белгілі болады"
 
-#: ../src/groupchat_control.py:1372 ../src/groupchat_control.py:1377
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1392
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s бөлімнен шығарылған (%(reason)s)"
 
-#: ../src/groupchat_control.py:1374
+#: ../src/groupchat_control.py:1383
 msgid "affiliation changed"
 msgstr "қатысуы өзгертілген"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1388
 msgid "room configuration changed to members-only"
 msgstr "бөлімге қатысу тек мүшелер үшін деп өзгертілген"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1394
 msgid "system shutdown"
 msgstr "жүйе сөндірілуі"
 
-#: ../src/groupchat_control.py:1470
+#: ../src/groupchat_control.py:1477
 #, 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:1474
+#: ../src/groupchat_control.py:1481
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** %(nick)s қатысуы %(affiliation)s етіп орнатылған"
 
-#: ../src/groupchat_control.py:1489
+#: ../src/groupchat_control.py:1496
 #, 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:1493
+#: ../src/groupchat_control.py:1500
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** %(nick)s ролі %(role)s етіп орнатылған"
 
-#: ../src/groupchat_control.py:1522
+#: ../src/groupchat_control.py:1530
 #, python-format
 msgid "%s has left"
 msgstr "%s шықты"
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1535
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s чат бөлмесіне кірді"
 
-#: ../src/groupchat_control.py:1529 ../src/gui_interface.py:946
+#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
 #: ../src/history_window.py:447 ../src/notify.py:234
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s қазір %(status)s"
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1774
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "\"%s\" топ чатынан шығуды шынымен қалайсыз ба?"
 
-#: ../src/groupchat_control.py:1761
-msgid "If you close this window, you will be disconnected from this group chat."
+#: ../src/groupchat_control.py:1776
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
 msgstr "Бұл терезені жапсаңыз, топ чатынан шығасыз."
 
-#: ../src/groupchat_control.py:1765 ../src/gui_interface.py:1216
-#: ../src/gui_interface.py:1992 ../src/gui_interface.py:2029
-#: ../src/gui_interface.py:2064 ../src/message_window.py:224
-#: ../src/roster_window.py:2739 ../src/roster_window.py:3399
-#: ../src/roster_window.py:4123
+#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
+#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
+#: ../src/gui_interface.py:1853 ../src/message_window.py:224
+#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
+#: ../src/roster_window.py:4195
 msgid "_Do not ask me again"
 msgstr "М_ені қайта сұрамау"
 
-#: ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:1814
 msgid "Changing Subject"
 msgstr "Тақырыпты өзгерту"
 
-#: ../src/groupchat_control.py:1800
+#: ../src/groupchat_control.py:1815
 msgid "Please specify the new subject:"
 msgstr "Жаңа тақырыпты көрсетіңіз:"
 
-#: ../src/groupchat_control.py:1807
+#: ../src/groupchat_control.py:1822
 msgid "Changing Nickname"
 msgstr "Ник атын өзгерту"
 
-#: ../src/groupchat_control.py:1808
+#: ../src/groupchat_control.py:1823
 msgid "Please specify the new nickname you want to use:"
 msgstr "Жаңа ник атыңызды енгізіңіз:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1839
+#: ../src/groupchat_control.py:1854
 #, python-format
 msgid "Destroying %s"
 msgstr "Өшірілуде %s"
 
-#: ../src/groupchat_control.py:1840
+#: ../src/groupchat_control.py:1855
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8075,22 +8957,22 @@ msgstr ""
 "Сіз бұл бөлмені жоюды қалағансыз.\n"
 "Төменде оның себебін көрсете аласыз:"
 
-#: ../src/groupchat_control.py:1842
+#: ../src/groupchat_control.py:1857
 msgid "You may also enter an alternate venue:"
 msgstr "Басқа кездесу орнын көрсете аласыз:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2028
+#: ../src/groupchat_control.py:2046
 #, python-format
 msgid "Kicking %s"
 msgstr "%s тебілуде"
 
-#: ../src/groupchat_control.py:2029 ../src/groupchat_control.py:2356
+#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
 msgid "You may specify a reason below:"
 msgstr "Төменде оның себебін көрсете аласыз:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2355
+#: ../src/groupchat_control.py:2373
 #, python-format
 msgid "Banning %s"
 msgstr "%s банға жіберу"
@@ -8100,8 +8982,12 @@ msgid "A programming error has been detected"
 msgstr "Бағдарламалау қатесі табылды"
 
 #: ../src/gtkexcepthook.py:47
-msgid "It probably is not fatal, but should be reported to the developers nonetheless."
-msgstr "Ол қатаң қате болмауы да мүмкін, бірақ сонда да жасаушыларға хабарлануы керек."
+msgid ""
+"It probably is not fatal, but should be reported to the developers "
+"nonetheless."
+msgstr ""
+"Ол қатаң қате болмауы да мүмкін, бірақ сонда да жасаушыларға хабарлануы "
+"керек."
 
 #: ../src/gtkexcepthook.py:54
 msgid "_Report Bug"
@@ -8112,113 +8998,161 @@ msgid "Details"
 msgstr "Көбірек"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
+#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Қате: оқу үшін %s ашу мүмкін емес"
 
-#: ../src/gtkgui_helpers.py:400
+#: ../src/gtkgui_helpers.py:404
 msgid "Error reading file:"
 msgstr "Файлды оқу қатесі:"
 
-#: ../src/gtkgui_helpers.py:403
+#: ../src/gtkgui_helpers.py:407
 msgid "Error parsing file:"
 msgstr "Файлды өңдеу қатесі:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:444
+#: ../src/gtkgui_helpers.py:448
 #, 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:818
+#: ../src/gtkgui_helpers.py:822
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim қазір негізгі Jabber клиенті емес"
 
-#: ../src/gtkgui_helpers.py:819
+#: ../src/gtkgui_helpers.py:823
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Gajim-ды жүйеңізде негізгі Jabber клиенті қылуды қалайсыз ба?"
 
-#: ../src/gtkgui_helpers.py:820
+#: ../src/gtkgui_helpers.py:824
 msgid "Always check to see if Gajim is the default Jabber client on startup"
-msgstr "Қосылғанда, әрқашан Gajim жүйеңізде негізгі Jabber клиенті екенін тексеру"
+msgstr ""
+"Қосылғанда, әрқашан Gajim жүйеңізде негізгі Jabber клиенті екенін тексеру"
 
-#: ../src/gtkgui_helpers.py:887
+#: ../src/gtkgui_helpers.py:891
 msgid "Extension not supported"
 msgstr "Кеңейтуге қолдау жоқ"
 
-#: ../src/gtkgui_helpers.py:888
+#: ../src/gtkgui_helpers.py:892
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
-msgstr "Суретті %(type)s пішімінде сақтау мүмкін емес. %(new_filename)s ретінде сақтау керек пе?"
+msgstr ""
+"Суретті %(type)s пішімінде сақтау мүмкін емес. %(new_filename)s ретінде "
+"сақтау керек пе?"
 
-#: ../src/gtkgui_helpers.py:924
+#: ../src/gtkgui_helpers.py:928
 msgid "Save Image as..."
 msgstr "Суретті қалайша сақтау..."
 
-#: ../src/gui_interface.py:140
+#. we are banned
+#. group chat does not exist
+#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
+#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
+#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
+#: ../src/gui_interface.py:348
+msgid "Unable to join group chat"
+msgstr "Чат бөлмесіне кіру мүмкін емес"
+
+#: ../src/gui_interface.py:138
 #, python-format
 msgid ""
-"Your desired nickname in group chat %s is in use or registered by another occupant.\n"
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
-"Сіз %s топ чаты үшін таңдаған ник атыңызды басқа қатысушы тіркелген болса керек.\n"
+"Сіз %s топ чаты үшін таңдаған ник атыңызды басқа қатысушы тіркелген болса "
+"керек.\n"
 "Басқа никты төменде көрсетіңіз:"
 
-#: ../src/gui_interface.py:143
+#: ../src/gui_interface.py:141
 msgid "Always use this nickname when there is a conflict"
 msgstr "Осындай қолайсыздық болса әрқашан осы никты қолдану"
 
-#: ../src/gui_interface.py:159
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Бұл сұранымды қабылдайсыз ба?"
 
-#: ../src/gui_interface.py:161
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "%s тіркелгісіндегі бұл сұранымды қабылдайсыз ба?"
 
-#: ../src/gui_interface.py:164
+#: ../src/gui_interface.py:163
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) %(url)s үшін авторизация (id: %(id)s)"
 
-#: ../src/gui_interface.py:213 ../src/notify.py:493
+#: ../src/gui_interface.py:209 ../src/notify.py:493
 msgid "Connection Failed"
 msgstr "Байланысу сәтсіз"
 
-#: ../src/gui_interface.py:606 ../src/gui_interface.py:610
+#: ../src/gui_interface.py:312
+#, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "%s бөлмесіне кіру үшін пароль керек. Оны көрсетіңіз."
+
+#: ../src/gui_interface.py:324
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr "%s үшін пайдаланушылар саны максималды санына жетті"
+
+#: ../src/gui_interface.py:333
+#, python-format
+msgid "You are banned from group chat %s."
+msgstr "Сізді %s топ чатынан бандаған."
+
+#: ../src/gui_interface.py:338
+#, python-format
+msgid "Group chat %s does not exist."
+msgstr "%s топтық чаты жоқ."
+
+#: ../src/gui_interface.py:341
+msgid "Group chat creation is restricted."
+msgstr "Топтық чаттарды жасау рұқсат етілмеген."
+
+#: ../src/gui_interface.py:344
+#, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Сіздің тіркелген ник атыңыз %s топ чатында қолданылуы керек."
+
+#: ../src/gui_interface.py:349
+#, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Сіз %s топ чат мүшелері тізімінде емессіз."
+
+#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Қате %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:621 ../src/gui_interface.py:636
+#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "%(message)s жіберу кезіндегі қате ( %(error)s )"
 
-#: ../src/gui_interface.py:663 ../src/notify.py:495
+#: ../src/gui_interface.py:540 ../src/notify.py:495
 msgid "Subscription request"
 msgstr "Жазылуға сұраным"
 
-#: ../src/gui_interface.py:688
+#: ../src/gui_interface.py:565
 msgid "Authorization accepted"
 msgstr "Авторизация қабылданды"
 
-#: ../src/gui_interface.py:689
+#: ../src/gui_interface.py:566
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "\"%s\" контакты өз қалып-күйін көруге сізге авторизация берген."
 
-#: ../src/gui_interface.py:702
+#: ../src/gui_interface.py:579
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "\"%s\" контакты сізден өзіне жазылуды өшіріп тастаған"
 
-#: ../src/gui_interface.py:703
+#: ../src/gui_interface.py:580
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8226,99 +9160,106 @@ msgstr ""
 "Сіз енді оны әрқашан да желіде емес ретінде көресіз.\n"
 "Оны өз контакттар тізіміңізден өшіруді қалайсыз ба?"
 
-#: ../src/gui_interface.py:727 ../src/notify.py:497
+#: ../src/gui_interface.py:604 ../src/notify.py:497
 msgid "Unsubscribed"
 msgstr "Жазылмаған"
 
-#: ../src/gui_interface.py:754
+#: ../src/gui_interface.py:631
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "\"%s\" үшін байланысты орнату мүмкін емес"
 
-#: ../src/gui_interface.py:1015
+#: ../src/gui_interface.py:859
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s тақырыпты %(subject)s етіп орнатқан"
 
-#: ../src/gui_interface.py:1083
+#: ../src/gui_interface.py:926
 msgid "Room now shows unavailable member"
 msgstr "Бөлме енді қолжетерсіз қатысушыларды көрсетеді"
 
-#: ../src/gui_interface.py:1085
+#: ../src/gui_interface.py:928
 msgid "room now does not show unavailable members"
 msgstr "Бөлме енді қолжетерсіз қатысушыларды көрсетпейді"
 
-#: ../src/gui_interface.py:1087
+#: ../src/gui_interface.py:930
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr "Жекелікке байланысты емес бөлме баптауының өзгерісі орын алды"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:1091
+#: ../src/gui_interface.py:934
 msgid "Room logging is now enabled"
 msgstr "Бөлме тарихын сақтау енді қосулы"
 
-#: ../src/gui_interface.py:1093
+#: ../src/gui_interface.py:936
 msgid "Room logging is now disabled"
 msgstr "Бөлме тарихын сақтау енді сөндірулі"
 
-#: ../src/gui_interface.py:1095
+#: ../src/gui_interface.py:938
 msgid "Room is now non-anonymous"
 msgstr "Бөлме енді анонимды емес"
 
-#: ../src/gui_interface.py:1098
+#: ../src/gui_interface.py:941
 msgid "Room is now semi-anonymous"
 msgstr "Бөлме енді жартылай анонимды"
 
-#: ../src/gui_interface.py:1101
+#: ../src/gui_interface.py:944
 msgid "Room is now fully-anonymous"
 msgstr "Бөлме енді толық анонимды"
 
-#: ../src/gui_interface.py:1133
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "%s бөлмесіне кіру үшін пароль керек. Оны көрсетіңіз."
-
-#: ../src/gui_interface.py:1180
-msgid "You configured Gajim to use GPG agent, but there is no GPG agent running or it returned a wrong passphrase.\n"
-msgstr "Сіз Gajim-ды GPG агентін қолдануға баптағансыз, бірақ, қосулы тұрған GPG агенті жоқ немесе ол қате кілтсөзді қайтарған.\n"
+#: ../src/gui_interface.py:985
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+"Сіз Gajim-ды GPG агентін қолдануға баптағансыз, бірақ, қосулы тұрған GPG "
+"агенті жоқ немесе ол қате кілтсөзді қайтарған.\n"
 
-#: ../src/gui_interface.py:1182 ../src/gui_interface.py:1189
+#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Сіз қазір өзіңіздің OpenPGP кілтсіз-ақ қосулы тұрсыз."
 
-#: ../src/gui_interface.py:1184
+#: ../src/gui_interface.py:989
 msgid "Your passphrase is incorrect"
 msgstr "Сіз көрсеткен кілтсөз қате"
 
-#: ../src/gui_interface.py:1188
+#: ../src/gui_interface.py:993
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "OpenGPG кілтсөзі қате"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid "GPG key not trusted"
 msgstr "GPG кілті сенімді емес"
 
-#: ../src/gui_interface.py:1214
-msgid "The GPG key used to encrypt this chat is not trusted. Do you really want to encrypt this message?"
-msgstr "Бұл чатты шифрлеу үшін қолданылатын GPG кілті сенімді емес. Бұл хабарламаны шифрлеуді шынымен қалайсыз ба?"
+#: ../src/gui_interface.py:1019
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+"Бұл чатты шифрлеу үшін қолданылатын GPG кілті сенімді емес. Бұл хабарламаны "
+"шифрлеуді шынымен қалайсыз ба?"
 
-#: ../src/gui_interface.py:1226
-msgid "Gnome Keyring is installed but not                 correctly started (environment variable probably not                 correctly set)"
-msgstr "Gnome Keyring орнатулы тұр, бірақ дұрыс қосылмаған (қоршам айнымалысы дұрыс орнатылмаған сияқты)"
+#: ../src/gui_interface.py:1031
+msgid ""
+"Gnome Keyring is installed but not                 correctly started "
+"(environment variable probably not                 correctly set)"
+msgstr ""
+"Gnome Keyring орнатулы тұр, бірақ дұрыс қосылмаған (қоршам айнымалысы дұрыс "
+"орнатылмаған сияқты)"
 
-#: ../src/gui_interface.py:1330
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "%(gmail_mail_address)s үшін жаңа пошта бар"
 
-#: ../src/gui_interface.py:1332
+#: ../src/gui_interface.py:1133
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Сізде %d жаңа поштамен алмасу бар"
 msgstr[1] "Сізде %d жаңа поштамен алмасу бар"
 
-#: ../src/gui_interface.py:1345
+#: ../src/gui_interface.py:1146
 #, python-format
 msgid ""
 "\n"
@@ -8333,42 +9274,42 @@ msgstr ""
 "Тақырыбы: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1418
+#: ../src/gui_interface.py:1215
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s сізге файлды жібергісі келеді:"
 
-#: ../src/gui_interface.py:1455 ../src/roster_window.py:1856
+#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
 msgid "Remote contact stopped transfer"
 msgstr "Қашықтағы контакт файлдармен алмасуды тоқтатқан"
 
-#: ../src/gui_interface.py:1458 ../src/roster_window.py:1858
+#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
 msgid "Error opening file"
 msgstr "Файлды ашу қатесі"
 
-#: ../src/gui_interface.py:1490
+#: ../src/gui_interface.py:1287
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "%(name)s жіберген %(filename)s сәтті қабылдадыңыз."
 
 #. ft stopped
-#: ../src/gui_interface.py:1494
+#: ../src/gui_interface.py:1291
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "%(name)s жіберген %(filename)s файлын алу тоқтатылды."
 
-#: ../src/gui_interface.py:1507
+#: ../src/gui_interface.py:1304
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Сіз %(filename)s файлын %(name)s үшін сәтті жібердіңіз."
 
 #. ft stopped
-#: ../src/gui_interface.py:1511
+#: ../src/gui_interface.py:1308
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "%(filename)s файлын %(name)s үшін жіберу тоқтатылды."
 
-#: ../src/gui_interface.py:1623
+#: ../src/gui_interface.py:1426
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8377,154 +9318,186 @@ msgstr ""
 "%s жіберген хабарламаны декодалау мүмкін емес\n"
 "Ол зақымдалған шығар."
 
-#: ../src/gui_interface.py:1630
+#: ../src/gui_interface.py:1433
 msgid "Unable to decrypt message"
 msgstr "Хабарламаны декодалау мүмкін емес"
 
-#: ../src/gui_interface.py:1702
+#: ../src/gui_interface.py:1505
 msgid "Username Conflict"
 msgstr "Пайдаланушы аттардың ерегісуі"
 
-#: ../src/gui_interface.py:1703
+#: ../src/gui_interface.py:1506
 msgid "Please type a new username for your local account"
 msgstr "Жергілікті тіркелгіңіз үшін жаңа пайдаланушы атын енгізіңіз"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1519
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gui_interface.py:1729
+#: ../src/gui_interface.py:1532
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s сек.)"
 
-#: ../src/gui_interface.py:1740
+#: ../src/gui_interface.py:1543
 msgid "Error."
 msgstr "Қате."
 
-#: ../src/gui_interface.py:1768
+#: ../src/gui_interface.py:1556
 msgid "Resource Conflict"
 msgstr "Ресурстар ерегісуі"
 
-#: ../src/gui_interface.py:1769
-msgid "You are already connected to this account with the same resource. Please type a new one"
+#: ../src/gui_interface.py:1557
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
 msgstr "Сіз осы тіркелгіге осы ресурспен қосулы тұрсыз. Жаңасын көрсетіңіз"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1816
+#: ../src/gui_interface.py:1604
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s сізбен дауыс чатын бастағысы келеді."
 
-#: ../src/gui_interface.py:1819
+#: ../src/gui_interface.py:1607
 msgid "Voice Chat Request"
 msgstr "Дауыс чатына сұраным"
 
-#: ../src/gui_interface.py:1927
+#: ../src/gui_interface.py:1716
 msgid "Error verifying SSL certificate"
 msgstr "SSL сертификатын растау қатесі"
 
-#: ../src/gui_interface.py:1928
+#: ../src/gui_interface.py:1717
 #, python-format
 msgid ""
-"There was an error verifying the SSL certificate of your jabber server: %(error)s\n"
+"There was an error verifying the SSL certificate of your jabber server: "
+"%(error)s\n"
 "Do you still want to connect to this server?"
 msgstr ""
-"Сіздің jabber серверінің SSL сертификаты растауда қате орын алған: %(error)s\n"
+"Сіздің jabber серверінің SSL сертификаты растауда қате орын алған: "
+"%(error)s\n"
 "Сонда да сервермен байланысты орнатуды қалайсыз ба?"
 
-#: ../src/gui_interface.py:1936
+#: ../src/gui_interface.py:1725
 msgid "Ignore this error for this certificate."
 msgstr "Бұл сертификат үшін осы қатені елемеу."
 
-#: ../src/gui_interface.py:1956
+#: ../src/gui_interface.py:1745
 msgid "SSL certificate error"
 msgstr "SSL сертификат қатесі"
 
-#: ../src/gui_interface.py:1957
+#: ../src/gui_interface.py:1746
 #, python-format
 msgid ""
-"It seems the SSL certificate of account %(account)s 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 ""
-"%(account)s тіркелгісінің SSL сертификаты өзгерген сияқты не сіздің байланысызды біреу сындырған.\n"
+"%(account)s тіркелгісінің SSL сертификаты өзгерген сияқты не сіздің "
+"байланысызды біреу сындырған.\n"
 "Ескі баспасы: %(old)s\n"
 "Жаңа баспасы: %(new)s\n"
 "\n"
 "Сонда да байланыс орнату мен сертификат баспасын жаңартуды қалайсыз ба?"
 
-#: ../src/gui_interface.py:1987 ../src/gui_interface.py:2024
-#: ../src/gui_interface.py:2060
+#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
+#: ../src/gui_interface.py:1849
 msgid "Insecure connection"
 msgstr "Қауіпсіз емес байланыс"
 
-#: ../src/gui_interface.py:1988
-msgid "You are about to connect to the server with an insecure connection. This means all your conversations will be exchanged unencrypted. Are you sure you want to do that?"
-msgstr "Сіз серверге қауіпсіз емес байланысты орнатасыз. Бұл дегеніміз, сіздің барлық сөйлесулеріңіз шифрленбеген түрде жүреді. Осыны жасауды шынымен қалайсыз ба?"
+#: ../src/gui_interface.py:1777
+msgid ""
+"You are about to connect to the server with an insecure connection. This "
+"means all your conversations will be exchanged unencrypted. Are you sure you "
+"want to do that?"
+msgstr ""
+"Сіз серверге қауіпсіз емес байланысты орнатасыз. Бұл дегеніміз, сіздің "
+"барлық сөйлесулеріңіз шифрленбеген түрде жүреді. Осыны жасауды шынымен "
+"қалайсыз ба?"
 
-#: ../src/gui_interface.py:1991 ../src/gui_interface.py:2028
-#: ../src/gui_interface.py:2063
+#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
+#: ../src/gui_interface.py:1852
 msgid "Yes, I really want to connect insecurely"
 msgstr "Иә, қауіпсіз емес байланысты орнатқым келеді"
 
-#: ../src/gui_interface.py:2025
-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 "Қауіпсіз емес байланыс арқылы пароліңізді жібересіз. Осыған жол бермеу үшін PyOpenSSL орнатуыңыз керек. Осыны жасауды шынымен қалайсыз ба?"
+#: ../src/gui_interface.py:1814
+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 ""
+"Қауіпсіз емес байланыс арқылы пароліңізді жібересіз. Осыған жол бермеу үшін "
+"PyOpenSSL орнатуыңыз керек. Осыны жасауды шынымен қалайсыз ба?"
 
-#: ../src/gui_interface.py:2061
-msgid "You are about to send your password unencrypted on an insecure connection. Are you sure you want to do that?"
-msgstr "Қауіпсіз емес байланыс арқылы шифрленбеген пароліңізді жібересіз. Осыны жасауды шынымен қалайсыз ба?"
+#: ../src/gui_interface.py:1850
+msgid ""
+"You are about to send your password unencrypted on an insecure connection. "
+"Are you sure you want to do that?"
+msgstr ""
+"Қауіпсіз емес байланыс арқылы шифрленбеген пароліңізді жібересіз. Осыны "
+"жасауды шынымен қалайсыз ба?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2624 ../src/gui_interface.py:2647
+#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
 msgid "Emoticons disabled"
 msgstr "Смайликтер сөндірулі"
 
-#: ../src/gui_interface.py:2625
-msgid "Your configured emoticons theme has not been found, so emoticons have been disabled."
-msgstr "Сіз баптаған смайликтер темасы табылмады, сол үшін смайликтер сөндірілген."
+#: ../src/gui_interface.py:2423
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+"Сіз баптаған смайликтер темасы табылмады, сол үшін смайликтер сөндірілген."
 
-#: ../src/gui_interface.py:2648
-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 "Сіз баптаған смайликтер темасын жүктеу мүмкін емес. Мүмкін, сізге emoticons.py файл пішімін жаңарту керек. Көбірек білу үшін http://trac.gajim.org/wiki/Emoticons қараңыз."
+#: ../src/gui_interface.py:2446
+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 ""
+"Сіз баптаған смайликтер темасын жүктеу мүмкін емес. Мүмкін, сізге emoticons."
+"py файл пішімін жаңарту керек. Көбірек білу үшін http://trac.gajim.org/wiki/"
+"Emoticons қараңыз."
 
-#: ../src/gui_interface.py:2679 ../src/roster_window.py:3560
+#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
 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/gui_interface.py:3058
+#: ../src/gui_interface.py:2871
 msgid "Could not save your settings and preferences"
 msgstr "Баптауларыңызды сақтау мүмкін емес"
 
-#: ../src/gui_interface.py:3592
+#: ../src/gui_interface.py:3411
 msgid "Passphrase Required"
 msgstr "Кілтсөз керек"
 
-#: ../src/gui_interface.py:3593
+#: ../src/gui_interface.py:3412
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr "%(keyid)s кілті үшін GPG кілт құпия сөзін енгізіңіз (%(account)s тіркелгісі)."
+msgstr ""
+"%(keyid)s кілті үшін GPG кілт құпия сөзін енгізіңіз (%(account)s тіркелгісі)."
 
-#: ../src/gui_interface.py:3607
+#: ../src/gui_interface.py:3426
 msgid "GPG key expired"
 msgstr "GPG кілтінің мерзімі біткен"
 
-#: ../src/gui_interface.py:3608
+#: ../src/gui_interface.py:3427
 #, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
-msgstr "Сіздің GPG кілтіңіздің мерзімі біткен, сол үшін сіз %s үшін байланысыңыз OpenPGP-сіз іске асырылады."
+msgstr ""
+"Сіздің GPG кілтіңіздің мерзімі біткен, сол үшін сіз %s үшін байланысыңыз "
+"OpenPGP-сіз іске асырылады."
 
 #. ask again
-#: ../src/gui_interface.py:3617
+#: ../src/gui_interface.py:3436
 msgid "Wrong Passphrase"
 msgstr "Кілтсөз қате"
 
-#: ../src/gui_interface.py:3618
+#: ../src/gui_interface.py:3437
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Өзіңіздің GPG кілтсөзіңізді қайта енгізіңіз не Бас тартуды қалаңыз."
 
@@ -8562,17 +9535,30 @@ msgstr "Ник аты"
 msgid "Message"
 msgstr "Хабарлама"
 
+#. holds subject
+#: ../src/history_manager.py:188 ../src/history_manager.py:219
+msgid "Subject"
+msgstr "Тақырып"
+
 #: ../src/history_manager.py:241
-msgid "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING)"
-msgstr "Дерекқорды тазалауды қалайсыз ба? (GAJIM ҚОСУЛЫ ТҰРСА ОСЫНЫ ҚОЛДАНУ ҚАТАҢ ҰСЫНЫЛМАЙДЫ)"
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
+msgstr ""
+"Дерекқорды тазалауды қалайсыз ба? (GAJIM ҚОСУЛЫ ТҰРСА ОСЫНЫ ҚОЛДАНУ ҚАТАҢ "
+"ҰСЫНЫЛМАЙДЫ)"
 
 #: ../src/history_manager.py:243
 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 click NO.\n"
+"Normally allocated database size will not be freed, it will just become "
+"reusable. If you really want to reduce database filesize, click YES, else "
+"click NO.\n"
 "\n"
 "In case you click YES, please wait..."
 msgstr ""
-"Қалыпты бөлінген дерекқор өлшемі азаймайды, оны қайта қолдануға болады. Дерекқор өлшемін шынымен азайтсам десеңіз, ИӘ шертіңіз, олай болмаса, ЖОҚ шертіңіз.\n"
+"Қалыпты бөлінген дерекқор өлшемі азаймайды, оны қайта қолдануға болады. "
+"Дерекқор өлшемін шынымен азайтсам десеңіз, ИӘ шертіңіз, олай болмаса, ЖОҚ "
+"шертіңіз.\n"
 "ИӘ шертсеңіз, күте тұрыңыз..."
 
 #: ../src/history_manager.py:460
@@ -8587,8 +9573,10 @@ msgstr "%(time)s уақытында %(who)s айтқан: %(message)s\n"
 #: ../src/history_manager.py:572
 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[0] ""
+"Ерекшеленген контактпен барлық сөйлесулер тарихын өшіруді қалайсыз ба?"
+msgstr[1] ""
+"Ерекшеленген контакттармен барлық сөйлесулер тарихын өшіруді қалайсыз ба?"
 
 #: ../src/history_manager.py:576 ../src/history_manager.py:611
 msgid "This is an irreversible operation."
@@ -8649,19 +9637,19 @@ msgstr "Сіз бірнеше чатты жабуды таңдадыңыз"
 msgid "Do you really want to close them all?"
 msgstr "Сіз олардың барлығын жабуды таңдайсыз ба?"
 
-#: ../src/message_window.py:484
+#: ../src/message_window.py:485
 msgid "Chats"
 msgstr "Чаттар"
 
-#: ../src/message_window.py:486
+#: ../src/message_window.py:487
 msgid "Group Chats"
 msgstr "Чат бөлмелері"
 
-#: ../src/message_window.py:488
+#: ../src/message_window.py:489
 msgid "Private Chats"
 msgstr "Жеке чаттар"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:495
 msgid "Messages"
 msgstr "Хабарламалар"
 
@@ -8717,298 +9705,351 @@ msgstr "%(nickname)s жіберген жаңа хабарлама"
 msgid "Ignore"
 msgstr "Елемеу"
 
-#: ../src/profile_window.py:57
+#: ../src/profile_window.py:58
 msgid "Retrieving profile..."
 msgstr "Профайлды алу..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2935
+#: ../src/profile_window.py:111 ../src/roster_window.py:3001
 msgid "File is empty"
 msgstr "Файл бос"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2938
+#: ../src/profile_window.py:114 ../src/roster_window.py:3004
 msgid "File does not exist"
 msgstr "Файл жоқ"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2940 ../src/roster_window.py:2951
+#: ../src/profile_window.py:128 ../src/profile_window.py:144
+#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
 msgid "Could not load image"
 msgstr "Суретті жүктеу мүмкін емес"
 
-#: ../src/profile_window.py:214
+#: ../src/profile_window.py:215
 msgid "Wrong date format"
 msgstr "Уақыт пішімі қате"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:216
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Уақыт пішімі ЖЖЖЖ-АА-КК түрінде болуы керек"
 
-#: ../src/profile_window.py:269
+#: ../src/profile_window.py:270
 msgid "Information received"
 msgstr "Ақпарат алынды"
 
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:341
 msgid "Without a connection you can not publish your contact information."
 msgstr "Байланыс жоқ кезде сіз өзіңіздің контакт ақпаратын жариялай алмайсыз."
 
-#: ../src/profile_window.py:353
+#: ../src/profile_window.py:354
 msgid "Sending profile..."
 msgstr "Профайлды жіберу..."
 
-#: ../src/profile_window.py:368
+#: ../src/profile_window.py:369
 msgid "Information NOT published"
 msgstr "Ақпарат жарияланған ЖОҚ"
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:376
 msgid "vCard publication failed"
 msgstr "vCard жариялануы қатемен аяқталды"
 
-#: ../src/profile_window.py:376
-msgid "There was an error while publishing your personal information, try again later."
-msgstr "Сіз өзіңіздің жеке ақпаратыңызды жариялау кезінде қате кетті, кейін қайталап көріңіз."
+#: ../src/profile_window.py:377
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Сіз өзіңіздің жеке ақпаратыңызды жариялау кезінде қате кетті, кейін қайталап "
+"көріңіз."
 
-#: ../src/roster_window.py:256 ../src/roster_window.py:1012
+#: ../src/roster_window.py:262 ../src/roster_window.py:1026
 msgid "Merged accounts"
 msgstr "Біріктірілген тіркелгілер"
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1942
 msgid "Authorization has been sent"
 msgstr "Авторизация жіберілді"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1943
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "\"%s\" енді сіздің қалып-күйіңізді біле алады."
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1966
 msgid "Subscription request has been sent"
 msgstr "Жазылуға сұраным жіберілді"
 
-#: ../src/roster_window.py:1944
+#: ../src/roster_window.py:1967
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
-msgstr "Егер \"%s\" сіздің сұранымыңызды қабылдаса, сіз оның қалып-күйін біле аласыз."
+msgstr ""
+"Егер \"%s\" сіздің сұранымыңызды қабылдаса, сіз оның қалып-күйін біле аласыз."
 
-#: ../src/roster_window.py:1958
+#: ../src/roster_window.py:1981
 msgid "Authorization has been removed"
 msgstr "Авторизация өшірілді"
 
-#: ../src/roster_window.py:1959
+#: ../src/roster_window.py:1982
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" енді сізді әрқашан желіде емес күйінде көреді."
 
-#: ../src/roster_window.py:1986
+#: ../src/roster_window.py:2009
 msgid "GPG is not usable"
 msgstr "GPG қолдануға мүмкін емес"
 
-#: ../src/roster_window.py:1987
+#: ../src/roster_window.py:2010
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Сіз %s үшін OpenPGP-сіз байланыс орнатасыз."
 
-#: ../src/roster_window.py:2199 ../src/roster_window.py:3496
+#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
 msgid "You are participating in one or more group chats"
 msgstr "Сіз бір не бірнеше чат бөлмесіне қатысушы болып тұрсыз"
 
-#: ../src/roster_window.py:2200 ../src/roster_window.py:3497
-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:2223 ../src/roster_window.py:3563
+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:2226
+#: ../src/roster_window.py:2249
 msgid "desync'ed"
 msgstr "байланыспаған"
 
-#: ../src/roster_window.py:2288
+#: ../src/roster_window.py:2311
 msgid "Really quit Gajim?"
 msgstr "Gajim-нан шығу керек пе?"
 
-#: ../src/roster_window.py:2289
+#: ../src/roster_window.py:2312
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Gajim-нан шығуды шынымен қалайсыз ба?"
 
-#: ../src/roster_window.py:2290
+#: ../src/roster_window.py:2313
 msgid "Always close Gajim"
 msgstr "Gajim-ді әрқашан жабу"
 
-#: ../src/roster_window.py:2373
+#: ../src/roster_window.py:2396
 msgid "You have running file transfers"
 msgstr "Қазір белсенді файлдармен алмасулар бар"
 
-#: ../src/roster_window.py:2374
-msgid "If you quit now, the file(s) being transfered will be stopped. Do you still want to quit?"
+#: ../src/roster_window.py:2397
+#, fuzzy
+msgid ""
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
+"want to quit?"
 msgstr "Қазйр шықсаңыз, файлдармен алмасу(лар) тоқталады. Шығуды қалайсыз ба?"
 
-#: ../src/roster_window.py:2405 ../src/roster_window.py:2653
+#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
 msgid "You have unread messages"
 msgstr "Сізде оқылмаған хабарламалар бар"
 
-#: ../src/roster_window.py:2406
-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:2429
+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:2654
+#: ../src/roster_window.py:2720
 msgid "You must read them before removing this transport."
 msgstr "Транспортты өшіру алдында келесіні оқуыңыз керек."
 
-#: ../src/roster_window.py:2657
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "\"%s\" транспорты өшіріледі"
 
-#: ../src/roster_window.py:2658
-msgid "You will no longer be able to send and receive messages from contacts using this transport."
-msgstr "Бұл транспортты қолданатын барлық контакттарға бұдан былай хабарламаларды жібере не ала алмайтын боласыз."
+#: ../src/roster_window.py:2724
+msgid ""
+"You will no longer be able to send and receive messages from contacts using "
+"this transport."
+msgstr ""
+"Бұл транспортты қолданатын барлық контакттарға бұдан былай хабарламаларды "
+"жібере не ала алмайтын боласыз."
 
-#: ../src/roster_window.py:2661
+#: ../src/roster_window.py:2727
 msgid "Transports will be removed"
 msgstr "Транспорттар өшіріледі"
 
-#: ../src/roster_window.py:2666
+#: ../src/roster_window.py:2732
 #, python-format
-msgid "You will no longer be able to send and receive messages to contacts from these transports: %s"
-msgstr "Келесі транспорттарды қолданатын барлық контакттарға бұдан былай хабарламаларды жібере не ала алмайтын боласыз: %s"
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports: %s"
+msgstr ""
+"Келесі транспорттарды қолданатын барлық контакттарға бұдан былай "
+"хабарламаларды жібере не ала алмайтын боласыз: %s"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2800
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Контактты блоктауды қалағансыз. Жалғастыруды қалайсыз ба?"
 
-#: ../src/roster_window.py:2736
-msgid "This contact will see you offline and you will not receive messages he will send you."
-msgstr "Контакт бұдан былай сізді желіде емес сияқты көреді және сіз ол сізге жібергісі келетін хабарламаларды ала алмайтын боласыз."
+#: ../src/roster_window.py:2802
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+"Контакт бұдан былай сізді желіде емес сияқты көреді және сіз ол сізге "
+"жібергісі келетін хабарламаларды ала алмайтын боласыз."
 
 #. it's jid
-#: ../src/roster_window.py:2827
+#: ../src/roster_window.py:2893
 msgid "Rename Contact"
 msgstr "Контакт атын ауыстыру"
 
-#: ../src/roster_window.py:2828
+#: ../src/roster_window.py:2894
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "%s контакты үшін жаңа ник атын енгізіңіз"
 
-#: ../src/roster_window.py:2835
+#: ../src/roster_window.py:2901
 msgid "Rename Group"
 msgstr "Топ атын ауыстыру"
 
-#: ../src/roster_window.py:2836
+#: ../src/roster_window.py:2902
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "%s тобы үшін жаңа атын енгізіңіз"
 
-#: ../src/roster_window.py:2881
+#: ../src/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Топты өшіру"
 
-#: ../src/roster_window.py:2882
+#: ../src/roster_window.py:2948
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Сіз ростерден %s тобын өшіруді қалайсыз ба?"
 
-#: ../src/roster_window.py:2883
+#: ../src/roster_window.py:2949
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Сонымен қатар ростерден осы топтың барлық контакттарын өшіру"
 
-#: ../src/roster_window.py:2922
+#: ../src/roster_window.py:2988
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP кілтін орнату"
 
-#: ../src/roster_window.py:2923
+#: ../src/roster_window.py:2989
 msgid "Select a key to apply to the contact"
 msgstr "Контактқа ілу үшін кілт таңдаңыз"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3372
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "\"%s\" контакты ростеріңізден өшіріледі"
 
-#: ../src/roster_window.py:3308
+#: ../src/roster_window.py:3374
 #, 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:3313
-msgid "By removing this contact you also remove authorization resulting in him or her always seeing you as offline."
-msgstr "Контактты өшірумен қатар сіз оларға берген авторизацияны да өшіресіз, ол енді сізді әрқашан желіде емес сияқты көреді."
+#: ../src/roster_window.py:3379
+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:3319
+#: ../src/roster_window.py:3385
 msgid "Do you want to continue?"
 msgstr "Жалғастыруды қалайсыз ба?"
 
-#: ../src/roster_window.py:3323
-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:3389
+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:3326
+#: ../src/roster_window.py:3392
 msgid "I want this contact to know my status after removal"
 msgstr "Өшіруден кейін осы контакттар менің қалып-күйімді білуін қалаймын"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3330
+#: ../src/roster_window.py:3396
 msgid "Contacts will be removed from your roster"
 msgstr "Контакттар ростеріңізден өшіріледі"
 
-#: ../src/roster_window.py:3335
+#: ../src/roster_window.py:3401
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
 "you also remove authorization resulting in them always seeing you as offline."
 msgstr ""
 "Бұл контакттарды өшіру нәтижесінде:%s\n"
-"оларға берген авторизацияны да өшіресіз, ол енді сізді әрқашан желіде емес сияқты көреді."
+"оларға берген авторизацияны да өшіресіз, ол енді сізді әрқашан желіде емес "
+"сияқты көреді."
 
-#: ../src/roster_window.py:3393
-msgid "You are about to send a custom status. Are you sure you want  to continue?"
+#: ../src/roster_window.py:3459
+msgid ""
+"You are about to send a custom status. Are you sure you want  to continue?"
 msgstr "Сіз таңдауыңызша қалып-күйді жіберуді қалағансыз. Жалғастырамыз ба?"
 
-#: ../src/roster_window.py:3395
+#: ../src/roster_window.py:3461
 #, python-format
-msgid "This contact will temporarily see you as %(status)s, but only until you change your status. Then he or she will see your global status."
-msgstr "Бұл контакт уақытша сізді %(status)s сияқты көреді, бірақ тек сіз өз қалып-күйіңізді өзгерткенге дейін. Одан кейін ол сіздің негізгі қалып-күйіңізді көретін болады."
+msgid ""
+"This contact will temporarily see you as %(status)s, but only until you "
+"change your status. Then he or she will see your global status."
+msgstr ""
+"Бұл контакт уақытша сізді %(status)s сияқты көреді, бірақ тек сіз өз қалып-"
+"күйіңізді өзгерткенге дейін. Одан кейін ол сіздің негізгі қалып-күйіңізді "
+"көретін болады."
 
-#: ../src/roster_window.py:3414
+#: ../src/roster_window.py:3480
 msgid "No account available"
 msgstr "Бірде-бір тіркелгі қолжетерсіз"
 
-#: ../src/roster_window.py:3415
+#: ../src/roster_window.py:3481
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Басқа контакттармен сөйлесу үшін алдымен тіркелгіні жасауыңыз қажет."
 
-#: ../src/roster_window.py:4023
+#: ../src/roster_window.py:4095
 msgid "Metacontacts storage not supported by your server"
 msgstr "Метаконтакттарды сақтау серверіңіз қолдамайды"
 
-#: ../src/roster_window.py:4025
-msgid "Your server does not support storing metacontacts information. So those information will not be saved on next reconnection."
-msgstr "Серверінің метаконтакттар ақпаратын сақтауды қолдамайды. Сол үшін, бұл ақпарат келесі рет қосылғаны үшін сақталмайды."
+#: ../src/roster_window.py:4097
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be saved on next reconnection."
+msgstr ""
+"Серверінің метаконтакттар ақпаратын сақтауды қолдамайды. Сол үшін, бұл "
+"ақпарат келесі рет қосылғаны үшін сақталмайды."
 
-#: ../src/roster_window.py:4117
-msgid "You are about to create a metacontact. Are you sure you want to continue?"
+#: ../src/roster_window.py:4189
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Метаконтакт жасауды қалағансыз. Жалғастырамыз ба?"
 
-#: ../src/roster_window.py:4119
-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 "Метаконтакт - бірнеше бірлік контактты бір жолға біріктіру тәсілі. Әдетте ол бір адамның бірнеше Jabber не транспорт тіркелгілері бар болса қолданылады."
+#: ../src/roster_window.py:4191
+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 ""
+"Метаконтакт - бірнеше бірлік контактты бір жолға біріктіру тәсілі. Әдетте ол "
+"бір адамның бірнеше Jabber не транспорт тіркелгілері бар болса қолданылады."
 
-#: ../src/roster_window.py:4234
+#: ../src/roster_window.py:4306
 msgid "Invalid file URI:"
 msgstr "Файл URI қате:"
 
-#: ../src/roster_window.py:4246
+#: ../src/roster_window.py:4318
 #, 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:4361
+#: ../src/roster_window.py:4433
 #, python-format
 msgid "Send %s to %s"
 msgstr "%s қазір %s үшін жіберу"
 
-#: ../src/roster_window.py:4367
+#: ../src/roster_window.py:4439
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "%s және %s метаконтакт жасау"
@@ -9018,142 +10059,142 @@ msgstr "%s және %s метаконтакт жасау"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4816 ../src/roster_window.py:4889
-#: ../src/roster_window.py:4898 ../src/statusicon.py:246
-#: ../src/statusicon.py:293 ../src/statusicon.py:299
+#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
+#: ../src/roster_window.py:4970 ../src/statusicon.py:263
+#: ../src/statusicon.py:310 ../src/statusicon.py:316
 #, python-format
 msgid "using account %s"
 msgstr "%s тіркелгісін қолданып"
 
 #. add
-#: ../src/roster_window.py:4905
+#: ../src/roster_window.py:4977
 #, python-format
 msgid "to %s account"
 msgstr "%s тіркелгісіне"
 
 #. disco
-#: ../src/roster_window.py:4910
+#: ../src/roster_window.py:4982
 #, python-format
 msgid "using %s account"
 msgstr "%s тіркелгісін қолданып"
 
-#: ../src/roster_window.py:4948 ../src/statusicon.py:309
+#: ../src/roster_window.py:5020 ../src/statusicon.py:326
 msgid "_Manage Bookmarks..."
 msgstr "_Бетбелгілерді басқару..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4968
+#: ../src/roster_window.py:5040
 #, python-format
 msgid "of account %s"
 msgstr "%s тіркелгісі үшін"
 
-#: ../src/roster_window.py:5009
+#: ../src/roster_window.py:5081
 #, python-format
 msgid "for account %s"
 msgstr "%s тіркелгісі үшін"
 
-#: ../src/roster_window.py:5069 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
 msgid "_Change Status Message"
 msgstr "Қалып-кү_й хабарламасын өзгерту"
 
-#: ../src/roster_window.py:5102
+#: ../src/roster_window.py:5174
 msgid "Publish Tune"
 msgstr "Өленді жариялау"
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5176
 msgid "Publish Location"
 msgstr "Орналасуды жариялау"
 
-#: ../src/roster_window.py:5107
+#: ../src/roster_window.py:5179
 msgid "Configure Services..."
 msgstr "Қызметтерді баптау..."
 
-#: ../src/roster_window.py:5252
+#: ../src/roster_window.py:5324
 msgid "_Maximize All"
 msgstr "Бар_лығын жазу"
 
-#: ../src/roster_window.py:5262 ../src/roster_window.py:5436
+#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
 msgid "Send Group M_essage"
 msgstr "Топ ү_шін хабарлама жіберу"
 
-#: ../src/roster_window.py:5270
+#: ../src/roster_window.py:5342
 msgid "To all users"
 msgstr "Барлық пайдаланушыларға"
 
-#: ../src/roster_window.py:5274
+#: ../src/roster_window.py:5346
 msgid "To all online users"
 msgstr "Барлық желідегі пайдаланушыларға"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5456
+#: ../src/roster_window.py:5528
 msgid "_Manage Contacts"
 msgstr "_Контакттарды басқару"
 
 #. Edit Groups
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5537
 msgid "Edit _Groups"
 msgstr "Топтар_ды түзету"
 
 #. Send single message
-#: ../src/roster_window.py:5520
+#: ../src/roster_window.py:5592
 msgid "Send Single Message"
 msgstr "Бір хабарламаны жіберу..."
 
 #. Execute Command
-#: ../src/roster_window.py:5567
+#: ../src/roster_window.py:5639
 msgid "Execute Command..."
 msgstr "Команданы орындау..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5577
+#: ../src/roster_window.py:5649
 msgid "_Manage Transport"
 msgstr "_Транспортты басқару"
 
 #. Modify Transport
-#: ../src/roster_window.py:5586
+#: ../src/roster_window.py:5658
 msgid "_Modify Transport"
 msgstr "Тр_анспортты басқару"
 
 #. Rename
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5668
 msgid "_Rename"
 msgstr "Атын ауысты_ру"
 
-#: ../src/roster_window.py:5656
+#: ../src/roster_window.py:5728
 msgid "_Maximize"
 msgstr "_Максималды қылу"
 
-#: ../src/roster_window.py:5665
+#: ../src/roster_window.py:5737
 msgid "_Reconnect"
 msgstr "Қа_йта байланысу"
 
-#: ../src/roster_window.py:5672
+#: ../src/roster_window.py:5744
 msgid "_Disconnect"
 msgstr "Ба_йланысты үзу"
 
 #. History manager
-#: ../src/roster_window.py:5754
+#: ../src/roster_window.py:5833
 msgid "History Manager"
 msgstr "Тарихты басқару"
 
-#: ../src/roster_window.py:5765
+#: ../src/roster_window.py:5844
 msgid "_Join New Group Chat"
 msgstr "Жаңа _чат бөлмесіне кіру"
 
-#: ../src/roster_window.py:5938
+#: ../src/roster_window.py:6019
 msgid "Change Status Message..."
 msgstr "Қалып-күй хабарламасын өзгерту..."
 
-#: ../src/search_window.py:94
+#: ../src/search_window.py:105
 msgid "Waiting for results"
 msgstr "Нәтижелерді күту"
 
-#: ../src/search_window.py:132 ../src/search_window.py:210
+#: ../src/search_window.py:143 ../src/search_window.py:220
 msgid "Error in received dataform"
 msgstr "Алынған ақпарат формасындағы қате"
 
 #. No result
-#: ../src/search_window.py:166 ../src/search_window.py:202
+#: ../src/search_window.py:177 ../src/search_window.py:212
 msgid "No result"
 msgstr "Нәтижесі жоқ"
 
@@ -9166,14 +10207,15 @@ msgstr "Дискке жазу қатесі"
 msgid "Subject: %s"
 msgstr "Тақырыбы: %s"
 
-#: ../src/session.py:433 ../src/session.py:468
+#: ../src/session.py:447 ../src/session.py:491
 msgid "Confirm these session options"
 msgstr "Бұл сессия опцияларын растау"
 
-#: ../src/session.py:435
-#, python-format
+#: ../src/session.py:448
+#, fuzzy, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
+"The remote client wants '\n"
+"                            'to negotiate an session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -9185,7 +10227,7 @@ msgstr ""
 "\n"
 "Бұл опцияларды қолдайсыз ба?"
 
-#: ../src/session.py:469
+#: ../src/session.py:492
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9200,15 +10242,15 @@ msgstr ""
 "\n"
 "Сессияны жалғастыру керек пе?"
 
-#: ../src/statusicon.py:210
+#: ../src/statusicon.py:227
 msgid "_Change Status Message..."
 msgstr "Қалып-кү_й хабарламасын өзгерту..."
 
-#: ../src/statusicon.py:322
+#: ../src/statusicon.py:339
 msgid "Hide _Roster"
 msgstr "Р_остерді жасыру"
 
-#: ../src/statusicon.py:333
+#: ../src/statusicon.py:350
 msgid "Hide this menu"
 msgstr "Бұл мәзірді жасыру"
 
@@ -9347,60 +10389,120 @@ msgstr ""
 "Бұл қызмет толық ақпаратпен жауап бере алмайды.\n"
 "Ол ескірген не сынық сияқты"
 
-#: ../src/vcard.py:251
+#: ../src/vcard.py:265
 msgid "?Client:Unknown"
 msgstr "?Клиент:Белгісіз"
 
-#: ../src/vcard.py:253
+#: ../src/vcard.py:267
 msgid "?OS:Unknown"
 msgstr "?ОЖ:Белгісіз"
 
-#: ../src/vcard.py:274
+#: ../src/vcard.py:288
 msgid "?Time:Unknown"
 msgstr "?Уақыты:Белгісіз"
 
-#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
+#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
 #, python-format
 msgid "since %s"
 msgstr "%s бастап"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:345
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr "?Role in Group Chat:<b>Ролі:</b>"
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:349
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Қатысуы:</b>"
 
-#: ../src/vcard.py:343
-msgid "This contact is interested in your presence information, but you are not interested in his/her presence"
-msgstr "Бұл контакт сіздің бар болуы ақпаратыңызға қызығада, сіз болсаңыз, оған қызықпайсыз"
+#: ../src/vcard.py:357
+msgid ""
+"This contact is interested in your presence information, but you are not "
+"interested in his/her presence"
+msgstr ""
+"Бұл контакт сіздің бар болуы ақпаратыңызға қызығада, сіз болсаңыз, оған "
+"қызықпайсыз"
 
-#: ../src/vcard.py:345
-msgid "You are interested in the contact's presence information, but he/she is not interested in yours"
+#: ../src/vcard.py:359
+msgid ""
+"You are interested in the contact's presence information, but he/she is not "
+"interested in yours"
 msgstr "Сіз контакттың бар болуына қызығасыз, ол болса, сіздікіне қызықпайды"
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:361
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Сіз бен контакт өзара бар болуы ақпаратына қызығасыз"
 
 #. None
-#: ../src/vcard.py:349
-msgid "You are not interested in the contact's presence, and neither he/she is interested in yours"
-msgstr "Сіз контакттың бар болуына қызықпайсыз, және ол да өз ретінде сіздікіне қызықпайды"
+#: ../src/vcard.py:363
+msgid ""
+"You are not interested in the contact's presence, and neither he/she is "
+"interested in yours"
+msgstr ""
+"Сіз контакттың бар болуына қызықпайсыз, және ол да өз ретінде сіздікіне "
+"қызықпайды"
 
-#: ../src/vcard.py:356
+#: ../src/vcard.py:370
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Сіз осы контакттың өзіңіз жіберген жазылуға сұраным жауабын күтудесіз"
 
-#: ../src/vcard.py:358
+#: ../src/vcard.py:372
 msgid "There is no pending subscription request."
 msgstr "Кезекте жазылуға сұранымдар жоқ."
 
-#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
+#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
 msgid " resource with priority "
 msgstr " ресурс приоритеті"
 
+#~ msgid "@"
+#~ msgstr "@"
+
+#~ msgid "_Disable showing event in systray"
+#~ msgstr "Оқ_иғаны трейде көрсетуді сөндіру"
+
+#~ msgid "_Show event in systray"
+#~ msgstr "Оқиған_ы трейде көрсету"
+
+#~ msgid "Always use GNOME default applications"
+#~ msgstr "GNOME негізгі қолданбаларын қолдану"
+
+#~ msgid "Always use Xfce default applications"
+#~ msgstr "Xfce негізгі қолданбаларын қолдану"
+
+#~ msgid "Autodetect on every Gajim startup"
+#~ msgstr "Gajim қосылғанда, әр рет автоанықтау"
+
+#~ msgid "Show systray:"
+#~ msgstr "Трейде көрсету:"
+
+#~ msgid "Nickname not allowed: %s"
+#~ msgstr "Ник атына рұқсат жоқ: %s"
+
+#~ msgid "Room has been destroyed"
+#~ msgstr "Бөлме жойылған"
+
+#~ msgid "You can join this room instead: %s"
+#~ msgstr "Оның орнына мына бөлмеге кіре аласыз: %s"
+
+#~ msgid "I would like to add you to my roster."
+#~ msgstr "Мен өз ростеріме сізді қосқым келеді"
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "біз қазір %s контактына жазылғанбыз"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "%s жіберген жазылудан бас тарту сұранымы"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "біз қазір %s контактына жазылмағанбыз"
+
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "%s JID-і  RFC-мен үйлесімді емес. Ол сіздің ростеріңізге қосылмайды. Оны "
+#~ "өшіру үшін http://jru.jabberstudio.org/ сияқты ростерді басқару "
+#~ "құралдарын қолданыңыз"
+
 #~ msgid "Account Modification"
 #~ msgstr "Тіркелгі баптаулары"
 
@@ -9443,30 +10545,9 @@ msgstr " ресурс приоритеті"
 #~ msgid "B_OSH Port:"
 #~ msgstr "BOSH п_орты:"
 
-#~ msgid "Add this contact to roster (Ctrl+D)"
-#~ msgstr "Бұл контактты ростерге қосу (Ctrl+D)"
-
-#~ msgid "Browse the chat history (Ctrl+H)"
-#~ msgstr "Чат тарихын қарап шығу (Ctrl+H)"
-
-#~ msgid "Change the room's subject (Alt+T)"
-#~ msgstr "Бөлме тақырыбын өзгерту (Alt+T)"
-
-#~ msgid "Change your nickname (Ctrl+N)"
-#~ msgstr "Сіздің ник атыңызды өзгерту (Ctrl+N)"
-
-#~ msgid "Invite contacts to the conversation (Ctrl+G)"
-#~ msgstr "Контактты сөйлесуге шақыру (Ctrl+G)"
-
 #~ msgid "Send a file (Ctrl+F)"
 #~ msgstr "Файлды жіберу (Ctrl+F)"
 
-#~ msgid "Show a list of emoticons (Alt+M)"
-#~ msgstr "Смайликтер тізімін көрсету (Alt+M)"
-
-#~ msgid "Show the contact's profile (Ctrl+I)"
-#~ msgstr "Контакт профайлын көрсету (Ctrl+I)"
-
 #~ msgid ""
 #~ "All chat states\n"
 #~ "Composing only\n"
@@ -9517,9 +10598,6 @@ msgstr " ресурс приоритеті"
 #~ msgid "_Outgoing message:"
 #~ msgstr "_Шыққан хабарлама:"
 
-#~ msgid "_Preferences"
-#~ msgstr "_Баптаулар"
-
 #~ msgid "_Quit"
 #~ msgstr "_Шығу"
 
diff --git a/po/lt.po b/po/lt.po
index 0854344290dd2587f194f320d563a599e82e594c..1f8d55acae08d2e808685abe8091cef968d4ba68 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -3,11 +3,15 @@
 # This file is distributed under the same license as the Gajim - A Jabber Instant Messager package.
 #
 # Mantas Zimnickas <sirexas@yahoo.com>, 2007, 2009.
+#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim - A Jabber Instant Messager 0.11.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 11:28+0200\n"
+"POT-Creation-Date: 2010-10-01 20:39+0200\n"
 "PO-Revision-Date: 2009-08-19 23:55+0200\n"
 "Last-Translator: Mantas Zimnickas <sirexas@yahoo.com>\n"
 "Language-Team: Lithuanian <>\n"
@@ -25,7 +29,7 @@ msgstr "Jungtis į _Grupės Pokalbį..."
 msgid "_Add Contact..."
 msgstr "_Įtraukti asmenį..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:17
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
 msgid "_Discover Services"
 msgstr "_Ieškoti Paslaugų"
 
@@ -45,7 +49,7 @@ msgstr "_Atidaryti Gmail paštą"
 msgid "_Personal Events"
 msgstr "_Asmeniniai Įvykiai"
 
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:23
+#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
 msgid "_Start Chat..."
 msgstr "_Pradėti pokalbį..."
 
@@ -77,73 +81,69 @@ msgid "<b>Please select a server</b>"
 msgstr ""
 
 #: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid "@"
-msgstr ""
-
-#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
 msgstr ""
 
-#: ../data/gui/account_creation_wizard_window.ui.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:10
 msgid "Anon_ymous authentication"
 msgstr "AnoniminÄ— autentikacija"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Connect when I press Finish"
 msgstr "Prisijungti, kai paspausiu Baigti"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Prieigos kūrimo vedlys"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "I already have an account I want to _use"
 msgstr "Jau turiu prieigÄ…, kuriÄ… noriu _naudoti"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I want to _register for a new account"
 msgstr "Noriu už_registruoti naują prieigą"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:16
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 #: ../data/gui/accounts_window.ui.h:28
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Jei pažymėta, Gajim prisimins šios prieigos slaptažodį"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:17
+#: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Valdyti..."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:18
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
 #: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2263 ../src/config.py:2342
-#: ../src/config.py:2355 ../src/config.py:3596 ../src/config.py:3671
-#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513
-#: ../src/dialogs.py:526 ../src/roster_window.py:2890
-#: ../src/roster_window.py:2896 ../src/roster_window.py:2901
+#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
+#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
+#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
+#: ../src/dialogs.py:527 ../src/roster_window.py:2956
+#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
 msgid "None"
 msgstr "Joks"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:19
+#: ../data/gui/account_creation_wizard_window.ui.h:18
 msgid "Prox_y:"
 msgstr "_Proksis:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #: ../data/gui/accounts_window.ui.h:48
 msgid "Save pass_word"
 msgstr "Išsaugoti _slaptažodį"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:21
+#: ../data/gui/account_creation_wizard_window.ui.h:20
 msgid "Set my profile when I connect"
 msgstr "Nustatyti mano profilį, kai prisijungsiu"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:22
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Use custom hostname/port"
 msgstr "Naudoti parinktÄ… serverio adresÄ…/prievadÄ…"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:23
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -151,34 +151,34 @@ msgstr ""
 "Kad prisijungtumÄ—te privalote turÄ—ti prieigÄ…\n"
 "Jabber tinkle."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-#: ../data/gui/roster_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:16
 msgid "_Advanced"
 msgstr "_Papildomas"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:25
 msgid "_Finish"
 msgstr "_Baigti"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:27
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Hostname:"
 msgstr "_Serverio adresas: "
 
-#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #: ../data/gui/accounts_window.ui.h:62
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:28
 #: ../data/gui/accounts_window.ui.h:64
 msgid "_Password:"
 msgstr "_Slaptažodis:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:29
 msgid "_Port:"
 msgstr "_Portas:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:31
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Server:"
 msgstr "_Serveris:"
 
@@ -284,17 +284,17 @@ msgstr "Vardas:"
 #. No configured account
 #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
 #: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592
-#: ../src/notify.py:608
+#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
+#: ../src/notify.py:616
 msgid "Gajim"
 msgstr "Gajim"
 
 #. FIXME: Ugly workaround.
 #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
 #. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:61
-#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121
-#: ../src/roster_window.py:2832 ../src/roster_window.py:5379
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
+#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
 msgid "General"
 msgstr "Bendros parinktys"
 
@@ -351,7 +351,7 @@ msgstr "Informacija apie jus, kur yra išsaugota serveryje"
 
 #: ../data/gui/accounts_window.ui.h:35
 #: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:830
+#: ../src/dialogs.py:831
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -365,7 +365,7 @@ msgid "Mer_ge accounts"
 msgstr "Apjun_gti prieigas"
 
 #: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2356
+#: ../src/config.py:2358
 msgid "No key selected"
 msgstr "Raktas nepasirinktas"
 
@@ -392,7 +392,7 @@ msgid "Priority will change automatically according to your status."
 msgstr "Prioritetas keisis automatiškai, priklausomai nuo jūsų būklės."
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5329
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
 msgid "Re_name"
 msgstr "Pe_rvadinti"
 
@@ -617,38 +617,43 @@ msgid "Deletes Message of the Day"
 msgstr "Ištrins dienos žinutę"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
+#, fuzzy
+msgid "Edit Archi_ving Preferences"
+msgstr "_Nustatymai"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Edit _Privacy Lists..."
 msgstr "Keisti _Privačiuosius Sąrašus..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sends a message to users currently connected to this server"
 msgstr "Bus išsiųstos žinutės naudotojams, prisijungusiems prie šio serverio"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Set MOTD..."
 msgstr "Nustatyti MOTD..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Nustatyti dienos žinutę"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Show _XML Console"
 msgstr "Rodyti _XML konsolÄ™"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "Update MOTD..."
 msgstr "Atnaujinti MOTD..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "Atnaujinti dienos žinutę"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:11
 msgid "_Administrator"
 msgstr "_Administratorius"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:11
+#: ../data/gui/advanced_menuitem_menu.ui.h:12
 msgid "_Send Server Message..."
 msgstr "_Siųsti Žinutę Serveriui..."
 
@@ -682,7 +687,7 @@ msgid "All statuses"
 msgstr "Visos būklės"
 
 #: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:233
+#: ../src/common/commands.py:106 ../src/common/helpers.py:239
 #: ../src/tooltips.py:193
 msgid "Away"
 msgstr "Manęs nėra"
@@ -735,7 +740,7 @@ msgid "Have "
 msgstr "Turiu "
 
 #: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:249
 msgid "Invisible"
 msgstr "Nematomas"
 
@@ -744,7 +749,7 @@ msgid "Launch a command"
 msgstr "Paleisti komandÄ…"
 
 #: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:216 ../src/tooltips.py:197
+#: ../src/common/helpers.py:222 ../src/tooltips.py:197
 msgid "Not Available"
 msgstr "Esu išėjęs"
 
@@ -789,12 +794,13 @@ msgid "_Disable existing sound for this event"
 msgstr "_Uždrausti esmą garsą šiam įvykiui"
 
 #: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in roster"
+#, fuzzy
+msgid "_Disable showing event in notification area"
 msgstr "_Uždrausti įvykių rodyma kantaktų sąraše"
 
 #: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in systray"
-msgstr "_Uždrausti įvykių rodyma sistemos dėkle"
+msgid "_Disable showing event in roster"
+msgstr "_Uždrausti įvykių rodyma kantaktų sąraše"
 
 #: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
@@ -805,12 +811,13 @@ msgid "_Open chat window with user"
 msgstr "_Atidaryti pokalbio langÄ… su Å¡iuo naudotoju"
 
 #: ../data/gui/advanced_notifications_window.ui.h:35
-msgid "_Show event in roster"
+#, fuzzy
+msgid "_Show event in notification area"
 msgstr "_Rodyti įvykį kontaktų sąraše"
 
 #: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in systray"
-msgstr "_Rodyti įvykį sistemos dėkle"
+msgid "_Show event in roster"
+msgstr "_Rodyti įvykį kontaktų sąraše"
 
 #: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
@@ -838,6 +845,45 @@ msgstr "GrupÄ—s"
 msgid "when I'm in"
 msgstr "kai būsiu"
 
+#: ../data/gui/archiving_preferences_window.ui.h:1
+msgid "<i>Method Auto</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "<i>Method Local</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:3
+msgid "<i>Method Manual</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:4
+#, fuzzy
+msgid "Auto"
+msgstr "Automatinis prsijungimas"
+
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Concede"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "Forbid"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:7
+#, fuzzy
+msgid "No"
+msgstr "Joks"
+
+#: ../data/gui/archiving_preferences_window.ui.h:8
+#, fuzzy
+msgid "Prefer"
+msgstr "Parinktys"
+
+#: ../data/gui/archiving_preferences_window.ui.h:9
+msgid "Yes"
+msgstr ""
+
 #: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Įrašas:"
@@ -864,8 +910,8 @@ msgstr "Užblokuoti Kontaktai"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5348
-#: ../src/roster_window.py:5476 ../src/roster_window.py:5609
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
+#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
 msgid "_Unblock"
 msgstr ""
 
@@ -953,7 +999,7 @@ msgid "_Start Chat"
 msgstr "_Pradėti pokalbį"
 
 #. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4184
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
 msgid "#"
 msgstr "#"
 
@@ -1001,13 +1047,51 @@ msgstr ""
 msgid "9"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:13
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Įtraukti šį kontaktą į sąrašą (Ctrl+D)"
+
 #: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
+msgid "Browse the chat history (Ctrl+H)"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:15
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Pakviesti kontaktus į pokalbį (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Rodyti šypsenėlių sąrašą (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
+msgid "Show a list of formattings"
+msgstr "Rodyti formatavimo sąrašą"
+
+#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Rodyti šypsenėlių sąrašą (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:19
+#, fuzzy
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr "Įtraukti šį kontaktą į sąrašą (Ctrl+D)"
+
+#: ../data/gui/chat_control.ui.h:20
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:21
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
 #: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Siųsti"
 
-#: ../data/gui/chat_control.ui.h:15 ../data/gui/groupchat_control.ui.h:3
+#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
 msgid "label"
 msgstr ""
 
@@ -1055,8 +1139,8 @@ msgstr "Keisti _Grupes..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5284
-#: ../src/roster_window.py:5444
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
+#: ../src/roster_window.py:5516
 msgid "In_vite to"
 msgstr "Pak_viesti į"
 
@@ -1068,8 +1152,8 @@ msgstr "Kviesti Kontaktus"
 msgid "Remo_ve"
 msgstr "_Trinti"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5294
-#: ../src/roster_window.py:5533
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
+#: ../src/roster_window.py:5605
 msgid "Send Cus_tom Status"
 msgstr "Siųsti _Parinktą Būklę"
 
@@ -1102,8 +1186,8 @@ msgid "_Allow him/her to see my status"
 msgstr "_Leisti jam/jai matyti mano būklę"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5482 ../src/roster_window.py:5612
+#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
+#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
 msgid "_Block"
 msgstr ""
 
@@ -1113,8 +1197,8 @@ msgstr "_Drausti jam/jai matyti mano būklę"
 
 #: ../data/gui/contact_context_menu.ui.h:20
 #: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:21
-#: ../src/roster_window.py:5683
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
+#: ../src/roster_window.py:5755
 msgid "_History"
 msgstr "_Istorija"
 
@@ -1247,7 +1331,7 @@ msgstr "<b>Pokalbių būklės žymių spalvos</b>"
 msgid "Account row"
 msgstr "Prieiga"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:925
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
 msgid "Bold"
 msgstr "Paryškintas"
 
@@ -1285,7 +1369,7 @@ msgstr "Group"
 msgid "Inactive"
 msgstr "Neaktyvus"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:926
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
 msgid "Italic"
 msgstr "Pasviręs"
 
@@ -1333,7 +1417,7 @@ msgstr "Keisti _TemÄ…..."
 msgid "Configure _Room..."
 msgstr "Keisti Kambario Nustatymus..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1782
+#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
 msgid "_Bookmark"
 msgstr "Žy_mės"
 
@@ -1393,19 +1477,32 @@ msgstr "_Siųsti privačią žinutę"
 msgid "_Voice"
 msgstr "_Balsas"
 
+#: ../data/gui/groupchat_control.ui.h:1
+#, fuzzy
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Žy_mės"
+
+#: ../data/gui/groupchat_control.ui.h:3
+msgid "Change the room's subject (Alt+T)"
+msgstr ""
+
+#: ../data/gui/groupchat_control.ui.h:4
+msgid "Change your nickname (Ctrl+N)"
+msgstr ""
+
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Kurti naują pranešimą"
 
-#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
-msgid "From"
-msgstr "Nuo"
+#: ../data/gui/groups_post_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:2
+msgid "From:"
+msgstr "Nuo:"
 
-#. holds subject
-#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
-#: ../src/history_manager.py:219
-msgid "Subject"
-msgstr "Tema"
+#: ../data/gui/groups_post_window.ui.h:3
+#: ../data/gui/single_message_window.ui.h:7
+msgid "Subject:"
+msgstr "Tema:"
 
 #: ../data/gui/history_manager.ui.h:1
 msgid ""
@@ -1422,8 +1519,8 @@ msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Gajim Istorijos Žurnalų Valdymas</b></big>"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3208
-#: ../src/dialogs.py:3305
+#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
+#: ../src/dialogs.py:3321
 msgid "Delete"
 msgstr "Trinti"
 
@@ -1476,12 +1573,74 @@ msgstr "Ieškoti:"
 msgid "_Log conversation history"
 msgstr "_Registruoti pokalbio istorijÄ…"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
+msgid "approve"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:2
+msgid "body"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:3
+msgid "concede"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:4
+msgid "expire"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:5
+msgid "false"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:6
+msgid "forbid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:7
+#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+msgid "jid"
+msgstr "jid"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:8
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
+#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
+msgid "message"
+msgstr "message"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
+msgid "oppose"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
+msgid "otr"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:11
+msgid "prefer"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:12
+msgid "require"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:13
+msgid "save"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:14
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
 msgid "Bro_wse Rooms"
 msgstr "_Browse"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2180
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
 msgid "Join Group Chat"
 msgstr "Prisijungti prie pokalbio grupÄ—je"
 
@@ -1519,8 +1678,8 @@ msgstr "Serveris:"
 msgid "_Bookmark this room"
 msgstr "Žy_mės"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1341
-#: ../src/disco.py:1786
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../src/disco.py:1804
 msgid "_Join"
 msgstr "_Jungtis"
 
@@ -1621,6 +1780,74 @@ msgstr "_Naudotojo vardas:"
 msgid "Passphrase"
 msgstr "Slapta frazÄ—"
 
+#: ../data/gui/plugins_window.ui.h:1
+msgid "&lt;empty&gt;"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:2
+msgid "<empty>"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:3
+#, fuzzy
+msgid "Authors:"
+msgstr "Au_torizuoti"
+
+#: ../data/gui/plugins_window.ui.h:4
+#, fuzzy
+msgid "Available"
+msgstr "Esu išėjęs"
+
+#: ../data/gui/plugins_window.ui.h:5
+#, fuzzy
+msgid "Configure"
+msgstr "_Konfigūruoti"
+
+#: ../data/gui/plugins_window.ui.h:6
+#, fuzzy
+msgid "Descrition:"
+msgstr "Aprašymas: "
+
+#: ../data/gui/plugins_window.ui.h:7
+#, fuzzy
+msgid "Homepage:"
+msgstr "<b>AsmeninÄ— svetainÄ—:</b>"
+
+#: ../data/gui/plugins_window.ui.h:8
+msgid "Install"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:9
+msgid "Installed"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:10
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:11
+msgid "Plugins"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:12
+msgid "Uninstall"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:13
+#, fuzzy
+msgid "Version:"
+msgstr "GTK+ Version:"
+
+#: ../data/gui/plugins_window.ui.h:14
+msgid "button"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:15
+msgid "homepage url"
+msgstr ""
+
 #: ../data/gui/popup_notification_window.ui.h:1
 #, fuzzy
 msgid "Event Type"
@@ -1748,121 +1975,104 @@ msgid "Always"
 msgstr "Manęs nėra"
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Always use GNOME default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:32
-msgid "Always use KDE default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:33
-msgid "Always use Xfce default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Prašyti įvesti būklės žinutę, kai aš:"
 
-#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
 msgid "Audio / Video"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:33
 msgid "Audio input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Audio output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:38
-#, fuzzy
-msgid "Autodetect on every Gajim startup"
-msgstr "_Prisijungti, kai Gajim pasileis"
-
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:35
 msgid "Chat message:"
 msgstr "Būklės pranešimas:"
 
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:36
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Startuojant tikrinti ar Gajim yra pagrindinis Jabber klientas"
 
-#: ../data/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:37
 #, fuzzy
 msgid "Composing only"
 msgstr "Kuriama"
 
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:38
 msgid "Configure color and font of the interface"
 msgstr "Nustatyti sÄ…sajos spalvÄ… ir Å¡riftÄ…"
 
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Būklės pranešimas:"
 
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Contact name"
 
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:41
 #, fuzzy
 msgid "Custom"
 msgstr "<b>Kitaip</b>"
 
-#: ../data/gui/preferences_window.ui.h:46
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Detached roster with chat grouped by account"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Detached roster with detached chats"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:45
 msgid "Detached roster with single chat"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
-#: ../src/config.py:671
+#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
+#: ../src/config.py:665
 msgid "Disabled"
 msgstr "Disabled"
 
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:47
 msgid "Display _activity of contacts in roster"
 msgstr "Rodyti kontaktų _aktyvumą sąraše"
 
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:48
 msgid "Display _extra email details"
 msgstr "Rodyti papildomus _el. pašto duomenis"
 
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:49
 #, fuzzy
 msgid "Display _location of contacts in roster"
 msgstr "Rodyti kontaktų nuotaikas sąraše"
 
-#: ../data/gui/preferences_window.ui.h:54
+#: ../data/gui/preferences_window.ui.h:50
 msgid "Display _tunes of contacts in roster"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display a_vatars of contacts in roster"
 msgstr "Rodyti asmenų _paveiksliukus kontaktų sąraše"
 
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display m_ood of contacts in roster"
 msgstr "Rodyti kontaktų nuotaikas sąraše"
 
-#: ../data/gui/preferences_window.ui.h:57
+#: ../data/gui/preferences_window.ui.h:53
 msgid "Display status _messages of contacts in roster"
 msgstr "Rodyti asmenų _būklės žinutes kontaktų sąraše"
 
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:54
 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 "
@@ -1872,7 +2082,7 @@ msgstr ""
 "kurį galite turėti su kokiu nors asmeniu. Čia jūs galite nurodyti kokią "
 "koduotę rodyti pokalbių languose."
 
-#: ../data/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:55
 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 "
@@ -1882,7 +2092,7 @@ msgstr ""
 "kurį galite turėti su kokiu nors asmeniu. Čia jūs galite nurodyti kokią "
 "koduotę išsiųsti kitai šaliai."
 
-#: ../data/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:56
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1890,36 +2100,36 @@ msgstr ""
 "Gajim rodys pranešimus apie ką tik atsijungusius asmenis iššokančiame "
 "langelyje, dešiniajame apatiniame ekrano kampe"
 
-#: ../data/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:58
 msgid "Hide all buttons in chat windows"
 msgstr "SlÄ—pti visus mygtukus pokalbio languose"
 
-#: ../data/gui/preferences_window.ui.h:63
+#: ../data/gui/preferences_window.ui.h:59
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
 msgstr ""
 "Jei pažymėta, Gajim leis kitiems matyti kokią operacijų sistemą naudojate"
 
-#: ../data/gui/preferences_window.ui.h:64
+#: ../data/gui/preferences_window.ui.h:60
 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/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:61
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:66
+#: ../data/gui/preferences_window.ui.h:62
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1927,7 +2137,7 @@ msgstr ""
 "Jei pažymėta, Gajim rodys asmens paveiksliuką kontaktų sąraše ir pokalbio "
 "lange"
 
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1935,35 +2145,35 @@ msgstr ""
 "Jei pažymėta, Gajim rodys žiničių būkles žemiau kontaktinio asmens vardo, "
 "kontaktų sąraše ir pokalbių grupėse"
 
-#: ../data/gui/preferences_window.ui.h:69
+#: ../data/gui/preferences_window.ui.h:65
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr "Jei pažymėta, Gajim rodys kontaktų aktyvumą sąrašo lange"
 
-#: ../data/gui/preferences_window.ui.h:70
+#: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the location of contacts in the roster window"
 msgstr "Jei pažymėta, Gajim rodys kontaktų nuotaiką sąrašo lange"
 
-#: ../data/gui/preferences_window.ui.h:71
+#: ../data/gui/preferences_window.ui.h:67
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr "Jei pažymėta, Gajim rodys kontaktų nuotaiką sąrašo lange"
 
-#: ../data/gui/preferences_window.ui.h:72
+#: ../data/gui/preferences_window.ui.h:68
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:73
+#: ../data/gui/preferences_window.ui.h:69
 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/gui/preferences_window.ui.h:74
+#: ../data/gui/preferences_window.ui.h:70
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1974,21 +2184,21 @@ msgstr ""
 "kad negausite jokių žinučių iš žmonių, kurie neįtraukti į jūsų kontaktų "
 "sąrašą."
 
-#: ../data/gui/preferences_window.ui.h:75
+#: ../data/gui/preferences_window.ui.h:71
 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/gui/preferences_window.ui.h:76
+#: ../data/gui/preferences_window.ui.h:72
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
 msgstr ""
 "Jei pažymėsite, Gajim parodys pranešimą, kai gausite naują laišką į GMail"
 
-#: ../data/gui/preferences_window.ui.h:77
+#: ../data/gui/preferences_window.ui.h:73
 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, "
@@ -1998,13 +2208,13 @@ msgstr ""
 "(pvz.: asmuo iš MSN protokolo turės atitinkamą MSN paveiksliuką būklei "
 "„prisijungęs“, „nuėjęs“, „užimtas“ atvaizduoti... )"
 
-#: ../data/gui/preferences_window.ui.h:78
+#: ../data/gui/preferences_window.ui.h:74
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:79
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2012,98 +2222,99 @@ msgstr ""
 "Jei neišjungtas, Gajim automatiškai pakeis tekstines šypsenėles tokias kaip "
 "':)', į atitinkamus animuotus arba statinius paveiksliukus „rožiukus“"
 
-#: ../data/gui/preferences_window.ui.h:80
+#: ../data/gui/preferences_window.ui.h:76
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:81
+#: ../data/gui/preferences_window.ui.h:77
 msgid "Ma_ke message windows compact"
 msgstr "_Padaryti žinučių langus kompaktiškus"
 
-#: ../data/gui/preferences_window.ui.h:82
+#: ../data/gui/preferences_window.ui.h:78
 msgid "Ma_nage..."
 msgstr "Val_dyti..."
 
-#: ../data/gui/preferences_window.ui.h:83
+#: ../data/gui/preferences_window.ui.h:79
 #, fuzzy
 msgid "Never"
 msgstr "_Niekada"
 
-#: ../data/gui/preferences_window.ui.h:84
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Notifications"
 msgstr "Pranešimai"
 
-#: ../data/gui/preferences_window.ui.h:85
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Notify me about contacts that sign _in"
 msgstr "Pranešti apie _prisijungusius kontaktus"
 
-#: ../data/gui/preferences_window.ui.h:86
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Notify me about contacts that sign _out"
 msgstr "Pranešti apie _atsijungusius kontaktus"
 
-#: ../data/gui/preferences_window.ui.h:87
+#: ../data/gui/preferences_window.ui.h:83
 #, fuzzy
 msgid "Notify me about it"
 msgstr "_Pranešti man apie tai"
 
-#: ../data/gui/preferences_window.ui.h:88
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notify on new _GMail email"
 msgstr "Pranešk apie naujus _GMail laiškus"
 
-#: ../data/gui/preferences_window.ui.h:89
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Only when pending events"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:90
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Personal Events"
 msgstr "Asmeniniai Įvykiai"
 
-#: ../data/gui/preferences_window.ui.h:91
+#: ../data/gui/preferences_window.ui.h:87
 msgid "Play _sounds"
 msgstr "Groti _garsus"
 
-#: ../data/gui/preferences_window.ui.h:92
+#: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
 msgid "Pop it up"
 msgstr "_Rodyk"
 
-#: ../data/gui/preferences_window.ui.h:93
+#: ../data/gui/preferences_window.ui.h:89
 msgid "Preferences"
 msgstr "Parinktys"
 
-#: ../data/gui/preferences_window.ui.h:94
+#: ../data/gui/preferences_window.ui.h:90
 msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:96
+#: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
 msgid "STUN server:"
 msgstr "Serveris:"
 
-#: ../data/gui/preferences_window.ui.h:97
+#: ../data/gui/preferences_window.ui.h:93
+#, fuzzy
+msgid "Show notification area icon:"
+msgstr "Naudoti piktogramą trėjuje (pranešimų panelės piktograma)"
+
+#: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
 msgid "Show only in roster"
 msgstr "Rodyti tik kontaktų _sąrašą"
 
-#: ../data/gui/preferences_window.ui.h:98
-msgid "Show systray:"
-msgstr "Rodyti sisteminį dėklą:"
-
-#: ../data/gui/preferences_window.ui.h:99
+#: ../data/gui/preferences_window.ui.h:95
 msgid "Sign _in"
 msgstr "Pr_isijungti"
 
-#: ../data/gui/preferences_window.ui.h:100
+#: ../data/gui/preferences_window.ui.h:96
 msgid "Sign _out"
 msgstr "_Atsijungti"
 
-#: ../data/gui/preferences_window.ui.h:101
+#: ../data/gui/preferences_window.ui.h:97
 msgid "Single window for everything"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:102
+#: ../data/gui/preferences_window.ui.h:98
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2111,27 +2322,27 @@ 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/gui/preferences_window.ui.h:103
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sort contacts by status"
 msgstr "Rūšiuoti kontaktus pagal būklę"
 
-#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
 msgid "Status"
 msgstr "BÅ«klÄ—"
 
-#: ../data/gui/preferences_window.ui.h:105
+#: ../data/gui/preferences_window.ui.h:101
 msgid "Status _iconset:"
 msgstr "Būklės _piktogramų rinkinys:"
 
-#: ../data/gui/preferences_window.ui.h:106
+#: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Stilius"
 
-#: ../data/gui/preferences_window.ui.h:107
+#: ../data/gui/preferences_window.ui.h:103
 msgid "T_heme:"
 msgstr "_Tema:"
 
-#: ../data/gui/preferences_window.ui.h:108
+#: ../data/gui/preferences_window.ui.h:104
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2139,7 +2350,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:111
+#: ../data/gui/preferences_window.ui.h:107
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2147,121 +2358,125 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:114
+#: ../data/gui/preferences_window.ui.h:110
 msgid "Use _transports icons"
 msgstr "Naudoti _pernašos piktogramas"
 
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:111
+msgid "Use default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:112
 msgid "Use system _default"
 msgstr "Naudoti sisteminius nustatymus"
 
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:113
 msgid "Video framerate"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:117
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Video input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:118
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Video output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:119
+#: ../data/gui/preferences_window.ui.h:116
 msgid "Video size"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:120
+#: ../data/gui/preferences_window.ui.h:117
 msgid "When new event is received:"
 msgstr "Naujam įvykiui įvykus:"
 
-#: ../data/gui/preferences_window.ui.h:121
+#: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
 msgid "Your message:"
 msgstr "Error message: %s"
 
-#: ../data/gui/preferences_window.ui.h:122
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your nickname:"
 msgstr "B_efore nickname:"
 
-#: ../data/gui/preferences_window.ui.h:123
+#: ../data/gui/preferences_window.ui.h:120
 msgid "_Away after:"
 msgstr "_Nuėjęs po:"
 
-#: ../data/gui/preferences_window.ui.h:124
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Naršyklė:"
 
-#: ../data/gui/preferences_window.ui.h:125
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Display chat state notifications:"
 msgstr "Rodyti _pokalbio būklės pranešimus:"
 
-#: ../data/gui/preferences_window.ui.h:126
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Emoticons:"
 msgstr "Å yp_senÄ—lÄ—s:"
 
-#: ../data/gui/preferences_window.ui.h:127
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_File manager:"
 msgstr "_Failų menedžeris:"
 
-#: ../data/gui/preferences_window.ui.h:128
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_Highlight misspelled words"
 msgstr "Žymėti žodžius su _gramatine klaida"
 
-#: ../data/gui/preferences_window.ui.h:129
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignoruoti įvykius nuo asmenų nesančių kontaktų sąraše"
 
-#: ../data/gui/preferences_window.ui.h:130
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignoruoti formatuotą turinį įeinančioms žinutėms"
 
-#: ../data/gui/preferences_window.ui.h:131
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Log status changes of contacts"
 msgstr "_Registruoti asmenų būklės pakitimus"
 
-#: ../data/gui/preferences_window.ui.h:132
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Mail client:"
 msgstr "_El. pašto programa:"
 
-#: ../data/gui/preferences_window.ui.h:133
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Not available after:"
 msgstr "_Nepasiekiamas po:"
 
-#: ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Open..."
 msgstr "_Atidaryti..."
 
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Reset to Default Colors"
 msgstr "_Grąžinti buvusias spalvas pagal nutylėjimą"
 
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Send chat state notifications:"
 msgstr "_Siųsti pokalbio būklės pranešimus:"
 
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Status message:"
 msgstr "_Būklės pranešimas:"
 
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:140
+#: ../data/gui/preferences_window.ui.h:137
 msgid "in _group chats"
 msgstr "pokalbiuose _grupÄ—je"
 
-#: ../data/gui/preferences_window.ui.h:141
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _roster"
 msgstr "_sąraše"
 
-#: ../data/gui/preferences_window.ui.h:142
+#: ../data/gui/preferences_window.ui.h:139
 msgid "minutes"
 msgstr "minutÄ—s"
 
@@ -2313,7 +2528,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Tvarka:"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3436
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
 msgid "Privacy List"
 msgstr "Privatus sąrašas"
 
@@ -2524,8 +2739,8 @@ msgstr "Pašalinti prieigą ir iš Gajim ir iš _serverio"
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5492 ../src/roster_window.py:5622
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
+#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
 msgid "_Remove"
 msgstr "_Trinti"
 
@@ -2569,56 +2784,60 @@ msgid "Help online"
 msgstr "Pagalba tinkle"
 
 #: ../data/gui/roster_window.ui.h:8
+msgid "P_lugins"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:9
 msgid "Profile, A_vatar"
 msgstr "Profilis, At_vaizdas"
 
-#: ../data/gui/roster_window.ui.h:9
+#: ../data/gui/roster_window.ui.h:10
 msgid "Show Only _Active Contacts"
 msgstr "Rodyti Tik _Aktyvius Kontaktus"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
 msgid "Show Trans_ports"
 msgstr "Rodyti _Pernašas"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
 msgid "Show _Offline Contacts"
 msgstr "Rodyti _Atsijungusius Asmenis"
 
-#: ../data/gui/roster_window.ui.h:12 ../src/statusicon.py:326
+#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
 msgid "Show _Roster"
 msgstr "Rodyk _Kontaktų Sąrašą"
 
-#: ../data/gui/roster_window.ui.h:13
+#: ../data/gui/roster_window.ui.h:14
 msgid "_Accounts"
 msgstr "_Prieigos"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
 #: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Veiksmai"
 
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
 msgid "_Contents"
 msgstr "_Turinys"
 
-#: ../data/gui/roster_window.ui.h:18 ../src/disco.py:1502
+#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
 msgid "_Edit"
 msgstr "_Redaguoti"
 
-#: ../data/gui/roster_window.ui.h:19
+#: ../data/gui/roster_window.ui.h:20
 msgid "_FAQ"
 msgstr "_DUK"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Help"
 msgstr "_Pagalba"
 
-#: ../data/gui/roster_window.ui.h:22
+#: ../data/gui/roster_window.ui.h:23
 msgid "_Send Single Message..."
 msgstr "_Siųsti Žinutę..."
 
-#: ../data/gui/roster_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:25
 msgid "_View"
 msgstr "_Rodinys"
 
@@ -2635,11 +2854,11 @@ msgid "_Add contact"
 msgstr "Įtr_aukti Kontaktą"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5634
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
 msgid "_Information"
 msgstr "_Informacija"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1353
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
 msgid "_Search"
 msgstr "_Ieškoti"
 
@@ -2659,10 +2878,6 @@ msgstr "Registruotis prie"
 msgid "_Cancel"
 msgstr "_Atšaukti"
 
-#: ../data/gui/single_message_window.ui.h:2
-msgid "From:"
-msgstr "Nuo:"
-
 #: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Atsakyti šiai žinutei"
@@ -2679,10 +2894,6 @@ msgstr "Siųsti žinutę"
 msgid "Send message and close window"
 msgstr "Išsiųsti žinutę ir uždaryti langą"
 
-#: ../data/gui/single_message_window.ui.h:7
-msgid "Subject:"
-msgstr "Tema:"
-
 #: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Kam:"
@@ -2892,25 +3103,34 @@ msgstr "Gajim Greitųjų žinučių programa"
 msgid "Jabber IM Client"
 msgstr "Jabber IM Klientas"
 
-#: ../src/adhoc_commands.py:314
+#: ../src/adhoc_commands.py:323
 msgid "Cancel confirmation"
 msgstr "Atšaukti sutikimą"
 
-#: ../src/adhoc_commands.py:315
+#: ../src/adhoc_commands.py:324
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:351 ../src/adhoc_commands.py:374
+#: ../src/adhoc_commands.py:370
+#, fuzzy
+msgid "Invalid Form"
+msgstr "Invalid File"
+
+#: ../src/adhoc_commands.py:371
+msgid "The form is not filled correctly."
+msgstr ""
+
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:360
+#: ../src/adhoc_commands.py:399
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:471
+#: ../src/adhoc_commands.py:513
 msgid "Service returned an error."
 msgstr ""
 
@@ -2935,7 +3155,7 @@ msgstr "Integer"
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:945
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
 msgid "Color"
 msgstr "Colour"
 
@@ -2972,280 +3192,288 @@ msgstr[1] "Jūs gavote naujų įrašų (ir %d nerodomi):"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "English"
 msgstr "English"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Belarusian"
 msgstr "Belarusian"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Bulgarian"
 msgstr "Bulgarian"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Breton"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Czech"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "German"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Greek"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "British"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Esperanto"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Spanish"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Basque"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "French"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Croatian"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Italian"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian (b)"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Dutch"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Polish"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Portuguese"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Russian"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Serbian"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Slovak"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Swedish"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:479
+#: ../src/chat_control.py:496
 msgid "Spelling language"
 msgstr "Rašybos tikrinimo kalba"
 
 #. we are not connected
-#: ../src/chat_control.py:511 ../src/chat_control.py:720
+#: ../src/chat_control.py:528 ../src/chat_control.py:737
 msgid "A connection is not available"
 msgstr ""
 
-#: ../src/chat_control.py:512 ../src/chat_control.py:721
+#: ../src/chat_control.py:529 ../src/chat_control.py:738
 msgid "Your message can not be sent until you are connected."
 msgstr ""
 
-#: ../src/chat_control.py:927
+#: ../src/chat_control.py:944
 msgid "Underline"
 msgstr "Pabraukimas"
 
-#: ../src/chat_control.py:928
+#: ../src/chat_control.py:945
 msgid "Strike"
 msgstr "Perbraukimas"
 
-#: ../src/chat_control.py:951
+#: ../src/chat_control.py:968
 msgid "Font"
 msgstr "Å riftas"
 
-#: ../src/chat_control.py:960
+#: ../src/chat_control.py:977
 msgid "Clear formating"
 msgstr "Valyti formatavimÄ…"
 
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1055
 msgid "Really send file?"
 msgstr "Tikrai siųsti failą?"
 
-#: ../src/chat_control.py:1039
+#: ../src/chat_control.py:1056
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1503 ../src/chat_control.py:1987
+#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
 msgid "GPG encryption enabled"
 msgstr "GPG šifravimas įjungtas"
 
 #. Add to roster
-#: ../src/chat_control.py:1528 ../src/common/contacts.py:158
+#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
 #: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:245 ../src/dialogs.py:1064 ../src/dialogs.py:2078
-#: ../src/dialogs.py:2107 ../src/gui_interface.py:674
+#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
+#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
 #: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1610 ../src/roster_window.py:1612
-#: ../src/roster_window.py:1942 ../src/roster_window.py:3289
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
+#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
+#: ../src/roster_window.py:3382
 msgid "Not in Roster"
 msgstr "Ne Sąraše"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1575
 msgid "This contact does not support file transfer."
 msgstr "Šis kontaktas neturi failų siuntimo funkcijos."
 
-#: ../src/chat_control.py:1561
+#: ../src/chat_control.py:1578
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1656
+#: ../src/chat_control.py:1677
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:1869
 #, 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:1967 ../src/dialogs.py:4866
+#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1968
+#: ../src/chat_control.py:1991
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1977
+#: ../src/chat_control.py:2000
 msgid "GPG encryption disabled"
 msgstr "GPG šifravimas išjungtas"
 
-#: ../src/chat_control.py:2003
+#: ../src/chat_control.py:2026
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:2028
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2051
 msgid "and authenticated"
 msgstr "ir patvirtintas"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2032
+#: ../src/chat_control.py:2055
 msgid "and NOT authenticated"
 msgstr "ir NEpatvirtintas"
 
 #. 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:2039
+#: ../src/chat_control.py:2062
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2182
+#: ../src/chat_control.py:2205
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2191
+#: ../src/chat_control.py:2215
+msgid "This session WILL be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2217
+msgid "This session WILL NOT be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2226
 msgid "This session is encrypted"
 msgstr "Ši žinutė šifruota"
 
-#: ../src/chat_control.py:2194
+#: ../src/chat_control.py:2229
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2196
+#: ../src/chat_control.py:2231
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2201
+#: ../src/chat_control.py:2236
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2203
+#: ../src/chat_control.py:2238
 msgid "E2E encryption disabled"
 msgstr "E2E šifravimas išjungtas"
 
-#: ../src/chat_control.py:2241 ../src/chat_control.py:2254
+#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
 msgid "The following message was NOT encrypted"
 msgstr "Ši žinutė NEBUVO šifruota"
 
-#: ../src/chat_control.py:2247
+#: ../src/chat_control.py:2288
 msgid "The following message was encrypted"
 msgstr "Ši žinutė buvo šifruota"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2519
+#: ../src/chat_control.py:2566
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "You just received a new message from \"%s\""
 
-#: ../src/chat_control.py:2520
+#: ../src/chat_control.py:2567
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3253,22 +3481,20 @@ msgstr ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 
-#: ../src/chat_control.py:2663 ../src/common/connection_handlers.py:1635
-#: ../src/common/connection_handlers.py:1758
-#: ../src/common/connection_handlers.py:1960
-#: ../src/common/connection_handlers.py:2110 ../src/common/connection.py:452
+#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
 #: ../src/gajim.py:159 ../src/session.py:138
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2664
+#: ../src/chat_control.py:2714
 #, 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:2906
+#: ../src/chat_control.py:2962
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s dabar %(status)s"
@@ -3282,28 +3508,28 @@ msgstr "creating logs database"
 msgid "creating cache database"
 msgstr "creating logs database"
 
-#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
-#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
-#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
-#: ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
 #, 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:275 ../src/common/check_paths.py:282
-#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
-#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
-#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:333
+#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
+#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
+#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
 msgid "Gajim will now exit"
 msgstr "Gajim will now exit"
 
-#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
+#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
 #, 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:342
+#: ../src/common/check_paths.py:351
 #, python-format
 msgid "creating %s directory"
 msgstr "creating %s directory"
@@ -3367,9 +3593,9 @@ msgstr "Choose the groupchats you want to leave"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:801
-#: ../src/roster_window.py:1614 ../src/roster_window.py:1616
-#: ../src/roster_window.py:5251
+#: ../src/common/helpers.py:57 ../src/roster_window.py:815
+#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
+#: ../src/roster_window.py:5323
 msgid "Groupchats"
 msgstr "Groupchats"
 
@@ -3427,7 +3653,8 @@ msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
 #: ../src/common/config.py:88
-msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgid ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
 #: ../src/common/config.py:93
@@ -3477,9 +3704,9 @@ msgstr ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:501
-#: ../src/common/optparser.py:290 ../src/common/optparser.py:486
-#: ../src/common/optparser.py:520 ../src/gui_interface.py:3370
+#: ../src/common/config.py:106 ../src/common/config.py:505
+#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
+#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
 msgid "default"
 msgstr "įprastas"
 
@@ -3689,7 +3916,8 @@ msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 
 #: ../src/common/config.py:197
-msgid "Notify of events in the system trayicon."
+#, fuzzy
+msgid "Notify of events in the notification area."
 msgstr "Notify of events in the system trayicon."
 
 #: ../src/common/config.py:203
@@ -3723,9 +3951,10 @@ msgstr ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 
 #: ../src/common/config.py:221
+#, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
+"setting is taken into account only if notification icon is used."
 msgstr ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3976,7 +4205,7 @@ msgstr ""
 #: ../src/common/config.py:270
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
-"systray icon."
+"notification icon."
 msgstr ""
 
 #: ../src/common/config.py:271
@@ -4146,111 +4375,122 @@ msgstr ""
 msgid "Message that is sent to contacts you want to add"
 msgstr "Please fill in the data of the contact you want to add"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:374
+msgid "Last time we syncronized with logs from server."
+msgstr ""
+
+#: ../src/common/config.py:436
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Is OpenPGP enabled for this contact?"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:437 ../src/common/config.py:440
+#: ../src/common/config.py:438 ../src/common/config.py:441
 msgid "Language for which we want to check misspelled words"
 msgstr "Language for which we want to check misspelt words"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:447
 msgid "all or space separated status"
 msgstr "all or space separated status"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:448
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', or 'both'"
 
-#: ../src/common/config.py:448 ../src/common/config.py:450
-#: ../src/common/config.py:451 ../src/common/config.py:454
-#: ../src/common/config.py:455
+#: ../src/common/config.py:449 ../src/common/config.py:451
+#: ../src/common/config.py:452 ../src/common/config.py:455
+#: ../src/common/config.py:456
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' or ''"
 
-#: ../src/common/config.py:461 ../src/common/pep.py:157
+#: ../src/common/config.py:460
+msgid ""
+"State whether plugins should be activated on exit (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
+msgstr ""
+
+#: ../src/common/config.py:465 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Sleeping"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back soon"
 msgstr "Back soon"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back in some minutes."
 msgstr "Back in some minutes."
 
-#: ../src/common/config.py:463 ../src/common/pep.py:127
+#: ../src/common/config.py:467 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Eating"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:467
 msgid "I'm eating, so leave me a message."
 msgstr "I'm eating, so leave me a message."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "Movie"
 msgstr "Movie"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "I'm watching a movie."
 msgstr "I'm watching a movie."
 
-#: ../src/common/config.py:465 ../src/common/pep.py:186
+#: ../src/common/config.py:469 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Working"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:469
 msgid "I'm working."
 msgstr "I'm working."
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "Phone"
 msgstr "Phone"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "I'm on the phone."
 msgstr "I'm on the phone."
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "Out"
 msgstr "Out"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "I'm out enjoying life."
 msgstr "I'm out enjoying life."
 
-#: ../src/common/config.py:478
+#: ../src/common/config.py:482
 msgid "I'm available."
 msgstr "I'm available."
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:483
 msgid "I'm free for chat."
 msgstr "I'm free for chat."
 
-#: ../src/common/config.py:480 ../src/config.py:1600
+#: ../src/common/config.py:484 ../src/config.py:1600
 msgid "Be right back."
 msgstr "Be right back."
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:485
 msgid "I'm not available."
 msgstr "I'm not available."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:486
 msgid "Do not disturb."
 msgstr "Do not disturb."
 
-#: ../src/common/config.py:483 ../src/common/config.py:484
+#: ../src/common/config.py:487 ../src/common/config.py:488
 msgid "Bye!"
 msgstr "Bye!"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:498
 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."
@@ -4258,87 +4498,83 @@ 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:495
+#: ../src/common/config.py:499
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sound to play when any MUC message arrives."
 
-#: ../src/common/config.py:504 ../src/common/optparser.py:304
+#: ../src/common/config.py:508 ../src/common/optparser.py:308
 msgid "green"
 msgstr "green"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:290
+#: ../src/common/config.py:512 ../src/common/optparser.py:294
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:512
+#: ../src/common/config.py:516
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:520
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:84
+#: ../src/common/connection_handlers.py:94
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Unable to load idle module"
 
-#: ../src/common/connection_handlers.py:117
+#: ../src/common/connection_handlers.py:127
 #, 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:124
+#: ../src/common/connection_handlers.py:134
 msgid "Registration succeeded"
 msgstr "Registracija sÄ—kminga"
 
-#: ../src/common/connection_handlers.py:125
+#: ../src/common/connection_handlers.py:135
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 msgid "Registration failed"
 msgstr "Registracija nesÄ—kminga"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:445
-#: ../src/common/connection_handlers.py:1633
-#: ../src/common/connection_handlers.py:1756
-#: ../src/common/connection_handlers.py:1957
-#: ../src/common/connection_handlers.py:2108 ../src/common/connection.py:449
+#: ../src/common/connection_handlers.py:466
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
 #: ../src/gajim.py:341
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:678 ../src/common/connection.py:1472
+#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
 msgid "Invisibility not supported"
 msgstr "Nematomumo funkcijos nÄ—ra"
 
-#: ../src/common/connection_handlers.py:679 ../src/common/connection.py:1473
+#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1446 ../src/common/connection.py:253
-#: ../src/config.py:2091 ../src/config.py:2100 ../src/config.py:2168
-#: ../src/config.py:3560 ../src/dataforms_widget.py:597 ../src/dialogs.py:2931
+#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
+#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
+#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
 msgid "Invalid Jabber ID"
 msgstr "Invalid Jabber ID"
 
-#: ../src/common/connection_handlers.py:1447
+#: ../src/common/connection_handlers.py:1405
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1636
-#: ../src/common/connection_handlers.py:1759
-#: ../src/common/connection_handlers.py:1961
-#: ../src/common/connection_handlers.py:2111 ../src/common/connection.py:453
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
 #: ../src/gajim.py:160 ../src/session.py:139
 #, python-format
 msgid ""
@@ -4346,90 +4582,6 @@ msgid ""
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1805
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Nickname not allowed: %s"
-
-#: ../src/common/connection_handlers.py:1902
-#: ../src/common/connection_handlers.py:1911
-#: ../src/common/connection_handlers.py:1918
-#: ../src/common/connection_handlers.py:1922
-#: ../src/common/connection_handlers.py:1926
-#: ../src/common/connection_handlers.py:1931 ../src/gui_interface.py:139
-msgid "Unable to join group chat"
-msgstr "Unable to join group chat"
-
-#: ../src/common/connection_handlers.py:1903
-#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:1912
-#, python-format
-msgid "You are banned from group chat %s."
-msgstr "Jūs esate išmestas iš grupės pokalbio %s."
-
-#: ../src/common/connection_handlers.py:1919
-#, python-format
-msgid "Group chat %s does not exist."
-msgstr "Tokios grupÄ—s pokalbis %s neegzistuoja."
-
-#: ../src/common/connection_handlers.py:1923
-msgid "Group chat creation is restricted."
-msgstr "Group chat creation is restricted."
-
-#: ../src/common/connection_handlers.py:1927
-#, python-format
-msgid "Your registered nickname must be used in group chat %s."
-msgstr ""
-"Jūsų užregistruotas slapyvardis turi būti naudojamas grupės pokalbyje %s."
-
-#: ../src/common/connection_handlers.py:1932
-#, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Jūs estate grupės pokalbio %s narių sąraše."
-
-#. Room has been destroyed. see
-#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:1976
-msgid "Room has been destroyed"
-msgstr "Kambarys buvo sunaikintas"
-
-#: ../src/common/connection_handlers.py:1984
-#, python-format
-msgid "You can join this room instead: %s"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:2020
-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:2041
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "we are now subscribed to %s"
-
-#: ../src/common/connection_handlers.py:2043
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "unsubscribe request from %s"
-
-#: ../src/common/connection_handlers.py:2045
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "we are now unsubscribed from %s"
-
-#: ../src/common/connection_handlers.py:2240
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr ""
@@ -4558,27 +4710,27 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:254 ../src/dialogs.py:2932
+#: ../src/common/connection.py:256 ../src/dialogs.py:2948
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr ""
 
-#: ../src/common/connection.py:276
+#: ../src/common/connection.py:278
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:281
 #, 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:331
+#: ../src/common/connection.py:333
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr ""
 
-#: ../src/common/connection.py:439
+#: ../src/common/connection.py:441
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4587,149 +4739,149 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:807
+#: ../src/common/connection.py:809
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Connection with account \"%s\" has been lost"
 
-#: ../src/common/connection.py:808
+#: ../src/common/connection.py:810
 msgid "Reconnect manually."
 msgstr "Reconnect manually."
 
-#: ../src/common/connection.py:820
+#: ../src/common/connection.py:822
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Serveris %(name)s atsiuntė blogą atsakymą į registravimo užklausą: %(error)s"
 
-#: ../src/common/connection.py:854
+#: ../src/common/connection.py:856
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:867
+#: ../src/common/connection.py:869
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr ""
 
 #. wrong answer
-#: ../src/common/connection.py:882
+#: ../src/common/connection.py:884
 msgid "Invalid answer"
 msgstr "Invalid answer"
 
-#: ../src/common/connection.py:883
+#: ../src/common/connection.py:885
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Pernaša %(name)s atsiuntė klaidingą atsakymą į registravimo užklausą: "
 "%(error)s"
 
-#: ../src/common/connection.py:1165 ../src/common/connection.py:1294
-#: ../src/common/connection.py:1784
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
+#: ../src/common/connection.py:1792
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Could not connect to \"%s\""
 
-#: ../src/common/connection.py:1166 ../src/gui_interface.py:755
+#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
 msgid "Check your connection or try again later."
 msgstr "Check your connection or try again later."
 
-#: ../src/common/connection.py:1171
+#: ../src/common/connection.py:1173
 #, python-format
 msgid "Server replied: %s"
 msgstr "Serveris atsakÄ—: %s"
 
-#: ../src/common/connection.py:1184
+#: ../src/common/connection.py:1186
 msgid "Connection to proxy failed"
 msgstr "Nepavyko prisijungti prie proksi"
 
-#: ../src/common/connection.py:1215 ../src/common/connection.py:1274
+#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Nepavyko prisijungti prie %s"
 
-#: ../src/common/connection.py:1216 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Prarastas ryšys su %s. Jungiamasi iš naujo."
 
-#: ../src/common/connection.py:1241
+#: ../src/common/connection.py:1243
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1244
+#: ../src/common/connection.py:1246
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1248
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr ""
 
-#: ../src/common/connection.py:1295
+#: ../src/common/connection.py:1297
 msgid "Check your connection or try again later"
 msgstr "Check your connection or try again later"
 
-#: ../src/common/connection.py:1324
+#: ../src/common/connection.py:1329
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Authentication failed with \"%s\""
 
-#: ../src/common/connection.py:1326
+#: ../src/common/connection.py:1331
 msgid "Please check your login and password for correctness."
 msgstr "Please check your login and password for correctness."
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1400
 msgid "Error while removing privacy list"
 msgstr "Error while removing privacy list"
 
-#: ../src/common/connection.py:1396
+#: ../src/common/connection.py:1401
 #, 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:1650
+#: ../src/common/connection.py:1658
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1653
+#: ../src/common/connection.py:1661
 msgid "Sent contacts:"
 msgstr "Siųsti kontaktus:"
 
-#: ../src/common/connection.py:1799 ../src/common/connection.py:1822
+#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
 msgid "Not fetched because of invisible status"
 msgstr "Not fetched because of invisible status"
 
-#: ../src/common/connection.py:2254
+#: ../src/common/connection.py:2262
 msgid "Unregister failed"
 msgstr "IÅ¡siregistruoti nepavyko"
 
-#: ../src/common/connection.py:2255
+#: ../src/common/connection.py:2263
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
 #: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:674
+#: ../src/gui_interface.py:551
 msgid "Observers"
 msgstr "Observers"
 
 #: ../src/common/contacts.py:139 ../src/common/contacts.py:366
 #: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1499 ../src/gui_interface.py:424
-#: ../src/roster_window.py:840 ../src/roster_window.py:1525
-#: ../src/roster_window.py:1606 ../src/roster_window.py:1608
-#: ../src/roster_window.py:1769
+#: ../src/disco.py:1517 ../src/roster_window.py:854
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
+#: ../src/roster_window.py:2466
 msgid "Transports"
 msgstr "Transports"
 
@@ -4955,203 +5107,219 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:148
+msgid "Username must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:153
 msgid "Invalid character in username."
 msgstr ""
 
-#: ../src/common/helpers.py:156
-msgid "Server address required."
+#: ../src/common/helpers.py:159
+msgid "Server must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 msgid "Invalid character in hostname."
 msgstr ""
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:166
+msgid "Server address required."
+msgstr ""
+
+#: ../src/common/helpers.py:170
+msgid "Resource must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:175
 msgid "Invalid character in resource."
 msgstr ""
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:215
 msgid "_Busy"
 msgstr "_Užimtas"
 
-#: ../src/common/helpers.py:211 ../src/tooltips.py:195
+#: ../src/common/helpers.py:217 ../src/tooltips.py:195
 msgid "Busy"
 msgstr "Užimtas"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:220
 msgid "_Not Available"
 msgstr "_Nepasiekiamas"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:225
 msgid "_Free for Chat"
 msgstr "_Laisvas Pokalbiams"
 
-#: ../src/common/helpers.py:221 ../src/tooltips.py:191
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Free for Chat"
 msgstr "Laisvas Pokalbiams"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:230
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "_Prisijungęs"
 
-#: ../src/common/helpers.py:226 ../src/tooltips.py:189
+#: ../src/common/helpers.py:232 ../src/tooltips.py:189
 #, fuzzy
 msgid "?user status:Available"
 msgstr "All"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:234
 msgid "Connecting"
 msgstr "Jungiamasi"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:237
 msgid "A_way"
 msgstr "_Nuėjęs"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:242
 msgid "_Offline"
 msgstr "A_tsijungęs"
 
-#: ../src/common/helpers.py:238 ../src/tooltips.py:199
+#: ../src/common/helpers.py:244 ../src/tooltips.py:199
 msgid "Offline"
 msgstr "Atsijungęs"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:247
 msgid "_Invisible"
 msgstr "N_ematomas"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:253
 msgid "?contact has status:Unknown"
 msgstr "Būklė nežinoma"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:255
 msgid "?contact has status:Has errors"
 msgstr "BÅ«klÄ— klaidinga"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:260
 msgid "?Subscription we already have:None"
 msgstr "Joks"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:262
 msgid "To"
 msgstr "Kam"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
+msgid "From"
+msgstr "Nuo"
+
+#: ../src/common/helpers.py:266
 msgid "Both"
 msgstr "Abu"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:274
 msgid "?Ask (for Subscription):None"
 msgstr "Joks"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:276
 msgid "Subscribe"
 msgstr "Subscribe"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:285
 msgid "?Group Chat Contact Role:None"
 msgstr "None"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:288
 msgid "Moderators"
 msgstr "Moderators"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:290
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:293
 msgid "Participants"
 msgstr "Participants"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:295
 msgid "Participant"
 msgstr "Participant"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:298
 msgid "Visitors"
 msgstr "Visitors"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:300
 msgid "Visitor"
 msgstr "Visitor"
 
-#: ../src/common/helpers.py:300 ../src/tooltips.py:210
+#: ../src/common/helpers.py:306 ../src/tooltips.py:210
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "None"
 
-#: ../src/common/helpers.py:302 ../src/tooltips.py:216
+#: ../src/common/helpers.py:308 ../src/tooltips.py:216
 msgid "Owner"
 msgstr "Owner"
 
-#: ../src/common/helpers.py:304 ../src/tooltips.py:214
+#: ../src/common/helpers.py:310 ../src/tooltips.py:214
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:212
+#: ../src/common/helpers.py:312 ../src/tooltips.py:212
 msgid "Member"
 msgstr "Member"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:351
 msgid "is paying attention to the conversation"
 msgstr "is paying attention to the conversation"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:353
 msgid "is doing something else"
 msgstr "is doing something else"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:355
 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:352
+#: ../src/common/helpers.py:358
 msgid "paused composing a message"
 msgstr "paused composing a message"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:360
 msgid "has closed the chat window or tab"
 msgstr "has closed the chat window or tab"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:619
+#: ../src/common/helpers.py:625
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:622
+#: ../src/common/helpers.py:628
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:626
+#: ../src/common/helpers.py:632
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:629
+#: ../src/common/helpers.py:635
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:633
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:636
+#: ../src/common/helpers.py:642
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:645
 #, python-format
 msgid "%s B"
 msgstr "%s B"
@@ -5194,12 +5362,12 @@ msgstr "Gajim - %s"
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:111
+#: ../src/common/jingle_rtp.py:107
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Kambario nustatymai"
 
-#: ../src/common/jingle_rtp.py:112
+#: ../src/common/jingle_rtp.py:108
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5211,30 +5379,30 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:209
+#: ../src/common/jingle_rtp.py:205
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:210
+#: ../src/common/jingle_rtp.py:206
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Error message: %s"
 
-#: ../src/common/jingle_rtp.py:336
+#: ../src/common/jingle_rtp.py:335
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:339
+#: ../src/common/jingle_rtp.py:338
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:382
+#: ../src/common/jingle_rtp.py:381
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:390
+#: ../src/common/jingle_rtp.py:389
 msgid "video output"
 msgstr ""
 
@@ -5311,11 +5479,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "error: cannot open %s for reading"
 
-#: ../src/common/optparser.py:299 ../src/common/optparser.py:300
+#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:379
+#: ../src/common/optparser.py:383
 msgid "migrating logs database to indices"
 msgstr "migrating logs database to indices"
 
@@ -5986,17 +6154,17 @@ msgstr ""
 "cancelled."
 
 #. we're not english
-#: ../src/common/stanza_session.py:303
+#: ../src/common/stanza_session.py:423
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:178
+#: ../src/common/zeroconf/connection_zeroconf.py:181
 msgid "Avahi error"
 msgstr "Avahi error"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:179
+#: ../src/common/zeroconf/connection_zeroconf.py:182
 #, python-format
 msgid ""
 "%s\n"
@@ -6005,44 +6173,44 @@ msgstr ""
 "%s\n"
 "Link-local messaging might not work properly."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:190
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:199
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Could not start local service"
 msgstr "Could not start local service"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Unable to bind to port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-#: ../src/common/zeroconf/connection_zeroconf.py:283
-#: ../src/common/zeroconf/connection_zeroconf.py:294
-#: ../src/common/zeroconf/connection_zeroconf.py:308
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:286
+#: ../src/common/zeroconf/connection_zeroconf.py:297
+#: ../src/common/zeroconf/connection_zeroconf.py:311
 msgid "Please check if avahi-daemon is running."
 msgstr "Please check if avahi-daemon is running."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:282
-#: ../src/common/zeroconf/connection_zeroconf.py:293
-#: ../src/common/zeroconf/connection_zeroconf.py:307
+#: ../src/common/zeroconf/connection_zeroconf.py:285
+#: ../src/common/zeroconf/connection_zeroconf.py:296
+#: ../src/common/zeroconf/connection_zeroconf.py:310
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Could not change status of account \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:325
+#: ../src/common/zeroconf/connection_zeroconf.py:328
 msgid "Your message could not be sent."
 msgstr ""
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:335
+#: ../src/common/zeroconf/connection_zeroconf.py:338
 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:360
+#: ../src/common/zeroconf/connection_zeroconf.py:363
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6063,16 +6231,16 @@ msgstr "Žinutė pagal nutylėjimą"
 msgid "Enabled"
 msgstr "Įjungtas"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3078
+#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
 msgid "Default"
 msgstr "Default"
 
-#: ../src/config.py:739 ../src/dialogs.py:1395
+#: ../src/config.py:733 ../src/dialogs.py:1409
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Dictionary for lang %s not available"
 
-#: ../src/config.py:740
+#: ../src/config.py:734
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6090,9 +6258,9 @@ msgid "status message text"
 msgstr "status message text"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2383 ../src/dialogs.py:2449
-#: ../src/dialogs.py:3215 ../src/disco.py:866 ../src/disco.py:1726
-#: ../src/disco.py:2030 ../src/history_window.py:90
+#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
+#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
+#: ../src/disco.py:2048 ../src/history_window.py:90
 msgid "Name"
 msgstr "Name"
 
@@ -6126,7 +6294,7 @@ 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:1976 ../src/config.py:2509 ../src/config.py:2545
+#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
 msgid "You are currently connected to the server"
 msgstr "You are currently connected to the server"
 
@@ -6162,131 +6330,131 @@ msgstr "Account name cannot be empty."
 msgid "Account name cannot contain spaces."
 msgstr "Account name cannot contain spaces."
 
-#: ../src/config.py:2072
+#: ../src/config.py:2074
 msgid "Rename Account"
 msgstr "Pervadinti PrieigÄ…"
 
-#: ../src/config.py:2073
+#: ../src/config.py:2075
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Įveskite naują prieigos %s pavadinimą"
 
-#: ../src/config.py:2101
+#: ../src/config.py:2103
 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:2318 ../src/config.py:3606
+#: ../src/config.py:2320 ../src/config.py:3623
 msgid "Invalid entry"
 msgstr "Invalid entry"
 
-#: ../src/config.py:2319 ../src/config.py:3607
+#: ../src/config.py:2321 ../src/config.py:3624
 msgid "Custom port must be a port number."
 msgstr "Custom port must be a port number."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2342
 msgid "Failed to get secret keys"
 msgstr "Failed to get secret keys"
 
-#: ../src/config.py:2341
+#: ../src/config.py:2343
 msgid "There is no OpenPGP secret key available."
 msgstr ""
 
-#: ../src/config.py:2375
+#: ../src/config.py:2377
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Key Selection"
 
-#: ../src/config.py:2376
+#: ../src/config.py:2378
 msgid "Choose your OpenPGP key"
 msgstr "Choose your OpenPGP key"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2385
 msgid "No such account available"
 msgstr "No such account available"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2386
 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:2391 ../src/dialogs.py:2136 ../src/dialogs.py:2371
-#: ../src/dialogs.py:2557 ../src/disco.py:511 ../src/profile_window.py:339
+#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
+#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
 msgid "You are not connected to the server"
 msgstr "You are not connected to the server"
 
-#: ../src/config.py:2392
+#: ../src/config.py:2394
 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:2396
+#: ../src/config.py:2398
 msgid "Your server doesn't support Vcard"
 msgstr "Your server doesn't support Vcard"
 
-#: ../src/config.py:2397
+#: ../src/config.py:2399
 msgid "Your server can't save your personal information."
 msgstr "Your server can't save your personal information."
 
-#: ../src/config.py:2510 ../src/config.py:2546
+#: ../src/config.py:2512 ../src/config.py:2548
 msgid "To disable the account, you must be disconnected."
 msgstr ""
 
-#: ../src/config.py:2515
+#: ../src/config.py:2517
 msgid "Account Local already exists."
 msgstr "Account Local already exists."
 
-#: ../src/config.py:2516
+#: ../src/config.py:2518
 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:2673
+#: ../src/config.py:2675
 #, python-format
 msgid "Edit %s"
 msgstr "Edit %s"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2677
 #, python-format
 msgid "Register to %s"
 msgstr "Register to %s"
 
 #. list at the beginning
-#: ../src/config.py:2711
+#: ../src/config.py:2713
 msgid "Ban List"
 msgstr "Ban List"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2714
 msgid "Member List"
 msgstr "Member List"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2714
 msgid "Owner List"
 msgstr "Owner List"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2715
 msgid "Administrator List"
 msgstr "Administrator List"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2763 ../src/disco.py:873 ../src/history_manager.py:201
+#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2773
+#: ../src/config.py:2789
 msgid "Reason"
 msgstr "Reason"
 
-#: ../src/config.py:2780
+#: ../src/config.py:2796
 msgid "Nick"
 msgstr "Nick"
 
-#: ../src/config.py:2786
+#: ../src/config.py:2802
 msgid "Role"
 msgstr "Role"
 
-#: ../src/config.py:2813
+#: ../src/config.py:2829
 msgid "Banning..."
 msgstr "Banning..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2815
+#: ../src/config.py:2831
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6294,11 +6462,11 @@ msgstr ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 
-#: ../src/config.py:2817
+#: ../src/config.py:2833
 msgid "Adding Member..."
 msgstr "Adding Member..."
 
-#: ../src/config.py:2818
+#: ../src/config.py:2834
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6306,11 +6474,11 @@ msgstr ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2836
 msgid "Adding Owner..."
 msgstr "Adding Owner..."
 
-#: ../src/config.py:2821
+#: ../src/config.py:2837
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6318,11 +6486,11 @@ msgstr ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 
-#: ../src/config.py:2823
+#: ../src/config.py:2839
 msgid "Adding Administrator..."
 msgstr "Adding Administrator..."
 
-#: ../src/config.py:2824
+#: ../src/config.py:2840
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6330,7 +6498,7 @@ msgstr ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2825
+#: ../src/config.py:2841
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6340,142 +6508,142 @@ msgid ""
 "domain/resource, or address containing a subdomain)."
 msgstr ""
 
-#: ../src/config.py:2926
+#: ../src/config.py:2943
 #, python-format
 msgid "Removing %s account"
 msgstr ""
 
-#: ../src/config.py:2941
+#: ../src/config.py:2958
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Account name is in use"
 
-#: ../src/config.py:2942
+#: ../src/config.py:2959
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2955 ../src/gui_interface.py:1132
-#: ../src/gui_interface.py:1243
+#: ../src/config.py:2972 ../src/gui_interface.py:311
+#: ../src/gui_interface.py:1048
 msgid "Password Required"
 msgstr "Password Required"
 
-#: ../src/config.py:2956 ../src/gui_interface.py:1223
+#: ../src/config.py:2973 ../src/gui_interface.py:1028
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enter your password for account %s"
 
-#: ../src/config.py:2957 ../src/gui_interface.py:1243
+#: ../src/config.py:2974 ../src/gui_interface.py:1048
 msgid "Save password"
 msgstr "Save password"
 
-#: ../src/config.py:2967
+#: ../src/config.py:2984
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Account \"%s\" is connected to the server"
 
-#: ../src/config.py:2968
+#: ../src/config.py:2985
 msgid "If you remove it, the connection will be lost."
 msgstr "If you remove it, the connection will be lost."
 
-#: ../src/config.py:2982
+#: ../src/config.py:2999
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Nepavyko prisijungti prie proksi"
 
-#: ../src/config.py:2983
+#: ../src/config.py:3000
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "What do you want to do?"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3001
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Pašalinti prieigą, _tik iš Gajim"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3002
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3078
+#: ../src/config.py:3095
 msgid "?print_status:All"
 msgstr "All"
 
-#: ../src/config.py:3079
+#: ../src/config.py:3096
 msgid "Enter and leave only"
 msgstr "Enter and leave only"
 
-#: ../src/config.py:3080
+#: ../src/config.py:3097
 msgid "?print_status:None"
 msgstr "None"
 
-#: ../src/config.py:3150
+#: ../src/config.py:3167
 msgid "New Group Chat"
 msgstr "New Group Chat"
 
-#: ../src/config.py:3183
+#: ../src/config.py:3200
 msgid "This bookmark has invalid data"
 msgstr "This bookmark has invalid data"
 
-#: ../src/config.py:3184
+#: ../src/config.py:3201
 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."
 
 #. invalid char
-#: ../src/config.py:3302 ../src/dialogs.py:1934
+#: ../src/config.py:3319 ../src/dialogs.py:1950
 msgid "Invalid nickname"
 msgstr ""
 
-#: ../src/config.py:3303 ../src/config.py:3317 ../src/config.py:3331
+#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
 msgid "Character not allowed"
 msgstr ""
 
-#: ../src/config.py:3316 ../src/config.py:3582
+#: ../src/config.py:3333 ../src/config.py:3599
 msgid "Invalid server"
 msgstr ""
 
-#: ../src/config.py:3330
+#: ../src/config.py:3347
 msgid "Invalid room"
 msgstr ""
 
-#: ../src/config.py:3498
+#: ../src/config.py:3515
 msgid "Account has been added successfully"
 msgstr "Account has been added successfully"
 
-#: ../src/config.py:3499 ../src/config.py:3505
+#: ../src/config.py:3516 ../src/config.py:3522
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
 
-#: ../src/config.py:3504
+#: ../src/config.py:3521
 msgid "Your new account has been created successfully"
 msgstr "Your new account has been successfully created"
 
-#: ../src/config.py:3543
+#: ../src/config.py:3560
 msgid "Invalid username"
 msgstr "Invalid username"
 
-#: ../src/config.py:3545
+#: ../src/config.py:3562
 msgid "You must provide a username to configure this account."
 msgstr "You must provide a username to configure this account."
 
-#: ../src/config.py:3583
+#: ../src/config.py:3600
 msgid "Please provide a server on which you want to register."
 msgstr ""
 
-#: ../src/config.py:3639 ../src/gui_interface.py:1904
+#: ../src/config.py:3656 ../src/gui_interface.py:1693
 msgid "Certificate Already in File"
 msgstr ""
 
-#: ../src/config.py:3640 ../src/gui_interface.py:1905
+#: ../src/config.py:3657 ../src/gui_interface.py:1694
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3717
+#: ../src/config.py:3734
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6485,7 +6653,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3723 ../src/gui_interface.py:1932
+#: ../src/config.py:3740 ../src/gui_interface.py:1721
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6493,113 +6661,122 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3755 ../src/config.py:3789
+#: ../src/config.py:3772 ../src/config.py:3806
 msgid "An error occurred during account creation"
 msgstr "An error occurred during account creation"
 
-#: ../src/config.py:3854
+#: ../src/config.py:3871
 msgid "Account name is in use"
 msgstr "Account name is in use"
 
-#: ../src/config.py:3855
+#: ../src/config.py:3872
 msgid "You already have an account using this name."
 msgstr "You already have an account using this name."
 
-#: ../src/config.py:4009
+#: ../src/config.py:3991
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/config.py:3992
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#: ../src/config.py:4036
 msgid "Active"
 msgstr "Active"
 
-#: ../src/config.py:4017
+#: ../src/config.py:4044
 msgid "Event"
 msgstr "Event"
 
-#: ../src/config.py:4052
+#: ../src/config.py:4079
 msgid "First Message Received"
 msgstr "First Message Received"
 
-#: ../src/config.py:4053
+#: ../src/config.py:4080
 msgid "Next Message Received Focused"
 msgstr ""
 
-#: ../src/config.py:4055
+#: ../src/config.py:4082
 msgid "Next Message Received Unfocused"
 msgstr ""
 
-#: ../src/config.py:4056
+#: ../src/config.py:4083
 msgid "Contact Connected"
 msgstr "Contact Connected"
 
-#: ../src/config.py:4057
+#: ../src/config.py:4084
 msgid "Contact Disconnected"
 msgstr "Contact Disconnected"
 
-#: ../src/config.py:4058
+#: ../src/config.py:4085
 msgid "Message Sent"
 msgstr "Message Sent"
 
-#: ../src/config.py:4059
+#: ../src/config.py:4086
 msgid "Group Chat Message Highlight"
 msgstr "Group Chat Message Highlight"
 
-#: ../src/config.py:4060
+#: ../src/config.py:4087
 msgid "Group Chat Message Received"
 msgstr "Group Chat Message Received"
 
-#: ../src/config.py:4061
+#: ../src/config.py:4088
 msgid "GMail Email Received"
 msgstr "GMail E-mail Received"
 
-#: ../src/conversation_textview.py:600
+#: ../src/conversation_textview.py:601
 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:619
+#: ../src/conversation_textview.py:620
 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:739
+#: ../src/conversation_textview.py:740
 msgid "_Quote"
 msgstr "_Cituoti"
 
-#: ../src/conversation_textview.py:746
+#: ../src/conversation_textview.py:747
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Actions for \"%s\""
 
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Read _Wikipedia Article"
 msgstr "Read _Wikipedia Article"
 
-#: ../src/conversation_textview.py:763
+#: ../src/conversation_textview.py:765
 msgid "Look it up in _Dictionary"
 msgstr "Look it up in _Dictionary"
 
-#: ../src/conversation_textview.py:780
+#: ../src/conversation_textview.py:782
 #, 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:793
+#: ../src/conversation_textview.py:795
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Search URL is missing an \"%s\""
 
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 msgid "Web _Search for it"
 msgstr "Web _Search for it"
 
-#: ../src/conversation_textview.py:802
+#: ../src/conversation_textview.py:804
 msgid "Open as _Link"
 msgstr "Open as _Link"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1296
+#: ../src/conversation_textview.py:1298
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6607,185 +6784,190 @@ msgstr[0] "Yesterday"
 msgstr[1] "Yesterday"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1344 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Subject: %s\n"
 
-#: ../src/dataforms_widget.py:544
+#: ../src/dataforms_widget.py:545
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Unable to load idle module"
 
-#: ../src/dataforms_widget.py:546
+#: ../src/dataforms_widget.py:547
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Nematomumo funkcijos nÄ—ra"
 
-#: ../src/dataforms_widget.py:601
+#: ../src/dataforms_widget.py:562
+msgid "This field is required"
+msgstr ""
+
+#: ../src/dataforms_widget.py:607
 msgid "Jabber ID already in list"
 msgstr ""
 
-#: ../src/dataforms_widget.py:602
+#: ../src/dataforms_widget.py:608
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:613
+#: ../src/dataforms_widget.py:619
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:616 ../src/dataforms_widget.py:618
+#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Contact name: <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:195
 msgid "Group"
 msgstr "Group"
 
-#: ../src/dialogs.py:201
+#: ../src/dialogs.py:202
 msgid "In the group"
 msgstr "In the group"
 
-#: ../src/dialogs.py:292
+#: ../src/dialogs.py:293
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:297
+#: ../src/dialogs.py:298
 msgid "Contact name"
 msgstr "Contact name"
 
-#: ../src/dialogs.py:469
+#: ../src/dialogs.py:470
 msgid "Set Mood"
 msgstr ""
 
-#: ../src/dialogs.py:589
+#: ../src/dialogs.py:590
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Message"
 
-#: ../src/dialogs.py:603
+#: ../src/dialogs.py:604
 msgid "Status Message"
 msgstr "Status Message"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:794
 msgid "Overwrite Status Message?"
 msgstr ""
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:795
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 
-#: ../src/dialogs.py:802
+#: ../src/dialogs.py:803
 msgid "Save as Preset Status Message"
 msgstr "Save as Preset Status Message"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:804
 msgid "Please type a name for this status message"
 msgstr "Please type a name for this status message"
 
-#: ../src/dialogs.py:831
+#: ../src/dialogs.py:832
 msgid "AIM Address:"
 msgstr "AIM Address:"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:833
 msgid "GG Number:"
 msgstr "GG Number:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:834
 msgid "ICQ Number:"
 msgstr "ICQ Number:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:835
 msgid "MSN Address:"
 msgstr "MSN Address:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:836
 msgid "Yahoo! Address:"
 msgstr "Yahoo! Address:"
 
-#: ../src/dialogs.py:872
+#: ../src/dialogs.py:873
 #, 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:875
+#: ../src/dialogs.py:876
 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:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
+#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
+#: ../src/dialogs.py:3464
 msgid "Invalid User ID"
 msgstr "Invalid User ID"
 
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1052
 msgid "The user ID must not contain a resource."
 msgstr "The user ID must not contain a resource."
 
-#: ../src/dialogs.py:1051
+#: ../src/dialogs.py:1057
 msgid "You cannot add yourself to your roster."
 msgstr ""
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1071
 msgid "Contact already in roster"
 msgstr "Contact already in roster"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1072
 msgid "This contact is already listed in your roster."
 msgstr "This contact is already listed in your roster."
 
-#: ../src/dialogs.py:1112
+#: ../src/dialogs.py:1118
 msgid "User ID:"
 msgstr "User ID:"
 
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1189
 msgid "A GTK+ jabber client"
 msgstr "A GTK+ jabber client"
 
-#: ../src/dialogs.py:1176
+#: ../src/dialogs.py:1190
 msgid "GTK+ Version:"
 msgstr "GTK+ Version:"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1191
 msgid "PyGTK Version:"
 msgstr "PyGTK Version:"
 
-#: ../src/dialogs.py:1187
+#: ../src/dialogs.py:1201
 msgid "Current Developers:"
 msgstr "Current Developers:"
 
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1203
 msgid "Past Developers:"
 msgstr "Past Developers:"
 
-#: ../src/dialogs.py:1195
+#: ../src/dialogs.py:1209
 msgid "THANKS:"
 msgstr "THANKS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1215
 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:1213
+#: ../src/dialogs.py:1227
 msgid "translator-credits"
 msgstr "Jeff Bailes <thepizzaking@gmail.com>"
 
-#: ../src/dialogs.py:1396
+#: ../src/dialogs.py:1410
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6794,100 +6976,100 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1935 ../src/dialogs.py:2322
+#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
 msgid "The nickname has not allowed characters."
 msgstr ""
 
-#: ../src/dialogs.py:2053
+#: ../src/dialogs.py:2069
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr ""
 
-#: ../src/dialogs.py:2056
+#: ../src/dialogs.py:2072
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Subscription request from %s"
 
-#: ../src/dialogs.py:2131 ../src/gui_interface.py:2672
+#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "You are already in group chat %s"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2153
 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:2178
+#: ../src/dialogs.py:2194
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Join Group Chat with account %s"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2325
 msgid "Invalid Account"
 msgstr ""
 
-#: ../src/dialogs.py:2310
+#: ../src/dialogs.py:2326
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr ""
 
-#: ../src/dialogs.py:2321
+#: ../src/dialogs.py:2337
 msgid "Invalid Nickname"
 msgstr ""
 
-#: ../src/dialogs.py:2326 ../src/dialogs.py:2332
-#: ../src/groupchat_control.py:1832
+#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
+#: ../src/groupchat_control.py:1847
 msgid "Invalid group chat Jabber ID"
 msgstr "Invalid group chat Jabber ID"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2343
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "The group chat Jabber ID has invalid characters."
 
-#: ../src/dialogs.py:2333 ../src/groupchat_control.py:1833
+#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "The group chat Jabber ID has invalid characters."
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2356
 msgid "This is not a group chat"
 msgstr "This is not a group chat"
 
-#: ../src/dialogs.py:2341
+#: ../src/dialogs.py:2357
 #, 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:2372
+#: ../src/dialogs.py:2388
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr ""
 
-#: ../src/dialogs.py:2386
+#: ../src/dialogs.py:2402
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2421
+#: ../src/dialogs.py:2437
 msgid "This account is not connected to the server"
 msgstr ""
 
-#: ../src/dialogs.py:2422
+#: ../src/dialogs.py:2438
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 
-#: ../src/dialogs.py:2446
+#: ../src/dialogs.py:2462
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2523
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start Chat with account %s"
 
-#: ../src/dialogs.py:2509
+#: ../src/dialogs.py:2525
 msgid "Start Chat"
 msgstr "Start Chat"
 
-#: ../src/dialogs.py:2510
+#: ../src/dialogs.py:2526
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6896,168 +7078,168 @@ msgstr ""
 "to send a chat message to:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2536 ../src/dialogs.py:2917 ../src/dialogs.py:3129
+#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
 msgid "Connection not available"
 msgstr "Connection not available"
 
-#: ../src/dialogs.py:2537 ../src/dialogs.py:2918 ../src/dialogs.py:3130
+#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Please make sure you are connected with \"%s\"."
 
-#: ../src/dialogs.py:2546 ../src/dialogs.py:2549
+#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
 msgid "Invalid JID"
 msgstr "Invalid JID"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2565
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Unable to parse \"%s\"."
 
-#: ../src/dialogs.py:2558
+#: ../src/dialogs.py:2574
 msgid "Without a connection, you can not change your password."
 msgstr "Without a connection, you can not change your password."
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "Invalid password"
 msgstr "Invalid password"
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "You must enter a password."
 msgstr "You must enter a password."
 
-#: ../src/dialogs.py:2581
+#: ../src/dialogs.py:2597
 msgid "Passwords do not match"
 msgstr "Passwords do not match"
 
-#: ../src/dialogs.py:2582
+#: ../src/dialogs.py:2598
 msgid "The passwords typed in both fields must be identical."
 msgstr "The passwords typed in both fields must be identical."
 
 #. default value
-#: ../src/dialogs.py:2619 ../src/notify.py:247 ../src/notify.py:473
+#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
 msgid "Contact Signed In"
 msgstr "Contact Signed In"
 
-#: ../src/dialogs.py:2621 ../src/notify.py:255 ../src/notify.py:475
+#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
 msgid "Contact Signed Out"
 msgstr "Contact Signed Out"
 
 #. chat message
-#: ../src/dialogs.py:2623 ../src/notify.py:277 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
 msgid "New Message"
 msgstr "New Message"
 
 #. single message
-#: ../src/dialogs.py:2623 ../src/notify.py:259 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
 msgid "New Single Message"
 msgstr "New Single Message"
 
 #. private message
-#: ../src/dialogs.py:2624 ../src/notify.py:265 ../src/notify.py:478
+#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
 msgid "New Private Message"
 msgstr "New Private Message"
 
-#: ../src/dialogs.py:2624 ../src/gui_interface.py:1358 ../src/notify.py:487
+#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
 msgid "New E-mail"
 msgstr "New E-mail"
 
-#: ../src/dialogs.py:2626 ../src/gui_interface.py:1420 ../src/notify.py:480
+#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
 msgid "File Transfer Request"
 msgstr "File Transfer Request"
 
-#: ../src/dialogs.py:2628 ../src/gui_interface.py:1320
-#: ../src/gui_interface.py:1389 ../src/notify.py:482
+#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
+#: ../src/gui_interface.py:1186 ../src/notify.py:482
 msgid "File Transfer Error"
 msgstr "File Transfer Error"
 
-#: ../src/dialogs.py:2630 ../src/gui_interface.py:1466
-#: ../src/gui_interface.py:1489 ../src/gui_interface.py:1506
+#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
+#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
 #: ../src/notify.py:484
 msgid "File Transfer Completed"
 msgstr "File Transfer Completed"
 
-#: ../src/dialogs.py:2631 ../src/gui_interface.py:1469 ../src/notify.py:485
+#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
 msgid "File Transfer Stopped"
 msgstr "File Transfer Stopped"
 
-#: ../src/dialogs.py:2633 ../src/gui_interface.py:1152 ../src/notify.py:489
+#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
 msgid "Groupchat Invitation"
 msgstr "Groupchat Invitation"
 
-#: ../src/dialogs.py:2635 ../src/notify.py:239 ../src/notify.py:491
+#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
 msgid "Contact Changed Status"
 msgstr "Contact Changed Status"
 
-#: ../src/dialogs.py:2836
+#: ../src/dialogs.py:2852
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Single Message using account %s"
 
-#: ../src/dialogs.py:2838
+#: ../src/dialogs.py:2854
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Single Message in account %s"
 
-#: ../src/dialogs.py:2840
+#: ../src/dialogs.py:2856
 msgid "Single Message"
 msgstr "Single Message"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2843
+#: ../src/dialogs.py:2859
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:2882
 #, python-format
 msgid "Received %s"
 msgstr "Received %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2889
+#: ../src/dialogs.py:2905
 #, python-format
 msgid "Form %s"
 msgstr ""
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2968
+#: ../src/dialogs.py:2984
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:2985
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s wrote:\n"
 
-#: ../src/dialogs.py:3028
+#: ../src/dialogs.py:3044
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Console for %s"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3046
 msgid "XML Console"
 msgstr "XML Console"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "add"
 msgstr "Įtraukti"
 
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "modify"
 msgstr "Keisti"
 
-#: ../src/dialogs.py:3160
+#: ../src/dialogs.py:3176
 #, fuzzy
 msgid "remove"
 msgstr "_Trinti"
 
-#: ../src/dialogs.py:3188
+#: ../src/dialogs.py:3204
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7065,154 +7247,187 @@ msgid ""
 msgstr ""
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3204 ../src/dialogs.py:3250
+#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
 msgid "Add"
 msgstr "Įtraukti"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3206 ../src/dialogs.py:3281
+#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
 msgid "Modify"
 msgstr "Keisti"
 
-#: ../src/dialogs.py:3212
+#: ../src/dialogs.py:3228
 msgid "Jabber ID"
 msgstr ""
 
-#: ../src/dialogs.py:3218
+#: ../src/dialogs.py:3234
 msgid "Groups"
 msgstr "GrupÄ—s"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3342
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr ""
 
-#: ../src/dialogs.py:3340
+#: ../src/dialogs.py:3356
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "Įtr_aukti Kontaktą"
 
-#: ../src/dialogs.py:3377
+#: ../src/dialogs.py:3393
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Removes contact from roster"
 
-#: ../src/dialogs.py:3430
+#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#, python-format
+msgid "Archiving Preferences for %s"
+msgstr ""
+
+#: ../src/dialogs.py:3473
+#, fuzzy
+msgid "Invalid expire value"
+msgstr "Invalid File"
+
+#: ../src/dialogs.py:3474
+msgid "Expire must be a valid positive integer."
+msgstr ""
+
+#: ../src/dialogs.py:3521
+msgid "There is an error with the form"
+msgstr ""
+
+#: ../src/dialogs.py:3732
+msgid "There is an error"
+msgstr ""
+
+#: ../src/dialogs.py:3796
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privacy List <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3434
+#: ../src/dialogs.py:3800
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privacy List for %s"
 
-#: ../src/dialogs.py:3490
+#: ../src/dialogs.py:3856
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3861
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr ""
 
-#: ../src/dialogs.py:3539
+#: ../src/dialogs.py:3905
 msgid "<b>Edit a rule</b>"
 msgstr ""
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:4016
 msgid "<b>Add a rule</b>"
 msgstr ""
 
-#: ../src/dialogs.py:3750
+#: ../src/dialogs.py:4116
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3752
+#: ../src/dialogs.py:4118
 msgid "Privacy Lists"
 msgstr ""
 
-#: ../src/dialogs.py:3822
+#: ../src/dialogs.py:4188
 msgid "Invalid List Name"
 msgstr ""
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4189
 msgid "You must enter a name to create a privacy list."
 msgstr ""
 
-#: ../src/dialogs.py:3855
+#: ../src/dialogs.py:4221
 msgid "You are invited to a groupchat"
 msgstr ""
 
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4224
 msgid "$Contact has invited you to join a discussion"
 msgstr ""
 
-#: ../src/dialogs.py:3860
+#: ../src/dialogs.py:4226
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr ""
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4234
 #, python-format
 msgid "Comment: %s"
 msgstr ""
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4236
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3932
+#: ../src/dialogs.py:4298
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:3942 ../src/dialogs.py:3985 ../src/dialogs.py:4041
+#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
+#: ../src/dialogs.py:4495
 msgid "All files"
 msgstr "All files"
 
-#: ../src/dialogs.py:3947
+#: ../src/dialogs.py:4313
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:3975
+#: ../src/dialogs.py:4341
 msgid "Choose Sound"
 msgstr "Choose Sound"
 
-#: ../src/dialogs.py:3990
+#: ../src/dialogs.py:4356
 msgid "Wav Sounds"
 msgstr "Wav Sounds"
 
-#: ../src/dialogs.py:4028
+#: ../src/dialogs.py:4394
 msgid "Choose Image"
 msgstr "Choose Image"
 
-#: ../src/dialogs.py:4046
+#: ../src/dialogs.py:4412
 msgid "Images"
 msgstr "Images"
 
-#: ../src/dialogs.py:4113
+#: ../src/dialogs.py:4482
+#, fuzzy
+msgid "Choose Archive"
+msgstr "Choose Image"
+
+#: ../src/dialogs.py:4500
+#, fuzzy
+msgid "Zip files"
+msgstr "All files"
+
+#: ../src/dialogs.py:4525
 #, python-format
 msgid "When %s becomes:"
 msgstr "When %s becomes:"
 
-#: ../src/dialogs.py:4115
+#: ../src/dialogs.py:4527
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Adding Special Notification for %s"
 
-#: ../src/dialogs.py:4190
+#: ../src/dialogs.py:4602
 msgid "Condition"
 msgstr "Condition"
 
-#: ../src/dialogs.py:4310
+#: ../src/dialogs.py:4722
 msgid "when I am "
 msgstr "when I am "
 
-#: ../src/dialogs.py:4786
+#: ../src/dialogs.py:5198
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7220,38 +7435,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4789
+#: ../src/dialogs.py:5201
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4795 ../src/dialogs.py:4879
+#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4801
+#: ../src/dialogs.py:5213
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4806
+#: ../src/dialogs.py:5218
 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:4809 ../src/dialogs.py:4860 ../src/dialogs.py:4873
+#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4814
+#: ../src/dialogs.py:5226
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4825
+#: ../src/dialogs.py:5237
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4826
+#: ../src/dialogs.py:5238
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7261,44 +7476,44 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4827
+#: ../src/dialogs.py:5239
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4861
+#: ../src/dialogs.py:5273
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4867
+#: ../src/dialogs.py:5279
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4874
+#: ../src/dialogs.py:5286
 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:4880
+#: ../src/dialogs.py:5292
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:4945
+#: ../src/dialogs.py:5357
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4947
+#: ../src/dialogs.py:5359
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4949
+#: ../src/dialogs.py:5361
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4953
+#: ../src/dialogs.py:5365
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7314,24 +7529,24 @@ msgstr "Others"
 msgid "Conference"
 msgstr "Conference"
 
-#: ../src/disco.py:512
+#: ../src/disco.py:513
 msgid "Without a connection, you can not browse available services"
 msgstr "Without a connection, you can not browse available services"
 
-#: ../src/disco.py:589
+#: ../src/disco.py:600
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Service Discovery using account %s"
 
-#: ../src/disco.py:591
+#: ../src/disco.py:602
 msgid "Service Discovery"
 msgstr "Service Discovery"
 
-#: ../src/disco.py:741
+#: ../src/disco.py:758
 msgid "The service could not be found"
 msgstr "The service could not be found"
 
-#: ../src/disco.py:742
+#: ../src/disco.py:759
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7339,93 +7554,93 @@ msgstr ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
 
-#: ../src/disco.py:746 ../src/disco.py:1082
+#: ../src/disco.py:763 ../src/disco.py:1100
 msgid "The service is not browsable"
 msgstr "The service is not browsable"
 
-#: ../src/disco.py:747
+#: ../src/disco.py:764
 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:786 ../src/disco.py:796
+#: ../src/disco.py:804 ../src/disco.py:814
 msgid "Invalid Server Name"
 msgstr ""
 
-#: ../src/disco.py:850
+#: ../src/disco.py:868
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr ""
 
-#: ../src/disco.py:894
+#: ../src/disco.py:912
 msgid "_Browse"
 msgstr "_Browse"
 
-#: ../src/disco.py:1083
+#: ../src/disco.py:1101
 msgid "This service does not contain any items to browse."
 msgstr "This service does not contain any items to browse."
 
-#: ../src/disco.py:1323
+#: ../src/disco.py:1341
 msgid "_Execute Command"
 msgstr "_Vykdyti komandÄ…"
 
-#: ../src/disco.py:1333 ../src/disco.py:1504
+#: ../src/disco.py:1351 ../src/disco.py:1522
 msgid "Re_gister"
 msgstr "Re_gister"
 
-#: ../src/disco.py:1545
+#: ../src/disco.py:1563
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr ""
 
 #. Users column
-#: ../src/disco.py:1736
+#: ../src/disco.py:1754
 msgid "Users"
 msgstr "Users"
 
 #. Description column
-#: ../src/disco.py:1744
+#: ../src/disco.py:1762
 msgid "Description"
 msgstr "Description"
 
 #. Id column
-#: ../src/disco.py:1752
+#: ../src/disco.py:1770
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1817 ../src/gui_interface.py:3182
+#: ../src/disco.py:1835 ../src/gui_interface.py:2995
 msgid "Bookmark already set"
 msgstr "Bookmark already set"
 
-#: ../src/disco.py:1818 ../src/gui_interface.py:3183
+#: ../src/disco.py:1836 ../src/gui_interface.py:2996
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Group Chat \"%s\" is already in your bookmarks."
 
-#: ../src/disco.py:1827 ../src/gui_interface.py:3197
+#: ../src/disco.py:1845 ../src/gui_interface.py:3010
 msgid "Bookmark has been added successfully"
 msgstr "Bookmark has been added successfully"
 
-#: ../src/disco.py:1828 ../src/gui_interface.py:3198
+#: ../src/disco.py:1846 ../src/gui_interface.py:3011
 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:2039
+#: ../src/disco.py:2057
 msgid "Subscribed"
 msgstr "Subscribed"
 
-#: ../src/disco.py:2047
+#: ../src/disco.py:2065
 msgid "Node"
 msgstr ""
 
-#: ../src/disco.py:2111
+#: ../src/disco.py:2129
 msgid "New post"
 msgstr ""
 
-#: ../src/disco.py:2117
+#: ../src/disco.py:2135
 msgid "_Subscribe"
 msgstr ""
 
-#: ../src/disco.py:2123
+#: ../src/disco.py:2141
 msgid "_Unsubscribe"
 msgstr ""
 
@@ -7593,14 +7808,14 @@ msgstr ""
 
 #: ../src/features_window.py:95
 msgid ""
-"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
-"in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 
 #: ../src/features_window.py:96
 msgid ""
-"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
+"You have to set 'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 
 #: ../src/features_window.py:97
@@ -7752,12 +7967,12 @@ msgstr "Description: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s wants to send you a file:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Cannot overwrite existing file \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -7765,22 +7980,22 @@ msgstr ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 msgid "This file already exists"
 msgstr "This file already exists"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 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:369 ../src/gtkgui_helpers.py:914
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Directory \"%s\" is not writable"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
 msgid "You do not have permission to create files in this directory."
 msgstr "You do not have permission to create files in this directory."
 
@@ -7882,28 +8097,28 @@ msgstr ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
 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:80
+#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
 msgid "command"
 msgstr "command"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "show help on command"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Shows or hides the roster window"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Pops up a window with the next pending event"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -7911,6 +8126,13 @@ msgstr ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
+#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
+#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
+#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
 #: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
 #: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
 #: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
@@ -7922,83 +8144,54 @@ msgstr ""
 msgid "account"
 msgstr "account"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "show only contacts of the given account"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Prints a list of registered accounts"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
 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:109
+#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106
 #, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"accoun't previous status"
+msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "one of: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
-msgid "message"
-msgstr "message"
-
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "status message"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
 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 ""
-"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:117
-msgid "Changes the priority of account or accounts"
-msgstr ""
-
-#: ../src/gajim-remote.py:119
-msgid "priority"
-msgstr ""
-
-#: ../src/gajim-remote.py:119
-msgid "priority you want to give to the account"
-msgstr ""
-
-#: ../src/gajim-remote.py:121
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
+"of all accounts that have \"sync with global status\" option set"
 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:127
+#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
 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:129
+#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
 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-plugin.py:118 ../src/gajim-remote-plugin.py:205
 #: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 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:134
-msgid "message content. The account must be specified or \"\""
-msgstr ""
-
-#: ../src/gajim-remote.py:139
+#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
 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 "
@@ -8008,29 +8201,34 @@ msgstr ""
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 
+#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
 #: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID of the contact that will receive the message"
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
+#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "message contents"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "pgp key"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 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:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
+#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
 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:152
+#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
 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 "
@@ -8040,134 +8238,133 @@ msgstr ""
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "subject"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "message subject"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr ""
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Gets detailed info on a contact"
 
+#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
+#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
 #: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
 #: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID of the contact"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Gets detailed info on a account"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Name of the account"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Sends file to a contact"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "file"
 msgstr "file"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "File path"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "if specified, file will be sent using this account"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Lists all preferences and their values"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sets value of 'key' to 'value'."
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "key=value"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 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:207
+#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Deletes a preference item"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
 msgid "key"
 msgstr "key"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "name of the preference to be deleted"
 
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
 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:218
+#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "Removes contact from roster"
 
-#: ../src/gajim-remote.py:227
+#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "Adds contact to roster"
 
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "jid"
-
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "Adds new contact to this account"
 
-#: ../src/gajim-remote.py:235
+#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
 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:242
+#: ../src/gajim-remote-plugin.py:226
+#, fuzzy
 msgid ""
-"Returns current status message (the global one unless account is specified)"
+"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:249
+#: ../src/gajim-remote-plugin.py:233 ../src/gajim-remote.py:249
 msgid "Returns number of unread messages"
 msgstr "Returns number of unread messages"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr "Opens 'Start Chat' dialogue"
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "Starts chat, using this account"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr "Sends custom XML"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr "XML to send"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8175,89 +8372,44 @@ msgstr ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 
-#: ../src/gajim-remote.py:268
-#, fuzzy
-msgid "Change the avatar"
-msgstr "Change status"
-
-#: ../src/gajim-remote.py:270
-msgid "Picture to use"
-msgstr ""
-
-#: ../src/gajim-remote.py:271
-#, fuzzy
-msgid ""
-"Account in which the avatar will be set; if not specified, the avatar will "
-"be set for all accounts"
-msgstr ""
-"Account in which the xml will be sent; if not specified, xml will be sent to "
-"all accounts"
-
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
 msgid "Handle a xmpp:/ uri"
 msgstr "Handle a xmpp:/ uri"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:279
-msgid "URI to handle"
-msgstr ""
-
-#: ../src/gajim-remote.py:280
-msgid "Account in which you want to handle it"
-msgstr ""
-
-#: ../src/gajim-remote.py:282
-msgid "Message content"
-msgstr ""
-
-#: ../src/gajim-remote.py:286
+#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
 msgid "Join a MUC room"
 msgstr "Join a MUC room"
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
 msgid "room"
 msgstr "room"
 
-#: ../src/gajim-remote.py:288
-msgid "Room JID"
-msgstr "Kambario JID"
-
-#: ../src/gajim-remote.py:289
+#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
 msgid "nick"
 msgstr "nick"
 
-#: ../src/gajim-remote.py:289
-msgid "Nickname to use"
-msgstr ""
-
-#: ../src/gajim-remote.py:290
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
 msgid "password"
 msgstr "password"
 
-#: ../src/gajim-remote.py:290
-msgid "Password to enter the room"
-msgstr ""
-
-#: ../src/gajim-remote.py:291
-msgid "Account from which you want to enter the room"
-msgstr ""
-
-#: ../src/gajim-remote.py:296
+#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
 msgid "Check if Gajim is running"
 msgstr ""
 
+#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
 #: ../src/gajim-remote.py:300
 msgid "Shows or hides the ipython window"
 msgstr ""
 
-#: ../src/gajim-remote.py:327
+#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "Missing argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:348
+#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8266,31 +8418,33 @@ msgstr ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 
-#: ../src/gajim-remote.py:351
+#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
 msgid "You have no active account"
 msgstr "You have no active account"
 
-#: ../src/gajim-remote.py:404
+#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:431
+#: ../src/gajim-remote-plugin.py:412
 #, python-format
 msgid ""
-"Usage: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
+"Usage: %s %s %s \n"
+"\t %s"
 msgstr ""
+"Usage: %s %s %s \n"
+"\t %s"
 
-#: ../src/gajim-remote.py:435
+#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
 msgid "Arguments:"
 msgstr "Arguments:"
 
-#: ../src/gajim-remote.py:439
+#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
 #, python-format
 msgid "%s not found"
 msgstr "%s not found"
 
-#: ../src/gajim-remote.py:445
+#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8299,6 +8453,112 @@ msgstr ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 
+#: ../src/gajim-remote-plugin.py:496
+#, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:500
+#, python-format
+msgid ""
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
+msgid "Wrong uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:109
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
+msgstr "one of: offline, online, chat, away, xa, dnd, invisible "
+
+#: ../src/gajim-remote.py:117
+msgid "Changes the priority of account or accounts"
+msgstr ""
+
+#: ../src/gajim-remote.py:119
+msgid "priority"
+msgstr ""
+
+#: ../src/gajim-remote.py:119
+msgid "priority you want to give to the account"
+msgstr ""
+
+#: ../src/gajim-remote.py:121
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+
+#: ../src/gajim-remote.py:134
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:242
+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:268
+#, fuzzy
+msgid "Change the avatar"
+msgstr "Change status"
+
+#: ../src/gajim-remote.py:270
+msgid "Picture to use"
+msgstr ""
+
+#: ../src/gajim-remote.py:271
+#, fuzzy
+msgid ""
+"Account in which the avatar will be set; if not specified, the avatar will "
+"be set for all accounts"
+msgstr ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+
+#: ../src/gajim-remote.py:279
+msgid "URI to handle"
+msgstr ""
+
+#: ../src/gajim-remote.py:280
+msgid "Account in which you want to handle it"
+msgstr ""
+
+#: ../src/gajim-remote.py:282
+msgid "Message content"
+msgstr ""
+
+#: ../src/gajim-remote.py:288
+msgid "Room JID"
+msgstr "Kambario JID"
+
+#: ../src/gajim-remote.py:289
+msgid "Nickname to use"
+msgstr ""
+
+#: ../src/gajim-remote.py:290
+msgid "Password to enter the room"
+msgstr ""
+
+#: ../src/gajim-remote.py:291
+msgid "Account from which you want to enter the room"
+msgstr ""
+
+#: ../src/gajim-remote.py:431
+#, python-format
+msgid ""
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
+msgstr ""
+
 #: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
@@ -8317,10 +8577,6 @@ msgstr ""
 msgid "No uri given"
 msgstr ""
 
-#: ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr ""
-
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Theme"
@@ -8346,198 +8602,196 @@ msgstr "You cannot delete your current theme"
 msgid "Please first choose another for your current theme."
 msgstr "Please first choose another for your current theme."
 
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:170
 msgid "Sending private message failed"
 msgstr "Sending private message failed"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:171
+#: ../src/groupchat_control.py:172
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 
-#: ../src/groupchat_control.py:450
+#: ../src/groupchat_control.py:455
 msgid "Insert Nickname"
 msgstr "Insert Nickname"
 
-#: ../src/groupchat_control.py:631
+#: ../src/groupchat_control.py:636
 msgid "Conversation with "
 msgstr "Pokalbis su "
 
-#: ../src/groupchat_control.py:633
+#: ../src/groupchat_control.py:638
 msgid "Continued conversation"
 msgstr "Pokalbio tęsinys"
 
-#. Can be a message (see handle_event_gc_config_change in
-#. gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1272 ../src/gui_interface.py:1080
+#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1286
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1288
 msgid "A new room has been created"
 msgstr ""
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1291
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1287
+#: ../src/groupchat_control.py:1297
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s has been kicked: %(reason)s"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1300
 #, 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:1300
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s has been banned: %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1312
 #, 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:1314 ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
 #, python-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
 
-#: ../src/groupchat_control.py:1330 ../src/gui_interface.py:919
+#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1372 ../src/groupchat_control.py:1377
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1392
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr ""
 
-#: ../src/groupchat_control.py:1374
+#: ../src/groupchat_control.py:1383
 msgid "affiliation changed"
 msgstr ""
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1388
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1394
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1470
+#: ../src/groupchat_control.py:1477
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1474
+#: ../src/groupchat_control.py:1481
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1489
+#: ../src/groupchat_control.py:1496
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1493
+#: ../src/groupchat_control.py:1500
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1522
+#: ../src/groupchat_control.py:1530
 #, python-format
 msgid "%s has left"
 msgstr ""
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1535
 #, python-format
 msgid "%s has joined the group chat"
 msgstr ""
 
-#: ../src/groupchat_control.py:1529 ../src/gui_interface.py:946
+#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
 #: ../src/history_window.py:447 ../src/notify.py:234
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s is now %(status)s"
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1774
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr ""
 
-#: ../src/groupchat_control.py:1761
+#: ../src/groupchat_control.py:1776
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 
-#: ../src/groupchat_control.py:1765 ../src/gui_interface.py:1216
-#: ../src/gui_interface.py:1992 ../src/gui_interface.py:2029
-#: ../src/gui_interface.py:2064 ../src/message_window.py:224
-#: ../src/roster_window.py:2739 ../src/roster_window.py:3399
-#: ../src/roster_window.py:4123
+#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
+#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
+#: ../src/gui_interface.py:1853 ../src/message_window.py:224
+#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
+#: ../src/roster_window.py:4195
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "Do _not ask me again"
 
-#: ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:1814
 msgid "Changing Subject"
 msgstr ""
 
-#: ../src/groupchat_control.py:1800
+#: ../src/groupchat_control.py:1815
 msgid "Please specify the new subject:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1807
+#: ../src/groupchat_control.py:1822
 msgid "Changing Nickname"
 msgstr ""
 
-#: ../src/groupchat_control.py:1808
+#: ../src/groupchat_control.py:1823
 msgid "Please specify the new nickname you want to use:"
 msgstr ""
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1839
+#: ../src/groupchat_control.py:1854
 #, python-format
 msgid "Destroying %s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1840
+#: ../src/groupchat_control.py:1855
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1842
+#: ../src/groupchat_control.py:1857
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2028
+#: ../src/groupchat_control.py:2046
 #, python-format
 msgid "Kicking %s"
 msgstr ""
 
-#: ../src/groupchat_control.py:2029 ../src/groupchat_control.py:2356
+#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
 msgid "You may specify a reason below:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2355
+#: ../src/groupchat_control.py:2373
 #, python-format
 msgid "Banning %s"
 msgstr ""
@@ -8561,53 +8815,62 @@ msgid "Details"
 msgstr ""
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
+#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:400
+#: ../src/gtkgui_helpers.py:404
 msgid "Error reading file:"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:403
+#: ../src/gtkgui_helpers.py:407
 msgid "Error parsing file:"
 msgstr ""
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:444
+#: ../src/gtkgui_helpers.py:448
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:818
+#: ../src/gtkgui_helpers.py:822
 msgid "Gajim is not the default Jabber client"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:819
+#: ../src/gtkgui_helpers.py:823
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:820
+#: ../src/gtkgui_helpers.py:824
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:887
+#: ../src/gtkgui_helpers.py:891
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:888
+#: ../src/gtkgui_helpers.py:892
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:924
+#: ../src/gtkgui_helpers.py:928
 msgid "Save Image as..."
 msgstr ""
 
-#: ../src/gui_interface.py:140
+#. we are banned
+#. group chat does not exist
+#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
+#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
+#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
+#: ../src/gui_interface.py:348
+msgid "Unable to join group chat"
+msgstr "Unable to join group chat"
+
+#: ../src/gui_interface.py:138
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8615,162 +8878,192 @@ msgid ""
 "Please specify another nickname below:"
 msgstr ""
 
-#: ../src/gui_interface.py:143
+#: ../src/gui_interface.py:141
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:159
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Do you accept this request?"
 
-#: ../src/gui_interface.py:161
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr ""
 
-#: ../src/gui_interface.py:164
+#: ../src/gui_interface.py:163
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr ""
 
-#: ../src/gui_interface.py:213 ../src/notify.py:493
+#: ../src/gui_interface.py:209 ../src/notify.py:493
 msgid "Connection Failed"
 msgstr ""
 
-#: ../src/gui_interface.py:606 ../src/gui_interface.py:610
+#: ../src/gui_interface.py:312
+#, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr ""
+
+#: ../src/gui_interface.py:324
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/gui_interface.py:333
+#, python-format
+msgid "You are banned from group chat %s."
+msgstr "Jūs esate išmestas iš grupės pokalbio %s."
+
+#: ../src/gui_interface.py:338
+#, python-format
+msgid "Group chat %s does not exist."
+msgstr "Tokios grupÄ—s pokalbis %s neegzistuoja."
+
+#: ../src/gui_interface.py:341
+msgid "Group chat creation is restricted."
+msgstr "Group chat creation is restricted."
+
+#: ../src/gui_interface.py:344
+#, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr ""
+"Jūsų užregistruotas slapyvardis turi būti naudojamas grupės pokalbyje %s."
+
+#: ../src/gui_interface.py:349
+#, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Jūs estate grupės pokalbio %s narių sąraše."
+
+#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr ""
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:621 ../src/gui_interface.py:636
+#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr ""
 
-#: ../src/gui_interface.py:663 ../src/notify.py:495
+#: ../src/gui_interface.py:540 ../src/notify.py:495
 msgid "Subscription request"
 msgstr "Sutikimo užklausimas"
 
-#: ../src/gui_interface.py:688
+#: ../src/gui_interface.py:565
 msgid "Authorization accepted"
 msgstr "Authorisation accepted"
 
-#: ../src/gui_interface.py:689
+#: ../src/gui_interface.py:566
 #, 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/gui_interface.py:702
+#: ../src/gui_interface.py:579
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contact \"%s\" removed subscription from you"
 
-#: ../src/gui_interface.py:703
+#: ../src/gui_interface.py:580
 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/gui_interface.py:727 ../src/notify.py:497
+#: ../src/gui_interface.py:604 ../src/notify.py:497
 msgid "Unsubscribed"
 msgstr ""
 
-#: ../src/gui_interface.py:754
+#: ../src/gui_interface.py:631
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contact with \"%s\" cannot be established"
 
-#: ../src/gui_interface.py:1015
+#: ../src/gui_interface.py:859
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1083
+#: ../src/gui_interface.py:926
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gui_interface.py:1085
+#: ../src/gui_interface.py:928
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gui_interface.py:1087
+#: ../src/gui_interface.py:930
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:1091
+#: ../src/gui_interface.py:934
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1093
+#: ../src/gui_interface.py:936
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1095
+#: ../src/gui_interface.py:938
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1098
+#: ../src/gui_interface.py:941
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1101
+#: ../src/gui_interface.py:944
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1133
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr ""
-
-#: ../src/gui_interface.py:1180
+#: ../src/gui_interface.py:985
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gui_interface.py:1182 ../src/gui_interface.py:1189
+#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
 msgid "You are currently connected without your OpenPGP key."
 msgstr "You are currently connected without your OpenPGP key."
 
-#: ../src/gui_interface.py:1184
+#: ../src/gui_interface.py:989
 msgid "Your passphrase is incorrect"
 msgstr "Your passphrase is incorrect"
 
-#: ../src/gui_interface.py:1188
+#: ../src/gui_interface.py:993
 msgid "OpenGPG Passphrase Incorrect"
 msgstr ""
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid "GPG key not trusted"
 msgstr ""
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
 msgstr ""
 
-#: ../src/gui_interface.py:1226
+#: ../src/gui_interface.py:1031
 msgid ""
 "Gnome Keyring is installed but not                 correctly started "
 "(environment variable probably not                 correctly set)"
 msgstr ""
 
-#: ../src/gui_interface.py:1330
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "New mail on %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1332
+#: ../src/gui_interface.py:1133
 #, 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/gui_interface.py:1345
+#: ../src/gui_interface.py:1146
 #, python-format
 msgid ""
 "\n"
@@ -8780,99 +9073,99 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1418
+#: ../src/gui_interface.py:1215
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s wants to send you a file."
 
-#: ../src/gui_interface.py:1455 ../src/roster_window.py:1856
+#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
 msgid "Remote contact stopped transfer"
 msgstr ""
 
-#: ../src/gui_interface.py:1458 ../src/roster_window.py:1858
+#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
 msgid "Error opening file"
 msgstr ""
 
-#: ../src/gui_interface.py:1490
+#: ../src/gui_interface.py:1287
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "You successfully received %(filename)s from %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1494
+#: ../src/gui_interface.py:1291
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: ../src/gui_interface.py:1507
+#: ../src/gui_interface.py:1304
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "You successfully sent %(filename)s to %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1511
+#: ../src/gui_interface.py:1308
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "File transfer of %(filename)s to %(name)s stopped."
 
-#: ../src/gui_interface.py:1623
+#: ../src/gui_interface.py:1426
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gui_interface.py:1630
+#: ../src/gui_interface.py:1433
 msgid "Unable to decrypt message"
 msgstr "Nepavyko iškoduoti žinutės"
 
-#: ../src/gui_interface.py:1702
+#: ../src/gui_interface.py:1505
 msgid "Username Conflict"
 msgstr "Username Conflict"
 
-#: ../src/gui_interface.py:1703
+#: ../src/gui_interface.py:1506
 msgid "Please type a new username for your local account"
 msgstr "Please type a new username for your local account"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1519
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gui_interface.py:1729
+#: ../src/gui_interface.py:1532
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gui_interface.py:1740
+#: ../src/gui_interface.py:1543
 msgid "Error."
 msgstr ""
 
-#: ../src/gui_interface.py:1768
+#: ../src/gui_interface.py:1556
 msgid "Resource Conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:1769
+#: ../src/gui_interface.py:1557
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1816
+#: ../src/gui_interface.py:1604
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s wants to send you a file."
 
-#: ../src/gui_interface.py:1819
+#: ../src/gui_interface.py:1607
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "File Transfer Request"
 
-#: ../src/gui_interface.py:1927
+#: ../src/gui_interface.py:1716
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1928
+#: ../src/gui_interface.py:1717
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -8880,15 +9173,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1936
+#: ../src/gui_interface.py:1725
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1956
+#: ../src/gui_interface.py:1745
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gui_interface.py:1957
+#: ../src/gui_interface.py:1746
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8899,87 +9192,87 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gui_interface.py:1987 ../src/gui_interface.py:2024
-#: ../src/gui_interface.py:2060
+#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
+#: ../src/gui_interface.py:1849
 msgid "Insecure connection"
 msgstr "Nesaugus ryšys"
 
-#: ../src/gui_interface.py:1988
+#: ../src/gui_interface.py:1777
 msgid ""
 "You are about to connect to the server with an insecure connection. This "
 "means all your conversations will be exchanged unencrypted. Are you sure you "
 "want to do that?"
 msgstr ""
 
-#: ../src/gui_interface.py:1991 ../src/gui_interface.py:2028
-#: ../src/gui_interface.py:2063
+#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
+#: ../src/gui_interface.py:1852
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gui_interface.py:2025
+#: ../src/gui_interface.py:1814
 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/gui_interface.py:2061
+#: ../src/gui_interface.py:1850
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
 "Are you sure you want to do that?"
 msgstr ""
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2624 ../src/gui_interface.py:2647
+#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
 msgid "Emoticons disabled"
 msgstr ""
 
-#: ../src/gui_interface.py:2625
+#: ../src/gui_interface.py:2423
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2648
+#: ../src/gui_interface.py:2446
 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/gui_interface.py:2679 ../src/roster_window.py:3560
+#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
 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/gui_interface.py:3058
+#: ../src/gui_interface.py:2871
 msgid "Could not save your settings and preferences"
 msgstr "Could not save your settings and preferences"
 
-#: ../src/gui_interface.py:3592
+#: ../src/gui_interface.py:3411
 msgid "Passphrase Required"
 msgstr "Passphrase Required"
 
-#: ../src/gui_interface.py:3593
+#: ../src/gui_interface.py:3412
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 
-#: ../src/gui_interface.py:3607
+#: ../src/gui_interface.py:3426
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gui_interface.py:3608
+#: ../src/gui_interface.py:3427
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "You will be connected to %s without OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3617
+#: ../src/gui_interface.py:3436
 msgid "Wrong Passphrase"
 msgstr ""
 
-#: ../src/gui_interface.py:3618
+#: ../src/gui_interface.py:3437
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Please retype your GPG passphrase or press Cancel."
 
@@ -9017,6 +9310,11 @@ msgstr ""
 msgid "Message"
 msgstr ""
 
+#. holds subject
+#: ../src/history_manager.py:188 ../src/history_manager.py:219
+msgid "Subject"
+msgstr "Tema"
+
 #: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -9106,19 +9404,19 @@ msgstr ""
 msgid "Do you really want to close them all?"
 msgstr ""
 
-#: ../src/message_window.py:484
+#: ../src/message_window.py:485
 msgid "Chats"
 msgstr "Chats"
 
-#: ../src/message_window.py:486
+#: ../src/message_window.py:487
 msgid "Group Chats"
 msgstr "Group Chats"
 
-#: ../src/message_window.py:488
+#: ../src/message_window.py:489
 msgid "Private Chats"
 msgstr "Private Chats"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:495
 msgid "Messages"
 msgstr "Messages"
 
@@ -9174,56 +9472,56 @@ msgstr ""
 msgid "Ignore"
 msgstr ""
 
-#: ../src/profile_window.py:57
+#: ../src/profile_window.py:58
 msgid "Retrieving profile..."
 msgstr "Retrieving profile..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2935
+#: ../src/profile_window.py:111 ../src/roster_window.py:3001
 msgid "File is empty"
 msgstr ""
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2938
+#: ../src/profile_window.py:114 ../src/roster_window.py:3004
 msgid "File does not exist"
 msgstr ""
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2940 ../src/roster_window.py:2951
+#: ../src/profile_window.py:128 ../src/profile_window.py:144
+#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
 msgid "Could not load image"
 msgstr "Could not load image"
 
-#: ../src/profile_window.py:214
+#: ../src/profile_window.py:215
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Asmens Informacija"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:216
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Formatas: YYYY-MM-DD"
 
-#: ../src/profile_window.py:269
+#: ../src/profile_window.py:270
 msgid "Information received"
 msgstr "Information received"
 
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:341
 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:353
+#: ../src/profile_window.py:354
 msgid "Sending profile..."
 msgstr "Sending profile..."
 
-#: ../src/profile_window.py:368
+#: ../src/profile_window.py:369
 msgid "Information NOT published"
 msgstr "Information NOT published"
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:376
 msgid "vCard publication failed"
 msgstr "vCard publication failed"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:377
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9231,51 +9529,51 @@ msgstr ""
 "There was an error while publishing your personal information, try again "
 "later."
 
-#: ../src/roster_window.py:256 ../src/roster_window.py:1012
+#: ../src/roster_window.py:262 ../src/roster_window.py:1026
 msgid "Merged accounts"
 msgstr "Apjungtos prieigos"
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1942
 msgid "Authorization has been sent"
 msgstr "Authorisation has been sent"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1943
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Dabar \"%s\" žinos apie jūsų būklę."
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1966
 msgid "Subscription request has been sent"
 msgstr "Subscription request has been sent"
 
-#: ../src/roster_window.py:1944
+#: ../src/roster_window.py:1967
 #, 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:1958
+#: ../src/roster_window.py:1981
 msgid "Authorization has been removed"
 msgstr "Authorisation has been removed"
 
-#: ../src/roster_window.py:1959
+#: ../src/roster_window.py:1982
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Now \"%s\" will always see you as offline."
 
-#: ../src/roster_window.py:1986
+#: ../src/roster_window.py:2009
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:1987
+#: ../src/roster_window.py:2010
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "You will be connected to %s without OpenPGP."
 
-#: ../src/roster_window.py:2199 ../src/roster_window.py:3496
+#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
 msgid "You are participating in one or more group chats"
 msgstr "You are participating in one or more group chats"
 
-#: ../src/roster_window.py:2200 ../src/roster_window.py:3497
+#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9283,221 +9581,221 @@ 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:2226
+#: ../src/roster_window.py:2249
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2288
+#: ../src/roster_window.py:2311
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2289
+#: ../src/roster_window.py:2312
 msgid "Are you sure you want to quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2290
+#: ../src/roster_window.py:2313
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2373
+#: ../src/roster_window.py:2396
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Atšaukti failo siuntimą"
 
-#: ../src/roster_window.py:2374
+#: ../src/roster_window.py:2397
 msgid ""
-"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2405 ../src/roster_window.py:2653
+#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
 msgid "You have unread messages"
 msgstr "You have unread messages"
 
-#: ../src/roster_window.py:2406
+#: ../src/roster_window.py:2429
 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:2654
+#: ../src/roster_window.py:2720
 msgid "You must read them before removing this transport."
 msgstr ""
 
-#: ../src/roster_window.py:2657
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr ""
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2724
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr ""
 
-#: ../src/roster_window.py:2661
+#: ../src/roster_window.py:2727
 msgid "Transports will be removed"
 msgstr ""
 
-#: ../src/roster_window.py:2666
+#: ../src/roster_window.py:2732
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "these transports: %s"
 msgstr ""
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2800
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 
-#: ../src/roster_window.py:2736
+#: ../src/roster_window.py:2802
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2827
+#: ../src/roster_window.py:2893
 msgid "Rename Contact"
 msgstr ""
 
-#: ../src/roster_window.py:2828
+#: ../src/roster_window.py:2894
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr ""
 
-#: ../src/roster_window.py:2835
+#: ../src/roster_window.py:2901
 msgid "Rename Group"
 msgstr ""
 
-#: ../src/roster_window.py:2836
+#: ../src/roster_window.py:2902
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr ""
 
-#: ../src/roster_window.py:2881
+#: ../src/roster_window.py:2947
 msgid "Remove Group"
 msgstr ""
 
-#: ../src/roster_window.py:2882
+#: ../src/roster_window.py:2948
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: ../src/roster_window.py:2883
+#: ../src/roster_window.py:2949
 msgid "Also remove all contacts in this group from your roster"
 msgstr ""
 
-#: ../src/roster_window.py:2922
+#: ../src/roster_window.py:2988
 msgid "Assign OpenPGP Key"
 msgstr ""
 
-#: ../src/roster_window.py:2923
+#: ../src/roster_window.py:2989
 msgid "Select a key to apply to the contact"
 msgstr ""
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3372
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr ""
 
-#: ../src/roster_window.py:3308
+#: ../src/roster_window.py:3374
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3313
+#: ../src/roster_window.py:3379
 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:3319
+#: ../src/roster_window.py:3385
 msgid "Do you want to continue?"
 msgstr ""
 
-#: ../src/roster_window.py:3323
+#: ../src/roster_window.py:3389
 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:3326
+#: ../src/roster_window.py:3392
 msgid "I want this contact to know my status after removal"
 msgstr ""
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3330
+#: ../src/roster_window.py:3396
 msgid "Contacts will be removed from your roster"
 msgstr ""
 
-#: ../src/roster_window.py:3335
+#: ../src/roster_window.py:3401
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
 "you also remove authorization resulting in them always seeing you as offline."
 msgstr ""
 
-#: ../src/roster_window.py:3393
+#: ../src/roster_window.py:3459
 msgid ""
 "You are about to send a custom status. Are you sure you want  to continue?"
 msgstr ""
 
-#: ../src/roster_window.py:3395
+#: ../src/roster_window.py:3461
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he or she will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3414
+#: ../src/roster_window.py:3480
 msgid "No account available"
 msgstr ""
 
-#: ../src/roster_window.py:3415
+#: ../src/roster_window.py:3481
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 
-#: ../src/roster_window.py:4023
+#: ../src/roster_window.py:4095
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: ../src/roster_window.py:4025
+#: ../src/roster_window.py:4097
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: ../src/roster_window.py:4117
+#: ../src/roster_window.py:4189
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 
-#: ../src/roster_window.py:4119
+#: ../src/roster_window.py:4191
 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:4234
+#: ../src/roster_window.py:4306
 msgid "Invalid file URI:"
 msgstr ""
 
-#: ../src/roster_window.py:4246
+#: ../src/roster_window.py:4318
 #, 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] ""
 msgstr[1] ""
 
-#: ../src/roster_window.py:4361
+#: ../src/roster_window.py:4433
 #, python-format
 msgid "Send %s to %s"
 msgstr ""
 
-#: ../src/roster_window.py:4367
+#: ../src/roster_window.py:4439
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr ""
@@ -9507,142 +9805,142 @@ msgstr ""
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4816 ../src/roster_window.py:4889
-#: ../src/roster_window.py:4898 ../src/statusicon.py:246
-#: ../src/statusicon.py:293 ../src/statusicon.py:299
+#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
+#: ../src/roster_window.py:4970 ../src/statusicon.py:263
+#: ../src/statusicon.py:310 ../src/statusicon.py:316
 #, python-format
 msgid "using account %s"
 msgstr ""
 
 #. add
-#: ../src/roster_window.py:4905
+#: ../src/roster_window.py:4977
 #, python-format
 msgid "to %s account"
 msgstr ""
 
 #. disco
-#: ../src/roster_window.py:4910
+#: ../src/roster_window.py:4982
 #, python-format
 msgid "using %s account"
 msgstr ""
 
-#: ../src/roster_window.py:4948 ../src/statusicon.py:309
+#: ../src/roster_window.py:5020 ../src/statusicon.py:326
 msgid "_Manage Bookmarks..."
 msgstr ""
 
 #. profile, avatar
-#: ../src/roster_window.py:4968
+#: ../src/roster_window.py:5040
 #, python-format
 msgid "of account %s"
 msgstr ""
 
-#: ../src/roster_window.py:5009
+#: ../src/roster_window.py:5081
 #, python-format
 msgid "for account %s"
 msgstr ""
 
-#: ../src/roster_window.py:5069 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
 msgid "_Change Status Message"
 msgstr "_Keisti Būklės Žinutę"
 
-#: ../src/roster_window.py:5102
+#: ../src/roster_window.py:5174
 msgid "Publish Tune"
 msgstr ""
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5176
 msgid "Publish Location"
 msgstr ""
 
-#: ../src/roster_window.py:5107
+#: ../src/roster_window.py:5179
 msgid "Configure Services..."
 msgstr "Konfigūruoti Paslaugas..."
 
-#: ../src/roster_window.py:5252
+#: ../src/roster_window.py:5324
 msgid "_Maximize All"
 msgstr ""
 
-#: ../src/roster_window.py:5262 ../src/roster_window.py:5436
+#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
 msgid "Send Group M_essage"
 msgstr ""
 
-#: ../src/roster_window.py:5270
+#: ../src/roster_window.py:5342
 msgid "To all users"
 msgstr "Visiems naudotojams"
 
-#: ../src/roster_window.py:5274
+#: ../src/roster_window.py:5346
 msgid "To all online users"
 msgstr "Visiems prisijungusiems"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5456
+#: ../src/roster_window.py:5528
 msgid "_Manage Contacts"
 msgstr ""
 
 #. Edit Groups
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5537
 msgid "Edit _Groups"
 msgstr "Redaguoti _Grupes"
 
 #. Send single message
-#: ../src/roster_window.py:5520
+#: ../src/roster_window.py:5592
 msgid "Send Single Message"
 msgstr "Siųsti Vieną Žinutę"
 
 #. Execute Command
-#: ../src/roster_window.py:5567
+#: ../src/roster_window.py:5639
 msgid "Execute Command..."
 msgstr "Vykdyti KomandÄ…..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5577
+#: ../src/roster_window.py:5649
 msgid "_Manage Transport"
 msgstr "_Valdyti Pernašą"
 
 #. Modify Transport
-#: ../src/roster_window.py:5586
+#: ../src/roster_window.py:5658
 msgid "_Modify Transport"
 msgstr "_Keisti Pernašą"
 
 #. Rename
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5668
 msgid "_Rename"
 msgstr "_Pervadinti"
 
-#: ../src/roster_window.py:5656
+#: ../src/roster_window.py:5728
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5665
+#: ../src/roster_window.py:5737
 msgid "_Reconnect"
 msgstr ""
 
-#: ../src/roster_window.py:5672
+#: ../src/roster_window.py:5744
 msgid "_Disconnect"
 msgstr ""
 
 #. History manager
-#: ../src/roster_window.py:5754
+#: ../src/roster_window.py:5833
 msgid "History Manager"
 msgstr "History Manager"
 
-#: ../src/roster_window.py:5765
+#: ../src/roster_window.py:5844
 msgid "_Join New Group Chat"
 msgstr "_Join New Group Chat"
 
-#: ../src/roster_window.py:5938
+#: ../src/roster_window.py:6019
 msgid "Change Status Message..."
 msgstr "Change Status Message..."
 
-#: ../src/search_window.py:94
+#: ../src/search_window.py:105
 msgid "Waiting for results"
 msgstr ""
 
-#: ../src/search_window.py:132 ../src/search_window.py:210
+#: ../src/search_window.py:143 ../src/search_window.py:220
 msgid "Error in received dataform"
 msgstr ""
 
 #. No result
-#: ../src/search_window.py:166 ../src/search_window.py:202
+#: ../src/search_window.py:177 ../src/search_window.py:212
 msgid "No result"
 msgstr ""
 
@@ -9655,21 +9953,22 @@ msgstr ""
 msgid "Subject: %s"
 msgstr "Subject: %s"
 
-#: ../src/session.py:433 ../src/session.py:468
+#: ../src/session.py:447 ../src/session.py:491
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:435
+#: ../src/session.py:448
 #, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
+"The remote client wants '\n"
+"                            'to negotiate an session with these features:\n"
 "\n"
 "%s\n"
 "\n"
 "Are these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:469
+#: ../src/session.py:492
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9679,16 +9978,16 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/statusicon.py:210
+#: ../src/statusicon.py:227
 msgid "_Change Status Message..."
 msgstr "_Change Status Message..."
 
-#: ../src/statusicon.py:322
+#: ../src/statusicon.py:339
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "_sąraše"
 
-#: ../src/statusicon.py:333
+#: ../src/statusicon.py:350
 msgid "Hide this menu"
 msgstr "Hide this menu"
 
@@ -9825,32 +10124,32 @@ msgid ""
 "It is most likely legacy or broken"
 msgstr ""
 
-#: ../src/vcard.py:251
+#: ../src/vcard.py:265
 msgid "?Client:Unknown"
 msgstr ""
 
-#: ../src/vcard.py:253
+#: ../src/vcard.py:267
 msgid "?OS:Unknown"
 msgstr ""
 
-#: ../src/vcard.py:274
+#: ../src/vcard.py:288
 msgid "?Time:Unknown"
 msgstr ""
 
-#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
+#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
 #, python-format
 msgid "since %s"
 msgstr "since %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:345
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:349
 msgid "<b>Affiliation:</b>"
 msgstr ""
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:357
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9858,7 +10157,7 @@ msgstr ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:359
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9866,13 +10165,13 @@ msgstr ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:361
 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:349
+#: ../src/vcard.py:363
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9880,18 +10179,56 @@ msgstr ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 
-#: ../src/vcard.py:356
+#: ../src/vcard.py:370
 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:358
+#: ../src/vcard.py:372
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
+#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
 msgid " resource with priority "
 msgstr " resource with priority "
 
+#~ msgid "_Disable showing event in systray"
+#~ msgstr "_Uždrausti įvykių rodyma sistemos dėkle"
+
+#~ msgid "_Show event in systray"
+#~ msgstr "_Rodyti įvykį sistemos dėkle"
+
+#, fuzzy
+#~ msgid "Autodetect on every Gajim startup"
+#~ msgstr "_Prisijungti, kai Gajim pasileis"
+
+#~ msgid "Show systray:"
+#~ msgstr "Rodyti sisteminį dėklą:"
+
+#~ msgid "Nickname not allowed: %s"
+#~ msgstr "Nickname not allowed: %s"
+
+#~ msgid "Room has been destroyed"
+#~ msgstr "Kambarys buvo sunaikintas"
+
+#~ msgid "I would like to add you to my roster."
+#~ msgstr "I would like to add you to my roster."
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "we are now subscribed to %s"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "unsubscribe request from %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "we are now unsubscribed from %s"
+
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+
 #~ msgid "Account Modification"
 #~ msgstr "Prieigos keitimas"
 
@@ -9979,22 +10316,6 @@ msgstr " resource with priority "
 #~ msgid "Manage Accounts"
 #~ msgstr "Prieigų valdymas"
 
-#~ msgid "Add this contact to roster (Ctrl+D)"
-#~ msgstr "Įtraukti šį kontaktą į sąrašą (Ctrl+D)"
-
-#~ msgid "Invite contacts to the conversation (Ctrl+G)"
-#~ msgstr "Pakviesti kontaktus į pokalbį (Ctrl+G)"
-
-#~ msgid "Show a list of emoticons (Alt+M)"
-#~ msgstr "Rodyti šypsenėlių sąrašą (Alt+M)"
-
-#~ msgid "Show a list of formattings"
-#~ msgstr "Rodyti formatavimo sąrašą"
-
-#, fuzzy
-#~ msgid "Show a menu of advanced functions (Alt+D)"
-#~ msgstr "Rodyti šypsenėlių sąrašą (Alt+M)"
-
 #~ msgid ""
 #~ "All chat states\n"
 #~ "Composing only\n"
@@ -10028,9 +10349,6 @@ msgstr " resource with priority "
 #~ "nuo\n"
 #~ "kam"
 
-#~ msgid "_Preferences"
-#~ msgstr "_Nustatymai"
-
 #~ msgid "_Quit"
 #~ msgstr "_IÅ¡jungti"
 
@@ -10444,13 +10762,6 @@ msgstr " resource with priority "
 #~ msgid "Session Management support not available (missing gnome.ui module)"
 #~ msgstr "Session Management support not available (missing gnome.ui module)"
 
-#~ msgid ""
-#~ "Usage: %s %s %s \n"
-#~ "\t %s"
-#~ msgstr ""
-#~ "Usage: %s %s %s \n"
-#~ "\t %s"
-
 #~ msgid "%s - Gajim"
 #~ msgstr "%s - Gajim"
 
@@ -10565,9 +10876,6 @@ msgstr " resource with priority "
 #~ msgid "Save _position and size for roster and chat windows"
 #~ msgstr "Įsiminti kontakų sąrašo ir pokalbių langų pozicijas ir dydžius"
 
-#~ msgid "Use t_rayicon (aka. notification area icon)"
-#~ msgstr "Naudoti piktogramą trėjuje (pranešimų panelės piktograma)"
-
 #~ msgid ""
 #~ "When a new event (message, file transfer request etc..) is received, the "
 #~ "following methods may be used to inform you about it. Please note that "
diff --git a/po/nb.po b/po/nb.po
index 537f3a2eba02830663d71321c4866f3146ec17e0..63f062025903b633eabf9f715b6c10c84a086a4d 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -2,11 +2,15 @@
 # This file is distributed under the same license as the Gajim package.
 # Stian B. Barmen <stian@jabber.no>, 2005.
 #
+#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 11:28+0200\n"
+"POT-Creation-Date: 2010-10-01 20:39+0200\n"
 "PO-Revision-Date: 2009-11-18 15:50+0100\n"
 "Last-Translator: Stian B. Barmen <stian@barmen.nu>\n"
 "Language-Team: <>\n"
@@ -25,7 +29,7 @@ msgstr "Bli med i _Gruppe Samtale..."
 msgid "_Add Contact..."
 msgstr "_Legg til Kontakt..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:17
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
 msgid "_Discover Services"
 msgstr "_Oppdag Tjenester"
 
@@ -45,7 +49,7 @@ msgstr "_Ã…pne Gmail Innboks"
 msgid "_Personal Events"
 msgstr "_Personlige Hendelser"
 
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:23
+#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
 msgid "_Start Chat..."
 msgstr "_Start Samtale..."
 
@@ -77,10 +81,6 @@ msgid "<b>Please select a server</b>"
 msgstr "<b>Vennligst velg en server</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid "@"
-msgstr "@"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
@@ -88,64 +88,64 @@ msgstr ""
 "Legg til dette sertifikatet til listen over tiltrodde leverandører.\n"
 "SHA1 fingeravtrykk til sertifikatet:\n"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:10
 msgid "Anon_ymous authentication"
 msgstr "Anon_ym autentisering"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Connect when I press Finish"
 msgstr "Koble til når jeg klikker Ferdig"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Konto Opprettings Veiviser"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "I already have an account I want to _use"
 msgstr "Jeg har allerede en konto jeg ønsker å _bruke"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I want to _register for a new account"
 msgstr "Jeg ønsker å _registrere en ny konto"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:16
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 #: ../data/gui/accounts_window.ui.h:28
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Dersom valgt vil Gajim huske passordet for kontoen"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:17
+#: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Behandle..."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:18
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
 #: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2263 ../src/config.py:2342
-#: ../src/config.py:2355 ../src/config.py:3596 ../src/config.py:3671
-#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513
-#: ../src/dialogs.py:526 ../src/roster_window.py:2890
-#: ../src/roster_window.py:2896 ../src/roster_window.py:2901
+#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
+#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
+#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
+#: ../src/dialogs.py:527 ../src/roster_window.py:2956
+#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
 msgid "None"
 msgstr "Ingen"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:19
+#: ../data/gui/account_creation_wizard_window.ui.h:18
 msgid "Prox_y:"
 msgstr "Prox_y:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #: ../data/gui/accounts_window.ui.h:48
 msgid "Save pass_word"
 msgstr "Lagre pass_ord"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:21
+#: ../data/gui/account_creation_wizard_window.ui.h:20
 msgid "Set my profile when I connect"
 msgstr "Klargjør profilen min når jeg kobler til"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:22
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Use custom hostname/port"
 msgstr "Bruk egendefinert maskinnavn/port"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:23
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -153,34 +153,34 @@ msgstr ""
 "Du trenger en konto før du kan koble\n"
 "til Jabber nettverket."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-#: ../data/gui/roster_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:16
 msgid "_Advanced"
 msgstr "_Avansert"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:25
 msgid "_Finish"
 msgstr "_Avslutt"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:27
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Hostname:"
 msgstr "_Maskinnavn:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #: ../data/gui/accounts_window.ui.h:62
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:28
 #: ../data/gui/accounts_window.ui.h:64
 msgid "_Password:"
 msgstr "_Passord:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:29
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:31
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Server:"
 msgstr "_Server:"
 
@@ -288,17 +288,17 @@ msgstr "Fornavn:"
 #. No configured account
 #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
 #: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592
-#: ../src/notify.py:608
+#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
+#: ../src/notify.py:616
 msgid "Gajim"
 msgstr "Gajim"
 
 #. FIXME: Ugly workaround.
 #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
 #. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:61
-#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121
-#: ../src/roster_window.py:2832 ../src/roster_window.py:5379
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
+#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
 msgid "General"
 msgstr "Generelle"
 
@@ -355,7 +355,7 @@ msgstr "Informasjon om deg, slik som den er lagret på serveren"
 
 #: ../data/gui/accounts_window.ui.h:35
 #: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:830
+#: ../src/dialogs.py:831
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -369,7 +369,7 @@ msgid "Mer_ge accounts"
 msgstr "Sammenslåin_g av kontoer"
 
 #: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2356
+#: ../src/config.py:2358
 msgid "No key selected"
 msgstr "Ingen nøkkel valgt"
 
@@ -396,7 +396,7 @@ msgid "Priority will change automatically according to your status."
 msgstr "Prioritet vil endres automatisk etter din status."
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5329
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
 msgid "Re_name"
 msgstr "Gi _nytt navn"
 
@@ -621,38 +621,43 @@ msgid "Deletes Message of the Day"
 msgstr "Sletter Meling for Dagen"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
+#, fuzzy
+msgid "Edit Archi_ving Preferences"
+msgstr "_Instillinger"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Edit _Privacy Lists..."
 msgstr "Rediger _Private Lister..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sends a message to users currently connected to this server"
 msgstr "Sender en melding til alle tilkoblede brukere på denne serveren"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Set MOTD..."
 msgstr "Sett MOTD..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Setter Melding for Dagen"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Show _XML Console"
 msgstr "Vis _XML Konsoll"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "Update MOTD..."
 msgstr "Oppdater MOTD..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "Uppdaterer Melding for Dagen"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:11
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:11
+#: ../data/gui/advanced_menuitem_menu.ui.h:12
 msgid "_Send Server Message..."
 msgstr "_Send Server Melding..."
 
@@ -686,7 +691,7 @@ msgid "All statuses"
 msgstr "Alle statuser"
 
 #: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:233
+#: ../src/common/commands.py:106 ../src/common/helpers.py:239
 #: ../src/tooltips.py:193
 msgid "Away"
 msgstr "Borte"
@@ -739,7 +744,7 @@ msgid "Have "
 msgstr "Har"
 
 #: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:249
 msgid "Invisible"
 msgstr "Usynlig"
 
@@ -748,7 +753,7 @@ msgid "Launch a command"
 msgstr "Kjør en kommando"
 
 #: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:216 ../src/tooltips.py:197
+#: ../src/common/helpers.py:222 ../src/tooltips.py:197
 msgid "Not Available"
 msgstr "Ikke tilgjengelig"
 
@@ -793,12 +798,13 @@ msgid "_Disable existing sound for this event"
 msgstr "_Deaktiver eksisterende lyd for denne hendelsen"
 
 #: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in roster"
+#, fuzzy
+msgid "_Disable showing event in notification area"
 msgstr "_Deaktiver visning av hendelser i kontaktlisten"
 
 #: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in systray"
-msgstr "_Deaktiver visning av hendelser i systemstatusfeltet"
+msgid "_Disable showing event in roster"
+msgstr "_Deaktiver visning av hendelser i kontaktlisten"
 
 #: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
@@ -809,12 +815,13 @@ msgid "_Open chat window with user"
 msgstr "_Ã…pne samtale vindu med bruker"
 
 #: ../data/gui/advanced_notifications_window.ui.h:35
-msgid "_Show event in roster"
+#, fuzzy
+msgid "_Show event in notification area"
 msgstr "_Vis hendelse i kontaktliste"
 
 #: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in systray"
-msgstr "_Vis hendelse i systemstatusfeltet"
+msgid "_Show event in roster"
+msgstr "_Vis hendelse i kontaktliste"
 
 #: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
@@ -842,6 +849,45 @@ msgstr "Grupper"
 msgid "when I'm in"
 msgstr "når jeg er i"
 
+#: ../data/gui/archiving_preferences_window.ui.h:1
+msgid "<i>Method Auto</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "<i>Method Local</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:3
+msgid "<i>Method Manual</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:4
+#, fuzzy
+msgid "Auto"
+msgstr "Auto bli med"
+
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Concede"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "Forbid"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:7
+#, fuzzy
+msgid "No"
+msgstr "Ingen"
+
+#: ../data/gui/archiving_preferences_window.ui.h:8
+#, fuzzy
+msgid "Prefer"
+msgstr "Tilstedeværelse"
+
+#: ../data/gui/archiving_preferences_window.ui.h:9
+msgid "Yes"
+msgstr ""
+
 #: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Entry:"
@@ -868,8 +914,8 @@ msgstr "Blokkerte Kontakter"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5348
-#: ../src/roster_window.py:5476 ../src/roster_window.py:5609
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
+#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
 msgid "_Unblock"
 msgstr "_Frigi"
 
@@ -957,7 +1003,7 @@ msgid "_Start Chat"
 msgstr "_Start Samtale"
 
 #. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4184
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
 msgid "#"
 msgstr "#"
 
@@ -1005,13 +1051,50 @@ msgstr ""
 msgid "9"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:13
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Legg til kontakt til kontaktlisten (Ctrl+D)"
+
 #: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Søk gjennom samtale historikken (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:15
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Inviter kontakter til samtalen (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Vis en liste over uttrykksikon (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
+msgid "Show a list of formattings"
+msgstr "Vis en liste over formatteringer"
+
+#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Vis en meny med avanserte funksjoner (Alt+A)"
+
+#: ../data/gui/chat_control.ui.h:19
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr "Vis kontaktens profil (Ctrl+I)"
+
+#: ../data/gui/chat_control.ui.h:20
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:21
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
 #: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Send"
 
-#: ../data/gui/chat_control.ui.h:15 ../data/gui/groupchat_control.ui.h:3
+#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
 msgid "label"
 msgstr ""
 
@@ -1061,8 +1144,8 @@ msgstr "Rediger _Grupper..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5284
-#: ../src/roster_window.py:5444
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
+#: ../src/roster_window.py:5516
 msgid "In_vite to"
 msgstr "In_viter til"
 
@@ -1074,8 +1157,8 @@ msgstr "Inviter _Kontakter"
 msgid "Remo_ve"
 msgstr "_Fjern"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5294
-#: ../src/roster_window.py:5533
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
+#: ../src/roster_window.py:5605
 msgid "Send Cus_tom Status"
 msgstr "Send Egendefiner_t Status"
 
@@ -1108,8 +1191,8 @@ msgid "_Allow him/her to see my status"
 msgstr "_Tillat han/henne å se min status"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5482 ../src/roster_window.py:5612
+#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
+#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
 msgid "_Block"
 msgstr "_Blokker"
 
@@ -1119,8 +1202,8 @@ msgstr "_Forby han/henne å se min status"
 
 #: ../data/gui/contact_context_menu.ui.h:20
 #: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:21
-#: ../src/roster_window.py:5683
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
+#: ../src/roster_window.py:5755
 msgid "_History"
 msgstr "_Historie"
 
@@ -1253,7 +1336,7 @@ msgstr "<b>Samtalestatus Fane Farger</b>"
 msgid "Account row"
 msgstr "Konto"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:925
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
 msgid "Bold"
 msgstr "Fet"
 
@@ -1291,7 +1374,7 @@ msgstr "Gruppe"
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:926
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
 msgid "Italic"
 msgstr "Kursiv"
 
@@ -1339,7 +1422,7 @@ msgstr "Endre _Tittel..."
 msgid "Configure _Room..."
 msgstr "Konfigurer _Rom..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1782
+#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
 msgid "_Bookmark"
 msgstr "_Bokmerke"
 
@@ -1399,19 +1482,31 @@ msgstr "_Send Privat Melding"
 msgid "_Voice"
 msgstr "_Stemme"
 
+#: ../data/gui/groupchat_control.ui.h:1
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "_Bokmerke dette rommet (Ctrl+B)"
+
+#: ../data/gui/groupchat_control.ui.h:3
+msgid "Change the room's subject (Alt+T)"
+msgstr "Endre rommets emne (Alt+T)"
+
+#: ../data/gui/groupchat_control.ui.h:4
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Endre ditt _Kallenavn (Ctrl+N)"
+
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Lag en ny post"
 
-#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
-msgid "From"
-msgstr "Fra"
+#: ../data/gui/groups_post_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:2
+msgid "From:"
+msgstr "Fra:"
 
-#. holds subject
-#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
-#: ../src/history_manager.py:219
-msgid "Subject"
-msgstr "Tittel"
+#: ../data/gui/groups_post_window.ui.h:3
+#: ../data/gui/single_message_window.ui.h:7
+msgid "Subject:"
+msgstr "Tema:"
 
 #: ../data/gui/history_manager.ui.h:1
 msgid ""
@@ -1428,8 +1523,8 @@ msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Velkommen til Gajims Historikk og Logg Behandler</b></big>"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3208
-#: ../src/dialogs.py:3305
+#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
+#: ../src/dialogs.py:3321
 msgid "Delete"
 msgstr "Slett"
 
@@ -1487,12 +1582,75 @@ msgstr "Søk:"
 msgid "_Log conversation history"
 msgstr "_Logg samtale historikk"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
+msgid "approve"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:2
+msgid "body"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:3
+msgid "concede"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:4
+msgid "expire"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:5
+msgid "false"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:6
+msgid "forbid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:7
+#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+msgid "jid"
+msgstr "jid"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:8
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
+#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
+msgid "message"
+msgstr "melding"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
+msgid "oppose"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
+#, fuzzy
+msgid "otr"
+msgstr "Varm"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:11
+msgid "prefer"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:12
+msgid "require"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:13
+msgid "save"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:14
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
 msgid "Bro_wse Rooms"
 msgstr "_Utforsk"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2180
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
 msgid "Join Group Chat"
 msgstr "Bli med i Gruppesamtale"
 
@@ -1530,8 +1688,8 @@ msgstr "Server:"
 msgid "_Bookmark this room"
 msgstr "Bokmerke dette rommet"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1341
-#: ../src/disco.py:1786
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../src/disco.py:1804
 msgid "_Join"
 msgstr "_Bli med"
 
@@ -1635,6 +1793,75 @@ msgstr "_Brukernavn:"
 msgid "Passphrase"
 msgstr "Passord setning"
 
+#: ../data/gui/plugins_window.ui.h:1
+msgid "&lt;empty&gt;"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:2
+msgid "<empty>"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:3
+#, fuzzy
+msgid "Authors:"
+msgstr "Go_dkjenn"
+
+#: ../data/gui/plugins_window.ui.h:4
+#, fuzzy
+msgid "Available"
+msgstr "_Tilgjengelig"
+
+#: ../data/gui/plugins_window.ui.h:5
+#, fuzzy
+msgid "Configure"
+msgstr "_Konfigurer"
+
+#: ../data/gui/plugins_window.ui.h:6
+#, fuzzy
+msgid "Descrition:"
+msgstr "Beskrivelse:"
+
+#: ../data/gui/plugins_window.ui.h:7
+#, fuzzy
+msgid "Homepage:"
+msgstr "<b>Hjemmeside:</b>"
+
+#: ../data/gui/plugins_window.ui.h:8
+msgid "Install"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:9
+#, fuzzy
+msgid "Installed"
+msgstr "Henger"
+
+#: ../data/gui/plugins_window.ui.h:10
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:11
+msgid "Plugins"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:12
+msgid "Uninstall"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:13
+#, fuzzy
+msgid "Version:"
+msgstr "GTK+ Versjon:"
+
+#: ../data/gui/plugins_window.ui.h:14
+msgid "button"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:15
+msgid "homepage url"
+msgstr ""
+
 #: ../data/gui/popup_notification_window.ui.h:1
 #, fuzzy
 msgid "Event Type"
@@ -1762,123 +1989,103 @@ msgid "Always"
 msgstr "Borte"
 
 #: ../data/gui/preferences_window.ui.h:31
-#, fuzzy
-msgid "Always use GNOME default applications"
-msgstr "Alltid bruk OS/X standard applikasjoner"
-
-#: ../data/gui/preferences_window.ui.h:32
-#, fuzzy
-msgid "Always use KDE default applications"
-msgstr "Alltid bruk OS/X standard applikasjoner"
-
-#: ../data/gui/preferences_window.ui.h:33
-#, fuzzy
-msgid "Always use Xfce default applications"
-msgstr "Alltid bruk OS/X standard applikasjoner"
-
-#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Spør etter status melding når jeg:"
 
-#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
 msgid "Audio / Video"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:33
 msgid "Audio input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Audio output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:38
-#, fuzzy
-msgid "Autodetect on every Gajim startup"
-msgstr "K_oble til når Gajim starter"
-
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:35
 msgid "Chat message:"
 msgstr "Samtale melding:"
 
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:36
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Sjekk ved oppstart om Gajim er _standard Jabber klient"
 
-#: ../data/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:37
 #, fuzzy
 msgid "Composing only"
 msgstr "Skriver"
 
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:38
 msgid "Configure color and font of the interface"
 msgstr "Konfigurer farge og font for grensesnittet"
 
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Samtale melding:"
 
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Kontakt navn"
 
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:41
 msgid "Custom"
 msgstr "Egendefinert"
 
-#: ../data/gui/preferences_window.ui.h:46
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Detached roster with chat grouped by account"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Detached roster with detached chats"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:45
 msgid "Detached roster with single chat"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
-#: ../src/config.py:671
+#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
+#: ../src/config.py:665
 msgid "Disabled"
 msgstr "Deaktivert"
 
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:47
 msgid "Display _activity of contacts in roster"
 msgstr "Vis _aktivitet til kontakter i kontaktlisten"
 
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:48
 msgid "Display _extra email details"
 msgstr "Vis _ekstra e-post detaljer"
 
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:49
 #, fuzzy
 msgid "Display _location of contacts in roster"
 msgstr "Vis h_umør til kontakter i kontaktlisten"
 
-#: ../data/gui/preferences_window.ui.h:54
+#: ../data/gui/preferences_window.ui.h:50
 msgid "Display _tunes of contacts in roster"
 msgstr "Vis _sanger til kontakter i kontaktlisten"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display a_vatars of contacts in roster"
 msgstr "Viser _kontaktikoner for kontakter i kontaktlisten"
 
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display m_ood of contacts in roster"
 msgstr "Vis h_umør til kontakter i kontaktlisten"
 
-#: ../data/gui/preferences_window.ui.h:57
+#: ../data/gui/preferences_window.ui.h:53
 msgid "Display status _messages of contacts in roster"
 msgstr "Viser status _meldinger for kontakter i kontaktlisten"
 
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:54
 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 "
@@ -1888,7 +2095,7 @@ msgstr ""
 "med en kontakt. Her kan du spesifisere hvilke samtalestatuser du ønsker å "
 "vise i samtale vinduer."
 
-#: ../data/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:55
 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 "
@@ -1898,7 +2105,7 @@ msgstr ""
 "med en kontakt. Her kan du spesifisere hvilke samtalestatuser du ønsker å "
 "sende motparten."
 
-#: ../data/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:56
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1906,11 +2113,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/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:58
 msgid "Hide all buttons in chat windows"
 msgstr "Gjem alle knapper i samtale vinduer"
 
-#: ../data/gui/preferences_window.ui.h:63
+#: ../data/gui/preferences_window.ui.h:59
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1918,20 +2125,20 @@ msgstr ""
 "Dersom valgt vil Gajim tillate at andre detekterer hvilket operativsystem du "
 "bruker"
 
-#: ../data/gui/preferences_window.ui.h:64
+#: ../data/gui/preferences_window.ui.h:60
 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/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:61
 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/gui/preferences_window.ui.h:66
+#: ../data/gui/preferences_window.ui.h:62
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1939,7 +2146,7 @@ msgstr ""
 "Dersom valgt vil Gajim endre status til Ikke Tilgjengelig når maskinen ikke "
 "har vert i bruk enda lenger"
 
-#: ../data/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1947,7 +2154,7 @@ msgstr ""
 "Dersom valgt vil Gajim vise ikonbilder for kontakter i kontaktliste vinduet "
 "og i gruppesamtaler"
 
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1955,31 +2162,31 @@ msgstr ""
 "Dersom valg vil Gajim vise status melding til kontakter under kontakt navnet "
 "i kontaktliste vinduet og i gruppesamtaler"
 
-#: ../data/gui/preferences_window.ui.h:69
+#: ../data/gui/preferences_window.ui.h:65
 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/gui/preferences_window.ui.h:70
+#: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the location of contacts in the roster window"
 msgstr "Dersom valgt vil Gajim vise humør for kontakter i kontaktliste vinduet"
 
-#: ../data/gui/preferences_window.ui.h:71
+#: ../data/gui/preferences_window.ui.h:67
 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/gui/preferences_window.ui.h:72
+#: ../data/gui/preferences_window.ui.h:68
 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/gui/preferences_window.ui.h:73
+#: ../data/gui/preferences_window.ui.h:69
 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 "
@@ -1989,7 +2196,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/gui/preferences_window.ui.h:74
+#: ../data/gui/preferences_window.ui.h:70
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1999,7 +2206,7 @@ msgstr ""
 "kontakter. Bruk med varsomhet, fordi det blokkerer alle meldinger fra alle "
 "kontakter som ikke er i kontaktlisten"
 
-#: ../data/gui/preferences_window.ui.h:75
+#: ../data/gui/preferences_window.ui.h:71
 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 "
@@ -2009,14 +2216,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/gui/preferences_window.ui.h:76
+#: ../data/gui/preferences_window.ui.h:72
 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/gui/preferences_window.ui.h:77
+#: ../data/gui/preferences_window.ui.h:73
 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, "
@@ -2025,7 +2232,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/gui/preferences_window.ui.h:78
+#: ../data/gui/preferences_window.ui.h:74
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -2033,7 +2240,7 @@ msgstr ""
 "Dersom valgt vil Gajim ikke spør for en status beskjed. Standard valget for "
 "beskjed vil benyttes isteden."
 
-#: ../data/gui/preferences_window.ui.h:79
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2041,45 +2248,45 @@ msgstr ""
 "Dersom ikke deaktiver, vil Gajim bytte ut ascii smil som ':)' med animerte "
 "eller statiske grafiske uttrykksikoner"
 
-#: ../data/gui/preferences_window.ui.h:80
+#: ../data/gui/preferences_window.ui.h:76
 msgid "Log _encrypted chat session"
 msgstr "Logg _krypterte samtale sesjoner"
 
-#: ../data/gui/preferences_window.ui.h:81
+#: ../data/gui/preferences_window.ui.h:77
 msgid "Ma_ke message windows compact"
 msgstr "Gj_ør meldings vinduet kompakt"
 
-#: ../data/gui/preferences_window.ui.h:82
+#: ../data/gui/preferences_window.ui.h:78
 msgid "Ma_nage..."
 msgstr "Be_handle..."
 
-#: ../data/gui/preferences_window.ui.h:83
+#: ../data/gui/preferences_window.ui.h:79
 #, fuzzy
 msgid "Never"
 msgstr "_Aldri"
 
-#: ../data/gui/preferences_window.ui.h:84
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Notifications"
 msgstr "Kunngjøringer"
 
-#: ../data/gui/preferences_window.ui.h:85
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Notify me about contacts that sign _in"
 msgstr "Varsle meg om kontakter som logger _inn"
 
-#: ../data/gui/preferences_window.ui.h:86
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Notify me about contacts that sign _out"
 msgstr "Varsle meg om kontakter som logger _ut"
 
-#: ../data/gui/preferences_window.ui.h:87
+#: ../data/gui/preferences_window.ui.h:83
 #, fuzzy
 msgid "Notify me about it"
 msgstr "_Gi meg beskjed om det"
 
-#: ../data/gui/preferences_window.ui.h:88
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notify on new _GMail email"
 msgstr "Alarmér om nye _Gmail e-post"
 
-#: ../data/gui/preferences_window.ui.h:89
+#: ../data/gui/preferences_window.ui.h:85
 #, fuzzy
 msgid "Only when pending events"
 msgstr ""
@@ -2087,56 +2294,57 @@ msgstr ""
 "Bare når hendelser venter\n"
 "Alltid"
 
-#: ../data/gui/preferences_window.ui.h:90
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Personal Events"
 msgstr "Personlige Hendelser"
 
-#: ../data/gui/preferences_window.ui.h:91
+#: ../data/gui/preferences_window.ui.h:87
 msgid "Play _sounds"
 msgstr "Spill av _lyder"
 
-#: ../data/gui/preferences_window.ui.h:92
+#: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
 msgid "Pop it up"
 msgstr "_Sprett opp"
 
-#: ../data/gui/preferences_window.ui.h:93
+#: ../data/gui/preferences_window.ui.h:89
 msgid "Preferences"
 msgstr "Tilstedeværelse"
 
-#: ../data/gui/preferences_window.ui.h:94
+#: ../data/gui/preferences_window.ui.h:90
 msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:96
+#: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
 msgid "STUN server:"
 msgstr "Server:"
 
-#: ../data/gui/preferences_window.ui.h:97
+#: ../data/gui/preferences_window.ui.h:93
+#, fuzzy
+msgid "Show notification area icon:"
+msgstr "Bruk Ikon i s_ystemstatusfelt (også kjent som systray)"
+
+#: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
 msgid "Show only in roster"
 msgstr "Vis bare i _kontaktliste"
 
-#: ../data/gui/preferences_window.ui.h:98
-msgid "Show systray:"
-msgstr "Vis systemstatus:"
-
-#: ../data/gui/preferences_window.ui.h:99
+#: ../data/gui/preferences_window.ui.h:95
 msgid "Sign _in"
 msgstr "Logger _inn"
 
-#: ../data/gui/preferences_window.ui.h:100
+#: ../data/gui/preferences_window.ui.h:96
 msgid "Sign _out"
 msgstr "Logger _ut"
 
-#: ../data/gui/preferences_window.ui.h:101
+#: ../data/gui/preferences_window.ui.h:97
 msgid "Single window for everything"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:102
+#: ../data/gui/preferences_window.ui.h:98
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2144,27 +2352,27 @@ msgstr ""
 "Noen meldinger kan inkludere rikt innhold (formatering, farger osv). Dersom "
 "valgt vil Gajim kun vise rå meldings tekst."
 
-#: ../data/gui/preferences_window.ui.h:103
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sort contacts by status"
 msgstr "Sorter kontakter etter status"
 
-#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
 msgid "Status"
 msgstr "Status"
 
-#: ../data/gui/preferences_window.ui.h:105
+#: ../data/gui/preferences_window.ui.h:101
 msgid "Status _iconset:"
 msgstr "Standard _ikonsamling:"
 
-#: ../data/gui/preferences_window.ui.h:106
+#: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Stil"
 
-#: ../data/gui/preferences_window.ui.h:107
+#: ../data/gui/preferences_window.ui.h:103
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/gui/preferences_window.ui.h:108
+#: ../data/gui/preferences_window.ui.h:104
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2176,7 +2384,7 @@ msgstr ""
 "$S byttes ut av tidligere status melding\n"
 "$T byttest ut av automatisk-borte tidsavbrudd"
 
-#: ../data/gui/preferences_window.ui.h:111
+#: ../data/gui/preferences_window.ui.h:107
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2188,121 +2396,126 @@ msgstr ""
 "$S vil byttes ut av forrige status melding\n"
 "$T vil byttes ut av automatisk-ikke-tilgjengelig tidsavbrudd"
 
-#: ../data/gui/preferences_window.ui.h:114
+#: ../data/gui/preferences_window.ui.h:110
 msgid "Use _transports icons"
 msgstr "Bruk _transport ikoner"
 
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:111
+#, fuzzy
+msgid "Use default applications"
+msgstr "Alltid bruk OS/X standard applikasjoner"
+
+#: ../data/gui/preferences_window.ui.h:112
 msgid "Use system _default"
 msgstr "Bruk systemets _standardinstillinger"
 
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:113
 msgid "Video framerate"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:117
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Video input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:118
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Video output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:119
+#: ../data/gui/preferences_window.ui.h:116
 msgid "Video size"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:120
+#: ../data/gui/preferences_window.ui.h:117
 msgid "When new event is received:"
 msgstr "NÃ¥r en ny hendelse blir motatt:"
 
-#: ../data/gui/preferences_window.ui.h:121
+#: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
 msgid "Your message:"
 msgstr "Feil melding: %s"
 
-#: ../data/gui/preferences_window.ui.h:122
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your nickname:"
 msgstr "F_ør kallenavn:"
 
-#: ../data/gui/preferences_window.ui.h:123
+#: ../data/gui/preferences_window.ui.h:120
 msgid "_Away after:"
 msgstr "_Borte etter:"
 
-#: ../data/gui/preferences_window.ui.h:124
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Nettleser:"
 
-#: ../data/gui/preferences_window.ui.h:125
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Display chat state notifications:"
 msgstr "_Vis samtale status opplysninger:"
 
-#: ../data/gui/preferences_window.ui.h:126
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Emoticons:"
 msgstr "_Uttrykksikoner:"
 
-#: ../data/gui/preferences_window.ui.h:127
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_File manager:"
 msgstr "_Fil behandler:"
 
-#: ../data/gui/preferences_window.ui.h:128
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_Highlight misspelled words"
 msgstr "_Uthev feilstavede ord"
 
-#: ../data/gui/preferences_window.ui.h:129
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorér hendelser fra kontakter som ikke er i kontaktlisten"
 
-#: ../data/gui/preferences_window.ui.h:130
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignorér rik tekst innhold i innkommende meldinger"
 
-#: ../data/gui/preferences_window.ui.h:131
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Log status changes of contacts"
 msgstr "_Logg status endringer til kontakter"
 
-#: ../data/gui/preferences_window.ui.h:132
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Mail client:"
 msgstr "_Post klient:"
 
-#: ../data/gui/preferences_window.ui.h:133
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Not available after:"
 msgstr "_Ikke tilgjengelig etter:"
 
-#: ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Open..."
 msgstr "_Ã…pne..."
 
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Reset to Default Colors"
 msgstr "_Tilbakestill til Standard Farger"
 
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Send chat state notifications:"
 msgstr "_Send Samtale status opplysninger:"
 
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Status message:"
 msgstr "_Status melding:"
 
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_URL highlight:"
 msgstr "_URL utheving:"
 
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_Window behavior:"
 msgstr "_Vindusoppførsel:"
 
-#: ../data/gui/preferences_window.ui.h:140
+#: ../data/gui/preferences_window.ui.h:137
 msgid "in _group chats"
 msgstr "i _gruppe samtale"
 
-#: ../data/gui/preferences_window.ui.h:141
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _roster"
 msgstr "i _kontaktliste"
 
-#: ../data/gui/preferences_window.ui.h:142
+#: ../data/gui/preferences_window.ui.h:139
 msgid "minutes"
 msgstr "minutter"
 
@@ -2354,7 +2567,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Rekkefølge:"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3436
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
 msgid "Privacy List"
 msgstr "Liste over Utestengte"
 
@@ -2565,8 +2778,8 @@ msgstr "Fjern konto fra Gajim og fra _serveren"
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5492 ../src/roster_window.py:5622
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
+#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
 msgid "_Remove"
 msgstr "_Fjern"
 
@@ -2612,56 +2825,60 @@ msgid "Help online"
 msgstr "Hjelp online"
 
 #: ../data/gui/roster_window.ui.h:8
+msgid "P_lugins"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:9
 msgid "Profile, A_vatar"
 msgstr "Profil, B_ilde"
 
-#: ../data/gui/roster_window.ui.h:9
+#: ../data/gui/roster_window.ui.h:10
 msgid "Show Only _Active Contacts"
 msgstr "Vis Bare _Aktive Kontakter"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
 msgid "Show Trans_ports"
 msgstr "Vis Trans_porter"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
 msgid "Show _Offline Contacts"
 msgstr "Vis _Frakoblede Kontakter"
 
-#: ../data/gui/roster_window.ui.h:12 ../src/statusicon.py:326
+#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
 msgid "Show _Roster"
 msgstr "Vis _Kontaktliste"
 
-#: ../data/gui/roster_window.ui.h:13
+#: ../data/gui/roster_window.ui.h:14
 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/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
 #: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Handlinger"
 
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../data/gui/roster_window.ui.h:18 ../src/disco.py:1502
+#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
 msgid "_Edit"
 msgstr "_Rediger"
 
-#: ../data/gui/roster_window.ui.h:19
+#: ../data/gui/roster_window.ui.h:20
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../data/gui/roster_window.ui.h:22
+#: ../data/gui/roster_window.ui.h:23
 msgid "_Send Single Message..."
 msgstr "_Send Enkeltmelding..."
 
-#: ../data/gui/roster_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:25
 msgid "_View"
 msgstr "_Vis"
 
@@ -2678,11 +2895,11 @@ msgid "_Add contact"
 msgstr "_Legg til kontakt"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5634
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
 msgid "_Information"
 msgstr "_Informasjon"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1353
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
 msgid "_Search"
 msgstr "_Søk"
 
@@ -2702,10 +2919,6 @@ msgstr "Registrer til:"
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../data/gui/single_message_window.ui.h:2
-msgid "From:"
-msgstr "Fra:"
-
 #: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Svar på denne meldingen"
@@ -2722,10 +2935,6 @@ msgstr "Send melding"
 msgid "Send message and close window"
 msgstr "Send melding og lukk vinduet"
 
-#: ../data/gui/single_message_window.ui.h:7
-msgid "Subject:"
-msgstr "Tema:"
-
 #: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Til:"
@@ -2935,25 +3144,35 @@ msgstr "Gajim Instant Messenger"
 msgid "Jabber IM Client"
 msgstr "Jabber IM Klient"
 
-#: ../src/adhoc_commands.py:314
+#: ../src/adhoc_commands.py:323
 msgid "Cancel confirmation"
 msgstr "Avbryt bekreftelse"
 
-#: ../src/adhoc_commands.py:315
+#: ../src/adhoc_commands.py:324
 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:351 ../src/adhoc_commands.py:374
+#: ../src/adhoc_commands.py:370
+#, fuzzy
+msgid "Invalid Form"
+msgstr "Ugyldig rom"
+
+#: ../src/adhoc_commands.py:371
+#, fuzzy
+msgid "The form is not filled correctly."
+msgstr "Kallenavnet inneholder ulovlige tegn"
+
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
 msgid "Service sent malformed data"
 msgstr "Tjenesten sendte ødelagte data"
 
-#: ../src/adhoc_commands.py:360
+#: ../src/adhoc_commands.py:399
 msgid "Service changed the session identifier."
 msgstr "Tjenesten endret sesjons identifikasjon. "
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:471
+#: ../src/adhoc_commands.py:513
 msgid "Service returned an error."
 msgstr "Tjenesten returnerte en feil."
 
@@ -2978,7 +3197,7 @@ msgstr "Nummer"
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:945
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
 msgid "Color"
 msgstr "Farge"
 
@@ -3015,185 +3234,185 @@ msgstr[1] "Du har motatt nye hendelser (og %(count)d vises ikke):"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "English"
 msgstr "Engelsk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Belarusian"
 msgstr "Bulgarsk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Bulgarian"
 msgstr "Bulgarsk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Breton"
 msgstr "Bretagner"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Czech"
 msgstr "Tsjekkisk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "German"
 msgstr "Tysk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Greek"
 msgstr "Gresk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "British"
 msgstr "Brtisk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Spanish"
 msgstr "Spansk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Basque"
 msgstr "Baskisk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "French"
 msgstr "Fransk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Croatian"
 msgstr "Kroatisk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Italian"
 msgstr "Italiensk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian (b)"
 msgstr "Norsk (b)"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Dutch"
 msgstr "Nederlansk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian"
 msgstr "Norsk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Polish"
 msgstr "Polsk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Portuguese"
 msgstr "Portugisisk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Brazilian Portuguese"
 msgstr "Brasiliansk Portugisisk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Russian"
 msgstr "Russisk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Slovak"
 msgstr "Slovakisk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Swedish"
 msgstr "Svensk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Chinese (Ch)"
 msgstr "Kinesisk (Ch)"
 
-#: ../src/chat_control.py:479
+#: ../src/chat_control.py:496
 msgid "Spelling language"
 msgstr "Stavekontroll språk"
 
 #. we are not connected
-#: ../src/chat_control.py:511 ../src/chat_control.py:720
+#: ../src/chat_control.py:528 ../src/chat_control.py:737
 msgid "A connection is not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/chat_control.py:512 ../src/chat_control.py:721
+#: ../src/chat_control.py:529 ../src/chat_control.py:738
 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:927
+#: ../src/chat_control.py:944
 msgid "Underline"
 msgstr "Understrek"
 
-#: ../src/chat_control.py:928
+#: ../src/chat_control.py:945
 msgid "Strike"
 msgstr "Streik"
 
-#: ../src/chat_control.py:951
+#: ../src/chat_control.py:968
 msgid "Font"
 msgstr "Font"
 
-#: ../src/chat_control.py:960
+#: ../src/chat_control.py:977
 msgid "Clear formating"
 msgstr "Fjern formattering"
 
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1055
 msgid "Really send file?"
 msgstr "Virkelig send fil?"
 
-#: ../src/chat_control.py:1039
+#: ../src/chat_control.py:1056
 #, 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:1503 ../src/chat_control.py:1987
+#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
 msgid "GPG encryption enabled"
 msgstr "GPG kryptering påslått"
 
 #. Add to roster
-#: ../src/chat_control.py:1528 ../src/common/contacts.py:158
+#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
 #: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:245 ../src/dialogs.py:1064 ../src/dialogs.py:2078
-#: ../src/dialogs.py:2107 ../src/gui_interface.py:674
+#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
+#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
 #: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1610 ../src/roster_window.py:1612
-#: ../src/roster_window.py:1942 ../src/roster_window.py:3289
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
+#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
+#: ../src/roster_window.py:3382
 msgid "Not in Roster"
 msgstr "Ikke i kontaktliste"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1575
 msgid "This contact does not support file transfer."
 msgstr "Denne kontakten støtter ikke filoverføring."
 
-#: ../src/chat_control.py:1561
+#: ../src/chat_control.py:1578
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr "Du må vite det ekte "
 
-#: ../src/chat_control.py:1656
+#: ../src/chat_control.py:1677
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:1869
 #, 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:1967 ../src/dialogs.py:4866
+#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
 msgid "No GPG key assigned"
 msgstr "Ingen GPG nøkkel tildelt"
 
-#: ../src/chat_control.py:1968
+#: ../src/chat_control.py:1991
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3201,50 +3420,50 @@ msgstr ""
 "Ingen GPG nøkkel er tildelt denne kontakten, så du kan ikke kryptere "
 "meldinger med GPG."
 
-#: ../src/chat_control.py:1977
+#: ../src/chat_control.py:2000
 msgid "GPG encryption disabled"
 msgstr "GPG kryptering avslått"
 
-#: ../src/chat_control.py:2003
+#: ../src/chat_control.py:2026
 msgid "Session WILL be logged"
 msgstr "Sesjonen VIL bli logget"
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:2028
 msgid "Session WILL NOT be logged"
 msgstr "Sesjonen VIL IKKE bli logget"
 
 #. encryption %s active
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is"
 msgstr "er"
 
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is NOT"
 msgstr "er IKKE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will"
 msgstr "vil"
 
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will NOT"
 msgstr "vil IKKE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2051
 msgid "and authenticated"
 msgstr "og autentisert"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2032
+#: ../src/chat_control.py:2055
 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:2039
+#: ../src/chat_control.py:2062
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3253,23 +3472,32 @@ msgstr ""
 "%(type)s kryptering %(status)s aktiv %(authenticated)s.\n"
 "Din samtale sesjon %(logged)s bli logget."
 
-#: ../src/chat_control.py:2182
+#: ../src/chat_control.py:2205
 msgid "Session negotiation cancelled"
 msgstr "Sesjons forhandlinger avbrutt"
 
-#: ../src/chat_control.py:2191
+#: ../src/chat_control.py:2215
+msgid "This session WILL be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2217
+#, fuzzy
+msgid "This session WILL NOT be archived on server"
+msgstr "Sesjonen VIL IKKE bli logget"
+
+#: ../src/chat_control.py:2226
 msgid "This session is encrypted"
 msgstr "Denne sesjonen er kryptert"
 
-#: ../src/chat_control.py:2194
+#: ../src/chat_control.py:2229
 msgid " and WILL be logged"
 msgstr "og VIL bli logget"
 
-#: ../src/chat_control.py:2196
+#: ../src/chat_control.py:2231
 msgid " and WILL NOT be logged"
 msgstr "og VIL IKKE bli logget"
 
-#: ../src/chat_control.py:2201
+#: ../src/chat_control.py:2236
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3277,25 +3505,25 @@ msgstr ""
 "Kontaktens identitet ikke bekreftet. Klikk på skjold knappen for flere "
 "detaljer."
 
-#: ../src/chat_control.py:2203
+#: ../src/chat_control.py:2238
 msgid "E2E encryption disabled"
 msgstr "E2E kryptering avslått"
 
-#: ../src/chat_control.py:2241 ../src/chat_control.py:2254
+#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
 msgid "The following message was NOT encrypted"
 msgstr "Den følgende meldingen ble IKKE kryptert"
 
-#: ../src/chat_control.py:2247
+#: ../src/chat_control.py:2288
 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:2519
+#: ../src/chat_control.py:2566
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du fikk akkurat en ny melding fra \"%s\""
 
-#: ../src/chat_control.py:2520
+#: ../src/chat_control.py:2567
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3303,15 +3531,13 @@ msgstr ""
 "Dersom du lukker vinduet og du har slått av historikk, så vil meldingen bli "
 "mistet."
 
-#: ../src/chat_control.py:2663 ../src/common/connection_handlers.py:1635
-#: ../src/common/connection_handlers.py:1758
-#: ../src/common/connection_handlers.py:1960
-#: ../src/common/connection_handlers.py:2110 ../src/common/connection.py:452
+#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
 #: ../src/gajim.py:159 ../src/session.py:138
 msgid "Database Error"
 msgstr "Database feil"
 
-#: ../src/chat_control.py:2664
+#: ../src/chat_control.py:2714
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3320,7 +3546,7 @@ msgstr ""
 "Database filen (%s) kan ikke leses. Prøv å reparer den eller fjern den (all "
 "historikk vil bli tapt)."
 
-#: ../src/chat_control.py:2906
+#: ../src/chat_control.py:2962
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s er nå %(status)s"
@@ -3334,28 +3560,28 @@ msgstr "lager logg database"
 msgid "creating cache database"
 msgstr "lager logg database"
 
-#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
-#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
-#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
-#: ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
 #, 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:275 ../src/common/check_paths.py:282
-#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
-#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
-#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:333
+#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
+#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
+#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
 msgid "Gajim will now exit"
 msgstr "Gajim vill nå lukkes"
 
-#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
+#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
 #, 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:342
+#: ../src/common/check_paths.py:351
 #, python-format
 msgid "creating %s directory"
 msgstr "lager %s mappe"
@@ -3419,9 +3645,9 @@ msgstr "Velg hvilke samtalegrupper du ønsker å forlate"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:801
-#: ../src/roster_window.py:1614 ../src/roster_window.py:1616
-#: ../src/roster_window.py:5251
+#: ../src/common/helpers.py:57 ../src/roster_window.py:815
+#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
+#: ../src/roster_window.py:5323
 msgid "Groupchats"
 msgstr "Gruppesamtaler"
 
@@ -3481,7 +3707,9 @@ 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:88
-msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+#, fuzzy
+msgid ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 "Når skal systemikon vises. Kan være 'aldri', 'ved_hendelse', 'alltid'. "
 
@@ -3532,9 +3760,9 @@ msgstr ""
 "Liste (mellomrom separert) av rader (kontoer og grupper) som er kollapset."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:501
-#: ../src/common/optparser.py:290 ../src/common/optparser.py:486
-#: ../src/common/optparser.py:520 ../src/gui_interface.py:3370
+#: ../src/common/config.py:106 ../src/common/config.py:505
+#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
+#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
 msgid "default"
 msgstr "standard"
 
@@ -3761,7 +3989,8 @@ msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard sier KiB = 1024 bytes, KB = 1000 bytes."
 
 #: ../src/common/config.py:197
-msgid "Notify of events in the system trayicon."
+#, fuzzy
+msgid "Notify of events in the notification area."
 msgstr "Varsle om hendelser i system-statusfelt ikonet."
 
 #: ../src/common/config.py:203
@@ -3797,9 +4026,10 @@ msgid ""
 msgstr "En semikolon-delt liste av ord som vil bli uthevet i gruppesamtaler."
 
 #: ../src/common/config.py:221
+#, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
+"setting is taken into account only if notification icon is used."
 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. "
@@ -4071,9 +4301,10 @@ msgstr ""
 "Maksimalt antall linjer som vises i samtaler. De eldste linjene fjernes."
 
 #: ../src/common/config.py:270
+#, fuzzy
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
-"systray icon."
+"notification icon."
 msgstr ""
 "Dersom True vil kunngjøringsvinduer fra notification-deamon bli festet til "
 "systray ikonet."
@@ -4273,11 +4504,15 @@ msgstr ""
 msgid "Message that is sent to contacts you want to add"
 msgstr "Vennligst fyll inn dataene til kontakten du ønsker å legge til"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:374
+msgid "Last time we syncronized with logs from server."
+msgstr ""
+
+#: ../src/common/config.py:436
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Er OpenPGP tilgjengelig for denne kontakten?"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4285,101 +4520,108 @@ msgstr ""
 "Skal Gajim automatisk starte en kryptert sesjon med denne kontakten når "
 "mulig?"
 
-#: ../src/common/config.py:437 ../src/common/config.py:440
+#: ../src/common/config.py:438 ../src/common/config.py:441
 msgid "Language for which we want to check misspelled words"
 msgstr "Språk som vi ønsker å sjekke feilstavede ord med"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:447
 msgid "all or space separated status"
 msgstr "alle eller mellomroms separert status"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:448
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', eller 'both'"
 
-#: ../src/common/config.py:448 ../src/common/config.py:450
-#: ../src/common/config.py:451 ../src/common/config.py:454
-#: ../src/common/config.py:455
+#: ../src/common/config.py:449 ../src/common/config.py:451
+#: ../src/common/config.py:452 ../src/common/config.py:455
+#: ../src/common/config.py:456
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' eller ''"
 
-#: ../src/common/config.py:461 ../src/common/pep.py:157
+#: ../src/common/config.py:460
+msgid ""
+"State whether plugins should be activated on exit (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
+msgstr ""
+
+#: ../src/common/config.py:465 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back soon"
 msgstr "Snart tilbake"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back in some minutes."
 msgstr "Tilbake om noen minutter."
 
-#: ../src/common/config.py:463 ../src/common/pep.py:127
+#: ../src/common/config.py:467 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Spiser"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:467
 msgid "I'm eating, so leave me a message."
 msgstr "Jeg spiser, så legg igjen en beskjed"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "I'm watching a movie."
 msgstr "Jeg ser på en film."
 
-#: ../src/common/config.py:465 ../src/common/pep.py:186
+#: ../src/common/config.py:469 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Jobber"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:469
 msgid "I'm working."
 msgstr "Jeg jobber."
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "I'm on the phone."
 msgstr "Jeg sitter i telefonen."
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "Out"
 msgstr "Ute"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "I'm out enjoying life."
 msgstr "Jeg er ute og lever livet."
 
-#: ../src/common/config.py:478
+#: ../src/common/config.py:482
 msgid "I'm available."
 msgstr "Jeg er tilgjengelig."
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:483
 msgid "I'm free for chat."
 msgstr "Ledig for prat."
 
-#: ../src/common/config.py:480 ../src/config.py:1600
+#: ../src/common/config.py:484 ../src/config.py:1600
 msgid "Be right back."
 msgstr "Snart tilbake."
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:485
 msgid "I'm not available."
 msgstr "Jeg er ikke tilgjengelig."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:486
 msgid "Do not disturb."
 msgstr "Ikke forstyrr."
 
-#: ../src/common/config.py:483 ../src/common/config.py:484
+#: ../src/common/config.py:487 ../src/common/config.py:488
 msgid "Bye!"
 msgstr "Hade bra!"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:498
 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."
@@ -4388,50 +4630,50 @@ msgstr ""
 "muc_highlight_words, eller når en samtalerom melding inneholder ditt "
 "kallenavn."
 
-#: ../src/common/config.py:495
+#: ../src/common/config.py:499
 msgid "Sound to play when any MUC message arrives."
 msgstr "Lyd som spilles når en ny samtalerom melding mottas."
 
-#: ../src/common/config.py:504 ../src/common/optparser.py:304
+#: ../src/common/config.py:508 ../src/common/optparser.py:308
 msgid "green"
 msgstr "grønn"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:290
+#: ../src/common/config.py:512 ../src/common/optparser.py:294
 msgid "grocery"
 msgstr "varehandel"
 
-#: ../src/common/config.py:512
+#: ../src/common/config.py:516
 msgid "human"
 msgstr "menneskelig"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:520
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:84
+#: ../src/common/connection_handlers.py:94
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Klarer ikke å uvirksom modulen"
 
-#: ../src/common/connection_handlers.py:117
+#: ../src/common/connection_handlers.py:127
 #, 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:124
+#: ../src/common/connection_handlers.py:134
 msgid "Registration succeeded"
 msgstr "Registrering vellykket"
 
-#: ../src/common/connection_handlers.py:125
+#: ../src/common/connection_handlers.py:135
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registrering med agenten %s var vellykket"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 msgid "Registration failed"
 msgstr "Registrering feilet"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -4439,38 +4681,34 @@ msgstr ""
 "Registrering med agenten %(agent)s feilet med melding %(error)s: "
 "%(error_msg)s"
 
-#: ../src/common/connection_handlers.py:445
-#: ../src/common/connection_handlers.py:1633
-#: ../src/common/connection_handlers.py:1756
-#: ../src/common/connection_handlers.py:1957
-#: ../src/common/connection_handlers.py:2108 ../src/common/connection.py:449
+#: ../src/common/connection_handlers.py:466
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
 #: ../src/gajim.py:341
 msgid "Disk Write Error"
 msgstr "Disk Skrive Feil"
 
-#: ../src/common/connection_handlers.py:678 ../src/common/connection.py:1472
+#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
 msgid "Invisibility not supported"
 msgstr "Usynlighet ikke støttet"
 
-#: ../src/common/connection_handlers.py:679 ../src/common/connection.py:1473
+#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Konto %s støtter ikke usynlighet."
 
-#: ../src/common/connection_handlers.py:1446 ../src/common/connection.py:253
-#: ../src/config.py:2091 ../src/config.py:2100 ../src/config.py:2168
-#: ../src/config.py:3560 ../src/dataforms_widget.py:597 ../src/dialogs.py:2931
+#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
+#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
+#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
 msgid "Invalid Jabber ID"
 msgstr "Ugyldig Jabber ID"
 
-#: ../src/common/connection_handlers.py:1447
+#: ../src/common/connection_handlers.py:1405
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr "En melding fra en ikke-gyldig JID ankom, den har blitt ignorert."
 
-#: ../src/common/connection_handlers.py:1636
-#: ../src/common/connection_handlers.py:1759
-#: ../src/common/connection_handlers.py:1961
-#: ../src/common/connection_handlers.py:2111 ../src/common/connection.py:453
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
 #: ../src/gajim.py:160 ../src/session.py:139
 #, python-format
 msgid ""
@@ -4480,90 +4718,6 @@ 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:1805
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Kallenavn ikke lovlig: %s"
-
-#: ../src/common/connection_handlers.py:1902
-#: ../src/common/connection_handlers.py:1911
-#: ../src/common/connection_handlers.py:1918
-#: ../src/common/connection_handlers.py:1922
-#: ../src/common/connection_handlers.py:1926
-#: ../src/common/connection_handlers.py:1931 ../src/gui_interface.py:139
-msgid "Unable to join group chat"
-msgstr "Klarer ikke å gå inn i gruppesamtale"
-
-#: ../src/common/connection_handlers.py:1903
-#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr "Maksimum antall brukere for %s er nådd"
-
-#: ../src/common/connection_handlers.py:1912
-#, python-format
-msgid "You are banned from group chat %s."
-msgstr "Du er uønsket fra gruppesamtalen %s."
-
-#: ../src/common/connection_handlers.py:1919
-#, python-format
-msgid "Group chat %s does not exist."
-msgstr "Gruppesamtalerom %s finnes ikke."
-
-#: ../src/common/connection_handlers.py:1923
-msgid "Group chat creation is restricted."
-msgstr "Gruppesamtale oppretting er begrenset."
-
-#: ../src/common/connection_handlers.py:1927
-#, 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:1932
-#, 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:1976
-msgid "Room has been destroyed"
-msgstr "Rommet har blitt ødelagt"
-
-#: ../src/common/connection_handlers.py:1984
-#, 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:2020
-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:2041
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "vi abonnerer nå på %s"
-
-#: ../src/common/connection_handlers.py:2043
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "frakoblings ønske fra %s"
-
-#: ../src/common/connection_handlers.py:2045
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "vi abonnerer ikke lenger på %s"
-
-#: ../src/common/connection_handlers.py:2240
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"JID %s er ikke RFC kompatibel. Den vil ikke bli lagt til kontaktlisten. Bruk "
-"kontaktliste administrasjons verktøy som http://jru.jabberstudio.org/ for å "
-"fjerne den"
-
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr "Ikke i stand til å få utsteders sertifikat"
@@ -4692,16 +4846,16 @@ msgstr "Nøkkel bruk inkluderer ikke sertifikats signering"
 msgid "Application verification failure"
 msgstr "Applikasjons verifiserings feil"
 
-#: ../src/common/connection.py:254 ../src/dialogs.py:2932
+#: ../src/common/connection.py:256 ../src/dialogs.py:2948
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Det er ikke mulig å sende en melding til %s, JID er ikke gyldig."
 
-#: ../src/common/connection.py:276
+#: ../src/common/connection.py:278
 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:279
+#: ../src/common/connection.py:281
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr ""
@@ -4709,11 +4863,11 @@ msgstr ""
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:331
+#: ../src/common/connection.py:333
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Denne meldingen er *kryptert* (Se :XEP:`27`]"
 
-#: ../src/common/connection.py:439
+#: ../src/common/connection.py:441
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4722,77 +4876,77 @@ msgstr ""
 "Tittel: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:807
+#: ../src/common/connection.py:809
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Tilkobling til konto \"%s\" har blitt mistet"
 
-#: ../src/common/connection.py:808
+#: ../src/common/connection.py:810
 msgid "Reconnect manually."
 msgstr "Automatisk tilkobling."
 
-#: ../src/common/connection.py:820
+#: ../src/common/connection.py:822
 #, 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:854
+#: ../src/common/connection.py:856
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s tilbyr et annet registrerings skjema"
 
-#: ../src/common/connection.py:867
+#: ../src/common/connection.py:869
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Ukjent SSL feil: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:882
+#: ../src/common/connection.py:884
 msgid "Invalid answer"
 msgstr "Ugyldig svar"
 
-#: ../src/common/connection.py:883
+#: ../src/common/connection.py:885
 #, 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:1165 ../src/common/connection.py:1294
-#: ../src/common/connection.py:1784
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
+#: ../src/common/connection.py:1792
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kunne ikke koble til \"%s\""
 
-#: ../src/common/connection.py:1166 ../src/gui_interface.py:755
+#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
 msgid "Check your connection or try again later."
 msgstr "Sjekk nettverkstilkoblingen eller prøv igjen senere."
 
-#: ../src/common/connection.py:1171
+#: ../src/common/connection.py:1173
 #, python-format
 msgid "Server replied: %s"
 msgstr "Servern svarte: %s"
 
-#: ../src/common/connection.py:1184
+#: ../src/common/connection.py:1186
 msgid "Connection to proxy failed"
 msgstr "Tilkobling til proxy feilet"
 
-#: ../src/common/connection.py:1215 ../src/common/connection.py:1274
+#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Kunne ikke koble til kontoen %s"
 
-#: ../src/common/connection.py:1216 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
 #, 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:1241
+#: ../src/common/connection.py:1243
 #, 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:1244
+#: ../src/common/connection.py:1246
 #, python-format
 msgid ""
 "\n"
@@ -4801,7 +4955,7 @@ msgstr ""
 "\n"
 "SSL Feil: <b>%s</b>"
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1248
 #, python-format
 msgid ""
 "\n"
@@ -4810,24 +4964,24 @@ msgstr ""
 "\n"
 "Ukjent SSL feil: %d"
 
-#: ../src/common/connection.py:1295
+#: ../src/common/connection.py:1297
 msgid "Check your connection or try again later"
 msgstr "Sjekk nettverkstilgangen din og prøv igjen senere "
 
-#: ../src/common/connection.py:1324
+#: ../src/common/connection.py:1329
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentisering feilet med \"%s\""
 
-#: ../src/common/connection.py:1326
+#: ../src/common/connection.py:1331
 msgid "Please check your login and password for correctness."
 msgstr "Vennligst sjekk at brukernavn og passord er korrekt."
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1400
 msgid "Error while removing privacy list"
 msgstr "Feil ved fjerning av liste over uønskede"
 
-#: ../src/common/connection.py:1396
+#: ../src/common/connection.py:1401
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4836,39 +4990,39 @@ 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:1650
+#: ../src/common/connection.py:1658
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Sendt kontakt: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1653
+#: ../src/common/connection.py:1661
 msgid "Sent contacts:"
 msgstr "Sendt kontakter:"
 
-#: ../src/common/connection.py:1799 ../src/common/connection.py:1822
+#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
 msgid "Not fetched because of invisible status"
 msgstr "Ikke hentet på grunn av usynlig status"
 
-#: ../src/common/connection.py:2254
+#: ../src/common/connection.py:2262
 msgid "Unregister failed"
 msgstr "Avregistrering feilet"
 
-#: ../src/common/connection.py:2255
+#: ../src/common/connection.py:2263
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr "Avregistrering med server %(server)s feilet: %(error)s"
 
 #: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:674
+#: ../src/gui_interface.py:551
 msgid "Observers"
 msgstr "Observerere"
 
 #: ../src/common/contacts.py:139 ../src/common/contacts.py:366
 #: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1499 ../src/gui_interface.py:424
-#: ../src/roster_window.py:840 ../src/roster_window.py:1525
-#: ../src/roster_window.py:1606 ../src/roster_window.py:1608
-#: ../src/roster_window.py:1769
+#: ../src/disco.py:1517 ../src/roster_window.py:854
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
+#: ../src/roster_window.py:2466
 msgid "Transports"
 msgstr "Transporter"
 
@@ -5093,203 +5247,219 @@ msgstr "Slutten av uken"
 msgid "Weekend!"
 msgstr "Helg!"
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:148
+msgid "Username must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:153
 msgid "Invalid character in username."
 msgstr "Ugyldig karakter i brukernavn."
 
-#: ../src/common/helpers.py:156
-msgid "Server address required."
-msgstr "Server adresse kreves."
+#: ../src/common/helpers.py:159
+msgid "Server must be between 1 and 1023 chars"
+msgstr ""
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 msgid "Invalid character in hostname."
 msgstr "Ugyldig karakter i domene navn."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:166
+msgid "Server address required."
+msgstr "Server adresse kreves."
+
+#: ../src/common/helpers.py:170
+msgid "Resource must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:175
 msgid "Invalid character in resource."
 msgstr "Ugyldig karakter i ressurs."
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:215
 msgid "_Busy"
 msgstr "_Opptatt"
 
-#: ../src/common/helpers.py:211 ../src/tooltips.py:195
+#: ../src/common/helpers.py:217 ../src/tooltips.py:195
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:220
 msgid "_Not Available"
 msgstr "_Ikke Tilgjengelig"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:225
 msgid "_Free for Chat"
 msgstr "_Ledig for Samtale"
 
-#: ../src/common/helpers.py:221 ../src/tooltips.py:191
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Free for Chat"
 msgstr "Ledig for Prat"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:230
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?transfer status:Pauset"
 
-#: ../src/common/helpers.py:226 ../src/tooltips.py:189
+#: ../src/common/helpers.py:232 ../src/tooltips.py:189
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?transfer status:Pauset"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:234
 msgid "Connecting"
 msgstr "Kobler til"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:237
 msgid "A_way"
 msgstr "B_orte"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:242
 msgid "_Offline"
 msgstr "_Frakoblet"
 
-#: ../src/common/helpers.py:238 ../src/tooltips.py:199
+#: ../src/common/helpers.py:244 ../src/tooltips.py:199
 msgid "Offline"
 msgstr "Frakoblet"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:247
 msgid "_Invisible"
 msgstr "_Usynlig"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:253
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Ukjent"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:255
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Har feilmeldinger"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:260
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Ingen"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:262
 msgid "To"
 msgstr "Til"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
+msgid "From"
+msgstr "Fra"
+
+#: ../src/common/helpers.py:266
 msgid "Both"
 msgstr "Begge"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:274
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Ingen"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:276
 msgid "Subscribe"
 msgstr "Abonnér"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:285
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:288
 msgid "Moderators"
 msgstr "Ordstyrere"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:290
 msgid "Moderator"
 msgstr "Ordstyrer"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:293
 msgid "Participants"
 msgstr "Deltakere"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:295
 msgid "Participant"
 msgstr "Deltaker"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:298
 msgid "Visitors"
 msgstr "Besøkende"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:300
 msgid "Visitor"
 msgstr "Besøk"
 
-#: ../src/common/helpers.py:300 ../src/tooltips.py:210
+#: ../src/common/helpers.py:306 ../src/tooltips.py:210
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Ingen"
 
-#: ../src/common/helpers.py:302 ../src/tooltips.py:216
+#: ../src/common/helpers.py:308 ../src/tooltips.py:216
 msgid "Owner"
 msgstr "Eier"
 
-#: ../src/common/helpers.py:304 ../src/tooltips.py:214
+#: ../src/common/helpers.py:310 ../src/tooltips.py:214
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:212
+#: ../src/common/helpers.py:312 ../src/tooltips.py:212
 msgid "Member"
 msgstr "Medlem"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:351
 msgid "is paying attention to the conversation"
 msgstr "er fokusert på en annen samtale"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:353
 msgid "is doing something else"
 msgstr "gjør noe annet"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:355
 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:352
+#: ../src/common/helpers.py:358
 msgid "paused composing a message"
 msgstr "tok pause i skriving av en melding"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:360
 msgid "has closed the chat window or tab"
 msgstr "har lukket samtalevinduet eller fanen"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:619
+#: ../src/common/helpers.py:625
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:622
+#: ../src/common/helpers.py:628
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:626
+#: ../src/common/helpers.py:632
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:629
+#: ../src/common/helpers.py:635
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:633
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:636
+#: ../src/common/helpers.py:642
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:645
 #, python-format
 msgid "%s B"
 msgstr "%s B"
@@ -5332,12 +5502,12 @@ msgstr "Gajim - %s"
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:111
+#: ../src/common/jingle_rtp.py:107
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Rom Instillinger"
 
-#: ../src/common/jingle_rtp.py:112
+#: ../src/common/jingle_rtp.py:108
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5349,30 +5519,30 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:209
+#: ../src/common/jingle_rtp.py:205
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:210
+#: ../src/common/jingle_rtp.py:206
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Feil melding: %s"
 
-#: ../src/common/jingle_rtp.py:336
+#: ../src/common/jingle_rtp.py:335
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:339
+#: ../src/common/jingle_rtp.py:338
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:382
+#: ../src/common/jingle_rtp.py:381
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:390
+#: ../src/common/jingle_rtp.py:389
 msgid "video output"
 msgstr ""
 
@@ -5449,11 +5619,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "feil: kan ikke åpne %s for lesing"
 
-#: ../src/common/optparser.py:299 ../src/common/optparser.py:300
+#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
 msgid "cyan"
 msgstr "turkis"
 
-#: ../src/common/optparser.py:379
+#: ../src/common/optparser.py:383
 msgid "migrating logs database to indices"
 msgstr "migrerer logg databaser til indekser"
 
@@ -6126,7 +6296,7 @@ msgstr ""
 "avbrutt."
 
 #. we're not english
-#: ../src/common/stanza_session.py:303
+#: ../src/common/stanza_session.py:423
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6134,11 +6304,11 @@ msgstr ""
 "[Dette er en del av en kryptert sesjon. Dersom du ser denne meldingen gikk "
 "noe galt.]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:178
+#: ../src/common/zeroconf/connection_zeroconf.py:181
 msgid "Avahi error"
 msgstr "Avahi feil"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:179
+#: ../src/common/zeroconf/connection_zeroconf.py:182
 #, python-format
 msgid ""
 "%s\n"
@@ -6147,44 +6317,44 @@ msgstr ""
 "%s\n"
 "Link-lokal meldinger fungerer muligens ikke riktig."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:190
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Vennligst sjekk om Avahi eller Bonjour er installert."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:199
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Could not start local service"
 msgstr "Kunne ikke starte lokal tjeneste"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Klarer ikke å lytte til port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-#: ../src/common/zeroconf/connection_zeroconf.py:283
-#: ../src/common/zeroconf/connection_zeroconf.py:294
-#: ../src/common/zeroconf/connection_zeroconf.py:308
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:286
+#: ../src/common/zeroconf/connection_zeroconf.py:297
+#: ../src/common/zeroconf/connection_zeroconf.py:311
 msgid "Please check if avahi-daemon is running."
 msgstr "Vennligst sjekk om avahi-tjenesten kjører."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:282
-#: ../src/common/zeroconf/connection_zeroconf.py:293
-#: ../src/common/zeroconf/connection_zeroconf.py:307
+#: ../src/common/zeroconf/connection_zeroconf.py:285
+#: ../src/common/zeroconf/connection_zeroconf.py:296
+#: ../src/common/zeroconf/connection_zeroconf.py:310
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Kunne ikke endre status til konto \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:325
+#: ../src/common/zeroconf/connection_zeroconf.py:328
 msgid "Your message could not be sent."
 msgstr "Din melding kunne ikke bli sendt."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:335
+#: ../src/common/zeroconf/connection_zeroconf.py:338
 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:360
+#: ../src/common/zeroconf/connection_zeroconf.py:363
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6205,16 +6375,16 @@ msgstr "Standard Melding"
 msgid "Enabled"
 msgstr "Påslått"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3078
+#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:739 ../src/dialogs.py:1395
+#: ../src/config.py:733 ../src/dialogs.py:1409
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Ordliste for språk %s er ikke tilgjengelig"
 
-#: ../src/config.py:740
+#: ../src/config.py:734
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6232,9 +6402,9 @@ msgid "status message text"
 msgstr "status melding tekst"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2383 ../src/dialogs.py:2449
-#: ../src/dialogs.py:3215 ../src/disco.py:866 ../src/disco.py:1726
-#: ../src/disco.py:2030 ../src/history_window.py:90
+#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
+#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
+#: ../src/disco.py:2048 ../src/history_window.py:90
 msgid "Name"
 msgstr "Navn"
 
@@ -6269,7 +6439,7 @@ msgstr "Du har åpne samtaler på konto %s"
 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:1976 ../src/config.py:2509 ../src/config.py:2545
+#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
 msgid "You are currently connected to the server"
 msgstr "Du er for øyeblikket tilkoblet til serveren"
 
@@ -6305,131 +6475,131 @@ msgstr "Konto navn kan ikke være tomt."
 msgid "Account name cannot contain spaces."
 msgstr "Konto navn kan ikke inneholde mellomrom."
 
-#: ../src/config.py:2072
+#: ../src/config.py:2074
 msgid "Rename Account"
 msgstr "Omdøpe Konto"
 
-#: ../src/config.py:2073
+#: ../src/config.py:2075
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Skriv inn nytt navn for konto %s"
 
-#: ../src/config.py:2101
+#: ../src/config.py:2103
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "En Jabber ID må skrives som \"bruker@servernavn\"."
 
-#: ../src/config.py:2318 ../src/config.py:3606
+#: ../src/config.py:2320 ../src/config.py:3623
 msgid "Invalid entry"
 msgstr "Ugyldig innlegg"
 
-#: ../src/config.py:2319 ../src/config.py:3607
+#: ../src/config.py:2321 ../src/config.py:3624
 msgid "Custom port must be a port number."
 msgstr "Egendefinert port må være et port nummer"
 
-#: ../src/config.py:2340
+#: ../src/config.py:2342
 msgid "Failed to get secret keys"
 msgstr "Klarte ikke å hente hemmelig nøkkel"
 
-#: ../src/config.py:2341
+#: ../src/config.py:2343
 msgid "There is no OpenPGP secret key available."
 msgstr "Det er ingen OpenPGP hemmelig nøkkel tilgjengelig."
 
-#: ../src/config.py:2375
+#: ../src/config.py:2377
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Nøkkel Valg"
 
-#: ../src/config.py:2376
+#: ../src/config.py:2378
 msgid "Choose your OpenPGP key"
 msgstr "Velg din OpenPGP nøkkel"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2385
 msgid "No such account available"
 msgstr "Ingen slik konto tilgjengelig"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2386
 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:2391 ../src/dialogs.py:2136 ../src/dialogs.py:2371
-#: ../src/dialogs.py:2557 ../src/disco.py:511 ../src/profile_window.py:339
+#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
+#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilkoblet til serveren"
 
-#: ../src/config.py:2392
+#: ../src/config.py:2394
 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:2396
+#: ../src/config.py:2398
 msgid "Your server doesn't support Vcard"
 msgstr "Din server støtter ikke Vcard"
 
-#: ../src/config.py:2397
+#: ../src/config.py:2399
 msgid "Your server can't save your personal information."
 msgstr "Din server kan ikke lagre din personlige informasjon."
 
-#: ../src/config.py:2510 ../src/config.py:2546
+#: ../src/config.py:2512 ../src/config.py:2548
 msgid "To disable the account, you must be disconnected."
 msgstr "For å deaktivere kontoen, må du være tilkoblet."
 
-#: ../src/config.py:2515
+#: ../src/config.py:2517
 msgid "Account Local already exists."
 msgstr "Konto Lokal eksisterer allerede."
 
-#: ../src/config.py:2516
+#: ../src/config.py:2518
 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:2673
+#: ../src/config.py:2675
 #, python-format
 msgid "Edit %s"
 msgstr "Rediger %s"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2677
 #, python-format
 msgid "Register to %s"
 msgstr "Registrer til %s"
 
 #. list at the beginning
-#: ../src/config.py:2711
+#: ../src/config.py:2713
 msgid "Ban List"
 msgstr "Listen over Utestengte"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2714
 msgid "Member List"
 msgstr "Medlems Liste"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2714
 msgid "Owner List"
 msgstr "Eier Liste"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2715
 msgid "Administrator List"
 msgstr "Administrator Liste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2763 ../src/disco.py:873 ../src/history_manager.py:201
+#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2773
+#: ../src/config.py:2789
 msgid "Reason"
 msgstr "Grunn"
 
-#: ../src/config.py:2780
+#: ../src/config.py:2796
 msgid "Nick"
 msgstr "Kallenavn"
 
-#: ../src/config.py:2786
+#: ../src/config.py:2802
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2813
+#: ../src/config.py:2829
 msgid "Banning..."
 msgstr "Utvis..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2815
+#: ../src/config.py:2831
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6437,11 +6607,11 @@ msgstr ""
 "<b>Hvem ønsker du å utvise?</b>\n"
 "\n"
 
-#: ../src/config.py:2817
+#: ../src/config.py:2833
 msgid "Adding Member..."
 msgstr "Legger til Medlem..."
 
-#: ../src/config.py:2818
+#: ../src/config.py:2834
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6449,11 +6619,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2836
 msgid "Adding Owner..."
 msgstr "Legger til Eier..."
 
-#: ../src/config.py:2821
+#: ../src/config.py:2837
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6461,11 +6631,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til en eier?</b>\n"
 "\n"
 
-#: ../src/config.py:2823
+#: ../src/config.py:2839
 msgid "Adding Administrator..."
 msgstr "Legger til Administrator..."
 
-#: ../src/config.py:2824
+#: ../src/config.py:2840
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6473,7 +6643,7 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2825
+#: ../src/config.py:2841
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6489,109 +6659,109 @@ msgstr ""
 "4. domene (domene selv treffer, samt treffer alle bruker@domene,\n"
 "domene/ressurs, eller adresser som inneholder et underdomene)."
 
-#: ../src/config.py:2926
+#: ../src/config.py:2943
 #, python-format
 msgid "Removing %s account"
 msgstr "Fjerner %s kontoen"
 
-#: ../src/config.py:2941
+#: ../src/config.py:2958
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Uttryksikoner avslått"
 
-#: ../src/config.py:2942
+#: ../src/config.py:2959
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2955 ../src/gui_interface.py:1132
-#: ../src/gui_interface.py:1243
+#: ../src/config.py:2972 ../src/gui_interface.py:311
+#: ../src/gui_interface.py:1048
 msgid "Password Required"
 msgstr "Krever Passord"
 
-#: ../src/config.py:2956 ../src/gui_interface.py:1223
+#: ../src/config.py:2973 ../src/gui_interface.py:1028
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv inn passord for kontoen %s"
 
-#: ../src/config.py:2957 ../src/gui_interface.py:1243
+#: ../src/config.py:2974 ../src/gui_interface.py:1048
 msgid "Save password"
 msgstr "Lagre passord"
 
-#: ../src/config.py:2967
+#: ../src/config.py:2984
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kontoen \"%s\" er tilkoblet til serveren"
 
-#: ../src/config.py:2968
+#: ../src/config.py:2985
 msgid "If you remove it, the connection will be lost."
 msgstr "Dersom du fjerner den vil tilkoblingen mistes."
 
-#: ../src/config.py:2982
+#: ../src/config.py:2999
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Tilkobling til proxy feilet"
 
-#: ../src/config.py:2983
+#: ../src/config.py:3000
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Hva ønsker du å gjøre?"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3001
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Fjern kontoe _bare fra Gajim"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3002
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3078
+#: ../src/config.py:3095
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
 
-#: ../src/config.py:3079
+#: ../src/config.py:3096
 msgid "Enter and leave only"
 msgstr "GÃ¥ inn og legg igjen bare"
 
-#: ../src/config.py:3080
+#: ../src/config.py:3097
 msgid "?print_status:None"
 msgstr "?print_status:Ingen"
 
-#: ../src/config.py:3150
+#: ../src/config.py:3167
 msgid "New Group Chat"
 msgstr "Ny Gruppesamtale"
 
-#: ../src/config.py:3183
+#: ../src/config.py:3200
 msgid "This bookmark has invalid data"
 msgstr "Dette bokmerket har ugyldig innhold"
 
-#: ../src/config.py:3184
+#: ../src/config.py:3201
 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."
 
 #. invalid char
-#: ../src/config.py:3302 ../src/dialogs.py:1934
+#: ../src/config.py:3319 ../src/dialogs.py:1950
 msgid "Invalid nickname"
 msgstr "Ugyldig kallenavn"
 
-#: ../src/config.py:3303 ../src/config.py:3317 ../src/config.py:3331
+#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
 msgid "Character not allowed"
 msgstr "Tegn ikke lovlig"
 
-#: ../src/config.py:3316 ../src/config.py:3582
+#: ../src/config.py:3333 ../src/config.py:3599
 msgid "Invalid server"
 msgstr "Ugyldig server"
 
-#: ../src/config.py:3330
+#: ../src/config.py:3347
 msgid "Invalid room"
 msgstr "Ugyldig rom"
 
-#: ../src/config.py:3498
+#: ../src/config.py:3515
 msgid "Account has been added successfully"
 msgstr "Kontoen har blitt lagt til uten feilmeldinger"
 
-#: ../src/config.py:3499 ../src/config.py:3505
+#: ../src/config.py:3516 ../src/config.py:3522
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menu item under the Edit menu from the main "
@@ -6601,33 +6771,33 @@ msgstr ""
 "eller senere ved å klikke under Kontoer menyvalget, under Rediger menyen fra "
 "hovedvinduet."
 
-#: ../src/config.py:3504
+#: ../src/config.py:3521
 msgid "Your new account has been created successfully"
 msgstr "Din nye konto har blitt opprettet uten feilmeldinger"
 
-#: ../src/config.py:3543
+#: ../src/config.py:3560
 msgid "Invalid username"
 msgstr "Ugyldig brukernavn"
 
-#: ../src/config.py:3545
+#: ../src/config.py:3562
 msgid "You must provide a username to configure this account."
 msgstr "Du må oppgi et brukernavn for å konfigurere denne kontoen."
 
-#: ../src/config.py:3583
+#: ../src/config.py:3600
 msgid "Please provide a server on which you want to register."
 msgstr "Vennlist skriv inn serveren du ønsker å registrere."
 
-#: ../src/config.py:3639 ../src/gui_interface.py:1904
+#: ../src/config.py:3656 ../src/gui_interface.py:1693
 msgid "Certificate Already in File"
 msgstr "Sertifikat Allerede i Katalogen"
 
-#: ../src/config.py:3640 ../src/gui_interface.py:1905
+#: ../src/config.py:3657 ../src/gui_interface.py:1694
 #, 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:3717
+#: ../src/config.py:3734
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6642,7 +6812,7 @@ msgstr ""
 "SSL Feil: %(error)s\n"
 "Ønsker du fortsatt å koble til denne serveren?"
 
-#: ../src/config.py:3723 ../src/gui_interface.py:1932
+#: ../src/config.py:3740 ../src/gui_interface.py:1721
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6653,63 +6823,72 @@ msgstr ""
 "SHA1 fingeravtrykk til sertifikatet:\n"
 "%s"
 
-#: ../src/config.py:3755 ../src/config.py:3789
+#: ../src/config.py:3772 ../src/config.py:3806
 msgid "An error occurred during account creation"
 msgstr "Det skjedde en feil under oppretting av kontoen"
 
-#: ../src/config.py:3854
+#: ../src/config.py:3871
 msgid "Account name is in use"
 msgstr "Konto navnet er i bruk"
 
-#: ../src/config.py:3855
+#: ../src/config.py:3872
 msgid "You already have an account using this name."
 msgstr "Du har allerede en konto med dette navnet."
 
-#: ../src/config.py:4009
+#: ../src/config.py:3991
+msgid "PEP node was not removed"
+msgstr "PEP noden ble ikke fjernet"
+
+#: ../src/config.py:3992
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr "PEP noden %(node)s ble ikke fjernet: %(message)s"
+
+#: ../src/config.py:4036
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:4017
+#: ../src/config.py:4044
 msgid "Event"
 msgstr "Hendelse"
 
-#: ../src/config.py:4052
+#: ../src/config.py:4079
 msgid "First Message Received"
 msgstr "Første Melding Motatt"
 
-#: ../src/config.py:4053
+#: ../src/config.py:4080
 msgid "Next Message Received Focused"
 msgstr "Neste Melding Motatt i Fokus"
 
-#: ../src/config.py:4055
+#: ../src/config.py:4082
 msgid "Next Message Received Unfocused"
 msgstr "Neste Melding Motatt ikke i Fokus"
 
-#: ../src/config.py:4056
+#: ../src/config.py:4083
 msgid "Contact Connected"
 msgstr "Kontakt Koblet til"
 
-#: ../src/config.py:4057
+#: ../src/config.py:4084
 msgid "Contact Disconnected"
 msgstr "Kontakt Frakoblet"
 
-#: ../src/config.py:4058
+#: ../src/config.py:4085
 msgid "Message Sent"
 msgstr "Melding Sendt"
 
-#: ../src/config.py:4059
+#: ../src/config.py:4086
 msgid "Group Chat Message Highlight"
 msgstr "Gruppe Samtale Melding Utheving"
 
-#: ../src/config.py:4060
+#: ../src/config.py:4087
 msgid "Group Chat Message Received"
 msgstr "Gruppe Samtale Melding Motatt"
 
-#: ../src/config.py:4061
+#: ../src/config.py:4088
 msgid "GMail Email Received"
 msgstr "Gmail E-post Motatt"
 
-#: ../src/conversation_textview.py:600
+#: ../src/conversation_textview.py:601
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6719,7 +6898,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:619
+#: ../src/conversation_textview.py:620
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6727,44 +6906,44 @@ 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:739
+#: ../src/conversation_textview.py:740
 msgid "_Quote"
 msgstr "_Sitat"
 
-#: ../src/conversation_textview.py:746
+#: ../src/conversation_textview.py:747
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Handlinger for \"%s\""
 
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Read _Wikipedia Article"
 msgstr "Les_Wikipedia Artikkel"
 
-#: ../src/conversation_textview.py:763
+#: ../src/conversation_textview.py:765
 msgid "Look it up in _Dictionary"
 msgstr "Slå det opp i _Ordbok"
 
-#: ../src/conversation_textview.py:780
+#: ../src/conversation_textview.py:782
 #, 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:793
+#: ../src/conversation_textview.py:795
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Søk URL mangler en \"%s\""
 
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 msgid "Web _Search for it"
 msgstr "Web _Søk etter den"
 
-#: ../src/conversation_textview.py:802
+#: ../src/conversation_textview.py:804
 msgid "Open as _Link"
 msgstr "Ã…pne som _Link"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1296
+#: ../src/conversation_textview.py:1298
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6772,188 +6951,193 @@ msgstr[0] "I går"
 msgstr[1] "I går"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1344 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tittel: %s\n"
 
-#: ../src/dataforms_widget.py:544
+#: ../src/dataforms_widget.py:545
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Klarer ikke å uvirksom modulen"
 
-#: ../src/dataforms_widget.py:546
+#: ../src/dataforms_widget.py:547
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Usynlighet ikke støttet"
 
-#: ../src/dataforms_widget.py:601
+#: ../src/dataforms_widget.py:562
+msgid "This field is required"
+msgstr ""
+
+#: ../src/dataforms_widget.py:607
 msgid "Jabber ID already in list"
 msgstr "Jabber ID allerede i listen"
 
-#: ../src/dataforms_widget.py:602
+#: ../src/dataforms_widget.py:608
 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:613
+#: ../src/dataforms_widget.py:619
 msgid "new@jabber.id"
 msgstr "ny@jabber.id"
 
-#: ../src/dataforms_widget.py:616 ../src/dataforms_widget.py:618
+#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "ny%d@jabber.id"
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontakt navn: <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:195
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/dialogs.py:201
+#: ../src/dialogs.py:202
 msgid "In the group"
 msgstr "I gruppen"
 
-#: ../src/dialogs.py:292
+#: ../src/dialogs.py:293
 msgid "KeyID"
 msgstr "NøkkelID"
 
-#: ../src/dialogs.py:297
+#: ../src/dialogs.py:298
 msgid "Contact name"
 msgstr "Kontakt navn"
 
-#: ../src/dialogs.py:469
+#: ../src/dialogs.py:470
 msgid "Set Mood"
 msgstr "Sett Stemning"
 
-#: ../src/dialogs.py:589
+#: ../src/dialogs.py:590
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Melding"
 
-#: ../src/dialogs.py:603
+#: ../src/dialogs.py:604
 msgid "Status Message"
 msgstr "Status Melding"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:794
 msgid "Overwrite Status Message?"
 msgstr "Overskriv Status Melding?"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:795
 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:802
+#: ../src/dialogs.py:803
 msgid "Save as Preset Status Message"
 msgstr "Lagre som Forvalgt Status Melding"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:804
 msgid "Please type a name for this status message"
 msgstr "Vennligst skriv inn et navn for denne status meldingen"
 
-#: ../src/dialogs.py:831
+#: ../src/dialogs.py:832
 msgid "AIM Address:"
 msgstr "AIM Adresse:"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:833
 msgid "GG Number:"
 msgstr "GG Nummer:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:834
 msgid "ICQ Number:"
 msgstr "ICQ Nummer:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:835
 msgid "MSN Address:"
 msgstr "MSN Adresse:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:836
 msgid "Yahoo! Address:"
 msgstr "Yahoo Adresse:"
 
-#: ../src/dialogs.py:872
+#: ../src/dialogs.py:873
 #, 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:875
+#: ../src/dialogs.py:876
 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:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
+#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
+#: ../src/dialogs.py:3464
 msgid "Invalid User ID"
 msgstr "Ugyldig Bruker ID"
 
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1052
 msgid "The user ID must not contain a resource."
 msgstr "Bruker IDen må ikke inneholde en ressurs."
 
-#: ../src/dialogs.py:1051
+#: ../src/dialogs.py:1057
 msgid "You cannot add yourself to your roster."
 msgstr "Du kan ikke legge til deg selv i din kontaktliste."
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1071
 msgid "Contact already in roster"
 msgstr "Kontakt allerede i kontaktlisten"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1072
 msgid "This contact is already listed in your roster."
 msgstr "Kontakten er allerede listet  i din kontaktliste."
 
-#: ../src/dialogs.py:1112
+#: ../src/dialogs.py:1118
 msgid "User ID:"
 msgstr "Bruker ID:"
 
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1189
 msgid "A GTK+ jabber client"
 msgstr "En GTK+ Jabber klient"
 
-#: ../src/dialogs.py:1176
+#: ../src/dialogs.py:1190
 msgid "GTK+ Version:"
 msgstr "GTK+ Versjon:"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1191
 msgid "PyGTK Version:"
 msgstr "PyGTK Versjon:"
 
-#: ../src/dialogs.py:1187
+#: ../src/dialogs.py:1201
 msgid "Current Developers:"
 msgstr "Nåværende Utviklere:"
 
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1203
 msgid "Past Developers:"
 msgstr "Tidligere Utviklere:"
 
-#: ../src/dialogs.py:1195
+#: ../src/dialogs.py:1209
 msgid "THANKS:"
 msgstr "TUSEN TAKK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1215
 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:1213
+#: ../src/dialogs.py:1227
 msgid "translator-credits"
 msgstr "Stian B. Barmen <stian@barmen.nu>"
 
-#: ../src/dialogs.py:1396
+#: ../src/dialogs.py:1410
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6966,101 +7150,101 @@ msgstr ""
 "\n"
 "Utheving av feilstavede ord vil ikke bli brukt"
 
-#: ../src/dialogs.py:1935 ../src/dialogs.py:2322
+#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
 msgid "The nickname has not allowed characters."
 msgstr "Kallenavnet inneholder ulovlige tegn"
 
-#: ../src/dialogs.py:2053
+#: ../src/dialogs.py:2069
 #, 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:2056
+#: ../src/dialogs.py:2072
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnerings ønske fra %s"
 
-#: ../src/dialogs.py:2131 ../src/gui_interface.py:2672
+#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Du er allerede i gruppesamtale %s"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2153
 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:2178
+#: ../src/dialogs.py:2194
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Bli med i samtalegruppe med konto %s"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2325
 msgid "Invalid Account"
 msgstr "Ugyldig Konto"
 
-#: ../src/dialogs.py:2310
+#: ../src/dialogs.py:2326
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr ""
 "Du har valgt en konto som du ønsker å bruke for å gå inn i samtalerommet."
 
-#: ../src/dialogs.py:2321
+#: ../src/dialogs.py:2337
 msgid "Invalid Nickname"
 msgstr "Ugyldig Kallenavn"
 
-#: ../src/dialogs.py:2326 ../src/dialogs.py:2332
-#: ../src/groupchat_control.py:1832
+#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
+#: ../src/groupchat_control.py:1847
 msgid "Invalid group chat Jabber ID"
 msgstr "Ugyldig gruppesamtale Jabber ID"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2343
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "Gruppesamtalens Jabber ID inneholder ulovlige symboler."
 
-#: ../src/dialogs.py:2333 ../src/groupchat_control.py:1833
+#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Gruppesamtalens Jabber ID inneholder ulovlige symboler."
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2356
 msgid "This is not a group chat"
 msgstr "Dette er ikke en samtalegruppe"
 
-#: ../src/dialogs.py:2341
+#: ../src/dialogs.py:2357
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s er ikke navnet til en gruppesamtale."
 
-#: ../src/dialogs.py:2372
+#: ../src/dialogs.py:2388
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Du kan ikke synkronisere kontakter uten å være tilkoblet."
 
-#: ../src/dialogs.py:2386
+#: ../src/dialogs.py:2402
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2421
+#: ../src/dialogs.py:2437
 msgid "This account is not connected to the server"
 msgstr "Denne kontoen er ikke tilkoblet til serveren"
 
-#: ../src/dialogs.py:2422
+#: ../src/dialogs.py:2438
 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:2446
+#: ../src/dialogs.py:2462
 msgid "Synchronise"
 msgstr "Synkroniser"
 
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2523
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start samtale med konto %s"
 
-#: ../src/dialogs.py:2509
+#: ../src/dialogs.py:2525
 msgid "Start Chat"
 msgstr "Start Samtale"
 
-#: ../src/dialogs.py:2510
+#: ../src/dialogs.py:2526
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7069,168 +7253,168 @@ msgstr ""
 "Ã¥ sende en samtale melding til:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2536 ../src/dialogs.py:2917 ../src/dialogs.py:3129
+#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
 msgid "Connection not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/dialogs.py:2537 ../src/dialogs.py:2918 ../src/dialogs.py:3130
+#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vennligst sjekk at du er tilkoblet med \"%s\"."
 
-#: ../src/dialogs.py:2546 ../src/dialogs.py:2549
+#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
 msgid "Invalid JID"
 msgstr "Ugyldig JID"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2565
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kan ikke analysere \"%s\"."
 
-#: ../src/dialogs.py:2558
+#: ../src/dialogs.py:2574
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan ikke endre passordet ditt uten å være tilkoblet."
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "Invalid password"
 msgstr "Ugyldig passord"
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "You must enter a password."
 msgstr "Du må skrive inn et passord."
 
-#: ../src/dialogs.py:2581
+#: ../src/dialogs.py:2597
 msgid "Passwords do not match"
 msgstr "Passordene er ikke like"
 
-#: ../src/dialogs.py:2582
+#: ../src/dialogs.py:2598
 msgid "The passwords typed in both fields must be identical."
 msgstr "Passordene du skriver inn i begge felt må være identiske."
 
 #. default value
-#: ../src/dialogs.py:2619 ../src/notify.py:247 ../src/notify.py:473
+#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
 msgid "Contact Signed In"
 msgstr "Kontakt Logget PÃ¥"
 
-#: ../src/dialogs.py:2621 ../src/notify.py:255 ../src/notify.py:475
+#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
 msgid "Contact Signed Out"
 msgstr "Kontakt Logget Av"
 
 #. chat message
-#: ../src/dialogs.py:2623 ../src/notify.py:277 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
 msgid "New Message"
 msgstr "Ny Melding"
 
 #. single message
-#: ../src/dialogs.py:2623 ../src/notify.py:259 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
 msgid "New Single Message"
 msgstr "Ny Melding"
 
 #. private message
-#: ../src/dialogs.py:2624 ../src/notify.py:265 ../src/notify.py:478
+#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
 msgid "New Private Message"
 msgstr "Ny Privat Melding"
 
-#: ../src/dialogs.py:2624 ../src/gui_interface.py:1358 ../src/notify.py:487
+#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: ../src/dialogs.py:2626 ../src/gui_interface.py:1420 ../src/notify.py:480
+#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
 msgid "File Transfer Request"
 msgstr "Fil Overførings Forespørsel"
 
-#: ../src/dialogs.py:2628 ../src/gui_interface.py:1320
-#: ../src/gui_interface.py:1389 ../src/notify.py:482
+#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
+#: ../src/gui_interface.py:1186 ../src/notify.py:482
 msgid "File Transfer Error"
 msgstr "Fil Overføring Feilet"
 
-#: ../src/dialogs.py:2630 ../src/gui_interface.py:1466
-#: ../src/gui_interface.py:1489 ../src/gui_interface.py:1506
+#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
+#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
 #: ../src/notify.py:484
 msgid "File Transfer Completed"
 msgstr "Fil Overføring Komplett"
 
-#: ../src/dialogs.py:2631 ../src/gui_interface.py:1469 ../src/notify.py:485
+#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
 msgid "File Transfer Stopped"
 msgstr "Fil Overføring Stoppet"
 
-#: ../src/dialogs.py:2633 ../src/gui_interface.py:1152 ../src/notify.py:489
+#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
 msgid "Groupchat Invitation"
 msgstr "Gruppesamtale invitasjon"
 
-#: ../src/dialogs.py:2635 ../src/notify.py:239 ../src/notify.py:491
+#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
 msgid "Contact Changed Status"
 msgstr "Kontakt Endret Status"
 
-#: ../src/dialogs.py:2836
+#: ../src/dialogs.py:2852
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Enkelt Melding med konto %s"
 
-#: ../src/dialogs.py:2838
+#: ../src/dialogs.py:2854
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Enkelt Melding i konto %s"
 
-#: ../src/dialogs.py:2840
+#: ../src/dialogs.py:2856
 msgid "Single Message"
 msgstr "Melding"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2843
+#: ../src/dialogs.py:2859
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:2882
 #, python-format
 msgid "Received %s"
 msgstr "Motatt %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2889
+#: ../src/dialogs.py:2905
 #, 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:2968
+#: ../src/dialogs.py:2984
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:2985
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:3028
+#: ../src/dialogs.py:3044
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsoll for %s"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3046
 msgid "XML Console"
 msgstr "XML Konsoll"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "add"
 msgstr "Lei seg"
 
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "modify"
 msgstr "Endre"
 
-#: ../src/dialogs.py:3160
+#: ../src/dialogs.py:3176
 #, fuzzy
 msgid "remove"
 msgstr "_Fjern"
 
-#: ../src/dialogs.py:3188
+#: ../src/dialogs.py:3204
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7238,156 +7422,190 @@ msgid ""
 msgstr "<b>%s</b> ønsker at du <b>%s</b> noen kontakter i kontaktlisten. "
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3204 ../src/dialogs.py:3250
+#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
 msgid "Add"
 msgstr "Legg til"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3206 ../src/dialogs.py:3281
+#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
 msgid "Modify"
 msgstr "Endre"
 
-#: ../src/dialogs.py:3212
+#: ../src/dialogs.py:3228
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3218
+#: ../src/dialogs.py:3234
 msgid "Groups"
 msgstr "Grupper"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3342
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s anbefalte meg å legge til deg i min kontaktliste. "
 
-#: ../src/dialogs.py:3340
+#: ../src/dialogs.py:3356
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "_Legg til kontakt"
 
-#: ../src/dialogs.py:3377
+#: ../src/dialogs.py:3393
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Fjerner kontakt fra kontaktlisten"
 
-#: ../src/dialogs.py:3430
+#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#, python-format
+msgid "Archiving Preferences for %s"
+msgstr ""
+
+#: ../src/dialogs.py:3473
+#, fuzzy
+msgid "Invalid expire value"
+msgstr "Ugyldig Servernavn"
+
+#: ../src/dialogs.py:3474
+msgid "Expire must be a valid positive integer."
+msgstr ""
+
+#: ../src/dialogs.py:3521
+msgid "There is an error with the form"
+msgstr ""
+
+#: ../src/dialogs.py:3732
+#, fuzzy
+msgid "There is an error"
+msgstr "Tjenesten returnerte en feil."
+
+#: ../src/dialogs.py:3796
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Liste over Uønskede <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3434
+#: ../src/dialogs.py:3800
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Liste over Uønskede for %s"
 
-#: ../src/dialogs.py:3490
+#: ../src/dialogs.py:3856
 #, 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:3495
+#: ../src/dialogs.py:3861
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Rekkefølge: %(order)s, handling: %(action)s"
 
-#: ../src/dialogs.py:3539
+#: ../src/dialogs.py:3905
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Rediger en regel</b>"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:4016
 msgid "<b>Add a rule</b>"
 msgstr "<b>Legg til regel</b>"
 
-#: ../src/dialogs.py:3750
+#: ../src/dialogs.py:4116
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Liste over Uønskede for %s"
 
-#: ../src/dialogs.py:3752
+#: ../src/dialogs.py:4118
 msgid "Privacy Lists"
 msgstr "Liste overUønskede"
 
-#: ../src/dialogs.py:3822
+#: ../src/dialogs.py:4188
 msgid "Invalid List Name"
 msgstr "Listenavnet er Ugyldig"
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4189
 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:3855
+#: ../src/dialogs.py:4221
 msgid "You are invited to a groupchat"
 msgstr "Du er invitert til en gruppesamtale"
 
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4224
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact har invitert deg til en gruppesamtale"
 
-#: ../src/dialogs.py:3860
+#: ../src/dialogs.py:4226
 #, 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:3868
+#: ../src/dialogs.py:4234
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4236
 msgid "Do you want to accept the invitation?"
 msgstr "Ønsker du å akseptere invitasjonen?"
 
-#: ../src/dialogs.py:3932
+#: ../src/dialogs.py:4298
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:3942 ../src/dialogs.py:3985 ../src/dialogs.py:4041
+#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
+#: ../src/dialogs.py:4495
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/dialogs.py:3947
+#: ../src/dialogs.py:4313
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:3975
+#: ../src/dialogs.py:4341
 msgid "Choose Sound"
 msgstr "Velg Lyd"
 
-#: ../src/dialogs.py:3990
+#: ../src/dialogs.py:4356
 msgid "Wav Sounds"
 msgstr "Wav Lyder"
 
-#: ../src/dialogs.py:4028
+#: ../src/dialogs.py:4394
 msgid "Choose Image"
 msgstr "Velg Bilde"
 
-#: ../src/dialogs.py:4046
+#: ../src/dialogs.py:4412
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:4113
+#: ../src/dialogs.py:4482
+#, fuzzy
+msgid "Choose Archive"
+msgstr "Velg Bilde"
+
+#: ../src/dialogs.py:4500
+#, fuzzy
+msgid "Zip files"
+msgstr "Alle filer"
+
+#: ../src/dialogs.py:4525
 #, python-format
 msgid "When %s becomes:"
 msgstr "NÃ¥r %s blir:"
 
-#: ../src/dialogs.py:4115
+#: ../src/dialogs.py:4527
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Legg til Spesiell Alarm for %s"
 
-#: ../src/dialogs.py:4190
+#: ../src/dialogs.py:4602
 msgid "Condition"
 msgstr "Betingelse"
 
-#: ../src/dialogs.py:4310
+#: ../src/dialogs.py:4722
 msgid "when I am "
 msgstr "nå jeg er"
 
-#: ../src/dialogs.py:4786
+#: ../src/dialogs.py:5198
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7398,19 +7616,19 @@ msgstr ""
 "\n"
 "Denne sesjonens Short Authentication String er <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4789
+#: ../src/dialogs.py:5201
 msgid "You have already verified this contact's identity."
 msgstr "Du har allerede verifisert denne kontaktens identitet."
 
-#: ../src/dialogs.py:4795 ../src/dialogs.py:4879
+#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
 msgid "Contact's identity verified"
 msgstr "Kontaktens identitet verifisert"
 
-#: ../src/dialogs.py:4801
+#: ../src/dialogs.py:5213
 msgid "Verify again..."
 msgstr "Verifiser igjen..."
 
-#: ../src/dialogs.py:4806
+#: ../src/dialogs.py:5218
 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 "
@@ -7420,19 +7638,19 @@ msgstr ""
 "meldinger eller sende meldinger, må du verifisere identiteten ved å klikke "
 "på knappen under. "
 
-#: ../src/dialogs.py:4809 ../src/dialogs.py:4860 ../src/dialogs.py:4873
+#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktens identitet IKKE verifisert"
 
-#: ../src/dialogs.py:4814
+#: ../src/dialogs.py:5226
 msgid "Verify..."
 msgstr "Verifiser..."
 
-#: ../src/dialogs.py:4825
+#: ../src/dialogs.py:5237
 msgid "Have you verified the contact's identity?"
 msgstr "Har du verifisert kontaktens identitet?"
 
-#: ../src/dialogs.py:4826
+#: ../src/dialogs.py:5238
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7447,23 +7665,23 @@ msgstr ""
 "\n"
 "Denne sesjonens Short Authentication String er <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4827
+#: ../src/dialogs.py:5239
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Har du snakket med kontakten og verifisert SASen?"
 
-#: ../src/dialogs.py:4861
+#: ../src/dialogs.py:5273
 #, 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:4867
+#: ../src/dialogs.py:5279
 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:4874
+#: ../src/dialogs.py:5286
 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."
@@ -7472,7 +7690,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:4880
+#: ../src/dialogs.py:5292
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7480,19 +7698,19 @@ msgstr ""
 "GPG nøkkel er tildelt denne kontakten, og du stoler på den, så meldinger vil "
 "bli kryptert."
 
-#: ../src/dialogs.py:4945
+#: ../src/dialogs.py:5357
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4947
+#: ../src/dialogs.py:5359
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4949
+#: ../src/dialogs.py:5361
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4953
+#: ../src/dialogs.py:5365
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7508,24 +7726,24 @@ msgstr "Andre"
 msgid "Conference"
 msgstr "Konferanse"
 
-#: ../src/disco.py:512
+#: ../src/disco.py:513
 msgid "Without a connection, you can not browse available services"
 msgstr "Uten en tilkobling kan du ikke liste ut tilgjengelige tjenester"
 
-#: ../src/disco.py:589
+#: ../src/disco.py:600
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Se etter Tjenester med %s kontoen"
 
-#: ../src/disco.py:591
+#: ../src/disco.py:602
 msgid "Service Discovery"
 msgstr "Se etter Tjenester"
 
-#: ../src/disco.py:741
+#: ../src/disco.py:758
 msgid "The service could not be found"
 msgstr "Tjenesten ble ikke funnet"
 
-#: ../src/disco.py:742
+#: ../src/disco.py:759
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7533,93 +7751,93 @@ msgstr ""
 "Det er ingen tjeneste på adressen du oppgav, eller den svarer ikke. Sjekk "
 "adressen og prøv igjen."
 
-#: ../src/disco.py:746 ../src/disco.py:1082
+#: ../src/disco.py:763 ../src/disco.py:1100
 msgid "The service is not browsable"
 msgstr "Ikke mulig å utforske tjeneste"
 
-#: ../src/disco.py:747
+#: ../src/disco.py:764
 msgid "This type of service does not contain any items to browse."
 msgstr "Denne typen tjeneste inneholder ingen elementer å utforske"
 
-#: ../src/disco.py:786 ../src/disco.py:796
+#: ../src/disco.py:804 ../src/disco.py:814
 msgid "Invalid Server Name"
 msgstr "Ugyldig Servernavn"
 
-#: ../src/disco.py:850
+#: ../src/disco.py:868
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Utforsk %(address)s med kontoen %(account)s"
 
-#: ../src/disco.py:894
+#: ../src/disco.py:912
 msgid "_Browse"
 msgstr "_Utforsk"
 
-#: ../src/disco.py:1083
+#: ../src/disco.py:1101
 msgid "This service does not contain any items to browse."
 msgstr "Denne tjenesten innholer ingen elementer å utforske."
 
-#: ../src/disco.py:1323
+#: ../src/disco.py:1341
 msgid "_Execute Command"
 msgstr "_Kjør Kommando"
 
-#: ../src/disco.py:1333 ../src/disco.py:1504
+#: ../src/disco.py:1351 ../src/disco.py:1522
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
-#: ../src/disco.py:1545
+#: ../src/disco.py:1563
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanner %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1736
+#: ../src/disco.py:1754
 msgid "Users"
 msgstr "Brukere"
 
 #. Description column
-#: ../src/disco.py:1744
+#: ../src/disco.py:1762
 msgid "Description"
 msgstr "Beskrivelse"
 
 #. Id column
-#: ../src/disco.py:1752
+#: ../src/disco.py:1770
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1817 ../src/gui_interface.py:3182
+#: ../src/disco.py:1835 ../src/gui_interface.py:2995
 msgid "Bookmark already set"
 msgstr "Bokmerke allerede satt"
 
-#: ../src/disco.py:1818 ../src/gui_interface.py:3183
+#: ../src/disco.py:1836 ../src/gui_interface.py:2996
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Gruppesamtalen \"%s\" er allerede i dine bokmerker."
 
-#: ../src/disco.py:1827 ../src/gui_interface.py:3197
+#: ../src/disco.py:1845 ../src/gui_interface.py:3010
 msgid "Bookmark has been added successfully"
 msgstr "Bokmerke har blitt lagt til"
 
-#: ../src/disco.py:1828 ../src/gui_interface.py:3198
+#: ../src/disco.py:1846 ../src/gui_interface.py:3011
 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:2039
+#: ../src/disco.py:2057
 msgid "Subscribed"
 msgstr "Abonnerte"
 
-#: ../src/disco.py:2047
+#: ../src/disco.py:2065
 msgid "Node"
 msgstr "Node"
 
-#: ../src/disco.py:2111
+#: ../src/disco.py:2129
 msgid "New post"
 msgstr "Ny post"
 
-#: ../src/disco.py:2117
+#: ../src/disco.py:2135
 msgid "_Subscribe"
 msgstr "_Abonnér"
 
-#: ../src/disco.py:2123
+#: ../src/disco.py:2141
 msgid "_Unsubscribe"
 msgstr "_Fjern Abonnement"
 
@@ -7791,17 +8009,19 @@ msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Transformer LaTeX uttrykk mellom $$ $$."
 
 #: ../src/features_window.py:95
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
-"in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 "Krever texlive-latex-base og dvipng. Du må sette 'use_latex' til True i "
 "Avansert Konfigurasjons Editoren."
 
 #: ../src/features_window.py:96
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
+"You have to set 'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 "Krever texlive-latex-base og dvipng (Alt er i MikTeX). Du må sette "
 "'use_latex' til True i Avansert Konfigurasjons Editoren."
@@ -7958,12 +8178,12 @@ msgstr "Beskrivelse: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s ønsker å sende deg en fil:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Kan ikke overskrive eksisterende fil \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -7971,22 +8191,22 @@ msgstr ""
 "En fil med dette navnet eksisterer og du har ikke rettigheter til å "
 "overskrive den."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 msgid "This file already exists"
 msgstr "Denne filen finnes fra før"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 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:369 ../src/gtkgui_helpers.py:914
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Katalogen \"%s\" er ikke skrivbar"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
 msgid "You do not have permission to create files in this directory."
 msgstr "Du har ikke rettigheter til å lage filer i denne katalogen."
 
@@ -8089,28 +8309,28 @@ msgstr ""
 "En annen instans av Gajim ser ut til å kjøre\n"
 "Start likevel?"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
 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:80
+#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
 msgid "command"
 msgstr "kommando"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "vis hjelp for kommando"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Vis eller skjul kontaktliste vinduet"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
 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:93
+#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8118,6 +8338,13 @@ msgstr ""
 "Skriv ut en liste over alle kontakter i kontaklisten. Hver kontakt kommer på "
 "en egen linje"
 
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
+#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
+#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
+#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
 #: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
 #: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
 #: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
@@ -8129,43 +8356,35 @@ msgstr ""
 msgid "account"
 msgstr "konto"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "vis bare kontakter for denne kontoen"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Skriv ut en liste over registrerte kontoer"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
 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:109
+#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106
 #, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"accoun't previous status"
+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:110 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
-msgid "message"
-msgstr "melding"
-
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "status melding"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8173,43 +8392,20 @@ 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:117
-msgid "Changes the priority of account or accounts"
-msgstr "Endrer prioritet på konto eller kontoer"
-
-#: ../src/gajim-remote.py:119
-msgid "priority"
-msgstr "prioritet"
-
-#: ../src/gajim-remote.py:119
-msgid "priority you want to give to the account"
-msgstr "prioritet du ønsker å gi til kontoen"
-
-#: ../src/gajim-remote.py:121
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-msgstr ""
-"endre prioritet til en konto. Dersom uspesifisert, endre status til alle "
-"kontoer som har \"synkroniser med global status\" valget påslått"
-
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
 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:129
+#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID til kontakten du ønsker å snakke med"
 
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
 #: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 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:134
-msgid "message content. The account must be specified or \"\""
-msgstr "meldings innhold. Kontoen må spesifiseres eller \"\""
-
-#: ../src/gajim-remote.py:139
+#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
 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 "
@@ -8219,30 +8415,35 @@ 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-plugin.py:127 ../src/gajim-remote-plugin.py:140
 #: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID til kontakten som vil motta meldingen"
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
+#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "meldings innhold"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "pgp nøkkel"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 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:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
+#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
 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:152
+#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
 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 "
@@ -8252,143 +8453,285 @@ 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:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "tittel"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "meldings tittel"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
 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:168
+#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "JID til rommet som vil motta meldingen"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Henter detaljert informasjon om en kontakt"
 
+#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
+#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
 #: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
 #: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID til kontakten"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Henter detaljert informasjon om en konto"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Navn på kontoen"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Sender fil til en kontakt"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "file"
 msgstr "fil"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Fil sti"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "dersom spesifisert, vil filen bli sendt fra denne kontoen"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Viser alle innstillingsmuligheter og gjeldende verdier"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Setter verdien av 'nøkkel' til 'verdi',"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "nøkkel=verdi"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 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:207
+#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Sletter en innstilling"
 
-#: ../src/gajim-remote.py:209
-msgid "key"
-msgstr "nøkkel"
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "key"
+msgstr "nøkkel"
+
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "name of the preference to be deleted"
+msgstr "navnet på innstillingen som skal slettes"
+
+#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+msgid "Writes the current state of Gajim preferences to the .config file"
+msgstr "Skriver gjeldende Gajim innstillinger til .config filen"
+
+#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
+msgid "Removes contact from roster"
+msgstr "Fjerner kontakt fra kontaktlisten"
+
+#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+msgid "Adds contact to roster"
+msgstr "Legger til kontakt til kontaktlisten"
+
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+msgid "Adds new contact to this account"
+msgstr "Legger til en ny kontakt til denne kontoen."
+
+#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+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-plugin.py:226
+#, fuzzy
+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-plugin.py:233 ../src/gajim-remote.py:249
+msgid "Returns number of unread messages"
+msgstr "Returnerer antall uleste meldinger"
+
+#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+msgid "Opens 'Start Chat' dialog"
+msgstr "Ã…pner 'Start Samtale' dialogen"
+
+#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+msgid "Starts chat, using this account"
+msgstr "Starter samtale, med denne kontoen"
+
+#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+msgid "Sends custom XML"
+msgstr "Send egendefinert XML"
+
+#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+msgid "XML to send"
+msgstr "XML for sending"
+
+#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+"Kontoen som xmlen vil bli sendt; dersom ikke spesifisert vil xmlen bli sendt "
+"til alle kontoer"
+
+#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
+msgid "Handle a xmpp:/ uri"
+msgstr "HÃ¥ndtere en xmpp:/ uri"
+
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
+msgid "uri"
+msgstr "uri"
+
+#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+msgid "Join a MUC room"
+msgstr "Bli med i et MUC rom"
+
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+msgid "room"
+msgstr "rom"
+
+#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+msgid "nick"
+msgstr "kallenavn"
+
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+msgid "password"
+msgstr "passord"
+
+#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+msgid "Check if Gajim is running"
+msgstr "Sjekk om Gajim kjører"
+
+#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
+#: ../src/gajim-remote.py:300
+msgid "Shows or hides the ipython window"
+msgstr "Vis eller skjul ipython vindu"
+
+#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+msgid "Missing argument \"contact_jid\""
+msgstr "Mangler argument \"contact_jid\""
+
+#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#, python-format
+msgid ""
+"'%s' is not in your roster.\n"
+"Please specify account for sending the message."
+msgstr ""
+"'%s' er ikke in kontaktlisten din.\n"
+"Vennligst spesifiser konto for sending av meldingen."
+
+#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+msgid "You have no active account"
+msgstr "Du har ingen aktiv konto"
 
-#: ../src/gajim-remote.py:209
-msgid "name of the preference to be deleted"
-msgstr "navnet på innstillingen som skal slettes"
+#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+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:213
-msgid "Writes the current state of Gajim preferences to the .config file"
-msgstr "Skriver gjeldende Gajim innstillinger til .config filen"
+#: ../src/gajim-remote-plugin.py:412
+#, python-format
+msgid ""
+"Usage: %s %s %s \n"
+"\t %s"
+msgstr ""
+"Bruk: %s %s %s \n"
+"\t %s"
 
-#: ../src/gajim-remote.py:218
-msgid "Removes contact from roster"
-msgstr "Fjerner kontakt fra kontaktlisten"
+#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+msgid "Arguments:"
+msgstr "Argumenter:"
 
-#: ../src/gajim-remote.py:227
-msgid "Adds contact to roster"
-msgstr "Legger til kontakt til kontaktlisten"
+#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#, python-format
+msgid "%s not found"
+msgstr "%s ikke funnet"
 
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "jid"
+#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
+#, python-format
+msgid ""
+"Usage: %s command [arguments]\n"
+"Command is one of:\n"
+msgstr ""
+"Bruk: %s kommando [argumenter]\n"
+"Kommando er en av:\n"
 
-#: ../src/gajim-remote.py:230
-msgid "Adds new contact to this account"
-msgstr "Legger til en ny kontakt til denne kontoen."
+#: ../src/gajim-remote-plugin.py:496
+#, fuzzy, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"For mange argumenter. \n"
+"Skriv \"%(basename)s hjelp %(command)s\" for mer informasjon"
 
-#: ../src/gajim-remote.py:235
-msgid "Returns current status (the global one unless account is specified)"
+#: ../src/gajim-remote-plugin.py:500
+#, fuzzy, python-format
+msgid ""
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
 msgstr ""
-"Returnerer innstillinger (globale innstillinger om ikke en konto er "
-"spesifisert)"
+"Argumentet \"%(arg)s\" er ikke spesifisert. \n"
+"Skriv \"%(basename)s hjelp %(command)s\" for mer informasjon"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
+msgid "Wrong uri"
+msgstr "Feil uri"
+
+#: ../src/gajim-remote.py:109
+#, fuzzy
 msgid ""
-"Returns current status message (the global one unless account is specified)"
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
 msgstr ""
-"Returnerer gjeldende status melding (den globale om ikke en konto er "
-"spesifisert)"
+"en av: frakoblet, tilkoblet, samtale, borte, mer borte, ikke forstyrr, "
+"usynlig"
 
-#: ../src/gajim-remote.py:249
-msgid "Returns number of unread messages"
-msgstr "Returnerer antall uleste meldinger"
+#: ../src/gajim-remote.py:117
+msgid "Changes the priority of account or accounts"
+msgstr "Endrer prioritet på konto eller kontoer"
 
-#: ../src/gajim-remote.py:253
-msgid "Opens 'Start Chat' dialog"
-msgstr "Ã…pner 'Start Samtale' dialogen"
+#: ../src/gajim-remote.py:119
+msgid "priority"
+msgstr "prioritet"
 
-#: ../src/gajim-remote.py:255
-msgid "Starts chat, using this account"
-msgstr "Starter samtale, med denne kontoen"
+#: ../src/gajim-remote.py:119
+msgid "priority you want to give to the account"
+msgstr "prioritet du ønsker å gi til kontoen"
 
-#: ../src/gajim-remote.py:259
-msgid "Sends custom XML"
-msgstr "Send egendefinert XML"
+#: ../src/gajim-remote.py:121
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"endre prioritet til en konto. Dersom uspesifisert, endre status til alle "
+"kontoer som har \"synkroniser med global status\" valget påslått"
 
-#: ../src/gajim-remote.py:261
-msgid "XML to send"
-msgstr "XML for sending"
+#: ../src/gajim-remote.py:134
+msgid "message content. The account must be specified or \"\""
+msgstr "meldings innhold. Kontoen må spesifiseres eller \"\""
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:242
 msgid ""
-"Account in which the xml will be sent; if not specified, xml will be sent to "
-"all accounts"
+"Returns current status message (the global one unless account is specified)"
 msgstr ""
-"Kontoen som xmlen vil bli sendt; dersom ikke spesifisert vil xmlen bli sendt "
-"til alle kontoer"
+"Returnerer gjeldende status melding (den globale om ikke en konto er "
+"spesifisert)"
 
 #: ../src/gajim-remote.py:268
 #, fuzzy
@@ -8409,14 +8752,6 @@ msgstr ""
 "Kontoen som xmlen vil bli sendt; dersom ikke spesifisert vil xmlen bli sendt "
 "til alle kontoer"
 
-#: ../src/gajim-remote.py:277
-msgid "Handle a xmpp:/ uri"
-msgstr "HÃ¥ndtere en xmpp:/ uri"
-
-#: ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "uri"
-
 #: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr "URI til håndgrep"
@@ -8429,30 +8764,14 @@ msgstr "Konto som du ønsker å benytte for å håndtere det"
 msgid "Message content"
 msgstr "Meldings innhold"
 
-#: ../src/gajim-remote.py:286
-msgid "Join a MUC room"
-msgstr "Bli med i et MUC rom"
-
-#: ../src/gajim-remote.py:288
-msgid "room"
-msgstr "rom"
-
 #: ../src/gajim-remote.py:288
 msgid "Room JID"
 msgstr "Rom JID"
 
-#: ../src/gajim-remote.py:289
-msgid "nick"
-msgstr "kallenavn"
-
 #: ../src/gajim-remote.py:289
 msgid "Nickname to use"
 msgstr "Kallenavn å bruke"
 
-#: ../src/gajim-remote.py:290
-msgid "password"
-msgstr "passord"
-
 #: ../src/gajim-remote.py:290
 msgid "Password to enter the room"
 msgstr "Passord for å komme inn i rommet"
@@ -8461,35 +8780,6 @@ msgstr "Passord for å komme inn i rommet"
 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:296
-msgid "Check if Gajim is running"
-msgstr "Sjekk om Gajim kjører"
-
-#: ../src/gajim-remote.py:300
-msgid "Shows or hides the ipython window"
-msgstr "Vis eller skjul ipython vindu"
-
-#: ../src/gajim-remote.py:327
-msgid "Missing argument \"contact_jid\""
-msgstr "Mangler argument \"contact_jid\""
-
-#: ../src/gajim-remote.py:348
-#, python-format
-msgid ""
-"'%s' is not in your roster.\n"
-"Please specify account for sending the message."
-msgstr ""
-"'%s' er ikke in kontaktlisten din.\n"
-"Vennligst spesifiser konto for sending av meldingen."
-
-#: ../src/gajim-remote.py:351
-msgid "You have no active account"
-msgstr "Du har ingen aktiv konto"
-
-#: ../src/gajim-remote.py:404
-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:431
 #, python-format
 msgid ""
@@ -8499,24 +8789,6 @@ msgstr ""
 "Bruk: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:435
-msgid "Arguments:"
-msgstr "Argumenter:"
-
-#: ../src/gajim-remote.py:439
-#, python-format
-msgid "%s not found"
-msgstr "%s ikke funnet"
-
-#: ../src/gajim-remote.py:445
-#, python-format
-msgid ""
-"Usage: %s command [arguments]\n"
-"Command is one of:\n"
-msgstr ""
-"Bruk: %s kommando [argumenter]\n"
-"Kommando er en av:\n"
-
 #: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
@@ -8539,10 +8811,6 @@ msgstr ""
 msgid "No uri given"
 msgstr ""
 
-#: ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Feil uri"
-
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Tema"
@@ -8568,180 +8836,178 @@ msgstr "Du kan ikke slette ditt gjeldene tema"
 msgid "Please first choose another for your current theme."
 msgstr "Vennligst velg en annen for ditt gjeldende tema."
 
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:170
 msgid "Sending private message failed"
 msgstr "Sending av privat melding feilet"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:171
+#: ../src/groupchat_control.py:172
 #, 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:455
 msgid "Insert Nickname"
 msgstr "Skriv inn Kallenavn"
 
-#: ../src/groupchat_control.py:631
+#: ../src/groupchat_control.py:636
 msgid "Conversation with "
 msgstr "Samtale med"
 
-#: ../src/groupchat_control.py:633
+#: ../src/groupchat_control.py:638
 msgid "Continued conversation"
 msgstr "Fortsettende samtale"
 
-#. Can be a message (see handle_event_gc_config_change in
-#. gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1272 ../src/gui_interface.py:1080
+#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Enhver deltaker får log å se din fulle JID"
 
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1286
 msgid "Room logging is enabled"
 msgstr "Rom logging er påslått"
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1288
 msgid "A new room has been created"
 msgstr "Et nytt rom har blitt laget"
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1291
 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:1287
+#: ../src/groupchat_control.py:1297
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blitt utvist: %(reason)s"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1300
 #, 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:1300
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s er blitt uønsket: %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1312
 #, 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:1314 ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nå kjent som %s"
 
-#: ../src/groupchat_control.py:1330 ../src/gui_interface.py:919
+#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s er nå kjent som %(new_nick)s"
 
-#: ../src/groupchat_control.py:1372 ../src/groupchat_control.py:1377
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1392
 #, 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:1374
+#: ../src/groupchat_control.py:1383
 msgid "affiliation changed"
 msgstr "tilhørighet endret"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1388
 msgid "room configuration changed to members-only"
 msgstr "rom konfigurasjon er endret til kun-for-medlemmer"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1394
 msgid "system shutdown"
 msgstr "systemet slår seg av"
 
-#: ../src/groupchat_control.py:1470
+#: ../src/groupchat_control.py:1477
 #, 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:1474
+#: ../src/groupchat_control.py:1481
 #, 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:1489
+#: ../src/groupchat_control.py:1496
 #, 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:1493
+#: ../src/groupchat_control.py:1500
 #, 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:1522
+#: ../src/groupchat_control.py:1530
 #, python-format
 msgid "%s has left"
 msgstr "%s har dratt"
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1535
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s har blitt med i gruppesamtalen"
 
-#: ../src/groupchat_control.py:1529 ../src/gui_interface.py:946
+#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
 #: ../src/history_window.py:447 ../src/notify.py:234
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s er nå %(status)s"
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1774
 #, 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:1761
+#: ../src/groupchat_control.py:1776
 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:1765 ../src/gui_interface.py:1216
-#: ../src/gui_interface.py:1992 ../src/gui_interface.py:2029
-#: ../src/gui_interface.py:2064 ../src/message_window.py:224
-#: ../src/roster_window.py:2739 ../src/roster_window.py:3399
-#: ../src/roster_window.py:4123
+#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
+#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
+#: ../src/gui_interface.py:1853 ../src/message_window.py:224
+#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
+#: ../src/roster_window.py:4195
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Ikke spør meg igjen"
 
-#: ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:1814
 msgid "Changing Subject"
 msgstr "Endrer Tittel"
 
-#: ../src/groupchat_control.py:1800
+#: ../src/groupchat_control.py:1815
 msgid "Please specify the new subject:"
 msgstr "Vennlist skriv inn ny tittel:"
 
-#: ../src/groupchat_control.py:1807
+#: ../src/groupchat_control.py:1822
 msgid "Changing Nickname"
 msgstr "Endrer Kallenavn"
 
-#: ../src/groupchat_control.py:1808
+#: ../src/groupchat_control.py:1823
 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:1839
+#: ../src/groupchat_control.py:1854
 #, python-format
 msgid "Destroying %s"
 msgstr "Ødelegger %s"
 
-#: ../src/groupchat_control.py:1840
+#: ../src/groupchat_control.py:1855
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8749,22 +9015,22 @@ msgstr ""
 "Du kommer garantert til å ødelegge dette rommet.\n"
 "Du kan skrive en årsak under:"
 
-#: ../src/groupchat_control.py:1842
+#: ../src/groupchat_control.py:1857
 msgid "You may also enter an alternate venue:"
 msgstr "Du kan også skrive et alternativt møtested:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2028
+#: ../src/groupchat_control.py:2046
 #, python-format
 msgid "Kicking %s"
 msgstr "Utkasting %s"
 
-#: ../src/groupchat_control.py:2029 ../src/groupchat_control.py:2356
+#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
 msgid "You may specify a reason below:"
 msgstr "Du kan spesifisere grunn under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2355
+#: ../src/groupchat_control.py:2373
 #, python-format
 msgid "Banning %s"
 msgstr "Utvise %s"
@@ -8790,53 +9056,62 @@ msgid "Details"
 msgstr "Detaljer"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
+#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Feil: kan ikke åpne %s for lesing"
 
-#: ../src/gtkgui_helpers.py:400
+#: ../src/gtkgui_helpers.py:404
 msgid "Error reading file:"
 msgstr "Feil under lesing av fil:"
 
-#: ../src/gtkgui_helpers.py:403
+#: ../src/gtkgui_helpers.py:407
 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:444
+#: ../src/gtkgui_helpers.py:448
 #, 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:818
+#: ../src/gtkgui_helpers.py:822
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim er ikke standard Jabber klient"
 
-#: ../src/gtkgui_helpers.py:819
+#: ../src/gtkgui_helpers.py:823
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Ønsker du å sette Gajim til standard Jabber klient?"
 
-#: ../src/gtkgui_helpers.py:820
+#: ../src/gtkgui_helpers.py:824
 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:887
+#: ../src/gtkgui_helpers.py:891
 msgid "Extension not supported"
 msgstr "Utvidelse ikke støttet"
 
-#: ../src/gtkgui_helpers.py:888
+#: ../src/gtkgui_helpers.py:892
 #, 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:924
+#: ../src/gtkgui_helpers.py:928
 msgid "Save Image as..."
 msgstr "Lagre Bilde som..."
 
-#: ../src/gui_interface.py:140
+#. we are banned
+#. group chat does not exist
+#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
+#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
+#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
+#: ../src/gui_interface.py:348
+msgid "Unable to join group chat"
+msgstr "Klarer ikke å gå inn i gruppesamtale"
+
+#: ../src/gui_interface.py:138
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8847,58 +9122,92 @@ msgstr ""
 "en annen samtalebruker.\n"
 "Vennligst skriv et annet kallenavn under:"
 
-#: ../src/gui_interface.py:143
+#: ../src/gui_interface.py:141
 msgid "Always use this nickname when there is a conflict"
 msgstr "Alltid bruk dette kallenavnet når det er en konflikt"
 
-#: ../src/gui_interface.py:159
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Godtar du denne forespørselen?"
 
-#: ../src/gui_interface.py:161
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Godtar du denne forespørselen på konto %s?"
 
-#: ../src/gui_interface.py:164
+#: ../src/gui_interface.py:163
 #, 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/gui_interface.py:213 ../src/notify.py:493
+#: ../src/gui_interface.py:209 ../src/notify.py:493
 msgid "Connection Failed"
 msgstr "Tilkobling Feilet"
 
-#: ../src/gui_interface.py:606 ../src/gui_interface.py:610
+#: ../src/gui_interface.py:312
+#, 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/gui_interface.py:324
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr "Maksimum antall brukere for %s er nådd"
+
+#: ../src/gui_interface.py:333
+#, python-format
+msgid "You are banned from group chat %s."
+msgstr "Du er uønsket fra gruppesamtalen %s."
+
+#: ../src/gui_interface.py:338
+#, python-format
+msgid "Group chat %s does not exist."
+msgstr "Gruppesamtalerom %s finnes ikke."
+
+#: ../src/gui_interface.py:341
+msgid "Group chat creation is restricted."
+msgstr "Gruppesamtale oppretting er begrenset."
+
+#: ../src/gui_interface.py:344
+#, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Ditt registrerte kallenavn må brukes i gruppesamtale %s. "
+
+#: ../src/gui_interface.py:349
+#, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Du er ikke i medlemslisten i gruppesamtale %s."
+
+#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Feil %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:621 ../src/gui_interface.py:636
+#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "feil ved sending %(message)s ( %(error)s )"
 
-#: ../src/gui_interface.py:663 ../src/notify.py:495
+#: ../src/gui_interface.py:540 ../src/notify.py:495
 msgid "Subscription request"
 msgstr "Abonnerings forespørsel"
 
-#: ../src/gui_interface.py:688
+#: ../src/gui_interface.py:565
 msgid "Authorization accepted"
 msgstr "Godkjenningsforespørel akseptert"
 
-#: ../src/gui_interface.py:689
+#: ../src/gui_interface.py:566
 #, 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/gui_interface.py:702
+#: ../src/gui_interface.py:579
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakten \"%s\" fjernet abonnementet fra deg"
 
-#: ../src/gui_interface.py:703
+#: ../src/gui_interface.py:580
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8906,59 +9215,54 @@ msgstr ""
 "Du vil alltid se han eller henne som frakoblet.\n"
 "Ønsker du å fjerne han eller henne fra din kontakt liste?"
 
-#: ../src/gui_interface.py:727 ../src/notify.py:497
+#: ../src/gui_interface.py:604 ../src/notify.py:497
 msgid "Unsubscribed"
 msgstr "Fjern Abonnement"
 
-#: ../src/gui_interface.py:754
+#: ../src/gui_interface.py:631
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan ikke opprettes"
 
-#: ../src/gui_interface.py:1015
+#: ../src/gui_interface.py:859
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s har satt tittel til %(subject)s"
 
-#: ../src/gui_interface.py:1083
+#: ../src/gui_interface.py:926
 msgid "Room now shows unavailable member"
 msgstr "Rommet viser nå utilgjengelig medlem"
 
-#: ../src/gui_interface.py:1085
+#: ../src/gui_interface.py:928
 msgid "room now does not show unavailable members"
 msgstr "rommet viser nå ikke utilgjengelige medlemmer"
 
-#: ../src/gui_interface.py:1087
+#: ../src/gui_interface.py:930
 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/gui_interface.py:1091
+#: ../src/gui_interface.py:934
 msgid "Room logging is now enabled"
 msgstr "Rom logging er nå påslått"
 
-#: ../src/gui_interface.py:1093
+#: ../src/gui_interface.py:936
 msgid "Room logging is now disabled"
 msgstr "Rom logging er nå avslått"
 
-#: ../src/gui_interface.py:1095
+#: ../src/gui_interface.py:938
 msgid "Room is now non-anonymous"
 msgstr "Rommet er nå ikke-anonymisert"
 
-#: ../src/gui_interface.py:1098
+#: ../src/gui_interface.py:941
 msgid "Room is now semi-anonymous"
 msgstr "Rommet er nå semi-anonymisert"
 
-#: ../src/gui_interface.py:1101
+#: ../src/gui_interface.py:944
 msgid "Room is now fully-anonymous"
 msgstr "Romet er nå full-anonymisert"
 
-#: ../src/gui_interface.py:1133
-#, 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/gui_interface.py:1180
+#: ../src/gui_interface.py:985
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -8966,23 +9270,23 @@ 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/gui_interface.py:1182 ../src/gui_interface.py:1189
+#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du er nå tilkoblet uten din OpenPGP nøkkel."
 
-#: ../src/gui_interface.py:1184
+#: ../src/gui_interface.py:989
 msgid "Your passphrase is incorrect"
 msgstr "Passord setningen din er ikke riktig"
 
-#: ../src/gui_interface.py:1188
+#: ../src/gui_interface.py:993
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "OpenGPG Passordord er ikke riktig"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid "GPG key not trusted"
 msgstr "GPG nøkkel ikke tiltrodd"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
@@ -8990,7 +9294,7 @@ msgstr ""
 "GPG nøkkelen brukt til å kryptere denne samtalen er ikke tiltrodd. Ønsker du "
 "virkelig å kryptere denne meldingen?"
 
-#: ../src/gui_interface.py:1226
+#: ../src/gui_interface.py:1031
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not                 correctly started "
@@ -8999,19 +9303,19 @@ msgstr ""
 "Gnome Keyring er installert men ikke \t\t\t\tstartet riktig (system variabel "
 "sikkert ikke \t\t\t\tsatt riktig)"
 
-#: ../src/gui_interface.py:1330
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Ny e-post på %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1332
+#: ../src/gui_interface.py:1133
 #, 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/gui_interface.py:1345
+#: ../src/gui_interface.py:1146
 #, python-format
 msgid ""
 "\n"
@@ -9026,42 +9330,42 @@ msgstr ""
 "Tittel: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1418
+#: ../src/gui_interface.py:1215
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s ønsker å sende deg en fil."
 
-#: ../src/gui_interface.py:1455 ../src/roster_window.py:1856
+#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
 msgid "Remote contact stopped transfer"
 msgstr "Kontakten stoppet overføring"
 
-#: ../src/gui_interface.py:1458 ../src/roster_window.py:1858
+#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
 msgid "Error opening file"
 msgstr "Feil under åpning av fil"
 
-#: ../src/gui_interface.py:1490
+#: ../src/gui_interface.py:1287
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Du har vellykket motatt %(filename)s fra %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1494
+#: ../src/gui_interface.py:1291
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Fil overføring av %(filename)s fra %(name)s stoppet."
 
-#: ../src/gui_interface.py:1507
+#: ../src/gui_interface.py:1304
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Du har vellykket sendt %(filename)s til %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1511
+#: ../src/gui_interface.py:1308
 #, 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/gui_interface.py:1623
+#: ../src/gui_interface.py:1426
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -9070,36 +9374,36 @@ msgstr ""
 "Ikke mulig å dekryptere melding fra %s\n"
 "Den kan ha blitt endret."
 
-#: ../src/gui_interface.py:1630
+#: ../src/gui_interface.py:1433
 msgid "Unable to decrypt message"
 msgstr "Klarer ikke å dekryptere meldingen"
 
-#: ../src/gui_interface.py:1702
+#: ../src/gui_interface.py:1505
 msgid "Username Conflict"
 msgstr "Brukernavn Konflikt"
 
-#: ../src/gui_interface.py:1703
+#: ../src/gui_interface.py:1506
 msgid "Please type a new username for your local account"
 msgstr "Vennligst skriv inn et nytt brukernavn for din lokale konto"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1519
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gui_interface.py:1729
+#: ../src/gui_interface.py:1532
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gui_interface.py:1740
+#: ../src/gui_interface.py:1543
 msgid "Error."
 msgstr "Feil."
 
-#: ../src/gui_interface.py:1768
+#: ../src/gui_interface.py:1556
 msgid "Resource Conflict"
 msgstr "Ressurs Konflikt"
 
-#: ../src/gui_interface.py:1769
+#: ../src/gui_interface.py:1557
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -9108,21 +9412,21 @@ msgstr ""
 "et annet"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1816
+#: ../src/gui_interface.py:1604
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s ønsker å sende deg en fil."
 
-#: ../src/gui_interface.py:1819
+#: ../src/gui_interface.py:1607
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Fil Overførings Forespørsel"
 
-#: ../src/gui_interface.py:1927
+#: ../src/gui_interface.py:1716
 msgid "Error verifying SSL certificate"
 msgstr "Feil ved verifisering av SSL sertifikat"
 
-#: ../src/gui_interface.py:1928
+#: ../src/gui_interface.py:1717
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9133,15 +9437,15 @@ msgstr ""
 "server: %(error)s\n"
 "Ønsker du fortsatt å koble til denne serveren?"
 
-#: ../src/gui_interface.py:1936
+#: ../src/gui_interface.py:1725
 msgid "Ignore this error for this certificate."
 msgstr "Ignorer denne feilen for dette sertifikatet"
 
-#: ../src/gui_interface.py:1956
+#: ../src/gui_interface.py:1745
 msgid "SSL certificate error"
 msgstr "SSL sertifikats feil"
 
-#: ../src/gui_interface.py:1957
+#: ../src/gui_interface.py:1746
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9158,12 +9462,12 @@ msgstr ""
 "\n"
 "Ønsker du fortsatt å koble til og oppdatere fingeravtrykket til sertifikatet?"
 
-#: ../src/gui_interface.py:1987 ../src/gui_interface.py:2024
-#: ../src/gui_interface.py:2060
+#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
+#: ../src/gui_interface.py:1849
 msgid "Insecure connection"
 msgstr "Usikker tilkobling"
 
-#: ../src/gui_interface.py:1988
+#: ../src/gui_interface.py:1777
 #, fuzzy
 msgid ""
 "You are about to connect to the server with an insecure connection. This "
@@ -9174,12 +9478,12 @@ msgstr ""
 "burde installere PyOpenSSL for å motvirke dette. Er du sikker på at du "
 "ønsker å fortsette?"
 
-#: ../src/gui_interface.py:1991 ../src/gui_interface.py:2028
-#: ../src/gui_interface.py:2063
+#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
+#: ../src/gui_interface.py:1852
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ja, jeg ønsker å koble til usikkert"
 
-#: ../src/gui_interface.py:2025
+#: ../src/gui_interface.py:1814
 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?"
@@ -9188,7 +9492,7 @@ msgstr ""
 "burde installere PyOpenSSL for å motvirke dette. Er du sikker på at du "
 "ønsker å fortsette?"
 
-#: ../src/gui_interface.py:2061
+#: ../src/gui_interface.py:1850
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9198,11 +9502,11 @@ msgstr ""
 "at du ønsker å gjøre det?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2624 ../src/gui_interface.py:2647
+#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
 msgid "Emoticons disabled"
 msgstr "Uttryksikoner avslått"
 
-#: ../src/gui_interface.py:2625
+#: ../src/gui_interface.py:2423
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -9210,7 +9514,7 @@ msgstr ""
 "Ditt konfigurerte følelsesikon tema ble ikke funnet, så følelsesikoner har "
 "blitt slått av. "
 
-#: ../src/gui_interface.py:2648
+#: ../src/gui_interface.py:2446
 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 "
@@ -9220,40 +9524,40 @@ msgstr ""
 "oppdatere formatet på emoticons.py filen. Se http://trac.gajim.org/wiki/"
 "Emoticons for flere detaljer."
 
-#: ../src/gui_interface.py:2679 ../src/roster_window.py:3560
+#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
 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/gui_interface.py:3058
+#: ../src/gui_interface.py:2871
 msgid "Could not save your settings and preferences"
 msgstr "Kan ikke lagre dine innstillinger og valg"
 
-#: ../src/gui_interface.py:3592
+#: ../src/gui_interface.py:3411
 msgid "Passphrase Required"
 msgstr "Passordsetning Kreves"
 
-#: ../src/gui_interface.py:3593
+#: ../src/gui_interface.py:3412
 #, 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/gui_interface.py:3607
+#: ../src/gui_interface.py:3426
 msgid "GPG key expired"
 msgstr "GPG nøkkel utgått"
 
-#: ../src/gui_interface.py:3608
+#: ../src/gui_interface.py:3427
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Din GPG nøkkel er utgått, du vil bli koblet til %s uten OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3617
+#: ../src/gui_interface.py:3436
 msgid "Wrong Passphrase"
 msgstr "Feil Passordsetning"
 
-#: ../src/gui_interface.py:3618
+#: ../src/gui_interface.py:3437
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Vennligst skriv inn GPG passordsetningen igjen eller trykk Avbryt."
 
@@ -9291,6 +9595,11 @@ msgstr "Kallenavn"
 msgid "Message"
 msgstr "Melding"
 
+#. holds subject
+#: ../src/history_manager.py:188 ../src/history_manager.py:219
+msgid "Subject"
+msgstr "Tittel"
+
 #: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -9385,19 +9694,19 @@ msgstr "Du kommer til å lukke flere tabber"
 msgid "Do you really want to close them all?"
 msgstr "Ønsker du virkelig å lukke alle?"
 
-#: ../src/message_window.py:484
+#: ../src/message_window.py:485
 msgid "Chats"
 msgstr "Samtaler"
 
-#: ../src/message_window.py:486
+#: ../src/message_window.py:487
 msgid "Group Chats"
 msgstr "Gruppe Samtaler"
 
-#: ../src/message_window.py:488
+#: ../src/message_window.py:489
 msgid "Private Chats"
 msgstr "Private Samtaler"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:495
 msgid "Messages"
 msgstr "Meldinger"
 
@@ -9453,56 +9762,56 @@ msgstr "Ny Melding fra %(nickname)s"
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../src/profile_window.py:57
+#: ../src/profile_window.py:58
 msgid "Retrieving profile..."
 msgstr "Henter profil..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2935
+#: ../src/profile_window.py:111 ../src/roster_window.py:3001
 msgid "File is empty"
 msgstr "Filen er tom"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2938
+#: ../src/profile_window.py:114 ../src/roster_window.py:3004
 msgid "File does not exist"
 msgstr "Filen finnes ikke"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2940 ../src/roster_window.py:2951
+#: ../src/profile_window.py:128 ../src/profile_window.py:144
+#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
 msgid "Could not load image"
 msgstr "Kunne ikke laste bilde"
 
-#: ../src/profile_window.py:214
+#: ../src/profile_window.py:215
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Kontaktinformasjon"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:216
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Format: YYYY-MM-DD"
 
-#: ../src/profile_window.py:269
+#: ../src/profile_window.py:270
 msgid "Information received"
 msgstr "Informasjon motatt"
 
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:341
 msgid "Without a connection you can not publish your contact information."
 msgstr "Uten en tilkobling kan du ikke publisere din kontakt informasjon."
 
-#: ../src/profile_window.py:353
+#: ../src/profile_window.py:354
 msgid "Sending profile..."
 msgstr "Sender profil..."
 
-#: ../src/profile_window.py:368
+#: ../src/profile_window.py:369
 msgid "Information NOT published"
 msgstr "Informasjon IKKE publisert"
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:376
 msgid "vCard publication failed"
 msgstr "vCard publisering feilet"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:377
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9510,53 +9819,53 @@ msgstr ""
 "Det skjedde en feil med publisering av din personlige informasjon, prøv "
 "igjen senere."
 
-#: ../src/roster_window.py:256 ../src/roster_window.py:1012
+#: ../src/roster_window.py:262 ../src/roster_window.py:1026
 msgid "Merged accounts"
 msgstr "Samlede kontoer"
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1942
 msgid "Authorization has been sent"
 msgstr "Godkjenning har blitt sendt"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1943
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "NÃ¥ vil \"%s\" kunne se din status."
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1966
 msgid "Subscription request has been sent"
 msgstr "Abonnerings forespørsel er sendt"
 
-#: ../src/roster_window.py:1944
+#: ../src/roster_window.py:1967
 #, 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:1958
+#: ../src/roster_window.py:1981
 msgid "Authorization has been removed"
 msgstr "Godkjenning har blitt fjernet"
 
-#: ../src/roster_window.py:1959
+#: ../src/roster_window.py:1982
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "NÃ¥ vil \"%s\" alltid se deg som frakoblet."
 
-#: ../src/roster_window.py:1986
+#: ../src/roster_window.py:2009
 msgid "GPG is not usable"
 msgstr "GPG fungerer ikke"
 
-#: ../src/roster_window.py:1987
+#: ../src/roster_window.py:2010
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Du vil bli tilkoblet til %s uten OpenPGP."
 
-#: ../src/roster_window.py:2199 ../src/roster_window.py:3496
+#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
 msgid "You are participating in one or more group chats"
 msgstr "Du er med i en eller flere gruppesamtaler"
 
-#: ../src/roster_window.py:2200 ../src/roster_window.py:3497
+#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9564,38 +9873,38 @@ 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:2226
+#: ../src/roster_window.py:2249
 msgid "desync'ed"
 msgstr "ute av synk"
 
-#: ../src/roster_window.py:2288
+#: ../src/roster_window.py:2311
 msgid "Really quit Gajim?"
 msgstr "Virkelig avslutte Gajim?"
 
-#: ../src/roster_window.py:2289
+#: ../src/roster_window.py:2312
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Er du sikker på at du vil avslutte Gajim?"
 
-#: ../src/roster_window.py:2290
+#: ../src/roster_window.py:2313
 msgid "Always close Gajim"
 msgstr "Alltid lukk Gajim"
 
-#: ../src/roster_window.py:2373
+#: ../src/roster_window.py:2396
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Avbryt filoverføring"
 
-#: ../src/roster_window.py:2374
+#: ../src/roster_window.py:2397
 msgid ""
-"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2405 ../src/roster_window.py:2653
+#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
 msgid "You have unread messages"
 msgstr "Du har uleste meldinger"
 
-#: ../src/roster_window.py:2406
+#: ../src/roster_window.py:2429
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9603,16 +9912,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:2654
+#: ../src/roster_window.py:2720
 msgid "You must read them before removing this transport."
 msgstr "Du må lese dem før du fjerner denne transporten."
 
-#: ../src/roster_window.py:2657
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" vil bli fjernet"
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2724
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9620,11 +9929,11 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger med kontakter som bruker "
 "denne transporten."
 
-#: ../src/roster_window.py:2661
+#: ../src/roster_window.py:2727
 msgid "Transports will be removed"
 msgstr "Transportene vil bli fjernet"
 
-#: ../src/roster_window.py:2666
+#: ../src/roster_window.py:2732
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9633,12 +9942,12 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger med kontakter fra disse "
 "transportene: %s"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2800
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "Du skal til å blokkere en kontakt. Er du sikker på at du ønsker å fortsette?"
 
-#: ../src/roster_window.py:2736
+#: ../src/roster_window.py:2802
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -9647,57 +9956,57 @@ msgstr ""
 "sender deg."
 
 #. it's jid
-#: ../src/roster_window.py:2827
+#: ../src/roster_window.py:2893
 msgid "Rename Contact"
 msgstr "Omdøpe Kontakt"
 
-#: ../src/roster_window.py:2828
+#: ../src/roster_window.py:2894
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Skriv inn et nytt kallenavn for kontakt %s"
 
-#: ../src/roster_window.py:2835
+#: ../src/roster_window.py:2901
 msgid "Rename Group"
 msgstr "Omdøpe Gruppe"
 
-#: ../src/roster_window.py:2836
+#: ../src/roster_window.py:2902
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Skriv inn nytt navn for gruppe %s"
 
-#: ../src/roster_window.py:2881
+#: ../src/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Fjern Gruppe"
 
-#: ../src/roster_window.py:2882
+#: ../src/roster_window.py:2948
 #, 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:2883
+#: ../src/roster_window.py:2949
 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:2922
+#: ../src/roster_window.py:2988
 msgid "Assign OpenPGP Key"
 msgstr "Tilegn OpenPGP Nøkkel"
 
-#: ../src/roster_window.py:2923
+#: ../src/roster_window.py:2989
 msgid "Select a key to apply to the contact"
 msgstr "Velger en nøkkel til en kontakt"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3372
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
 
-#: ../src/roster_window.py:3308
+#: ../src/roster_window.py:3374
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 "Du er i ferd med å fjerne \"%(name)s\" (%(jid)s) fra din kontaktliste.\n"
 
-#: ../src/roster_window.py:3313
+#: ../src/roster_window.py:3379
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9706,11 +10015,11 @@ msgstr ""
 "eller henne alltid vil se deg som frakoblet."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3319
+#: ../src/roster_window.py:3385
 msgid "Do you want to continue?"
 msgstr "Ønsker du å fortsette?"
 
-#: ../src/roster_window.py:3323
+#: ../src/roster_window.py:3389
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9718,16 +10027,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:3326
+#: ../src/roster_window.py:3392
 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:3330
+#: ../src/roster_window.py:3396
 msgid "Contacts will be removed from your roster"
 msgstr "Kontaktene vil bli fjernet fra din kontaktliste"
 
-#: ../src/roster_window.py:3335
+#: ../src/roster_window.py:3401
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9737,7 +10046,7 @@ msgstr ""
 "fjerner du også autorisasjonen som gjør at de alltid vil se deg som "
 "frakoblet."
 
-#: ../src/roster_window.py:3393
+#: ../src/roster_window.py:3459
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want  to continue?"
@@ -9745,7 +10054,7 @@ msgstr ""
 "Du skal til å sende en individuell status. Er du sikker på at du ønsker å "
 "fortsette?"
 
-#: ../src/roster_window.py:3395
+#: ../src/roster_window.py:3461
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -9754,19 +10063,19 @@ msgstr ""
 "Denne kontakten vil midlertidig se deg som %(status)s, men bare til du "
 "endrer status igjen. Da vil han se din nye globale status. "
 
-#: ../src/roster_window.py:3414
+#: ../src/roster_window.py:3480
 msgid "No account available"
 msgstr "Ingen konto tilgjengelig"
 
-#: ../src/roster_window.py:3415
+#: ../src/roster_window.py:3481
 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:4023
+#: ../src/roster_window.py:4095
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakter lagring støttes ikke av din server"
 
-#: ../src/roster_window.py:4025
+#: ../src/roster_window.py:4097
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9774,13 +10083,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:4117
+#: ../src/roster_window.py:4189
 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:4119
+#: ../src/roster_window.py:4191
 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 "
@@ -9790,23 +10099,23 @@ msgstr ""
 "brukes dette når samme person har flere Jabber kontoer eller transport "
 "kontoer."
 
-#: ../src/roster_window.py:4234
+#: ../src/roster_window.py:4306
 msgid "Invalid file URI:"
 msgstr "Ugyldig fil URI:"
 
-#: ../src/roster_window.py:4246
+#: ../src/roster_window.py:4318
 #, 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:4361
+#: ../src/roster_window.py:4433
 #, python-format
 msgid "Send %s to %s"
 msgstr "Send %s til %s"
 
-#: ../src/roster_window.py:4367
+#: ../src/roster_window.py:4439
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Gjør %s og %s metakontakter"
@@ -9816,143 +10125,143 @@ msgstr "Gjør %s og %s metakontakter"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4816 ../src/roster_window.py:4889
-#: ../src/roster_window.py:4898 ../src/statusicon.py:246
-#: ../src/statusicon.py:293 ../src/statusicon.py:299
+#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
+#: ../src/roster_window.py:4970 ../src/statusicon.py:263
+#: ../src/statusicon.py:310 ../src/statusicon.py:316
 #, python-format
 msgid "using account %s"
 msgstr "bruker kontoen %s"
 
 #. add
-#: ../src/roster_window.py:4905
+#: ../src/roster_window.py:4977
 #, python-format
 msgid "to %s account"
 msgstr "til %s kontoen"
 
 #. disco
-#: ../src/roster_window.py:4910
+#: ../src/roster_window.py:4982
 #, python-format
 msgid "using %s account"
 msgstr "på %s kontoen"
 
-#: ../src/roster_window.py:4948 ../src/statusicon.py:309
+#: ../src/roster_window.py:5020 ../src/statusicon.py:326
 msgid "_Manage Bookmarks..."
 msgstr "_Behandle Bokmerker..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4968
+#: ../src/roster_window.py:5040
 #, python-format
 msgid "of account %s"
 msgstr "for konto %s"
 
-#: ../src/roster_window.py:5009
+#: ../src/roster_window.py:5081
 #, python-format
 msgid "for account %s"
 msgstr "for kontoen %s"
 
-#: ../src/roster_window.py:5069 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
 msgid "_Change Status Message"
 msgstr "_Endre Status Melding"
 
-#: ../src/roster_window.py:5102
+#: ../src/roster_window.py:5174
 msgid "Publish Tune"
 msgstr "Publiser Sang"
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5176
 #, fuzzy
 msgid "Publish Location"
 msgstr "Publiser Sang"
 
-#: ../src/roster_window.py:5107
+#: ../src/roster_window.py:5179
 msgid "Configure Services..."
 msgstr "Konfigurer Tjenester..."
 
-#: ../src/roster_window.py:5252
+#: ../src/roster_window.py:5324
 msgid "_Maximize All"
 msgstr "_Maksimer Alle"
 
-#: ../src/roster_window.py:5262 ../src/roster_window.py:5436
+#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
 msgid "Send Group M_essage"
 msgstr "Send Gruppe M_elding"
 
-#: ../src/roster_window.py:5270
+#: ../src/roster_window.py:5342
 msgid "To all users"
 msgstr "Til alle brukere"
 
-#: ../src/roster_window.py:5274
+#: ../src/roster_window.py:5346
 msgid "To all online users"
 msgstr "Til alle påloggede brukere"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5456
+#: ../src/roster_window.py:5528
 msgid "_Manage Contacts"
 msgstr "_Behandle Kontakter"
 
 #. Edit Groups
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5537
 msgid "Edit _Groups"
 msgstr "Rediger _Grupper"
 
 #. Send single message
-#: ../src/roster_window.py:5520
+#: ../src/roster_window.py:5592
 msgid "Send Single Message"
 msgstr "Send en Melding"
 
 #. Execute Command
-#: ../src/roster_window.py:5567
+#: ../src/roster_window.py:5639
 msgid "Execute Command..."
 msgstr "Kjør Kommando..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5577
+#: ../src/roster_window.py:5649
 msgid "_Manage Transport"
 msgstr "_Behandle Transporter"
 
 #. Modify Transport
-#: ../src/roster_window.py:5586
+#: ../src/roster_window.py:5658
 msgid "_Modify Transport"
 msgstr "_Endre Transporter"
 
 #. Rename
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5668
 msgid "_Rename"
 msgstr "_Gi Nytt Navn"
 
-#: ../src/roster_window.py:5656
+#: ../src/roster_window.py:5728
 msgid "_Maximize"
 msgstr "_Maksimer"
 
-#: ../src/roster_window.py:5665
+#: ../src/roster_window.py:5737
 msgid "_Reconnect"
 msgstr "_Koble til på nytt"
 
-#: ../src/roster_window.py:5672
+#: ../src/roster_window.py:5744
 msgid "_Disconnect"
 msgstr "_Koble ifra"
 
 #. History manager
-#: ../src/roster_window.py:5754
+#: ../src/roster_window.py:5833
 msgid "History Manager"
 msgstr "Historikk Behandler"
 
-#: ../src/roster_window.py:5765
+#: ../src/roster_window.py:5844
 msgid "_Join New Group Chat"
 msgstr "_Bli med i Gruppesamtale"
 
-#: ../src/roster_window.py:5938
+#: ../src/roster_window.py:6019
 msgid "Change Status Message..."
 msgstr "Endre Status Melding..."
 
-#: ../src/search_window.py:94
+#: ../src/search_window.py:105
 msgid "Waiting for results"
 msgstr "Venter på resultater"
 
-#: ../src/search_window.py:132 ../src/search_window.py:210
+#: ../src/search_window.py:143 ../src/search_window.py:220
 msgid "Error in received dataform"
 msgstr "Feil i motatt dataskjema"
 
 #. No result
-#: ../src/search_window.py:166 ../src/search_window.py:202
+#: ../src/search_window.py:177 ../src/search_window.py:212
 msgid "No result"
 msgstr "Ingen resultater"
 
@@ -9965,14 +10274,15 @@ msgstr "Disk SkriveFeil"
 msgid "Subject: %s"
 msgstr "Tittel: %s"
 
-#: ../src/session.py:433 ../src/session.py:468
+#: ../src/session.py:447 ../src/session.py:491
 msgid "Confirm these session options"
 msgstr "Bekreft disse sesjons valgene"
 
-#: ../src/session.py:435
+#: ../src/session.py:448
 #, fuzzy, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
+"The remote client wants '\n"
+"                            'to negotiate an session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -9984,7 +10294,7 @@ msgstr ""
 "\n"
 "\tEr disse valgene akseptable?"
 
-#: ../src/session.py:469
+#: ../src/session.py:492
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9999,16 +10309,16 @@ msgstr ""
 "\n"
 "Fortsett med sesjonen?"
 
-#: ../src/statusicon.py:210
+#: ../src/statusicon.py:227
 msgid "_Change Status Message..."
 msgstr "_Endre Status Melding..."
 
-#: ../src/statusicon.py:322
+#: ../src/statusicon.py:339
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "i _kontaktliste"
 
-#: ../src/statusicon.py:333
+#: ../src/statusicon.py:350
 msgid "Hide this menu"
 msgstr "Gjem dette vinduet"
 
@@ -10147,32 +10457,32 @@ msgstr ""
 "Denne tjenesten kunne ikke svare med detaljert informasjon.\n"
 "Den er sannsynligvis utdatert eller ødelagt"
 
-#: ../src/vcard.py:251
+#: ../src/vcard.py:265
 msgid "?Client:Unknown"
 msgstr "?Client:Ukjent"
 
-#: ../src/vcard.py:253
+#: ../src/vcard.py:267
 msgid "?OS:Unknown"
 msgstr "?OS:Ukjent"
 
-#: ../src/vcard.py:274
+#: ../src/vcard.py:288
 msgid "?Time:Unknown"
 msgstr "?Time:Ukjent"
 
-#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
+#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
 #, python-format
 msgid "since %s"
 msgstr "siden %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:345
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:349
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Tilhørighet:</b>"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:357
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10180,7 +10490,7 @@ msgstr ""
 "Denne kontakten er interessert i din tilstedeværelses informasjon, men du er "
 "ikke interessert i hans/hennes status."
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:359
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10188,13 +10498,13 @@ msgstr ""
 "Du er interessert i denne kontaktens tilstedeværelses informasjon, men han/"
 "hun er ikke interessert i din."
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:361
 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:349
+#: ../src/vcard.py:363
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10202,26 +10512,70 @@ msgstr ""
 "Du er ikke interessert i kontaktens tilstedeværelses informasjon, ei heller "
 "han/hun i din."
 
-#: ../src/vcard.py:356
+#: ../src/vcard.py:370
 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:358
+#: ../src/vcard.py:372
 msgid "There is no pending subscription request."
 msgstr "Det er ingen ventende abonnements forespørsler."
 
-#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
+#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
 msgid " resource with priority "
 msgstr " ressurs med prioritet"
 
-#~ msgid "_Available"
-#~ msgstr "_Tilgjengelig"
+#~ msgid "@"
+#~ msgstr "@"
+
+#~ msgid "_Disable showing event in systray"
+#~ msgstr "_Deaktiver visning av hendelser i systemstatusfeltet"
 
-#~ msgid "PEP node was not removed"
-#~ msgstr "PEP noden ble ikke fjernet"
+#~ msgid "_Show event in systray"
+#~ msgstr "_Vis hendelse i systemstatusfeltet"
 
-#~ msgid "PEP node %(node)s was not removed: %(message)s"
-#~ msgstr "PEP noden %(node)s ble ikke fjernet: %(message)s"
+#, fuzzy
+#~ msgid "Always use GNOME default applications"
+#~ msgstr "Alltid bruk OS/X standard applikasjoner"
+
+#, fuzzy
+#~ msgid "Always use Xfce default applications"
+#~ msgstr "Alltid bruk OS/X standard applikasjoner"
+
+#, fuzzy
+#~ msgid "Autodetect on every Gajim startup"
+#~ msgstr "K_oble til når Gajim starter"
+
+#~ msgid "Show systray:"
+#~ msgstr "Vis systemstatus:"
+
+#~ msgid "Nickname not allowed: %s"
+#~ msgstr "Kallenavn ikke lovlig: %s"
+
+#~ msgid "Room has been destroyed"
+#~ msgstr "Rommet har blitt ødelagt"
+
+#~ msgid "You can join this room instead: %s"
+#~ msgstr "Du kan bli med i dette rommet isteden: %s"
+
+#~ msgid "I would like to add you to my roster."
+#~ msgstr "Jeg vil legge deg til min kontaktliste."
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "vi abonnerer nå på %s"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "frakoblings ønske fra %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "vi abonnerer ikke lenger på %s"
+
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "JID %s er ikke RFC kompatibel. Den vil ikke bli lagt til kontaktlisten. "
+#~ "Bruk kontaktliste administrasjons verktøy som http://jru.jabberstudio."
+#~ "org/ for å fjerne den"
 
 #~ msgid "Account Modification"
 #~ msgstr "Konto Endring"
@@ -10331,40 +10685,9 @@ msgstr " ressurs med prioritet"
 #~ msgid "gtk-delete"
 #~ msgstr "delete"
 
-#~ msgid "Add this contact to roster (Ctrl+D)"
-#~ msgstr "Legg til kontakt til kontaktlisten (Ctrl+D)"
-
-#~ msgid "Bookmark this room (Ctrl+B)"
-#~ msgstr "_Bokmerke dette rommet (Ctrl+B)"
-
-#~ msgid "Browse the chat history (Ctrl+H)"
-#~ msgstr "Søk gjennom samtale historikken (Ctrl+H)"
-
-#~ msgid "Change the room's subject (Alt+T)"
-#~ msgstr "Endre rommets emne (Alt+T)"
-
-#~ msgid "Change your nickname (Ctrl+N)"
-#~ msgstr "Endre ditt _Kallenavn (Ctrl+N)"
-
-#~ msgid "Invite contacts to the conversation (Ctrl+G)"
-#~ msgstr "Inviter kontakter til samtalen (Ctrl+G)"
-
 #~ msgid "Send a file (Ctrl+F)"
 #~ msgstr "Send en fil (Ctrl+F)"
 
-#~ msgid "Show a list of emoticons (Alt+M)"
-#~ msgstr "Vis en liste over uttrykksikon (Alt+M)"
-
-#~ msgid "Show a list of formattings"
-#~ msgstr "Vis en liste over formatteringer"
-
-#, fuzzy
-#~ msgid "Show a menu of advanced functions (Alt+D)"
-#~ msgstr "Vis en meny med avanserte funksjoner (Alt+A)"
-
-#~ msgid "Show the contact's profile (Ctrl+I)"
-#~ msgstr "Vis kontaktens profil (Ctrl+I)"
-
 #~ msgid ""
 #~ "All chat states\n"
 #~ "Composing only\n"
@@ -10423,9 +10746,6 @@ msgstr " ressurs med prioritet"
 #~ msgid "gtk-cancel"
 #~ msgstr "Avbryt"
 
-#~ msgid "_Preferences"
-#~ msgstr "_Instillinger"
-
 #~ msgid "_Quit"
 #~ msgstr "_Avslutt"
 
@@ -10916,9 +11236,6 @@ msgstr " ressurs med prioritet"
 #~ msgid "Treat all incoming messages as:"
 #~ msgstr "Behandle alle innkommende meldinger som:"
 
-#~ msgid "Use t_rayicon (aka. notification area icon)"
-#~ msgstr "Bruk Ikon i s_ystemstatusfelt (også kjent som systray)"
-
 #~ msgid ""
 #~ "When a new event (message, file transfer request etc..) is received, the "
 #~ "following methods may be used to inform you about it. Please note that "
@@ -11041,13 +11358,6 @@ msgstr " ressurs med prioritet"
 #~ msgstr ""
 #~ "Sesjons Administrasjons støtte ikke tilgjengelig (mangler gnome.ui modul)"
 
-#~ msgid ""
-#~ "Usage: %s %s %s \n"
-#~ "\t %s"
-#~ msgstr ""
-#~ "Bruk: %s %s %s \n"
-#~ "\t %s"
-
 #~ msgid "Private Chat"
 #~ msgstr "Privat Samtale"
 
diff --git a/po/nl.po b/po/nl.po
index 9ae7b78ccd9719fc642c65a1d8b89a7eefd22b24..435bba7d7c9fd757439fe3a44c6c36cbbb6f6b9e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,11 +5,15 @@
 # Stéphan Kochen <stephan@kochen.nl>, 2005.
 #
 #
+#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 11:28+0200\n"
+"POT-Creation-Date: 2010-10-01 20:39+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"
@@ -28,7 +32,7 @@ msgstr "Neem deel aan _Groepsgesprek"
 msgid "_Add Contact..."
 msgstr "_Contact Toevoegen..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:17
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
 msgid "_Discover Services"
 msgstr "Ontdek Services"
 
@@ -52,7 +56,7 @@ msgstr "_Open Email Samensteller"
 msgid "_Personal Events"
 msgstr "Persoonlijke Informatie"
 
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:23
+#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
 #, fuzzy
 msgid "_Start Chat..."
 msgstr "_Start Gesprek"
@@ -87,77 +91,73 @@ msgid "<b>Please select a server</b>"
 msgstr ""
 
 #: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid "@"
-msgstr ""
-
-#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
 msgstr ""
 
-#: ../data/gui/account_creation_wizard_window.ui.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:10
 #, fuzzy
 msgid "Anon_ymous authentication"
 msgstr "Gebruik aanmelding"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Connect when I press Finish"
 msgstr "Verbind zodra ik Afronden druk"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Wizard Account Aanmaken"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 #, fuzzy
 msgid "I already have an account I want to _use"
 msgstr "Ik heb al een account die ik wil gebruiken"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I want to _register for a new account"
 msgstr "Ik wil een nieuwe account _registreren"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:16
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 #: ../data/gui/accounts_window.ui.h:28
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Indien aangevinkt zal Gajim het wachtwoord onthouden voor deze account"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:17
+#: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Beheer..."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:18
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
 #: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2263 ../src/config.py:2342
-#: ../src/config.py:2355 ../src/config.py:3596 ../src/config.py:3671
-#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513
-#: ../src/dialogs.py:526 ../src/roster_window.py:2890
-#: ../src/roster_window.py:2896 ../src/roster_window.py:2901
+#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
+#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
+#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
+#: ../src/dialogs.py:527 ../src/roster_window.py:2956
+#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
 msgid "None"
 msgstr "Geen"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:19
+#: ../data/gui/account_creation_wizard_window.ui.h:18
 #, fuzzy
 msgid "Prox_y:"
 msgstr "Proxy:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #: ../data/gui/accounts_window.ui.h:48
 msgid "Save pass_word"
 msgstr "Sla _wachtwoord op"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:21
+#: ../data/gui/account_creation_wizard_window.ui.h:20
 #, fuzzy
 msgid "Set my profile when I connect"
 msgstr "Stel een contactafbeelding in zodra ik verbinding maak"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:22
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Use custom hostname/port"
 msgstr "Gebruik aangepaste hostnaam/poort"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:23
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -165,35 +165,35 @@ msgstr ""
 "Je hebt een account nodig om verbinding te maken\n"
 "met het Jabber netwerk."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-#: ../data/gui/roster_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:16
 msgid "_Advanced"
 msgstr "Gea_vanceerd"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:25
 msgid "_Finish"
 msgstr "_Afronden"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:27
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 #, fuzzy
 msgid "_Hostname:"
 msgstr "Hostnaam: "
 
-#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #: ../data/gui/accounts_window.ui.h:62
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:28
 #: ../data/gui/accounts_window.ui.h:64
 msgid "_Password:"
 msgstr "_Wachtwoord:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:29
 msgid "_Port:"
 msgstr "_Poort:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:31
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Server:"
 msgstr "_Server:"
 
@@ -306,17 +306,17 @@ msgstr "Naam:"
 #. No configured account
 #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
 #: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592
-#: ../src/notify.py:608
+#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
+#: ../src/notify.py:616
 msgid "Gajim"
 msgstr "Gajim"
 
 #. FIXME: Ugly workaround.
 #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
 #. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:61
-#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121
-#: ../src/roster_window.py:2832 ../src/roster_window.py:5379
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
+#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
 msgid "General"
 msgstr "Algemeen"
 
@@ -371,7 +371,7 @@ msgstr "Informatie over jou, zoals op de server opgeslagen"
 
 #: ../data/gui/accounts_window.ui.h:35
 #: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:830
+#: ../src/dialogs.py:831
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -387,7 +387,7 @@ msgid "Mer_ge accounts"
 msgstr "Accounts _samenvoegen"
 
 #: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2356
+#: ../src/config.py:2358
 msgid "No key selected"
 msgstr "Geen sleutel geselecteerd"
 
@@ -414,7 +414,7 @@ msgid "Priority will change automatically according to your status."
 msgstr ""
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5329
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
 msgid "Re_name"
 msgstr "Her_noem"
 
@@ -655,41 +655,46 @@ msgstr "Zal het Bericht van de Dag wissen"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
 #, fuzzy
+msgid "Edit Archi_ving Preferences"
+msgstr "_Voorkeuren"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#, fuzzy
 msgid "Edit _Privacy Lists..."
 msgstr "Start Gesprek"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 #, fuzzy
 msgid "Sends a message to users currently connected to this server"
 msgstr "Stuurt een bericht naar gebruikers momenteel verbonden met deze server"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 #, fuzzy
 msgid "Set MOTD..."
 msgstr "Stel MOTD in"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Stelt het Bericht van de Dag in"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Show _XML Console"
 msgstr "_XML Console Weergeven"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "MOTD Bijwerken"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "Werkt Bericht van de Dag bij"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:11
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:11
+#: ../data/gui/advanced_menuitem_menu.ui.h:12
 #, fuzzy
 msgid "_Send Server Message..."
 msgstr "Ver_stuur Server Bericht"
@@ -729,7 +734,7 @@ msgid "All statuses"
 msgstr "Status: "
 
 #: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:233
+#: ../src/common/commands.py:106 ../src/common/helpers.py:239
 #: ../src/tooltips.py:193
 msgid "Away"
 msgstr "Afwezig"
@@ -782,7 +787,7 @@ msgid "Have "
 msgstr ""
 
 #: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:249
 msgid "Invisible"
 msgstr "Onzichtbaar"
 
@@ -792,7 +797,7 @@ msgid "Launch a command"
 msgstr "commando"
 
 #: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:216 ../src/tooltips.py:197
+#: ../src/common/helpers.py:222 ../src/tooltips.py:197
 msgid "Not Available"
 msgstr "Niet Beschikbaar"
 
@@ -839,11 +844,11 @@ msgid "_Disable existing sound for this event"
 msgstr ""
 
 #: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in roster"
+msgid "_Disable showing event in notification area"
 msgstr ""
 
 #: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in systray"
+msgid "_Disable showing event in roster"
 msgstr ""
 
 #: ../data/gui/advanced_notifications_window.ui.h:33
@@ -857,12 +862,12 @@ msgstr "Gebruik enkel gespreksvenster met _tabs"
 
 #: ../data/gui/advanced_notifications_window.ui.h:35
 #, fuzzy
-msgid "_Show event in roster"
+msgid "_Show event in notification area"
 msgstr "Alleen in _rooster weergeven"
 
 #: ../data/gui/advanced_notifications_window.ui.h:36
 #, fuzzy
-msgid "_Show event in systray"
+msgid "_Show event in roster"
 msgstr "Alleen in _rooster weergeven"
 
 #: ../data/gui/advanced_notifications_window.ui.h:37
@@ -892,6 +897,45 @@ msgstr "Groep"
 msgid "when I'm in"
 msgstr ""
 
+#: ../data/gui/archiving_preferences_window.ui.h:1
+msgid "<i>Method Auto</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "<i>Method Local</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:3
+msgid "<i>Method Manual</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:4
+#, fuzzy
+msgid "Auto"
+msgstr "Automatisch binnengaan"
+
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Concede"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "Forbid"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:7
+#, fuzzy
+msgid "No"
+msgstr "Geen"
+
+#: ../data/gui/archiving_preferences_window.ui.h:8
+#, fuzzy
+msgid "Prefer"
+msgstr "Voorkeuren"
+
+#: ../data/gui/archiving_preferences_window.ui.h:9
+msgid "Yes"
+msgstr ""
+
 #: ../data/gui/atom_entry_window.ui.h:1
 #, fuzzy
 msgid "Entry:"
@@ -923,8 +967,8 @@ msgstr "_Inhoud"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5348
-#: ../src/roster_window.py:5476 ../src/roster_window.py:5609
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
+#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
 msgid "_Unblock"
 msgstr ""
 
@@ -1021,7 +1065,7 @@ msgid "_Start Chat"
 msgstr "_Start Gesprek"
 
 #. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4184
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
 msgid "#"
 msgstr ""
 
@@ -1069,13 +1113,55 @@ msgstr ""
 msgid "9"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:13
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Voegt contact toe aan rooster"
+
 #: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
+msgid "Browse the chat history (Ctrl+H)"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:15
+#, fuzzy
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "let op deze conversatie"
+
+#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+#, fuzzy
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Klik om een emoticon in te voegen (Alt+E)"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
+#, fuzzy
+msgid "Show a list of formattings"
+msgstr "Klik om een emoticon in te voegen (Alt+E)"
+
+#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Klik om een emoticon in te voegen (Alt+E)"
+
+#: ../data/gui/chat_control.ui.h:19
+#, fuzzy
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr "Voegt contact toe aan rooster"
+
+#: ../data/gui/chat_control.ui.h:20
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:21
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
 #: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "Ver_stuur"
 
-#: ../data/gui/chat_control.ui.h:15 ../data/gui/groupchat_control.ui.h:3
+#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
 msgid "label"
 msgstr ""
 
@@ -1130,8 +1216,8 @@ msgstr "Wijzig _Groepen"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5284
-#: ../src/roster_window.py:5444
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
+#: ../src/roster_window.py:5516
 msgid "In_vite to"
 msgstr ""
 
@@ -1145,8 +1231,8 @@ msgstr "_Inhoud"
 msgid "Remo_ve"
 msgstr "_Verwijder"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5294
-#: ../src/roster_window.py:5533
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
+#: ../src/roster_window.py:5605
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Vraag hem/haar toestemming zijn/haar status te zien"
@@ -1184,8 +1270,8 @@ msgid "_Allow him/her to see my status"
 msgstr "Sta hem/haar toe mijn status te zien"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5482 ../src/roster_window.py:5612
+#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
+#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
 msgid "_Block"
 msgstr ""
 
@@ -1196,8 +1282,8 @@ msgstr "Verbiedt hem/haar mijn status te zien"
 
 #: ../data/gui/contact_context_menu.ui.h:20
 #: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:21
-#: ../src/roster_window.py:5683
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
+#: ../src/roster_window.py:5755
 msgid "_History"
 msgstr "_Geschiedenis"
 
@@ -1342,7 +1428,7 @@ msgstr ""
 msgid "Account row"
 msgstr "Account"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:925
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
 msgid "Bold"
 msgstr "Vetgedrukt"
 
@@ -1382,7 +1468,7 @@ msgstr "Groep"
 msgid "Inactive"
 msgstr "Actief"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:926
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
 msgid "Italic"
 msgstr "Schuingedrukt"
 
@@ -1430,7 +1516,7 @@ msgstr "Verander _Onderwerp"
 msgid "Configure _Room..."
 msgstr "Configureer _Ruimte"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1782
+#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
 #, fuzzy
 msgid "_Bookmark"
 msgstr "Maak _Bladwijzer Voor Deze Ruimte"
@@ -1494,19 +1580,32 @@ msgstr "Ver_stuur Privé Bericht"
 msgid "_Voice"
 msgstr "_Stem"
 
+#: ../data/gui/groupchat_control.ui.h:1
+#, fuzzy
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Maak _Bladwijzer Voor Deze Ruimte"
+
+#: ../data/gui/groupchat_control.ui.h:3
+msgid "Change the room's subject (Alt+T)"
+msgstr ""
+
+#: ../data/gui/groupchat_control.ui.h:4
+#, fuzzy
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Verander Bij_naam"
+
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr ""
 
-#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
-msgid "From"
-msgstr "Van"
+#: ../data/gui/groups_post_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:2
+msgid "From:"
+msgstr "Van:"
 
-#. holds subject
-#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
-#: ../src/history_manager.py:219
-#, fuzzy
-msgid "Subject"
+#: ../data/gui/groups_post_window.ui.h:3
+#: ../data/gui/single_message_window.ui.h:7
+msgid "Subject:"
 msgstr "Onderwerp:"
 
 #: ../data/gui/history_manager.ui.h:1
@@ -1521,8 +1620,8 @@ msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr ""
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3208
-#: ../src/dialogs.py:3305
+#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
+#: ../src/dialogs.py:3321
 #, fuzzy
 msgid "Delete"
 msgstr "Wis MOTD"
@@ -1578,12 +1677,75 @@ msgstr "_Zoek"
 msgid "_Log conversation history"
 msgstr "Gespreksgeschiedenis"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
+msgid "approve"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:2
+msgid "body"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:3
+msgid "concede"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:4
+msgid "expire"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:5
+msgid "false"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:6
+msgid "forbid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:7
+#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+msgid "jid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:8
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
+#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
+msgid "message"
+msgstr "bericht"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
+msgid "oppose"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
+#, fuzzy
+msgid "otr"
+msgstr "_Host:"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:11
+msgid "prefer"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:12
+msgid "require"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:13
+msgid "save"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:14
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
 msgid "Bro_wse Rooms"
 msgstr "_Bladeren"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2180
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
 msgid "Join Group Chat"
 msgstr "Neem deel aan Groepsgesprek"
 
@@ -1621,8 +1783,8 @@ msgstr "Server:"
 msgid "_Bookmark this room"
 msgstr "Maak _Bladwijzer Voor Deze Ruimte"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1341
-#: ../src/disco.py:1786
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../src/disco.py:1804
 msgid "_Join"
 msgstr "_Binnengaan"
 
@@ -1734,6 +1896,74 @@ msgstr "_Gebruikersnaam:"
 msgid "Passphrase"
 msgstr "Wachtwoord"
 
+#: ../data/gui/plugins_window.ui.h:1
+msgid "&lt;empty&gt;"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:2
+msgid "<empty>"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:3
+#, fuzzy
+msgid "Authors:"
+msgstr "_Toestemmen"
+
+#: ../data/gui/plugins_window.ui.h:4
+#, fuzzy
+msgid "Available"
+msgstr "Niet Beschikbaar"
+
+#: ../data/gui/plugins_window.ui.h:5
+#, fuzzy
+msgid "Configure"
+msgstr "_Verder"
+
+#: ../data/gui/plugins_window.ui.h:6
+#, fuzzy
+msgid "Descrition:"
+msgstr "Beschrijving: %s"
+
+#: ../data/gui/plugins_window.ui.h:7
+#, fuzzy
+msgid "Homepage:"
+msgstr "Homepage:"
+
+#: ../data/gui/plugins_window.ui.h:8
+msgid "Install"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:9
+#, fuzzy
+msgid "Installed"
+msgstr "Vastgelopen"
+
+#: ../data/gui/plugins_window.ui.h:10
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:11
+msgid "Plugins"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:12
+msgid "Uninstall"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:13
+msgid "Version:"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:14
+msgid "button"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:15
+msgid "homepage url"
+msgstr ""
+
 #: ../data/gui/popup_notification_window.ui.h:1
 #, fuzzy
 msgid "Event Type"
@@ -1872,126 +2102,109 @@ msgid "Always"
 msgstr "Afwezig"
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Always use GNOME default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:32
-msgid "Always use KDE default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:33
-msgid "Always use Xfce default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Vraag om status bericht als ik:"
 
-#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
 msgid "Audio / Video"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:33
 msgid "Audio input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Audio output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:38
-#, fuzzy
-msgid "Autodetect on every Gajim startup"
-msgstr "Automatisch _verbinding maken als Gajim opstart"
-
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:35
 #, fuzzy
 msgid "Chat message:"
 msgstr "Status bericht:"
 
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:36
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:37
 msgid "Composing only"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:38
 msgid "Configure color and font of the interface"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Status bericht:"
 
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Contactnaam"
 
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:41
 #, fuzzy
 msgid "Custom"
 msgstr "<b>Aangepast</b>"
 
-#: ../data/gui/preferences_window.ui.h:46
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Detached roster with chat grouped by account"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Detached roster with detached chats"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:45
 msgid "Detached roster with single chat"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
-#: ../src/config.py:671
+#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
+#: ../src/config.py:665
 msgid "Disabled"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:47
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
 
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:48
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:49
 #, fuzzy
 msgid "Display _location of contacts in roster"
 msgstr "Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
 
-#: ../data/gui/preferences_window.ui.h:54
+#: ../data/gui/preferences_window.ui.h:50
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:51
 #, fuzzy
 msgid "Display a_vatars of contacts in roster"
 msgstr "Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
 
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:52
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
 
-#: ../data/gui/preferences_window.ui.h:57
+#: ../data/gui/preferences_window.ui.h:53
 #, fuzzy
 msgid "Display status _messages of contacts in roster"
 msgstr "Statusberichten van contacten weergeven in het rooster"
 
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:54
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -1999,7 +2212,7 @@ msgid ""
 "display in chat windows."
 msgstr "Gajim kan de gesprekstoestanden versturen en ontvangen"
 
-#: ../data/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:55
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -2007,7 +2220,7 @@ msgid ""
 "send to the other party."
 msgstr "Gajim kan de gesprekstoestanden versturen en ontvangen"
 
-#: ../data/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:56
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2015,13 +2228,13 @@ msgstr ""
 "Gajim zal contacten die zich afmelden mededelen m.b.v. een popup rechtsonder "
 "in beeld"
 
-#: ../data/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:58
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../data/gui/preferences_window.ui.h:63
+#: ../data/gui/preferences_window.ui.h:59
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
@@ -2030,13 +2243,13 @@ msgstr ""
 "Indien aangevinkt zal Gajim zich automatisch aanmelden bij dit groepsgesprek "
 "tijdens het opstarten"
 
-#: ../data/gui/preferences_window.ui.h:64
+#: ../data/gui/preferences_window.ui.h:60
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:61
 #, fuzzy
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
@@ -2044,13 +2257,13 @@ msgstr ""
 "Indien aangevinkt zal Gajim een icoon in het mededelingengebied (systray) "
 "weergeven"
 
-#: ../data/gui/preferences_window.ui.h:66
+#: ../data/gui/preferences_window.ui.h:62
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:63
 #, fuzzy
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
@@ -2059,7 +2272,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster laten "
 "zien"
 
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:64
 #, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
@@ -2068,7 +2281,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim statusberichten van contacten onder de "
 "contactnaam in het roostervenster laten zien."
 
-#: ../data/gui/preferences_window.ui.h:69
+#: ../data/gui/preferences_window.ui.h:65
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -2076,7 +2289,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster laten "
 "zien"
 
-#: ../data/gui/preferences_window.ui.h:70
+#: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the location of contacts in the roster window"
@@ -2084,7 +2297,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster laten "
 "zien"
 
-#: ../data/gui/preferences_window.ui.h:71
+#: ../data/gui/preferences_window.ui.h:67
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -2092,7 +2305,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster laten "
 "zien"
 
-#: ../data/gui/preferences_window.ui.h:72
+#: ../data/gui/preferences_window.ui.h:68
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -2100,14 +2313,14 @@ msgstr ""
 "Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster laten "
 "zien"
 
-#: ../data/gui/preferences_window.ui.h:73
+#: ../data/gui/preferences_window.ui.h:69
 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/gui/preferences_window.ui.h:74
+#: ../data/gui/preferences_window.ui.h:70
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -2118,20 +2331,20 @@ msgstr ""
 "lastigvalt. Wees voorzichtig, met deze optie worden all berichten van "
 "contacten niet op je rooster geblokkeerd"
 
-#: ../data/gui/preferences_window.ui.h:75
+#: ../data/gui/preferences_window.ui.h:71
 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/gui/preferences_window.ui.h:76
+#: ../data/gui/preferences_window.ui.h:72
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:77
+#: ../data/gui/preferences_window.ui.h:73
 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, "
@@ -2141,13 +2354,13 @@ msgstr ""
 "(Bijv. contacten van MSN zullen met msn iconen weergegeven worden voor "
 "status online, afwezig, bezig, enz...)"
 
-#: ../data/gui/preferences_window.ui.h:78
+#: ../data/gui/preferences_window.ui.h:74
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:79
+#: ../data/gui/preferences_window.ui.h:75
 #, fuzzy
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
@@ -2156,135 +2369,135 @@ msgstr ""
 "Indien aangevinkt zal Gajim tekst smilies, zoals ':)', vervangen met "
 "bijpassende grafische emoticons"
 
-#: ../data/gui/preferences_window.ui.h:80
+#: ../data/gui/preferences_window.ui.h:76
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:81
+#: ../data/gui/preferences_window.ui.h:77
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "Bericht verzenden en venster sluiten"
 
-#: ../data/gui/preferences_window.ui.h:82
+#: ../data/gui/preferences_window.ui.h:78
 #, fuzzy
 msgid "Ma_nage..."
 msgstr "Beheer..."
 
-#: ../data/gui/preferences_window.ui.h:83
+#: ../data/gui/preferences_window.ui.h:79
 #, fuzzy
 msgid "Never"
 msgstr "_Nooit"
 
-#: ../data/gui/preferences_window.ui.h:84
+#: ../data/gui/preferences_window.ui.h:80
 #, fuzzy
 msgid "Notifications"
 msgstr "Account Wijziging"
 
-#: ../data/gui/preferences_window.ui.h:85
+#: ../data/gui/preferences_window.ui.h:81
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Geef mij bericht over contacten die: "
 
-#: ../data/gui/preferences_window.ui.h:86
+#: ../data/gui/preferences_window.ui.h:82
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Geef mij bericht over contacten die: "
 
-#: ../data/gui/preferences_window.ui.h:87
+#: ../data/gui/preferences_window.ui.h:83
 #, fuzzy
 msgid "Notify me about it"
 msgstr "_Stel mij ervan op de hoogte"
 
-#: ../data/gui/preferences_window.ui.h:88
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notify on new _GMail email"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:89
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Only when pending events"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:90
+#: ../data/gui/preferences_window.ui.h:86
 #, fuzzy
 msgid "Personal Events"
 msgstr "Persoonlijke Informatie"
 
-#: ../data/gui/preferences_window.ui.h:91
+#: ../data/gui/preferences_window.ui.h:87
 msgid "Play _sounds"
 msgstr "Speel _geluiden af"
 
-#: ../data/gui/preferences_window.ui.h:92
+#: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
 msgid "Pop it up"
 msgstr "_Opduiken"
 
-#: ../data/gui/preferences_window.ui.h:93
+#: ../data/gui/preferences_window.ui.h:89
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: ../data/gui/preferences_window.ui.h:94
+#: ../data/gui/preferences_window.ui.h:90
 msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:96
+#: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
 msgid "STUN server:"
 msgstr "Server:"
 
-#: ../data/gui/preferences_window.ui.h:97
+#: ../data/gui/preferences_window.ui.h:93
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Alleen in _rooster weergeven"
+msgid "Show notification area icon:"
+msgstr "_Icoon in mededelingsgebied"
 
-#: ../data/gui/preferences_window.ui.h:98
+#: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
-msgid "Show systray:"
+msgid "Show only in roster"
 msgstr "Alleen in _rooster weergeven"
 
-#: ../data/gui/preferences_window.ui.h:99
+#: ../data/gui/preferences_window.ui.h:95
 msgid "Sign _in"
 msgstr "_Inloggen"
 
-#: ../data/gui/preferences_window.ui.h:100
+#: ../data/gui/preferences_window.ui.h:96
 msgid "Sign _out"
 msgstr "_Uitloggen"
 
-#: ../data/gui/preferences_window.ui.h:101
+#: ../data/gui/preferences_window.ui.h:97
 msgid "Single window for everything"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:102
+#: ../data/gui/preferences_window.ui.h:98
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:103
+#: ../data/gui/preferences_window.ui.h:99
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "Sorteer contacten op status"
 
-#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
 msgid "Status"
 msgstr "Status"
 
-#: ../data/gui/preferences_window.ui.h:105
+#: ../data/gui/preferences_window.ui.h:101
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "Standaard _status iconenset:"
 
-#: ../data/gui/preferences_window.ui.h:106
+#: ../data/gui/preferences_window.ui.h:102
 #, fuzzy
 msgid "Style"
 msgstr "Vastgelopen"
 
-#: ../data/gui/preferences_window.ui.h:107
+#: ../data/gui/preferences_window.ui.h:103
 #, fuzzy
 msgid "T_heme:"
 msgstr "Thema:"
 
-#: ../data/gui/preferences_window.ui.h:108
+#: ../data/gui/preferences_window.ui.h:104
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2292,7 +2505,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:111
+#: ../data/gui/preferences_window.ui.h:107
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2300,134 +2513,138 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:114
+#: ../data/gui/preferences_window.ui.h:110
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Gebruik _transport iconensets"
 
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:111
+msgid "Use default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:112
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:113
 msgid "Video framerate"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:117
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Video input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:118
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Video output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:119
+#: ../data/gui/preferences_window.ui.h:116
 msgid "Video size"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:120
+#: ../data/gui/preferences_window.ui.h:117
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Als een nieuwe gebeurtenis ontvangen is"
 
-#: ../data/gui/preferences_window.ui.h:121
+#: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
 msgid "Your message:"
 msgstr "Fout bij lezen bestand:"
 
-#: ../data/gui/preferences_window.ui.h:122
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your nickname:"
 msgstr "Voor bijnaam:"
 
-#: ../data/gui/preferences_window.ui.h:123
+#: ../data/gui/preferences_window.ui.h:120
 #, fuzzy
 msgid "_Away after:"
 msgstr "Automatisch _afwezig na:"
 
-#: ../data/gui/preferences_window.ui.h:124
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../data/gui/preferences_window.ui.h:125
+#: ../data/gui/preferences_window.ui.h:122
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "Gesprekstoestands _mededelingen:"
 
-#: ../data/gui/preferences_window.ui.h:126
+#: ../data/gui/preferences_window.ui.h:123
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Beheer Emoticons"
 
-#: ../data/gui/preferences_window.ui.h:127
+#: ../data/gui/preferences_window.ui.h:124
 #, fuzzy
 msgid "_File manager:"
 msgstr "Bestandsbeheerder:"
 
-#: ../data/gui/preferences_window.ui.h:128
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_Highlight misspelled words"
 msgstr "Verkeerd gespelde woorden _markeren"
 
-#: ../data/gui/preferences_window.ui.h:129
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
 
-#: ../data/gui/preferences_window.ui.h:130
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore rich content in incoming messages"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:131
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Log status changes of contacts"
 msgstr "Houdt status veranderingen van contacten bij in het logboek"
 
-#: ../data/gui/preferences_window.ui.h:132
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Mail client:"
 msgstr "_Mail client:"
 
-#: ../data/gui/preferences_window.ui.h:133
+#: ../data/gui/preferences_window.ui.h:130
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Automatisch _niet beschikbaar na:"
 
-#: ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/preferences_window.ui.h:131
 #, fuzzy
 msgid "_Open..."
 msgstr "Open..."
 
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:132
 #, fuzzy
 msgid "_Reset to Default Colors"
 msgstr "Herstel naar Standaard Kleuren"
 
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:133
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "Gesprekstoestands _mededelingen:"
 
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:134
 #, fuzzy
 msgid "_Status message:"
 msgstr "Status bericht:"
 
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:140
+#: ../data/gui/preferences_window.ui.h:137
 #, fuzzy
 msgid "in _group chats"
 msgstr "Neem deel aan _Groepsgesprek"
 
-#: ../data/gui/preferences_window.ui.h:141
+#: ../data/gui/preferences_window.ui.h:138
 #, fuzzy
 msgid "in _roster"
 msgstr "niet in het rooster"
 
-#: ../data/gui/preferences_window.ui.h:142
+#: ../data/gui/preferences_window.ui.h:139
 msgid "minutes"
 msgstr "minuten"
 
@@ -2485,7 +2702,7 @@ msgstr "Jabber ID:"
 msgid "Order:"
 msgstr "Server:"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3436
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
 msgid "Privacy List"
 msgstr ""
 
@@ -2725,8 +2942,8 @@ msgstr "Verwijder account van Gajim en van de server"
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5492 ../src/roster_window.py:5622
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
+#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
 msgid "_Remove"
 msgstr "_Verwijder"
 
@@ -2772,61 +2989,65 @@ msgid "Help online"
 msgstr "Hulp online"
 
 #: ../data/gui/roster_window.ui.h:8
+msgid "P_lugins"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:9
 #, fuzzy
 msgid "Profile, A_vatar"
 msgstr "Profiel, Contactafbeelding"
 
-#: ../data/gui/roster_window.ui.h:9
+#: ../data/gui/roster_window.ui.h:10
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "_Offline Contacten Weergeven"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
 #, fuzzy
 msgid "Show Trans_ports"
 msgstr "Transporten"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
 msgid "Show _Offline Contacts"
 msgstr "_Offline Contacten Weergeven"
 
-#: ../data/gui/roster_window.ui.h:12 ../src/statusicon.py:326
+#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
 msgid "Show _Roster"
 msgstr "_Rooster Weergeven"
 
-#: ../data/gui/roster_window.ui.h:13
+#: ../data/gui/roster_window.ui.h:14
 #, 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/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
 #: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Acties"
 
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
 msgid "_Contents"
 msgstr "_Inhoud"
 
-#: ../data/gui/roster_window.ui.h:18 ../src/disco.py:1502
+#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
 msgid "_Edit"
 msgstr "Be_werken"
 
-#: ../data/gui/roster_window.ui.h:19
+#: ../data/gui/roster_window.ui.h:20
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Help"
 msgstr "_Hulp"
 
-#: ../data/gui/roster_window.ui.h:22
+#: ../data/gui/roster_window.ui.h:23
 #, fuzzy
 msgid "_Send Single Message..."
 msgstr "Enkel _Bericht Verzenden"
 
-#: ../data/gui/roster_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:25
 #, fuzzy
 msgid "_View"
 msgstr "_Stem"
@@ -2847,12 +3068,12 @@ msgid "_Add contact"
 msgstr "_Contact Toevoegen"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5634
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
 #, fuzzy
 msgid "_Information"
 msgstr "Contact Informatie"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1353
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
 msgid "_Search"
 msgstr "_Zoek"
 
@@ -2872,10 +3093,6 @@ msgstr "Registreer naar"
 msgid "_Cancel"
 msgstr "_Annulerem"
 
-#: ../data/gui/single_message_window.ui.h:2
-msgid "From:"
-msgstr "Van:"
-
 #: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Beantwoord dit bericht"
@@ -2892,10 +3109,6 @@ msgstr "Bericht verzenden"
 msgid "Send message and close window"
 msgstr "Bericht verzenden en venster sluiten"
 
-#: ../data/gui/single_message_window.ui.h:7
-msgid "Subject:"
-msgstr "Onderwerp:"
-
 #: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Aan:"
@@ -3125,26 +3338,36 @@ msgstr ""
 msgid "Jabber IM Client"
 msgstr "Jabber IM Client"
 
-#: ../src/adhoc_commands.py:314
+#: ../src/adhoc_commands.py:323
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Contact Informatie"
 
-#: ../src/adhoc_commands.py:315
+#: ../src/adhoc_commands.py:324
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:351 ../src/adhoc_commands.py:374
+#: ../src/adhoc_commands.py:370
+#, fuzzy
+msgid "Invalid Form"
+msgstr "Ongeldige invoer"
+
+#: ../src/adhoc_commands.py:371
+#, fuzzy
+msgid "The form is not filled correctly."
+msgstr "Bijnaam niet gevonden: %s"
+
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:360
+#: ../src/adhoc_commands.py:399
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:471
+#: ../src/adhoc_commands.py:513
 msgid "Service returned an error."
 msgstr ""
 
@@ -3172,7 +3395,7 @@ msgstr "In de groep"
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:945
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
 msgid "Color"
 msgstr ""
 
@@ -3209,241 +3432,241 @@ msgstr[1] ""
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "English"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Belarusian"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Bulgarian"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Breton"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Czech"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "German"
 msgstr "Algemeen"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Greek"
 msgstr "groen"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "British"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Esperanto"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Spanish"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Basque"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "French"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Croatian"
 msgstr "Locatie"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Italian"
 msgstr "Schuingedrukt"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian (b)"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Dutch"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Polish"
 msgstr "_Publiceren"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Portuguese"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Russian"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Serbian"
 msgstr "Algemeen"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Slovak"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Swedish"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:479
+#: ../src/chat_control.py:496
 msgid "Spelling language"
 msgstr ""
 
 #. we are not connected
-#: ../src/chat_control.py:511 ../src/chat_control.py:720
+#: ../src/chat_control.py:528 ../src/chat_control.py:737
 msgid "A connection is not available"
 msgstr "Er is geen verbinding beschikbaar"
 
-#: ../src/chat_control.py:512 ../src/chat_control.py:721
+#: ../src/chat_control.py:529 ../src/chat_control.py:738
 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:927
+#: ../src/chat_control.py:944
 #, fuzzy
 msgid "Underline"
 msgstr "Onderstreept"
 
-#: ../src/chat_control.py:928
+#: ../src/chat_control.py:945
 #, fuzzy
 msgid "Strike"
 msgstr "Uit_schoppen"
 
-#: ../src/chat_control.py:951
+#: ../src/chat_control.py:968
 #, fuzzy
 msgid "Font"
 msgstr "Lettertype:"
 
-#: ../src/chat_control.py:960
+#: ../src/chat_control.py:977
 #, fuzzy
 msgid "Clear formating"
 msgstr "Contact Informatie"
 
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1055
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:1039
+#: ../src/chat_control.py:1056
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1503 ../src/chat_control.py:1987
+#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Versleuteling ingeschakeld"
 
 #. Add to roster
-#: ../src/chat_control.py:1528 ../src/common/contacts.py:158
+#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
 #: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:245 ../src/dialogs.py:1064 ../src/dialogs.py:2078
-#: ../src/dialogs.py:2107 ../src/gui_interface.py:674
+#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
+#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
 #: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1610 ../src/roster_window.py:1612
-#: ../src/roster_window.py:1942 ../src/roster_window.py:3289
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
+#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
+#: ../src/roster_window.py:3382
 msgid "Not in Roster"
 msgstr "niet in het rooster"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1575
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Een lijst van actieve, afgeronde en gestopte bestandsoverdrachten"
 
-#: ../src/chat_control.py:1561
+#: ../src/chat_control.py:1578
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1656
+#: ../src/chat_control.py:1677
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:1869
 #, 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:1967 ../src/dialogs.py:4866
+#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1968
+#: ../src/chat_control.py:1991
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1977
+#: ../src/chat_control.py:2000
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Versleuteling uitgeschakeld"
 
-#: ../src/chat_control.py:2003
+#: ../src/chat_control.py:2026
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:2028
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2051
 #, fuzzy
 msgid "and authenticated"
 msgstr "Gebruik aanmelding"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2032
+#: ../src/chat_control.py:2055
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Gebruik aanmelding"
@@ -3451,58 +3674,66 @@ 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:2039
+#: ../src/chat_control.py:2062
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2182
+#: ../src/chat_control.py:2205
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2191
+#: ../src/chat_control.py:2215
+msgid "This session WILL be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2217
+msgid "This session WILL NOT be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2226
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Dit bericht is versleuteld]"
 
-#: ../src/chat_control.py:2194
+#: ../src/chat_control.py:2229
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2196
+#: ../src/chat_control.py:2231
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2201
+#: ../src/chat_control.py:2236
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2203
+#: ../src/chat_control.py:2238
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Versleuteling uitgeschakeld"
 
-#: ../src/chat_control.py:2241 ../src/chat_control.py:2254
+#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Dit bericht is versleuteld]"
 
-#: ../src/chat_control.py:2247
+#: ../src/chat_control.py:2288
 #, 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:2519
+#: ../src/chat_control.py:2566
 #, 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:2520
+#: ../src/chat_control.py:2567
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3510,22 +3741,20 @@ msgstr ""
 "Als je deze tab sluit en geschiedenis uitgeschakeld hebt zal dit bericht "
 "verlorgen gaan."
 
-#: ../src/chat_control.py:2663 ../src/common/connection_handlers.py:1635
-#: ../src/common/connection_handlers.py:1758
-#: ../src/common/connection_handlers.py:1960
-#: ../src/common/connection_handlers.py:2110 ../src/common/connection.py:452
+#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
 #: ../src/gajim.py:159 ../src/session.py:138
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2664
+#: ../src/chat_control.py:2714
 #, 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:2906
+#: ../src/chat_control.py:2962
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s is nu %(status)s"
@@ -3539,28 +3768,28 @@ msgstr "logboek database wordt aangemaakt"
 msgid "creating cache database"
 msgstr "logboek database wordt aangemaakt"
 
-#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
-#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
-#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
-#: ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
 #, 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:275 ../src/common/check_paths.py:282
-#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
-#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
-#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:333
+#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
+#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
+#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
 msgid "Gajim will now exit"
 msgstr "Gajim sluit nu af"
 
-#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
+#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
 #, 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:342
+#: ../src/common/check_paths.py:351
 #, python-format
 msgid "creating %s directory"
 msgstr "map %s wordt aangemaakt"
@@ -3632,9 +3861,9 @@ msgstr ""
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:801
-#: ../src/roster_window.py:1614 ../src/roster_window.py:1616
-#: ../src/roster_window.py:5251
+#: ../src/common/helpers.py:57 ../src/roster_window.py:815
+#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
+#: ../src/roster_window.py:5323
 #, fuzzy
 msgid "Groupchats"
 msgstr "Groupsgesprek"
@@ -3699,7 +3928,8 @@ msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
 #: ../src/common/config.py:88
-msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgid ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
 #: ../src/common/config.py:93
@@ -3753,9 +3983,9 @@ msgid ""
 msgstr ""
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:501
-#: ../src/common/optparser.py:290 ../src/common/optparser.py:486
-#: ../src/common/optparser.py:520 ../src/gui_interface.py:3370
+#: ../src/common/config.py:106 ../src/common/config.py:505
+#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
+#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
 #, fuzzy
 msgid "default"
 msgstr "Wis MOTD"
@@ -3950,7 +4180,7 @@ 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:197
-msgid "Notify of events in the system trayicon."
+msgid "Notify of events in the notification area."
 msgstr ""
 
 #: ../src/common/config.py:203
@@ -3988,9 +4218,10 @@ msgstr ""
 "groepsgesprek"
 
 #: ../src/common/config.py:221
+#, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
+"setting is taken into account only if notification icon is used."
 msgstr ""
 "Indien Aan stopt Gajim zodra het venster gesloten wordt. Deze instelling is "
 "alleen geldig als het icoon in het notificatiegebied gebruikt wordt."
@@ -4228,7 +4459,7 @@ msgstr ""
 #: ../src/common/config.py:270
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
-"systray icon."
+"notification icon."
 msgstr ""
 
 #: ../src/common/config.py:271
@@ -4394,116 +4625,127 @@ msgstr ""
 msgid "Message that is sent to contacts you want to add"
 msgstr "Vul de informatie in van de contactpersoon die je toe wilt voegen"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:374
+msgid "Last time we syncronized with logs from server."
+msgstr ""
+
+#: ../src/common/config.py:436
 #, fuzzy
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "OpenPGP is niet bruikbaar op deze computer"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:437 ../src/common/config.py:440
+#: ../src/common/config.py:438 ../src/common/config.py:441
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:447
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:448
 msgid "'yes', 'no', or 'both'"
 msgstr ""
 
-#: ../src/common/config.py:448 ../src/common/config.py:450
-#: ../src/common/config.py:451 ../src/common/config.py:454
-#: ../src/common/config.py:455
+#: ../src/common/config.py:449 ../src/common/config.py:451
+#: ../src/common/config.py:452 ../src/common/config.py:455
+#: ../src/common/config.py:456
 msgid "'yes', 'no' or ''"
 msgstr ""
 
-#: ../src/common/config.py:461 ../src/common/pep.py:157
+#: ../src/common/config.py:460
+msgid ""
+"State whether plugins should be activated on exit (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
+msgstr ""
+
+#: ../src/common/config.py:465 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Slapen"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back soon"
 msgstr "Zo terug"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back in some minutes."
 msgstr "In een paar minuten terug."
 
-#: ../src/common/config.py:463 ../src/common/pep.py:127
+#: ../src/common/config.py:467 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Eten"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:467
 msgid "I'm eating, so leave me a message."
 msgstr "Ik ben aan het eten, laat een bericht achter."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "I'm watching a movie."
 msgstr "Ik been een film aan het kijken."
 
-#: ../src/common/config.py:465 ../src/common/pep.py:186
+#: ../src/common/config.py:469 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Werken"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:469
 msgid "I'm working."
 msgstr "Ik ben aan het werk."
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "Phone"
 msgstr "Telefoon"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "I'm on the phone."
 msgstr "Ik ben aan het telefoneren."
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "Out"
 msgstr "Uit"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Ik ben uit van het leven genieten"
 
-#: ../src/common/config.py:478
+#: ../src/common/config.py:482
 #, fuzzy
 msgid "I'm available."
 msgstr "Aanwezig"
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:483
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Open voor Gesprek"
 
-#: ../src/common/config.py:480 ../src/config.py:1600
+#: ../src/common/config.py:484 ../src/config.py:1600
 msgid "Be right back."
 msgstr ""
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:485
 #, fuzzy
 msgid "I'm not available."
 msgstr "Niet Beschikbaar"
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:486
 msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:483 ../src/common/config.py:484
+#: ../src/common/config.py:487 ../src/common/config.py:488
 msgid "Bye!"
 msgstr ""
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:498
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -4512,183 +4754,92 @@ 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:495
+#: ../src/common/config.py:499
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: ../src/common/config.py:504 ../src/common/optparser.py:304
+#: ../src/common/config.py:508 ../src/common/optparser.py:308
 msgid "green"
 msgstr "groen"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:290
+#: ../src/common/config.py:512 ../src/common/optparser.py:294
 msgid "grocery"
 msgstr "kruidenier"
 
-#: ../src/common/config.py:512
+#: ../src/common/config.py:516
 msgid "human"
 msgstr "menselijk"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:520
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:84
+#: ../src/common/connection_handlers.py:94
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 #, fuzzy
 msgid "Unable to load idle module"
 msgstr "Niet in staat de ruimte binnen te gaan"
 
-#: ../src/common/connection_handlers.py:117
-#, 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:124
-#, fuzzy
-msgid "Registration succeeded"
-msgstr "vCard publicatie is met succes afgerond"
-
-#: ../src/common/connection_handlers.py:125
-#, python-format
-msgid "Registration with agent %s succeeded"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:133
-#, fuzzy
-msgid "Registration failed"
-msgstr "vCard publicatie is mislukt"
-
-#: ../src/common/connection_handlers.py:133
-#, python-format
-msgid ""
-"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:445
-#: ../src/common/connection_handlers.py:1633
-#: ../src/common/connection_handlers.py:1756
-#: ../src/common/connection_handlers.py:1957
-#: ../src/common/connection_handlers.py:2108 ../src/common/connection.py:449
-#: ../src/gajim.py:341
-msgid "Disk Write Error"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:678 ../src/common/connection.py:1472
-msgid "Invisibility not supported"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:679 ../src/common/connection.py:1473
-#, python-format
-msgid "Account %s doesn't support invisibility."
-msgstr ""
-
-#: ../src/common/connection_handlers.py:1446 ../src/common/connection.py:253
-#: ../src/config.py:2091 ../src/config.py:2100 ../src/config.py:2168
-#: ../src/config.py:3560 ../src/dataforms_widget.py:597 ../src/dialogs.py:2931
-msgid "Invalid Jabber ID"
-msgstr "Ongeldige Jabber ID"
-
-#: ../src/common/connection_handlers.py:1447
-msgid "A message from a non-valid JID arrived, it has been ignored."
-msgstr ""
-
-#: ../src/common/connection_handlers.py:1636
-#: ../src/common/connection_handlers.py:1759
-#: ../src/common/connection_handlers.py:1961
-#: ../src/common/connection_handlers.py:2111 ../src/common/connection.py:453
-#: ../src/gajim.py:160 ../src/session.py:139
-#, 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:1805
-#, fuzzy, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Bijnaam niet gevonden: %s"
-
-#: ../src/common/connection_handlers.py:1902
-#: ../src/common/connection_handlers.py:1911
-#: ../src/common/connection_handlers.py:1918
-#: ../src/common/connection_handlers.py:1922
-#: ../src/common/connection_handlers.py:1926
-#: ../src/common/connection_handlers.py:1931 ../src/gui_interface.py:139
-#, fuzzy
-msgid "Unable to join group chat"
-msgstr "Niet in staat de ruimte binnen te gaan"
-
-#: ../src/common/connection_handlers.py:1903
-#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:1912
-#, fuzzy, python-format
-msgid "You are banned from group chat %s."
-msgstr "Je bent uit deze ruimte verbannen."
-
-#: ../src/common/connection_handlers.py:1919
-#, fuzzy, python-format
-msgid "Group chat %s does not exist."
-msgstr "Die ruimte bestaat niet."
+#: ../src/common/connection_handlers.py:127
+#, 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:1923
+#: ../src/common/connection_handlers.py:134
 #, fuzzy
-msgid "Group chat creation is restricted."
-msgstr "Ruimte creatie is beperkt."
-
-#: ../src/common/connection_handlers.py:1927
-#, fuzzy, python-format
-msgid "Your registered nickname must be used in group chat %s."
-msgstr "Je geregistreerde bijnaam moet gebruikt worden."
+msgid "Registration succeeded"
+msgstr "vCard publicatie is met succes afgerond"
 
-#: ../src/common/connection_handlers.py:1932
-#, fuzzy, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Je staat niet in de ledenlijst"
+#: ../src/common/connection_handlers.py:135
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr ""
 
-#. Room has been destroyed. see
-#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:1976
+#: ../src/common/connection_handlers.py:143
 #, fuzzy
-msgid "Room has been destroyed"
-msgstr "Machtiging is verwijdert"
+msgid "Registration failed"
+msgstr "vCard publicatie is mislukt"
 
-#: ../src/common/connection_handlers.py:1984
+#: ../src/common/connection_handlers.py:143
 #, python-format
-msgid "You can join this room instead: %s"
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2020
-msgid "I would like to add you to my roster."
-msgstr "Ik zou je graag aan mijn rooster willen toevoegen."
+#: ../src/common/connection_handlers.py:466
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
+#: ../src/gajim.py:341
+msgid "Disk Write Error"
+msgstr ""
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2041
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "we zijn nu op %s geabonneert"
+#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
+msgid "Invisibility not supported"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:2043
+#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
 #, python-format
-msgid "unsubscribe request from %s"
-msgstr "afmelding verzocht van %s"
+msgid "Account %s doesn't support invisibility."
+msgstr ""
 
-#: ../src/common/connection_handlers.py:2045
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "we zijn nu van %s afgemeld"
+#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
+#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
+#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
+msgid "Invalid Jabber ID"
+msgstr "Ongeldige Jabber ID"
 
-#: ../src/common/connection_handlers.py:2240
-#, fuzzy, python-format
+#: ../src/common/connection_handlers.py:1405
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
+#: ../src/gajim.py:160 ../src/session.py:139
+#, python-format
 msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
+"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 ""
-"Jid %s is niet in lijn met de RFC. Het zal niet toegevoegd worden aan jouw "
-"rooster. Gebruik een roostermanagement applicatie zoals http://jru."
-"jabberstudio.org/ om het te verwijderen"
 
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
@@ -4820,28 +4971,28 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:254 ../src/dialogs.py:2932
+#: ../src/common/connection.py:256 ../src/dialogs.py:2948
 #, 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:276
+#: ../src/common/connection.py:278
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:281
 #, 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:331
+#: ../src/common/connection.py:333
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Dit bericht is versleuteld]"
 
-#: ../src/common/connection.py:439
+#: ../src/common/connection.py:441
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4850,152 +5001,152 @@ msgstr ""
 "Onderwerp: %s\n"
 "%s"
 
-#: ../src/common/connection.py:807
+#: ../src/common/connection.py:809
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Verbinding met account \"%s\" verbroken"
 
-#: ../src/common/connection.py:808
+#: ../src/common/connection.py:810
 msgid "Reconnect manually."
 msgstr ""
 
-#: ../src/common/connection.py:820
+#: ../src/common/connection.py:822
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: ../src/common/connection.py:854
+#: ../src/common/connection.py:856
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:867
+#: ../src/common/connection.py:869
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Onbekende D-Bus versie: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:882
+#: ../src/common/connection.py:884
 #, fuzzy
 msgid "Invalid answer"
 msgstr "Ongeldig wachtwoord"
 
-#: ../src/common/connection.py:883
+#: ../src/common/connection.py:885
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: ../src/common/connection.py:1165 ../src/common/connection.py:1294
-#: ../src/common/connection.py:1784
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
+#: ../src/common/connection.py:1792
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kon geen verbinding maken met \"%s\""
 
-#: ../src/common/connection.py:1166 ../src/gui_interface.py:755
+#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
 msgid "Check your connection or try again later."
 msgstr "Controleer de verbinding of probeer later nogmaals."
 
-#: ../src/common/connection.py:1171
+#: ../src/common/connection.py:1173
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Opgeslagen in: %s"
 
-#: ../src/common/connection.py:1184
+#: ../src/common/connection.py:1186
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Verbinding"
 
-#: ../src/common/connection.py:1215 ../src/common/connection.py:1274
+#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Kon geen verbinding maken met \"%s\""
 
-#: ../src/common/connection.py:1216 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Verbinding met account \"%s\" verbroken"
 
-#: ../src/common/connection.py:1241
+#: ../src/common/connection.py:1243
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1244
+#: ../src/common/connection.py:1246
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1248
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Onbekende D-Bus versie: %s"
 
-#: ../src/common/connection.py:1295
+#: ../src/common/connection.py:1297
 msgid "Check your connection or try again later"
 msgstr "Controleer je verbinding of probeer later nogmaals"
 
-#: ../src/common/connection.py:1324
+#: ../src/common/connection.py:1329
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Inloggen mislukt met \"%s\""
 
-#: ../src/common/connection.py:1326
+#: ../src/common/connection.py:1331
 msgid "Please check your login and password for correctness."
 msgstr "Controleer gebruikersnaam en wachtwoord."
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1400
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "fout tijdens versturen"
 
-#: ../src/common/connection.py:1396
+#: ../src/common/connection.py:1401
 #, 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:1650
+#: ../src/common/connection.py:1658
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1653
+#: ../src/common/connection.py:1661
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "_Inhoud"
 
-#: ../src/common/connection.py:1799 ../src/common/connection.py:1822
+#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
 msgid "Not fetched because of invisible status"
 msgstr ""
 
-#: ../src/common/connection.py:2254
+#: ../src/common/connection.py:2262
 #, fuzzy
 msgid "Unregister failed"
 msgstr "vCard publicatie is mislukt"
 
-#: ../src/common/connection.py:2255
+#: ../src/common/connection.py:2263
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
 #: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:674
+#: ../src/gui_interface.py:551
 #, fuzzy
 msgid "Observers"
 msgstr "Server"
 
 #: ../src/common/contacts.py:139 ../src/common/contacts.py:366
 #: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1499 ../src/gui_interface.py:424
-#: ../src/roster_window.py:840 ../src/roster_window.py:1525
-#: ../src/roster_window.py:1606 ../src/roster_window.py:1608
-#: ../src/roster_window.py:1769
+#: ../src/disco.py:1517 ../src/roster_window.py:854
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
+#: ../src/roster_window.py:2466
 msgid "Transports"
 msgstr "Transporten"
 
@@ -5229,207 +5380,223 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:148
+msgid "Username must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:153
 msgid "Invalid character in username."
 msgstr "Ongeldig character in gebruikersnaam."
 
-#: ../src/common/helpers.py:156
-msgid "Server address required."
-msgstr "Server adres vereist."
+#: ../src/common/helpers.py:159
+msgid "Server must be between 1 and 1023 chars"
+msgstr ""
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 msgid "Invalid character in hostname."
 msgstr "Ongeldig character in hostnaam."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:166
+msgid "Server address required."
+msgstr "Server adres vereist."
+
+#: ../src/common/helpers.py:170
+msgid "Resource must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:175
 msgid "Invalid character in resource."
 msgstr "Ongeldig character in bron."
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:215
 msgid "_Busy"
 msgstr "_Bezig"
 
-#: ../src/common/helpers.py:211 ../src/tooltips.py:195
+#: ../src/common/helpers.py:217 ../src/tooltips.py:195
 msgid "Busy"
 msgstr "Bezig"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:220
 msgid "_Not Available"
 msgstr "_Niet Beschikbaar"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:225
 msgid "_Free for Chat"
 msgstr "Open voor _Gesprek"
 
-#: ../src/common/helpers.py:221 ../src/tooltips.py:191
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Free for Chat"
 msgstr "Open voor Gesprek"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:230
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "_Aanwezig"
 
-#: ../src/common/helpers.py:226 ../src/tooltips.py:189
+#: ../src/common/helpers.py:232 ../src/tooltips.py:189
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Print tijd:"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:234
 msgid "Connecting"
 msgstr "Bezig met verbinden"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:237
 msgid "A_way"
 msgstr "Af_wezig"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:242
 msgid "_Offline"
 msgstr "_Offline"
 
-#: ../src/common/helpers.py:238 ../src/tooltips.py:199
+#: ../src/common/helpers.py:244 ../src/tooltips.py:199
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:247
 msgid "_Invisible"
 msgstr "Onz_ichtbaar"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:253
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Onbekend"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:255
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Heeft fouten"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:260
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Geen"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:262
 msgid "To"
 msgstr "Aan"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
+msgid "From"
+msgstr "Van"
+
+#: ../src/common/helpers.py:266
 msgid "Both"
 msgstr "Beide"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:274
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Geen"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:276
 msgid "Subscribe"
 msgstr "Abonneren"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:285
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Geen"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:288
 msgid "Moderators"
 msgstr "Beheerders"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:290
 msgid "Moderator"
 msgstr "Beheerder"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:293
 msgid "Participants"
 msgstr "Deelnemers"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:295
 msgid "Participant"
 msgstr "Deelnemer"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:298
 msgid "Visitors"
 msgstr "Bezoekers"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:300
 msgid "Visitor"
 msgstr "Bezoeker"
 
-#: ../src/common/helpers.py:300 ../src/tooltips.py:210
+#: ../src/common/helpers.py:306 ../src/tooltips.py:210
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Role:Geen"
 
-#: ../src/common/helpers.py:302 ../src/tooltips.py:216
+#: ../src/common/helpers.py:308 ../src/tooltips.py:216
 #, fuzzy
 msgid "Owner"
 msgstr "_Eigenaar"
 
-#: ../src/common/helpers.py:304 ../src/tooltips.py:214
+#: ../src/common/helpers.py:310 ../src/tooltips.py:214
 #, fuzzy
 msgid "Administrator"
 msgstr "_Administrator"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:212
+#: ../src/common/helpers.py:312 ../src/tooltips.py:212
 #, fuzzy
 msgid "Member"
 msgstr "_Lid"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:351
 msgid "is paying attention to the conversation"
 msgstr "let op deze conversatie"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:353
 msgid "is doing something else"
 msgstr "is met iets anders bezig"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:355
 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:352
+#: ../src/common/helpers.py:358
 msgid "paused composing a message"
 msgstr "pauzeert tijdens het typen van een bericht"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:360
 msgid "has closed the chat window or tab"
 msgstr "heeft het gespreksvenster of -tab gesloten"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:619
+#: ../src/common/helpers.py:625
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:622
+#: ../src/common/helpers.py:628
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:626
+#: ../src/common/helpers.py:632
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:629
+#: ../src/common/helpers.py:635
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:633
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:636
+#: ../src/common/helpers.py:642
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:645
 #, python-format
 msgid "%s B"
 msgstr "%s B"
@@ -5472,12 +5639,12 @@ msgstr "Gajim - %s"
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:111
+#: ../src/common/jingle_rtp.py:107
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Ruimte Configuratie"
 
-#: ../src/common/jingle_rtp.py:112
+#: ../src/common/jingle_rtp.py:108
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5489,30 +5656,30 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:209
+#: ../src/common/jingle_rtp.py:205
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:210
+#: ../src/common/jingle_rtp.py:206
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Fout bij lezen bestand:"
 
-#: ../src/common/jingle_rtp.py:336
+#: ../src/common/jingle_rtp.py:335
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:339
+#: ../src/common/jingle_rtp.py:338
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:382
+#: ../src/common/jingle_rtp.py:381
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:390
+#: ../src/common/jingle_rtp.py:389
 msgid "video output"
 msgstr ""
 
@@ -5589,11 +5756,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "fout: kan %s niet voor lezen openen"
 
-#: ../src/common/optparser.py:299 ../src/common/optparser.py:300
+#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
 msgid "cyan"
 msgstr "cyaan"
 
-#: ../src/common/optparser.py:379
+#: ../src/common/optparser.py:383
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "logboek database wordt aangemaakt"
@@ -6324,62 +6491,62 @@ msgid ""
 msgstr ""
 
 #. we're not english
-#: ../src/common/stanza_session.py:303
+#: ../src/common/stanza_session.py:423
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:178
+#: ../src/common/zeroconf/connection_zeroconf.py:181
 msgid "Avahi error"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:179
+#: ../src/common/zeroconf/connection_zeroconf.py:182
 #, python-format
 msgid ""
 "%s\n"
 "Link-local messaging might not work properly."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:190
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:199
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Could not start local service"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 #, 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:204
-#: ../src/common/zeroconf/connection_zeroconf.py:283
-#: ../src/common/zeroconf/connection_zeroconf.py:294
-#: ../src/common/zeroconf/connection_zeroconf.py:308
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:286
+#: ../src/common/zeroconf/connection_zeroconf.py:297
+#: ../src/common/zeroconf/connection_zeroconf.py:311
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:282
-#: ../src/common/zeroconf/connection_zeroconf.py:293
-#: ../src/common/zeroconf/connection_zeroconf.py:307
+#: ../src/common/zeroconf/connection_zeroconf.py:285
+#: ../src/common/zeroconf/connection_zeroconf.py:296
+#: ../src/common/zeroconf/connection_zeroconf.py:310
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Kon geen verbinding maken met \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:325
+#: ../src/common/zeroconf/connection_zeroconf.py:328
 #, 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:335
+#: ../src/common/zeroconf/connection_zeroconf.py:338
 msgid "Contact is offline. Your message could not be sent."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:363
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6400,17 +6567,17 @@ msgstr "Statusbericht"
 msgid "Enabled"
 msgstr "Inschakelen"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3078
+#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
 #, fuzzy
 msgid "Default"
 msgstr "Wis MOTD"
 
-#: ../src/config.py:739 ../src/dialogs.py:1395
+#: ../src/config.py:733 ../src/dialogs.py:1409
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Er is geen verbinding beschikbaar"
 
-#: ../src/config.py:740
+#: ../src/config.py:734
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6426,9 +6593,9 @@ msgid "status message text"
 msgstr "statusbericht"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2383 ../src/dialogs.py:2449
-#: ../src/dialogs.py:3215 ../src/disco.py:866 ../src/disco.py:1726
-#: ../src/disco.py:2030 ../src/history_window.py:90
+#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
+#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
+#: ../src/disco.py:2048 ../src/history_window.py:90
 msgid "Name"
 msgstr "Naam"
 
@@ -6462,7 +6629,7 @@ msgstr "Je hebt geen actieve account"
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1976 ../src/config.py:2509 ../src/config.py:2545
+#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
 msgid "You are currently connected to the server"
 msgstr "Je bent momenteel verbonden met de server"
 
@@ -6498,190 +6665,190 @@ msgstr "Account naam kan niet leeg zijn."
 msgid "Account name cannot contain spaces."
 msgstr "Account naam mag geen spaties bevatten."
 
-#: ../src/config.py:2072
+#: ../src/config.py:2074
 #, fuzzy
 msgid "Rename Account"
 msgstr "Beheer Accounts"
 
-#: ../src/config.py:2073
+#: ../src/config.py:2075
 #, 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:2101
+#: ../src/config.py:2103
 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:2318 ../src/config.py:3606
+#: ../src/config.py:2320 ../src/config.py:3623
 msgid "Invalid entry"
 msgstr "Ongeldige invoer"
 
-#: ../src/config.py:2319 ../src/config.py:3607
+#: ../src/config.py:2321 ../src/config.py:3624
 msgid "Custom port must be a port number."
 msgstr "Aangepaste poort moet een geldig poortnummer zijn."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2342
 msgid "Failed to get secret keys"
 msgstr "Kon de geheime sleutel niet ophalen"
 
-#: ../src/config.py:2341
+#: ../src/config.py:2343
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr ""
 "Er trad een probleem op bij het ophalen van je geheime OpenPGP sleutels."
 
-#: ../src/config.py:2375
+#: ../src/config.py:2377
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Versleuteling"
 
-#: ../src/config.py:2376
+#: ../src/config.py:2378
 msgid "Choose your OpenPGP key"
 msgstr "Kies je OpenPGP sleutel"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2385
 msgid "No such account available"
 msgstr "Account bestaat niet"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2386
 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:2391 ../src/dialogs.py:2136 ../src/dialogs.py:2371
-#: ../src/dialogs.py:2557 ../src/disco.py:511 ../src/profile_window.py:339
+#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
+#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
 msgid "You are not connected to the server"
 msgstr "Er is geen verbinding met de server"
 
-#: ../src/config.py:2392
+#: ../src/config.py:2394
 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:2396
+#: ../src/config.py:2398
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:2397
+#: ../src/config.py:2399
 #, 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:2510 ../src/config.py:2546
+#: ../src/config.py:2512 ../src/config.py:2548
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Om de account naam te veranderen moet de verbinding verbroken zijn"
 
-#: ../src/config.py:2515
+#: ../src/config.py:2517
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Account naam is al in gebruik"
 
-#: ../src/config.py:2516
+#: ../src/config.py:2518
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2673
+#: ../src/config.py:2675
 #, python-format
 msgid "Edit %s"
 msgstr "Wijzig %s"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2677
 #, python-format
 msgid "Register to %s"
 msgstr "Registreer met %s"
 
 #. list at the beginning
-#: ../src/config.py:2711
+#: ../src/config.py:2713
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:2712
+#: ../src/config.py:2714
 #, fuzzy
 msgid "Member List"
 msgstr "_Lid"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2714
 #, fuzzy
 msgid "Owner List"
 msgstr "_Eigenaar"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2715
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Administrator"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2763 ../src/disco.py:873 ../src/history_manager.py:201
+#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2773
+#: ../src/config.py:2789
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:2780
+#: ../src/config.py:2796
 #, fuzzy
 msgid "Nick"
 msgstr "Uit_schoppen"
 
-#: ../src/config.py:2786
+#: ../src/config.py:2802
 #, fuzzy
 msgid "Role"
 msgstr "Rol:"
 
-#: ../src/config.py:2813
+#: ../src/config.py:2829
 #, fuzzy
 msgid "Banning..."
 msgstr "%s verbannen"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2815
+#: ../src/config.py:2831
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2817
+#: ../src/config.py:2833
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:2818
+#: ../src/config.py:2834
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2836
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:2821
+#: ../src/config.py:2837
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2823
+#: ../src/config.py:2839
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Administrator"
 
-#: ../src/config.py:2824
+#: ../src/config.py:2840
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2825
+#: ../src/config.py:2841
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6691,86 +6858,86 @@ msgid ""
 "domain/resource, or address containing a subdomain)."
 msgstr ""
 
-#: ../src/config.py:2926
+#: ../src/config.py:2943
 #, python-format
 msgid "Removing %s account"
 msgstr "Account %s wordt verwijdert"
 
-#: ../src/config.py:2941
+#: ../src/config.py:2958
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Versleuteling uitgeschakeld"
 
-#: ../src/config.py:2942
+#: ../src/config.py:2959
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2955 ../src/gui_interface.py:1132
-#: ../src/gui_interface.py:1243
+#: ../src/config.py:2972 ../src/gui_interface.py:311
+#: ../src/gui_interface.py:1048
 msgid "Password Required"
 msgstr "Wachtwoord Vereist"
 
-#: ../src/config.py:2956 ../src/gui_interface.py:1223
+#: ../src/config.py:2973 ../src/gui_interface.py:1028
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Geef je wachtwoord op voor account %s"
 
-#: ../src/config.py:2957 ../src/gui_interface.py:1243
+#: ../src/config.py:2974 ../src/gui_interface.py:1048
 msgid "Save password"
 msgstr "Sla wachtwoord op"
 
-#: ../src/config.py:2967
+#: ../src/config.py:2984
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Account \"%s\" heeft verbinding met de server"
 
-#: ../src/config.py:2968
+#: ../src/config.py:2985
 msgid "If you remove it, the connection will be lost."
 msgstr "Als je het verwijdert, wordt de verbinding verbroken."
 
-#: ../src/config.py:2982
+#: ../src/config.py:2999
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Verbinding"
 
-#: ../src/config.py:2983
+#: ../src/config.py:3000
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3001
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Verwijder account alleen van Gajim"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3002
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3078
+#: ../src/config.py:3095
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Print tijd:"
 
-#: ../src/config.py:3079
+#: ../src/config.py:3096
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:3080
+#: ../src/config.py:3097
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Print tijd:"
 
-#: ../src/config.py:3150
+#: ../src/config.py:3167
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Groupsgesprek"
 
-#: ../src/config.py:3183
+#: ../src/config.py:3200
 msgid "This bookmark has invalid data"
 msgstr "Deze bladwijzer bevat ongeldige informatie"
 
-#: ../src/config.py:3184
+#: ../src/config.py:3201
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6778,31 +6945,31 @@ msgstr ""
 "bladwijzer."
 
 #. invalid char
-#: ../src/config.py:3302 ../src/dialogs.py:1934
+#: ../src/config.py:3319 ../src/dialogs.py:1950
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/config.py:3303 ../src/config.py:3317 ../src/config.py:3331
+#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Bijnaam niet gevonden: %s"
 
-#: ../src/config.py:3316 ../src/config.py:3582
+#: ../src/config.py:3333 ../src/config.py:3599
 #, fuzzy
 msgid "Invalid server"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/config.py:3330
+#: ../src/config.py:3347
 #, fuzzy
 msgid "Invalid room"
 msgstr "Ongeldige invoer"
 
-#: ../src/config.py:3498
+#: ../src/config.py:3515
 msgid "Account has been added successfully"
 msgstr "Account is met succes toegevoegd"
 
-#: ../src/config.py:3499 ../src/config.py:3505
+#: ../src/config.py:3516 ../src/config.py:3522
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6812,34 +6979,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:3504
+#: ../src/config.py:3521
 msgid "Your new account has been created successfully"
 msgstr "Je nieuwe account is met succes aangemaakt"
 
-#: ../src/config.py:3543
+#: ../src/config.py:3560
 msgid "Invalid username"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/config.py:3545
+#: ../src/config.py:3562
 msgid "You must provide a username to configure this account."
 msgstr "Je moet een gebruikersnaam invullen om deze account te configureren."
 
-#: ../src/config.py:3583
+#: ../src/config.py:3600
 #, 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:3639 ../src/gui_interface.py:1904
+#: ../src/config.py:3656 ../src/gui_interface.py:1693
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Contact staat al in het rooster"
 
-#: ../src/config.py:3640 ../src/gui_interface.py:1905
+#: ../src/config.py:3657 ../src/gui_interface.py:1694
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3717
+#: ../src/config.py:3734
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6849,7 +7016,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3723 ../src/gui_interface.py:1932
+#: ../src/config.py:3740 ../src/gui_interface.py:1721
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6857,77 +7024,86 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3755 ../src/config.py:3789
+#: ../src/config.py:3772 ../src/config.py:3806
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Er is een gout opgetreden bij het aanmaken van de account"
 
-#: ../src/config.py:3854
+#: ../src/config.py:3871
 msgid "Account name is in use"
 msgstr "Account naam is al in gebruik"
 
-#: ../src/config.py:3855
+#: ../src/config.py:3872
 msgid "You already have an account using this name."
 msgstr "Je hebt al een account met deze naam."
 
-#: ../src/config.py:4009
+#: ../src/config.py:3991
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/config.py:3992
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#: ../src/config.py:4036
 msgid "Active"
 msgstr "Actief"
 
-#: ../src/config.py:4017
+#: ../src/config.py:4044
 msgid "Event"
 msgstr "Gebeurtenis"
 
-#: ../src/config.py:4052
+#: ../src/config.py:4079
 msgid "First Message Received"
 msgstr ""
 
-#: ../src/config.py:4053
+#: ../src/config.py:4080
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Nieuw Bericht"
 
-#: ../src/config.py:4055
+#: ../src/config.py:4082
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Nieuw Bericht"
 
-#: ../src/config.py:4056
+#: ../src/config.py:4083
 #, fuzzy
 msgid "Contact Connected"
 msgstr "Contactnaam"
 
-#: ../src/config.py:4057
+#: ../src/config.py:4084
 #, fuzzy
 msgid "Contact Disconnected"
 msgstr "Contact is Ingelogd"
 
-#: ../src/config.py:4058
+#: ../src/config.py:4085
 #, fuzzy
 msgid "Message Sent"
 msgstr "_Bericht"
 
-#: ../src/config.py:4059
+#: ../src/config.py:4086
 msgid "Group Chat Message Highlight"
 msgstr ""
 
-#: ../src/config.py:4060
+#: ../src/config.py:4087
 msgid "Group Chat Message Received"
 msgstr ""
 
-#: ../src/config.py:4061
+#: ../src/config.py:4088
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Uitnodiging Ontvangen"
 
-#: ../src/conversation_textview.py:600
+#: ../src/conversation_textview.py:601
 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:619
+#: ../src/conversation_textview.py:620
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6936,46 +7112,46 @@ msgstr ""
 "Tekst onder deze streep is gezegd nadat je laatst op dit groepsgesprek gelet "
 "hebt."
 
-#: ../src/conversation_textview.py:739
+#: ../src/conversation_textview.py:740
 #, fuzzy
 msgid "_Quote"
 msgstr "A_fsluiten"
 
-#: ../src/conversation_textview.py:746
+#: ../src/conversation_textview.py:747
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Acties voor \"%s\""
 
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Read _Wikipedia Article"
 msgstr "Lees _Wikipedia Artikel"
 
-#: ../src/conversation_textview.py:763
+#: ../src/conversation_textview.py:765
 msgid "Look it up in _Dictionary"
 msgstr "Zoek op in het _Woordenboek"
 
-#: ../src/conversation_textview.py:780
+#: ../src/conversation_textview.py:782
 #, 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:793
+#: ../src/conversation_textview.py:795
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "\"%s\" ontbreekt in de URL van de Web Zoekmachine"
 
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 msgid "Web _Search for it"
 msgstr "_Zoek op het Web"
 
-#: ../src/conversation_textview.py:802
+#: ../src/conversation_textview.py:804
 msgid "Open as _Link"
 msgstr ""
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1296
+#: ../src/conversation_textview.py:1298
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6983,197 +7159,202 @@ msgstr[0] "Gisteren"
 msgstr[1] "Gisteren"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1344 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Onderwerp: %s\n"
 
-#: ../src/dataforms_widget.py:544
+#: ../src/dataforms_widget.py:545
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Niet in staat de ruimte binnen te gaan"
 
-#: ../src/dataforms_widget.py:546
+#: ../src/dataforms_widget.py:547
 #, python-format
 msgid "Media type not supported: %s"
 msgstr ""
 
-#: ../src/dataforms_widget.py:601
+#: ../src/dataforms_widget.py:562
+msgid "This field is required"
+msgstr ""
+
+#: ../src/dataforms_widget.py:607
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Jabber IM Client"
 
-#: ../src/dataforms_widget.py:602
+#: ../src/dataforms_widget.py:608
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:613
+#: ../src/dataforms_widget.py:619
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:616 ../src/dataforms_widget.py:618
+#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:82
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Contactnaam: <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:84
 #, fuzzy, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:195
 msgid "Group"
 msgstr "Groep"
 
-#: ../src/dialogs.py:201
+#: ../src/dialogs.py:202
 msgid "In the group"
 msgstr "In de groep"
 
-#: ../src/dialogs.py:292
+#: ../src/dialogs.py:293
 msgid "KeyID"
 msgstr "SleutelID"
 
-#: ../src/dialogs.py:297
+#: ../src/dialogs.py:298
 msgid "Contact name"
 msgstr "Contactnaam"
 
-#: ../src/dialogs.py:469
+#: ../src/dialogs.py:470
 #, fuzzy
 msgid "Set Mood"
 msgstr "Stel MOTD in"
 
-#: ../src/dialogs.py:589
+#: ../src/dialogs.py:590
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Statusbericht"
 
-#: ../src/dialogs.py:603
+#: ../src/dialogs.py:604
 msgid "Status Message"
 msgstr "Statusbericht"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:794
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Statusbericht"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:795
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 
-#: ../src/dialogs.py:802
+#: ../src/dialogs.py:803
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Vooraf Ingestelde Status Berichten</b>"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:804
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Typ je nieuwr statusbericht:"
 
-#: ../src/dialogs.py:831
+#: ../src/dialogs.py:832
 #, fuzzy
 msgid "AIM Address:"
 msgstr "_Adres:"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:833
 msgid "GG Number:"
 msgstr ""
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:834
 msgid "ICQ Number:"
 msgstr ""
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:835
 #, fuzzy
 msgid "MSN Address:"
 msgstr "_Adres:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:836
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Extra Adres:"
 
-#: ../src/dialogs.py:872
+#: ../src/dialogs.py:873
 #, 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:875
+#: ../src/dialogs.py:876
 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:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
+#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
+#: ../src/dialogs.py:3464
 msgid "Invalid User ID"
 msgstr "Ongeldige Gebruikers ID"
 
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1052
 #, fuzzy
 msgid "The user ID must not contain a resource."
 msgstr "Deze service heeft geen onderdelen om te doorbladeren."
 
-#: ../src/dialogs.py:1051
+#: ../src/dialogs.py:1057
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Ik zou je graag aan mijn rooster willen toevoegen."
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1071
 msgid "Contact already in roster"
 msgstr "Contact staat al in het rooster"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1072
 msgid "This contact is already listed in your roster."
 msgstr "Deze contact staat al op je rooster"
 
-#: ../src/dialogs.py:1112
+#: ../src/dialogs.py:1118
 #, fuzzy
 msgid "User ID:"
 msgstr "Gebruikers ID:"
 
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1189
 msgid "A GTK+ jabber client"
 msgstr "Een GTK+ jabber client"
 
-#: ../src/dialogs.py:1176
+#: ../src/dialogs.py:1190
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1191
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1187
+#: ../src/dialogs.py:1201
 msgid "Current Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1203
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:1195
+#: ../src/dialogs.py:1209
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1215
 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:1213
+#: ../src/dialogs.py:1227
 msgid "translator-credits"
 msgstr "Stéphan Kochen <stephan@kochen.nl>"
 
-#: ../src/dialogs.py:1396
+#: ../src/dialogs.py:1410
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7182,43 +7363,43 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1935 ../src/dialogs.py:2322
+#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr "Bijnaam niet gevonden: %s"
 
-#: ../src/dialogs.py:2053
+#: ../src/dialogs.py:2069
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Abonnerings aanvraag voor account %s van %s"
 
-#: ../src/dialogs.py:2056
+#: ../src/dialogs.py:2072
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnering aangevraagd van %s"
 
-#: ../src/dialogs.py:2131 ../src/gui_interface.py:2672
+#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
 #, fuzzy, python-format
 msgid "You are already in group chat %s"
 msgstr "Je bent al in ruimte %s"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2153
 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:2178
+#: ../src/dialogs.py:2194
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Neem deel aan Groepsgesprek met account %s"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2325
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Ongeldige account naam"
 
-#: ../src/dialogs.py:2310
+#: ../src/dialogs.py:2326
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
@@ -7226,70 +7407,70 @@ msgstr ""
 "Je moet een account aanmaken voor je gesprekken kunt voeren met andere "
 "contacten."
 
-#: ../src/dialogs.py:2321
+#: ../src/dialogs.py:2337
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/dialogs.py:2326 ../src/dialogs.py:2332
-#: ../src/groupchat_control.py:1832
+#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
+#: ../src/groupchat_control.py:1847
 #, fuzzy
 msgid "Invalid group chat Jabber ID"
 msgstr "Ongeldige Jabber ID"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2343
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr ""
 
-#: ../src/dialogs.py:2333 ../src/groupchat_control.py:1833
+#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr ""
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2356
 msgid "This is not a group chat"
 msgstr ""
 
-#: ../src/dialogs.py:2341
+#: ../src/dialogs.py:2357
 #, 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:2372
+#: ../src/dialogs.py:2388
 #, 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:2386
+#: ../src/dialogs.py:2402
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2421
+#: ../src/dialogs.py:2437
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Account \"%s\" heeft verbinding met de server"
 
-#: ../src/dialogs.py:2422
+#: ../src/dialogs.py:2438
 #, 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:2446
+#: ../src/dialogs.py:2462
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2523
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start Gesprek met account %s"
 
-#: ../src/dialogs.py:2509
+#: ../src/dialogs.py:2525
 msgid "Start Chat"
 msgstr "Start Gesprek"
 
-#: ../src/dialogs.py:2510
+#: ../src/dialogs.py:2526
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -7299,171 +7480,171 @@ msgstr ""
 "worden:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2536 ../src/dialogs.py:2917 ../src/dialogs.py:3129
+#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
 msgid "Connection not available"
 msgstr "Verbinding niet beschikbaar"
 
-#: ../src/dialogs.py:2537 ../src/dialogs.py:2918 ../src/dialogs.py:3130
+#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Zorg ervoor dat je verbinding hebt met \"%s\"."
 
-#: ../src/dialogs.py:2546 ../src/dialogs.py:2549
+#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Ongeldige Jabber ID"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2565
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:2558
+#: ../src/dialogs.py:2574
 msgid "Without a connection, you can not change your password."
 msgstr "Zonder verbinding is het niet mogelijk je wachtwoord te veranderen."
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "Invalid password"
 msgstr "Ongeldig wachtwoord"
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "You must enter a password."
 msgstr "Je moet een wachtwoord opgeven."
 
-#: ../src/dialogs.py:2581
+#: ../src/dialogs.py:2597
 msgid "Passwords do not match"
 msgstr "Wachtwoord komt niet overeen"
 
-#: ../src/dialogs.py:2582
+#: ../src/dialogs.py:2598
 msgid "The passwords typed in both fields must be identical."
 msgstr "De wachtwoorden in beide velden moeten identiek zijn"
 
 #. default value
-#: ../src/dialogs.py:2619 ../src/notify.py:247 ../src/notify.py:473
+#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
 msgid "Contact Signed In"
 msgstr "Contact is Ingelogd"
 
-#: ../src/dialogs.py:2621 ../src/notify.py:255 ../src/notify.py:475
+#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
 msgid "Contact Signed Out"
 msgstr "Contact is Uitgelogd"
 
 #. chat message
-#: ../src/dialogs.py:2623 ../src/notify.py:277 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
 msgid "New Message"
 msgstr "Nieuw Bericht"
 
 #. single message
-#: ../src/dialogs.py:2623 ../src/notify.py:259 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
 msgid "New Single Message"
 msgstr "Nieuw Enkel Bericht"
 
 #. private message
-#: ../src/dialogs.py:2624 ../src/notify.py:265 ../src/notify.py:478
+#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
 msgid "New Private Message"
 msgstr "Nieuw Privé Bericht"
 
-#: ../src/dialogs.py:2624 ../src/gui_interface.py:1358 ../src/notify.py:487
+#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
 msgid "New E-mail"
 msgstr ""
 
-#: ../src/dialogs.py:2626 ../src/gui_interface.py:1420 ../src/notify.py:480
+#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
 msgid "File Transfer Request"
 msgstr "Bestandsoverdracht Verzoek"
 
-#: ../src/dialogs.py:2628 ../src/gui_interface.py:1320
-#: ../src/gui_interface.py:1389 ../src/notify.py:482
+#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
+#: ../src/gui_interface.py:1186 ../src/notify.py:482
 msgid "File Transfer Error"
 msgstr "Bestandsoverdracht Fout"
 
-#: ../src/dialogs.py:2630 ../src/gui_interface.py:1466
-#: ../src/gui_interface.py:1489 ../src/gui_interface.py:1506
+#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
+#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
 #: ../src/notify.py:484
 msgid "File Transfer Completed"
 msgstr "Bestandsoverdracht Voltooid"
 
-#: ../src/dialogs.py:2631 ../src/gui_interface.py:1469 ../src/notify.py:485
+#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
 msgid "File Transfer Stopped"
 msgstr "Bestandsoverdracht Gestopt"
 
-#: ../src/dialogs.py:2633 ../src/gui_interface.py:1152 ../src/notify.py:489
+#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
 #, fuzzy
 msgid "Groupchat Invitation"
 msgstr "?Group Chat Contact Role:Geen"
 
-#: ../src/dialogs.py:2635 ../src/notify.py:239 ../src/notify.py:491
+#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Contact is Uitgelogd"
 
-#: ../src/dialogs.py:2836
+#: ../src/dialogs.py:2852
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Enkel Bericht met account %s"
 
-#: ../src/dialogs.py:2838
+#: ../src/dialogs.py:2854
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Enkel Bericht met account %s"
 
-#: ../src/dialogs.py:2840
+#: ../src/dialogs.py:2856
 msgid "Single Message"
 msgstr "Enkel Bericht"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2843
+#: ../src/dialogs.py:2859
 #, python-format
 msgid "Send %s"
 msgstr "Stuur %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:2882
 #, python-format
 msgid "Received %s"
 msgstr "Ontvangen %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2889
+#: ../src/dialogs.py:2905
 #, 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:2968
+#: ../src/dialogs.py:2984
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:2985
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s schreef:\n"
 
-#: ../src/dialogs.py:3028
+#: ../src/dialogs.py:3044
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Console voor %s"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3046
 msgid "XML Console"
 msgstr "XML Console"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "add"
 msgstr "Vastgelopen"
 
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "modify"
 msgstr "Be_werk"
 
-#: ../src/dialogs.py:3160
+#: ../src/dialogs.py:3176
 #, fuzzy
 msgid "remove"
 msgstr "_Verwijder"
 
-#: ../src/dialogs.py:3188
+#: ../src/dialogs.py:3204
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7471,166 +7652,199 @@ msgid ""
 msgstr "Ik wil je graag toevoegen aan mijn contactlijst"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3204 ../src/dialogs.py:3250
+#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
 #, fuzzy
 msgid "Add"
 msgstr "Adres"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3206 ../src/dialogs.py:3281
+#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
 #, fuzzy
 msgid "Modify"
 msgstr "Be_werk"
 
-#: ../src/dialogs.py:3212
+#: ../src/dialogs.py:3228
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:3218
+#: ../src/dialogs.py:3234
 #, fuzzy
 msgid "Groups"
 msgstr "Groep"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3342
 #, 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:3340
+#: ../src/dialogs.py:3356
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "_Contact Toevoegen"
 
-#: ../src/dialogs.py:3377
+#: ../src/dialogs.py:3393
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Verwijdert contact van rooster"
 
-#: ../src/dialogs.py:3430
+#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#, python-format
+msgid "Archiving Preferences for %s"
+msgstr ""
+
+#: ../src/dialogs.py:3473
+#, fuzzy
+msgid "Invalid expire value"
+msgstr "Ongeldige gebruikersnaam"
+
+#: ../src/dialogs.py:3474
+msgid "Expire must be a valid positive integer."
+msgstr ""
+
+#: ../src/dialogs.py:3521
+msgid "There is an error with the form"
+msgstr ""
+
+#: ../src/dialogs.py:3732
+msgid "There is an error"
+msgstr ""
+
+#: ../src/dialogs.py:3796
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:3434
+#: ../src/dialogs.py:3800
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3490
+#: ../src/dialogs.py:3856
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3861
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Beschrijving: %s"
 
-#: ../src/dialogs.py:3539
+#: ../src/dialogs.py:3905
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Formatteer een gespreksregel</b>"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:4016
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Formatteer een gespreksregel</b>"
 
-#: ../src/dialogs.py:3750
+#: ../src/dialogs.py:4116
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3752
+#: ../src/dialogs.py:4118
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Start Gesprek"
 
-#: ../src/dialogs.py:3822
+#: ../src/dialogs.py:4188
 #, fuzzy
 msgid "Invalid List Name"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4189
 #, 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:3855
+#: ../src/dialogs.py:4221
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Je bent uit deze ruimte verbannen."
 
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4224
 #, 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:3860
+#: ../src/dialogs.py:4226
 #, 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:3868
+#: ../src/dialogs.py:4234
 #, python-format
 msgid "Comment: %s"
 msgstr "Commentaar: %s"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4236
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3932
+#: ../src/dialogs.py:4298
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:3942 ../src/dialogs.py:3985 ../src/dialogs.py:4041
+#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
+#: ../src/dialogs.py:4495
 msgid "All files"
 msgstr "Alle bestanden"
 
-#: ../src/dialogs.py:3947
+#: ../src/dialogs.py:4313
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:3975
+#: ../src/dialogs.py:4341
 msgid "Choose Sound"
 msgstr "Kies Geluid"
 
-#: ../src/dialogs.py:3990
+#: ../src/dialogs.py:4356
 msgid "Wav Sounds"
 msgstr "Wav Geluiden"
 
-#: ../src/dialogs.py:4028
+#: ../src/dialogs.py:4394
 msgid "Choose Image"
 msgstr "Kies Afbeelding"
 
-#: ../src/dialogs.py:4046
+#: ../src/dialogs.py:4412
 msgid "Images"
 msgstr "Afbeeldingen"
 
-#: ../src/dialogs.py:4113
+#: ../src/dialogs.py:4482
+#, fuzzy
+msgid "Choose Archive"
+msgstr "Kies Afbeelding"
+
+#: ../src/dialogs.py:4500
+#, fuzzy
+msgid "Zip files"
+msgstr "Alle bestanden"
+
+#: ../src/dialogs.py:4525
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:4115
+#: ../src/dialogs.py:4527
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
-#: ../src/dialogs.py:4190
+#: ../src/dialogs.py:4602
 #, fuzzy
 msgid "Condition"
 msgstr "Verbinding"
 
-#: ../src/dialogs.py:4310
+#: ../src/dialogs.py:4722
 msgid "when I am "
 msgstr ""
 
-#: ../src/dialogs.py:4786
+#: ../src/dialogs.py:5198
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7638,38 +7852,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4789
+#: ../src/dialogs.py:5201
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4795 ../src/dialogs.py:4879
+#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4801
+#: ../src/dialogs.py:5213
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4806
+#: ../src/dialogs.py:5218
 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:4809 ../src/dialogs.py:4860 ../src/dialogs.py:4873
+#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4814
+#: ../src/dialogs.py:5226
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4825
+#: ../src/dialogs.py:5237
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4826
+#: ../src/dialogs.py:5238
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7679,44 +7893,44 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4827
+#: ../src/dialogs.py:5239
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4861
+#: ../src/dialogs.py:5273
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4867
+#: ../src/dialogs.py:5279
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4874
+#: ../src/dialogs.py:5286
 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:4880
+#: ../src/dialogs.py:5292
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:4945
+#: ../src/dialogs.py:5357
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4947
+#: ../src/dialogs.py:5359
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4949
+#: ../src/dialogs.py:5361
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4953
+#: ../src/dialogs.py:5365
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7732,25 +7946,25 @@ msgstr "Overigen"
 msgid "Conference"
 msgstr "Conferentie"
 
-#: ../src/disco.py:512
+#: ../src/disco.py:513
 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:589
+#: ../src/disco.py:600
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Service Ontdekking"
 
-#: ../src/disco.py:591
+#: ../src/disco.py:602
 msgid "Service Discovery"
 msgstr "Service Ontdekking"
 
-#: ../src/disco.py:741
+#: ../src/disco.py:758
 msgid "The service could not be found"
 msgstr "De service kon niet worden gevonden"
 
-#: ../src/disco.py:742
+#: ../src/disco.py:759
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7758,97 +7972,97 @@ msgstr ""
 "Er bestaat geen service op het opgegeven adres, of de service geeft geen "
 "antwoord. Controleer het adres en probeer nogmaals."
 
-#: ../src/disco.py:746 ../src/disco.py:1082
+#: ../src/disco.py:763 ../src/disco.py:1100
 msgid "The service is not browsable"
 msgstr "De service kan niet worden doorbladerd"
 
-#: ../src/disco.py:747
+#: ../src/disco.py:764
 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:786 ../src/disco.py:796
+#: ../src/disco.py:804 ../src/disco.py:814
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/disco.py:850
+#: ../src/disco.py:868
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "via account %s"
 
-#: ../src/disco.py:894
+#: ../src/disco.py:912
 msgid "_Browse"
 msgstr "_Bladeren"
 
-#: ../src/disco.py:1083
+#: ../src/disco.py:1101
 msgid "This service does not contain any items to browse."
 msgstr "Deze service heeft geen onderdelen om te doorbladeren."
 
-#: ../src/disco.py:1323
+#: ../src/disco.py:1341
 #, fuzzy
 msgid "_Execute Command"
 msgstr "commando"
 
-#: ../src/disco.py:1333 ../src/disco.py:1504
+#: ../src/disco.py:1351 ../src/disco.py:1522
 msgid "Re_gister"
 msgstr "Re_gistreer"
 
-#: ../src/disco.py:1545
+#: ../src/disco.py:1563
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Onderzoeken %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1736
+#: ../src/disco.py:1754
 msgid "Users"
 msgstr "Gebruikers"
 
 #. Description column
-#: ../src/disco.py:1744
+#: ../src/disco.py:1762
 msgid "Description"
 msgstr "Beschrijving"
 
 #. Id column
-#: ../src/disco.py:1752
+#: ../src/disco.py:1770
 msgid "Id"
 msgstr ""
 
-#: ../src/disco.py:1817 ../src/gui_interface.py:3182
+#: ../src/disco.py:1835 ../src/gui_interface.py:2995
 msgid "Bookmark already set"
 msgstr "Bladwijzer bestaat al"
 
-#: ../src/disco.py:1818 ../src/gui_interface.py:3183
+#: ../src/disco.py:1836 ../src/gui_interface.py:2996
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Ruimte \"%s\" heeft al een bladwijzer."
 
-#: ../src/disco.py:1827 ../src/gui_interface.py:3197
+#: ../src/disco.py:1845 ../src/gui_interface.py:3010
 msgid "Bookmark has been added successfully"
 msgstr "Bladwijzer is met succes toegevoegd"
 
-#: ../src/disco.py:1828 ../src/gui_interface.py:3198
+#: ../src/disco.py:1846 ../src/gui_interface.py:3011
 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:2039
+#: ../src/disco.py:2057
 #, fuzzy
 msgid "Subscribed"
 msgstr "Abonneren"
 
-#: ../src/disco.py:2047
+#: ../src/disco.py:2065
 #, fuzzy
 msgid "Node"
 msgstr "Geen"
 
-#: ../src/disco.py:2111
+#: ../src/disco.py:2129
 msgid "New post"
 msgstr ""
 
-#: ../src/disco.py:2117
+#: ../src/disco.py:2135
 msgid "_Subscribe"
 msgstr "_Abonneer"
 
-#: ../src/disco.py:2123
+#: ../src/disco.py:2141
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "_Abonneer"
@@ -8025,14 +8239,14 @@ msgstr ""
 
 #: ../src/features_window.py:95
 msgid ""
-"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
-"in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 
 #: ../src/features_window.py:96
 msgid ""
-"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
+"You have to set 'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 
 #: ../src/features_window.py:97
@@ -8191,34 +8405,34 @@ msgstr "Beschrijving: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s wil je een bestand sturen:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 msgid "This file already exists"
 msgstr "Dit bestands bestaat al"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 #, 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:369 ../src/gtkgui_helpers.py:914
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -8319,30 +8533,30 @@ msgid ""
 "Run anyway?"
 msgstr ""
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
 #, 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:80
+#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
 msgid "command"
 msgstr "commando"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "laat hulp zien op commando"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Laat roostervenster zien of verbergt het"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
 #, 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:93
+#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
 #, fuzzy
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
@@ -8351,6 +8565,13 @@ msgstr ""
 "Drukt een lijst af van contacten in het rooster. Elke contact komt op een "
 "aparte regel"
 
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
+#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
+#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
+#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
 #: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
 #: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
 #: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
@@ -8362,41 +8583,33 @@ msgstr ""
 msgid "account"
 msgstr "account"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "geef alleen contacten weer van de gegeven account"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Drukt een lijst van geregistreerde accounts af"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
 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:109
+#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106
 #, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"accoun't previous status"
+msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "een van: offline, online, chat, away, xa, dnd, invisible"
 
-#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
-msgid "message"
-msgstr "bericht"
-
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "statusbericht"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8405,52 +8618,24 @@ msgstr ""
 "status van alle accounts te veranderen die synchroniseren met de globale "
 "status"
 
-#: ../src/gajim-remote.py:117
-#, fuzzy
-msgid "Changes the priority of account or accounts"
-msgstr "Verander de status van de account of accounts"
-
-#: ../src/gajim-remote.py:119
-#, fuzzy
-msgid "priority"
-msgstr "Priori_teit"
-
-#: ../src/gajim-remote.py:119
-#, fuzzy
-msgid "priority you want to give to the account"
-msgstr "Ik wil een nieuwe account _registreren"
-
-#: ../src/gajim-remote.py:121
-#, fuzzy
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-msgstr ""
-"verander status van account \"account\". Indien niet opgegeven, probeer de "
-"status van alle accounts te veranderen die synchroniseren met de globale "
-"status"
-
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
 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:129
+#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
 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-plugin.py:118 ../src/gajim-remote-plugin.py:205
 #: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 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:134
-msgid "message content. The account must be specified or \"\""
-msgstr ""
-
-#: ../src/gajim-remote.py:139
+#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -8461,30 +8646,35 @@ msgstr ""
 "sleutel als account zijn optioneel. Als je alleen 'account' wilt opgeven "
 "zonder 'OpenPGP sleutel', zet 'OpenPGP sleutel' dan op ''."
 
+#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
 #: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID of contact die het bericht zal ontvangen"
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
+#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "inhoud bericht"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "pgp sleutel"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 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:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
+#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
 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:152
+#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -8495,155 +8685,306 @@ msgstr ""
 "sleutel als account zijn optioneel. Als je alleen 'account' wilt opgeven "
 "zonder 'OpenPGP sleutel', zet 'OpenPGP sleutel' dan op ''."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 #, fuzzy
 msgid "subject"
 msgstr "Onderwerp:"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 #, fuzzy
 msgid "message subject"
 msgstr "_Bericht"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID of contact die het bericht zal ontvangen"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Haal gedetaileerde informatie op over een contact"
 
+#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
+#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
 #: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
 #: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID van contact"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "Haal gedetaileerde informatie op over een contact"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
 #, fuzzy
 msgid "Name of the account"
 msgstr "Je hebt geen actieve account"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Stuurt een bestand aan contact"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "file"
 msgstr "bestand"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Bestandspad"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "indien opgegeven zal bestand verstuurd worden met deze account"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Laat alle voorkeuren zien en hun waarden"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Zet waarde van 'sleutel' op 'waarde'."
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "sleutel=waarde"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 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:207
+#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Verwijdert een voorkeur onderdeel"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
 msgid "key"
 msgstr "sleutel"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "naam van de voorkeur die verwijderd zal worden"
 
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
 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:218
-msgid "Removes contact from roster"
-msgstr "Verwijdert contact van rooster"
+#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
+msgid "Removes contact from roster"
+msgstr "Verwijdert contact van rooster"
+
+#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+msgid "Adds contact to roster"
+msgstr "Voegt contact toe aan rooster"
+
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#, fuzzy
+msgid "Adds new contact to this account"
+msgstr "Voegt een nieuwe contact toe aan deze account"
+
+#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+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-plugin.py:226
+#, fuzzy
+msgid ""
+"Returns current status message(the global one unless account is specified)"
+msgstr ""
+"Retourneert huidige status (de globale status, tenzij een account is "
+"opgegeven)"
+
+#: ../src/gajim-remote-plugin.py:233 ../src/gajim-remote.py:249
+#, fuzzy
+msgid "Returns number of unread messages"
+msgstr "Je hebt ongelezen berichten"
+
+#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+msgid "Opens 'Start Chat' dialog"
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#, fuzzy
+msgid "Starts chat, using this account"
+msgstr "Start Gesprek met account %s"
+
+#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+msgid "Sends custom XML"
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#, fuzzy
+msgid "XML to send"
+msgstr "XML Console"
+
+#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
+msgid "Handle a xmpp:/ uri"
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
+msgid "uri"
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#, fuzzy
+msgid "Join a MUC room"
+msgstr "Nieuwe Ruimte _Binnengaan"
+
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+#, fuzzy
+msgid "room"
+msgstr "Van"
+
+#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+#, fuzzy
+msgid "nick"
+msgstr "Uit_schoppen"
+
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+#, fuzzy
+msgid "password"
+msgstr "Wachtwoord:"
+
+#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+msgid "Check if Gajim is running"
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
+#: ../src/gajim-remote.py:300
+#, fuzzy
+msgid "Shows or hides the ipython window"
+msgstr "Laat roostervenster zien of verbergt het"
+
+#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+msgid "Missing argument \"contact_jid\""
+msgstr "Argument \"contact_jid\" ontbreekt"
+
+#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#, python-format
+msgid ""
+"'%s' is not in your roster.\n"
+"Please specify account for sending the message."
+msgstr ""
+"'%s' staat niet op je rooster.\n"
+"Geef een account op om het bericht mee te sturen."
+
+#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+msgid "You have no active account"
+msgstr "Je hebt geen actieve account"
+
+#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+msgid "It seems Gajim is not running. So you can't use gajim-remote."
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:412
+#, fuzzy, python-format
+msgid ""
+"Usage: %s %s %s \n"
+"\t %s"
+msgstr ""
+"Gebruik: %s %s %s \n"
+"\t"
+
+#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+msgid "Arguments:"
+msgstr "Argumenten:"
 
-#: ../src/gajim-remote.py:227
-msgid "Adds contact to roster"
-msgstr "Voegt contact toe aan rooster"
+#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#, python-format
+msgid "%s not found"
+msgstr "%s niet gevonden"
 
-#: ../src/gajim-remote.py:229
-msgid "jid"
+#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
+#, python-format
+msgid ""
+"Usage: %s command [arguments]\n"
+"Command is one of:\n"
 msgstr ""
+"Gebruik: %s commando [argumenten]\n"
+"Commando is een van:\n"
 
-#: ../src/gajim-remote.py:230
-#, fuzzy
-msgid "Adds new contact to this account"
-msgstr "Voegt een nieuwe contact toe aan deze account"
+#: ../src/gajim-remote-plugin.py:496
+#, fuzzy, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Argument \"%s\" is niet gespecificeerd. \n"
+"Type \"%s help %s\" voor meer info"
 
-#: ../src/gajim-remote.py:235
-msgid "Returns current status (the global one unless account is specified)"
+#: ../src/gajim-remote-plugin.py:500
+#, fuzzy, python-format
+msgid ""
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
 msgstr ""
-"Retourneert huidige status (de globale status, tenzij een account is "
-"opgegeven)"
+"Argument \"%s\" is niet gespecificeerd. \n"
+"Type \"%s help %s\" voor meer info"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
+#, fuzzy
+msgid "Wrong uri"
+msgstr "Wachtwoord"
+
+#: ../src/gajim-remote.py:109
 #, fuzzy
 msgid ""
-"Returns current status message (the global one unless account is specified)"
-msgstr ""
-"Retourneert huidige status (de globale status, tenzij een account is "
-"opgegeven)"
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
+msgstr "een van: offline, online, chat, away, xa, dnd, invisible"
 
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:117
 #, fuzzy
-msgid "Returns number of unread messages"
-msgstr "Je hebt ongelezen berichten"
+msgid "Changes the priority of account or accounts"
+msgstr "Verander de status van de account of accounts"
 
-#: ../src/gajim-remote.py:253
-msgid "Opens 'Start Chat' dialog"
-msgstr ""
+#: ../src/gajim-remote.py:119
+#, fuzzy
+msgid "priority"
+msgstr "Priori_teit"
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:119
 #, fuzzy
-msgid "Starts chat, using this account"
-msgstr "Start Gesprek met account %s"
+msgid "priority you want to give to the account"
+msgstr "Ik wil een nieuwe account _registreren"
 
-#: ../src/gajim-remote.py:259
-msgid "Sends custom XML"
+#: ../src/gajim-remote.py:121
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
 msgstr ""
+"verander status van account \"account\". Indien niet opgegeven, probeer de "
+"status van alle accounts te veranderen die synchroniseren met de globale "
+"status"
 
-#: ../src/gajim-remote.py:261
-#, fuzzy
-msgid "XML to send"
-msgstr "XML Console"
+#: ../src/gajim-remote.py:134
+msgid "message content. The account must be specified or \"\""
+msgstr ""
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:242
+#, fuzzy
 msgid ""
-"Account in which the xml will be sent; if not specified, xml will be sent to "
-"all accounts"
+"Returns current status message (the global one unless account is specified)"
 msgstr ""
+"Retourneert huidige status (de globale status, tenzij een account is "
+"opgegeven)"
 
 #: ../src/gajim-remote.py:268
 #, fuzzy
@@ -8661,14 +9002,6 @@ msgid ""
 "be set for all accounts"
 msgstr ""
 
-#: ../src/gajim-remote.py:277
-msgid "Handle a xmpp:/ uri"
-msgstr ""
-
-#: ../src/gajim-remote.py:279
-msgid "uri"
-msgstr ""
-
 #: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr ""
@@ -8682,36 +9015,16 @@ msgstr ""
 msgid "Message content"
 msgstr "inhoud bericht"
 
-#: ../src/gajim-remote.py:286
-#, fuzzy
-msgid "Join a MUC room"
-msgstr "Nieuwe Ruimte _Binnengaan"
-
-#: ../src/gajim-remote.py:288
-#, fuzzy
-msgid "room"
-msgstr "Van"
-
 #: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "Room JID"
 msgstr "Ruimte:"
 
-#: ../src/gajim-remote.py:289
-#, fuzzy
-msgid "nick"
-msgstr "Uit_schoppen"
-
 #: ../src/gajim-remote.py:289
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Bijnaam niet gevonden: %s"
 
-#: ../src/gajim-remote.py:290
-#, fuzzy
-msgid "password"
-msgstr "Wachtwoord:"
-
 #: ../src/gajim-remote.py:290
 #, fuzzy
 msgid "Password to enter the room"
@@ -8721,36 +9034,6 @@ msgstr "Wachtwoord komt niet overeen"
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:296
-msgid "Check if Gajim is running"
-msgstr ""
-
-#: ../src/gajim-remote.py:300
-#, fuzzy
-msgid "Shows or hides the ipython window"
-msgstr "Laat roostervenster zien of verbergt het"
-
-#: ../src/gajim-remote.py:327
-msgid "Missing argument \"contact_jid\""
-msgstr "Argument \"contact_jid\" ontbreekt"
-
-#: ../src/gajim-remote.py:348
-#, python-format
-msgid ""
-"'%s' is not in your roster.\n"
-"Please specify account for sending the message."
-msgstr ""
-"'%s' staat niet op je rooster.\n"
-"Geef een account op om het bericht mee te sturen."
-
-#: ../src/gajim-remote.py:351
-msgid "You have no active account"
-msgstr "Je hebt geen actieve account"
-
-#: ../src/gajim-remote.py:404
-msgid "It seems Gajim is not running. So you can't use gajim-remote."
-msgstr ""
-
 #: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
@@ -8758,24 +9041,6 @@ msgid ""
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:435
-msgid "Arguments:"
-msgstr "Argumenten:"
-
-#: ../src/gajim-remote.py:439
-#, python-format
-msgid "%s not found"
-msgstr "%s niet gevonden"
-
-#: ../src/gajim-remote.py:445
-#, python-format
-msgid ""
-"Usage: %s command [arguments]\n"
-"Command is one of:\n"
-msgstr ""
-"Gebruik: %s commando [argumenten]\n"
-"Commando is een van:\n"
-
 #: ../src/gajim-remote.py:514
 #, fuzzy, python-format
 msgid ""
@@ -8798,11 +9063,6 @@ msgstr ""
 msgid "No uri given"
 msgstr ""
 
-#: ../src/gajim-remote.py:540
-#, fuzzy
-msgid "Wrong uri"
-msgstr "Wachtwoord"
-
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Thema"
@@ -8829,205 +9089,203 @@ msgstr "Je kunt je huidige thema niet verwijderen"
 msgid "Please first choose another for your current theme."
 msgstr "Kies eerst een ander thema."
 
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:170
 msgid "Sending private message failed"
 msgstr "Sturen van privé bericht mislukt"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:171
+#: ../src/groupchat_control.py:172
 #, 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:450
+#: ../src/groupchat_control.py:455
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Verander Bij_naam"
 
-#: ../src/groupchat_control.py:631
+#: ../src/groupchat_control.py:636
 #, fuzzy
 msgid "Conversation with "
 msgstr "Gespreksgeschiedenis"
 
-#: ../src/groupchat_control.py:633
+#: ../src/groupchat_control.py:638
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Verbinding"
 
-#. Can be a message (see handle_event_gc_config_change in
-#. gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1272 ../src/gui_interface.py:1080
+#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1286
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1288
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Je nieuwe account is met succes aangemaakt"
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1291
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1287
+#: ../src/groupchat_control.py:1297
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s is uit de ruimte geschopt: %(reason)s"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1300
 #, 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:1300
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s is uit de ruimte verbannen: %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1312
 #, 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:1314 ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
 #, python-format
 msgid "You are now known as %s"
 msgstr "Je staat nu bekend als %s"
 
-#: ../src/groupchat_control.py:1330 ../src/gui_interface.py:919
+#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s is nu bekend als %s"
 
-#: ../src/groupchat_control.py:1372 ../src/groupchat_control.py:1377
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1392
 #, 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:1374
+#: ../src/groupchat_control.py:1383
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Aansluiting: "
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1388
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1394
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1470
+#: ../src/groupchat_control.py:1477
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1474
+#: ../src/groupchat_control.py:1481
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1489
+#: ../src/groupchat_control.py:1496
 #, 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:1493
+#: ../src/groupchat_control.py:1500
 #, 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:1522
+#: ../src/groupchat_control.py:1530
 #, python-format
 msgid "%s has left"
 msgstr "%s heeft de ruimte verlaten"
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1535
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "In de groep"
 
-#: ../src/groupchat_control.py:1529 ../src/gui_interface.py:946
+#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
 #: ../src/history_window.py:447 ../src/notify.py:234
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s is nu %(status)s"
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1774
 #, 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:1761
+#: ../src/groupchat_control.py:1776
 #, 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:1765 ../src/gui_interface.py:1216
-#: ../src/gui_interface.py:1992 ../src/gui_interface.py:2029
-#: ../src/gui_interface.py:2064 ../src/message_window.py:224
-#: ../src/roster_window.py:2739 ../src/roster_window.py:3399
-#: ../src/roster_window.py:4123
+#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
+#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
+#: ../src/gui_interface.py:1853 ../src/message_window.py:224
+#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
+#: ../src/roster_window.py:4195
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "Vraag mij dit niet nogmaals"
 
-#: ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:1814
 msgid "Changing Subject"
 msgstr "Onderwerp Veranderen"
 
-#: ../src/groupchat_control.py:1800
+#: ../src/groupchat_control.py:1815
 msgid "Please specify the new subject:"
 msgstr "Geef het nieuwe onderwerp op:"
 
-#: ../src/groupchat_control.py:1807
+#: ../src/groupchat_control.py:1822
 msgid "Changing Nickname"
 msgstr "Bijnaam Veranderen"
 
-#: ../src/groupchat_control.py:1808
+#: ../src/groupchat_control.py:1823
 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:1839
+#: ../src/groupchat_control.py:1854
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Beschrijving: %s"
 
-#: ../src/groupchat_control.py:1840
+#: ../src/groupchat_control.py:1855
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1842
+#: ../src/groupchat_control.py:1857
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2028
+#: ../src/groupchat_control.py:2046
 #, python-format
 msgid "Kicking %s"
 msgstr "%s uit de ruimte schoppen"
 
-#: ../src/groupchat_control.py:2029 ../src/groupchat_control.py:2356
+#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
 msgid "You may specify a reason below:"
 msgstr "Je kunt hieronder een reden opgeven:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2355
+#: ../src/groupchat_control.py:2373
 #, python-format
 msgid "Banning %s"
 msgstr "%s verbannen"
@@ -9053,56 +9311,66 @@ msgid "Details"
 msgstr "Details"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
+#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Fout: kan %s niet voor lezen openen"
 
-#: ../src/gtkgui_helpers.py:400
+#: ../src/gtkgui_helpers.py:404
 msgid "Error reading file:"
 msgstr "Fout bij lezen bestand:"
 
-#: ../src/gtkgui_helpers.py:403
+#: ../src/gtkgui_helpers.py:407
 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:444
+#: ../src/gtkgui_helpers.py:448
 #, 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:818
+#: ../src/gtkgui_helpers.py:822
 msgid "Gajim is not the default Jabber client"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:819
+#: ../src/gtkgui_helpers.py:823
 #, fuzzy
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Wil je het overschrijven?"
 
-#: ../src/gtkgui_helpers.py:820
+#: ../src/gtkgui_helpers.py:824
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:887
+#: ../src/gtkgui_helpers.py:891
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:888
+#: ../src/gtkgui_helpers.py:892
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:924
+#: ../src/gtkgui_helpers.py:928
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Sla Bestand op als..."
 
-#: ../src/gui_interface.py:140
+#. we are banned
+#. group chat does not exist
+#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
+#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
+#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
+#: ../src/gui_interface.py:348
+#, fuzzy
+msgid "Unable to join group chat"
+msgstr "Niet in staat de ruimte binnen te gaan"
+
+#: ../src/gui_interface.py:138
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9113,166 +9381,196 @@ msgstr ""
 "gebruiker.\n"
 "Geef een andere bijnaam op:"
 
-#: ../src/gui_interface.py:143
+#: ../src/gui_interface.py:141
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:159
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Neem je dit verzoek aan?"
 
-#: ../src/gui_interface.py:161
+#: ../src/gui_interface.py:160
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Neem je dit verzoek aan?"
 
-#: ../src/gui_interface.py:164
+#: ../src/gui_interface.py:163
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) Machtiging voor %s (id: %s)"
 
-#: ../src/gui_interface.py:213 ../src/notify.py:493
+#: ../src/gui_interface.py:209 ../src/notify.py:493
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Verbinding"
 
-#: ../src/gui_interface.py:606 ../src/gui_interface.py:610
+#: ../src/gui_interface.py:312
+#, 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/gui_interface.py:324
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/gui_interface.py:333
+#, fuzzy, python-format
+msgid "You are banned from group chat %s."
+msgstr "Je bent uit deze ruimte verbannen."
+
+#: ../src/gui_interface.py:338
+#, fuzzy, python-format
+msgid "Group chat %s does not exist."
+msgstr "Die ruimte bestaat niet."
+
+#: ../src/gui_interface.py:341
+#, fuzzy
+msgid "Group chat creation is restricted."
+msgstr "Ruimte creatie is beperkt."
+
+#: ../src/gui_interface.py:344
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Je geregistreerde bijnaam moet gebruikt worden."
+
+#: ../src/gui_interface.py:349
+#, fuzzy, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Je staat niet in de ledenlijst"
+
+#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Fout bij lezen bestand:"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:621 ../src/gui_interface.py:636
+#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "fout tijdens versturen"
 
-#: ../src/gui_interface.py:663 ../src/notify.py:495
+#: ../src/gui_interface.py:540 ../src/notify.py:495
 #, fuzzy
 msgid "Subscription request"
 msgstr "Abonneringsverzoek"
 
-#: ../src/gui_interface.py:688
+#: ../src/gui_interface.py:565
 msgid "Authorization accepted"
 msgstr "Machtiging geaccepteerd"
 
-#: ../src/gui_interface.py:689
+#: ../src/gui_interface.py:566
 #, 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/gui_interface.py:702
+#: ../src/gui_interface.py:579
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contact \"%s\" heeft het abonnement op jou opgezegd"
 
-#: ../src/gui_interface.py:703
+#: ../src/gui_interface.py:580
 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/gui_interface.py:727 ../src/notify.py:497
+#: ../src/gui_interface.py:604 ../src/notify.py:497
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Abonneer"
 
-#: ../src/gui_interface.py:754
+#: ../src/gui_interface.py:631
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kan geen contact maken met \"%s\""
 
-#: ../src/gui_interface.py:1015
+#: ../src/gui_interface.py:859
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1083
+#: ../src/gui_interface.py:926
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gui_interface.py:1085
+#: ../src/gui_interface.py:928
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gui_interface.py:1087
+#: ../src/gui_interface.py:930
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:1091
+#: ../src/gui_interface.py:934
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1093
+#: ../src/gui_interface.py:936
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1095
+#: ../src/gui_interface.py:938
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1098
+#: ../src/gui_interface.py:941
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1101
+#: ../src/gui_interface.py:944
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1133
-#, 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/gui_interface.py:1180
+#: ../src/gui_interface.py:985
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gui_interface.py:1182 ../src/gui_interface.py:1189
+#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Je bent momenteel verbonden zonder OpenPGP sleutel."
 
-#: ../src/gui_interface.py:1184
+#: ../src/gui_interface.py:989
 msgid "Your passphrase is incorrect"
 msgstr "Je wachtwoord is incorrect"
 
-#: ../src/gui_interface.py:1188
+#: ../src/gui_interface.py:993
 #, fuzzy
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Je wachtwoord is incorrect"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid "GPG key not trusted"
 msgstr ""
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
 msgstr ""
 
-#: ../src/gui_interface.py:1226
+#: ../src/gui_interface.py:1031
 msgid ""
 "Gnome Keyring is installed but not                 correctly started "
 "(environment variable probably not                 correctly set)"
 msgstr ""
 
-#: ../src/gui_interface.py:1330
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1332
+#: ../src/gui_interface.py:1133
 #, 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/gui_interface.py:1345
+#: ../src/gui_interface.py:1146
 #, python-format
 msgid ""
 "\n"
@@ -9282,104 +9580,104 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1418
+#: ../src/gui_interface.py:1215
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s wil je een bestand sturen."
 
-#: ../src/gui_interface.py:1455 ../src/roster_window.py:1856
+#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Verwijdert contact van rooster"
 
-#: ../src/gui_interface.py:1458 ../src/roster_window.py:1858
+#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
 #, fuzzy
 msgid "Error opening file"
 msgstr "Fout bij lezen bestand:"
 
-#: ../src/gui_interface.py:1490
+#: ../src/gui_interface.py:1287
 #, 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/gui_interface.py:1494
+#: ../src/gui_interface.py:1291
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Bestandsoverdracht van %(filename)s van %(name)s gestopt."
 
-#: ../src/gui_interface.py:1507
+#: ../src/gui_interface.py:1304
 #, 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/gui_interface.py:1511
+#: ../src/gui_interface.py:1308
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Bestandsoverdracht van %(filename)s aan %(name)s gestopt."
 
-#: ../src/gui_interface.py:1623
+#: ../src/gui_interface.py:1426
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gui_interface.py:1630
+#: ../src/gui_interface.py:1433
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Bij elk _bericht"
 
-#: ../src/gui_interface.py:1702
+#: ../src/gui_interface.py:1505
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:1703
+#: ../src/gui_interface.py:1506
 #, fuzzy
 msgid "Please type a new username for your local account"
 msgstr "<b>Vul de informatie in voor je nieuwe account</b>"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1519
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gui_interface.py:1729
+#: ../src/gui_interface.py:1532
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gui_interface.py:1740
+#: ../src/gui_interface.py:1543
 msgid "Error."
 msgstr ""
 
-#: ../src/gui_interface.py:1768
+#: ../src/gui_interface.py:1556
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Bron: "
 
-#: ../src/gui_interface.py:1769
+#: ../src/gui_interface.py:1557
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1816
+#: ../src/gui_interface.py:1604
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s wil je een bestand sturen."
 
-#: ../src/gui_interface.py:1819
+#: ../src/gui_interface.py:1607
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Bestandsoverdracht Verzoek"
 
-#: ../src/gui_interface.py:1927
+#: ../src/gui_interface.py:1716
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1928
+#: ../src/gui_interface.py:1717
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9387,15 +9685,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1936
+#: ../src/gui_interface.py:1725
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1956
+#: ../src/gui_interface.py:1745
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gui_interface.py:1957
+#: ../src/gui_interface.py:1746
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9406,13 +9704,13 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gui_interface.py:1987 ../src/gui_interface.py:2024
-#: ../src/gui_interface.py:2060
+#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
+#: ../src/gui_interface.py:1849
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Verbinding"
 
-#: ../src/gui_interface.py:1988
+#: ../src/gui_interface.py:1777
 #, fuzzy
 msgid ""
 "You are about to connect to the server with an insecure connection. This "
@@ -9422,18 +9720,18 @@ msgstr ""
 "Je moet een account aanmaken voor je gesprekken kunt voeren met andere "
 "contacten."
 
-#: ../src/gui_interface.py:1991 ../src/gui_interface.py:2028
-#: ../src/gui_interface.py:2063
+#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
+#: ../src/gui_interface.py:1852
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gui_interface.py:2025
+#: ../src/gui_interface.py:1814
 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/gui_interface.py:2061
+#: ../src/gui_interface.py:1850
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9443,60 +9741,60 @@ msgstr ""
 "contacten."
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2624 ../src/gui_interface.py:2647
+#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Versleuteling uitgeschakeld"
 
-#: ../src/gui_interface.py:2625
+#: ../src/gui_interface.py:2423
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2648
+#: ../src/gui_interface.py:2446
 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/gui_interface.py:2679 ../src/roster_window.py:3560
+#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
 #, 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/gui_interface.py:3058
+#: ../src/gui_interface.py:2871
 msgid "Could not save your settings and preferences"
 msgstr "Kan je instellingen en voorkeuren niet opslaan"
 
-#: ../src/gui_interface.py:3592
+#: ../src/gui_interface.py:3411
 msgid "Passphrase Required"
 msgstr "Wachtwoord Vereist"
 
-#: ../src/gui_interface.py:3593
+#: ../src/gui_interface.py:3412
 #, 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/gui_interface.py:3607
+#: ../src/gui_interface.py:3426
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gui_interface.py:3608
+#: ../src/gui_interface.py:3427
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Je zult verbonden worden met %s zonder OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3617
+#: ../src/gui_interface.py:3436
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Wachtwoord"
 
-#: ../src/gui_interface.py:3618
+#: ../src/gui_interface.py:3437
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
@@ -9538,6 +9836,12 @@ msgstr "Bijnaam:"
 msgid "Message"
 msgstr "_Bericht"
 
+#. holds subject
+#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#, fuzzy
+msgid "Subject"
+msgstr "Onderwerp:"
+
 #: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -9630,22 +9934,22 @@ msgstr "Er is geen verbinding met de server"
 msgid "Do you really want to close them all?"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/message_window.py:484
+#: ../src/message_window.py:485
 #, fuzzy
 msgid "Chats"
 msgstr "Gesprek"
 
-#: ../src/message_window.py:486
+#: ../src/message_window.py:487
 #, fuzzy
 msgid "Group Chats"
 msgstr "Groupsgesprek"
 
-#: ../src/message_window.py:488
+#: ../src/message_window.py:489
 #, fuzzy
 msgid "Private Chats"
 msgstr "Start Gesprek"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:495
 #, fuzzy
 msgid "Messages"
 msgstr "_Bericht"
@@ -9703,60 +10007,60 @@ msgstr ""
 msgid "Ignore"
 msgstr "_Verder"
 
-#: ../src/profile_window.py:57
+#: ../src/profile_window.py:58
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2935
+#: ../src/profile_window.py:111 ../src/roster_window.py:3001
 #, fuzzy
 msgid "File is empty"
 msgstr "Bestandspad"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2938
+#: ../src/profile_window.py:114 ../src/roster_window.py:3004
 #, fuzzy
 msgid "File does not exist"
 msgstr "Die ruimte bestaat niet."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2940 ../src/roster_window.py:2951
+#: ../src/profile_window.py:128 ../src/profile_window.py:144
+#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/profile_window.py:214
+#: ../src/profile_window.py:215
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Contact Informatie"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:216
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Formaat: YYYY-MM-DD"
 
-#: ../src/profile_window.py:269
+#: ../src/profile_window.py:270
 #, fuzzy
 msgid "Information received"
 msgstr "Uitnodiging Ontvangen"
 
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:341
 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:353
+#: ../src/profile_window.py:354
 msgid "Sending profile..."
 msgstr ""
 
-#: ../src/profile_window.py:368
+#: ../src/profile_window.py:369
 msgid "Information NOT published"
 msgstr ""
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:376
 msgid "vCard publication failed"
 msgstr "vCard publicatie is mislukt"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:377
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9764,51 +10068,51 @@ msgstr ""
 "Er trad een fout up bij het publiceren van je persoonlijke informatie, "
 "probeer het later nogmaals."
 
-#: ../src/roster_window.py:256 ../src/roster_window.py:1012
+#: ../src/roster_window.py:262 ../src/roster_window.py:1026
 msgid "Merged accounts"
 msgstr "Samengevoegde accounts"
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1942
 msgid "Authorization has been sent"
 msgstr "Machtiging is verzonden"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1943
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "\"%s\" zal nu je status ontvangen."
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1966
 msgid "Subscription request has been sent"
 msgstr "Abonneringsverzoek is verzonden"
 
-#: ../src/roster_window.py:1944
+#: ../src/roster_window.py:1967
 #, 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:1958
+#: ../src/roster_window.py:1981
 msgid "Authorization has been removed"
 msgstr "Machtiging is verwijdert"
 
-#: ../src/roster_window.py:1959
+#: ../src/roster_window.py:1982
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" zal je nu altijd als offline zien."
 
-#: ../src/roster_window.py:1986
+#: ../src/roster_window.py:2009
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:1987
+#: ../src/roster_window.py:2010
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Je zult verbonden worden met %s zonder OpenPGP."
 
-#: ../src/roster_window.py:2199 ../src/roster_window.py:3496
+#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
 msgid "You are participating in one or more group chats"
 msgstr "Je neem deel aan een of meerdere groepsgesprekken"
 
-#: ../src/roster_window.py:2200 ../src/roster_window.py:3497
+#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9817,39 +10121,39 @@ msgstr ""
 "groepsgesprekken verbroken worden. Weet je zeker dat je naar onzichtbaar "
 "wilt gaan?"
 
-#: ../src/roster_window.py:2226
+#: ../src/roster_window.py:2249
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2288
+#: ../src/roster_window.py:2311
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2289
+#: ../src/roster_window.py:2312
 #, 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:2290
+#: ../src/roster_window.py:2313
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2373
+#: ../src/roster_window.py:2396
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Bestandsoverdracht annuleren"
 
-#: ../src/roster_window.py:2374
+#: ../src/roster_window.py:2397
 msgid ""
-"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2405 ../src/roster_window.py:2653
+#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
 msgid "You have unread messages"
 msgstr "Je hebt ongelezen berichten"
 
-#: ../src/roster_window.py:2406
+#: ../src/roster_window.py:2429
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9858,16 +10162,16 @@ msgstr ""
 "Berichten zullen alleen voor later beschikbaar zijn als de geschiedenis "
 "ingeschakeld is."
 
-#: ../src/roster_window.py:2654
+#: ../src/roster_window.py:2720
 msgid "You must read them before removing this transport."
 msgstr ""
 
-#: ../src/roster_window.py:2657
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" zal worden verwijderd"
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2724
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -9876,12 +10180,12 @@ msgstr ""
 "Het zal niet meer mogelijk zijn berichten te sturen en ontvangen van "
 "contacten via deze transport"
 
-#: ../src/roster_window.py:2661
+#: ../src/roster_window.py:2727
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Transport \"%s\" zal worden verwijderd"
 
-#: ../src/roster_window.py:2666
+#: ../src/roster_window.py:2732
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9890,74 +10194,74 @@ msgstr ""
 "Het zal niet meer mogelijk zijn berichten te sturen en ontvangen van "
 "contacten via deze transport"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2800
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "Je moet een account aanmaken voor je gesprekken kunt voeren met andere "
 "contacten."
 
-#: ../src/roster_window.py:2736
+#: ../src/roster_window.py:2802
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2827
+#: ../src/roster_window.py:2893
 #, fuzzy
 msgid "Rename Contact"
 msgstr "_Inhoud"
 
-#: ../src/roster_window.py:2828
+#: ../src/roster_window.py:2894
 #, 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:2835
+#: ../src/roster_window.py:2901
 #, fuzzy
 msgid "Rename Group"
 msgstr "_Hernoem"
 
-#: ../src/roster_window.py:2836
+#: ../src/roster_window.py:2902
 #, 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:2881
+#: ../src/roster_window.py:2947
 #, fuzzy
 msgid "Remove Group"
 msgstr "_Verwijder"
 
-#: ../src/roster_window.py:2882
+#: ../src/roster_window.py:2948
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: ../src/roster_window.py:2883
+#: ../src/roster_window.py:2949
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Verwijdert contact van rooster"
 
-#: ../src/roster_window.py:2922
+#: ../src/roster_window.py:2988
 msgid "Assign OpenPGP Key"
 msgstr "Wijs een OpenPGP sleutel toe"
 
-#: ../src/roster_window.py:2923
+#: ../src/roster_window.py:2989
 msgid "Select a key to apply to the contact"
 msgstr "Selecteer een sleutel om aan de contact toe te wijzen"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3372
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contact \"%s\" zal van je rooster verwijdert worden"
 
-#: ../src/roster_window.py:3308
+#: ../src/roster_window.py:3374
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3313
+#: ../src/roster_window.py:3379
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -9967,12 +10271,12 @@ msgstr ""
 "status te zien. Hij/Zij zal jou altijd als offline zien."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3319
+#: ../src/roster_window.py:3385
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/roster_window.py:3323
+#: ../src/roster_window.py:3389
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9980,17 +10284,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:3326
+#: ../src/roster_window.py:3392
 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:3330
+#: ../src/roster_window.py:3396
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Contact \"%s\" zal van je rooster verwijdert worden"
 
-#: ../src/roster_window.py:3335
+#: ../src/roster_window.py:3401
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9999,7 +10303,7 @@ 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:3393
+#: ../src/roster_window.py:3459
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want  to continue?"
@@ -10007,34 +10311,34 @@ msgstr ""
 "Je moet een account aanmaken voor je gesprekken kunt voeren met andere "
 "contacten."
 
-#: ../src/roster_window.py:3395
+#: ../src/roster_window.py:3461
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he or she will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3414
+#: ../src/roster_window.py:3480
 msgid "No account available"
 msgstr "Geen account beschikbaar"
 
-#: ../src/roster_window.py:3415
+#: ../src/roster_window.py:3481
 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:4023
+#: ../src/roster_window.py:4095
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: ../src/roster_window.py:4025
+#: ../src/roster_window.py:4097
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: ../src/roster_window.py:4117
+#: ../src/roster_window.py:4189
 #, fuzzy
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
@@ -10042,31 +10346,31 @@ msgstr ""
 "Je moet een account aanmaken voor je gesprekken kunt voeren met andere "
 "contacten."
 
-#: ../src/roster_window.py:4119
+#: ../src/roster_window.py:4191
 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:4234
+#: ../src/roster_window.py:4306
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Ongeldig Bestand"
 
-#: ../src/roster_window.py:4246
+#: ../src/roster_window.py:4318
 #, 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:4361
+#: ../src/roster_window.py:4433
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Stuur %s"
 
-#: ../src/roster_window.py:4367
+#: ../src/roster_window.py:4439
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Stuurt een bestand aan contact"
@@ -10076,156 +10380,156 @@ msgstr "Stuurt een bestand aan contact"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4816 ../src/roster_window.py:4889
-#: ../src/roster_window.py:4898 ../src/statusicon.py:246
-#: ../src/statusicon.py:293 ../src/statusicon.py:299
+#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
+#: ../src/roster_window.py:4970 ../src/statusicon.py:263
+#: ../src/statusicon.py:310 ../src/statusicon.py:316
 #, python-format
 msgid "using account %s"
 msgstr "via account %s"
 
 #. add
-#: ../src/roster_window.py:4905
+#: ../src/roster_window.py:4977
 #, python-format
 msgid "to %s account"
 msgstr "aan %s account"
 
 #. disco
-#: ../src/roster_window.py:4910
+#: ../src/roster_window.py:4982
 #, python-format
 msgid "using %s account"
 msgstr "via %s account"
 
-#: ../src/roster_window.py:4948 ../src/statusicon.py:309
+#: ../src/roster_window.py:5020 ../src/statusicon.py:326
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "Beheer Bladwijzers..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4968
+#: ../src/roster_window.py:5040
 #, fuzzy, python-format
 msgid "of account %s"
 msgstr "voor account %s"
 
-#: ../src/roster_window.py:5009
+#: ../src/roster_window.py:5081
 #, python-format
 msgid "for account %s"
 msgstr "voor account %s"
 
-#: ../src/roster_window.py:5069 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
 msgid "_Change Status Message"
 msgstr "_Wijzig Statusbericht"
 
-#: ../src/roster_window.py:5102
+#: ../src/roster_window.py:5174
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publiceren"
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5176
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Publiceren"
 
-#: ../src/roster_window.py:5107
+#: ../src/roster_window.py:5179
 #, fuzzy
 msgid "Configure Services..."
 msgstr "Ontdek Services..."
 
-#: ../src/roster_window.py:5252
+#: ../src/roster_window.py:5324
 msgid "_Maximize All"
 msgstr ""
 
-#: ../src/roster_window.py:5262 ../src/roster_window.py:5436
+#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "Ver_stuur Server Bericht"
 
-#: ../src/roster_window.py:5270
+#: ../src/roster_window.py:5342
 msgid "To all users"
 msgstr ""
 
-#: ../src/roster_window.py:5274
+#: ../src/roster_window.py:5346
 #, fuzzy
 msgid "To all online users"
 msgstr "_Online Gebruikers"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5456
+#: ../src/roster_window.py:5528
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "_Inhoud"
 
 #. Edit Groups
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5537
 msgid "Edit _Groups"
 msgstr "Wijzig _Groepen"
 
 #. Send single message
-#: ../src/roster_window.py:5520
+#: ../src/roster_window.py:5592
 #, fuzzy
 msgid "Send Single Message"
 msgstr "Ver_stuur Enkel Bericht"
 
 #. Execute Command
-#: ../src/roster_window.py:5567
+#: ../src/roster_window.py:5639
 msgid "Execute Command..."
 msgstr ""
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5577
+#: ../src/roster_window.py:5649
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transporten"
 
 #. Modify Transport
-#: ../src/roster_window.py:5586
+#: ../src/roster_window.py:5658
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Transporten"
 
 #. Rename
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5668
 msgid "_Rename"
 msgstr "_Hernoem"
 
-#: ../src/roster_window.py:5656
+#: ../src/roster_window.py:5728
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5665
+#: ../src/roster_window.py:5737
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Contact is Ingelogd"
 
-#: ../src/roster_window.py:5672
+#: ../src/roster_window.py:5744
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Contact is Ingelogd"
 
 #. History manager
-#: ../src/roster_window.py:5754
+#: ../src/roster_window.py:5833
 #, fuzzy
 msgid "History Manager"
 msgstr "_Geschiedenis"
 
-#: ../src/roster_window.py:5765
+#: ../src/roster_window.py:5844
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "Neem deel aan Groepsgesprek"
 
-#: ../src/roster_window.py:5938
+#: ../src/roster_window.py:6019
 msgid "Change Status Message..."
 msgstr "Wijzig Statusbericht..."
 
-#: ../src/search_window.py:94
+#: ../src/search_window.py:105
 msgid "Waiting for results"
 msgstr ""
 
-#: ../src/search_window.py:132 ../src/search_window.py:210
+#: ../src/search_window.py:143 ../src/search_window.py:220
 msgid "Error in received dataform"
 msgstr ""
 
 #. No result
-#: ../src/search_window.py:166 ../src/search_window.py:202
+#: ../src/search_window.py:177 ../src/search_window.py:212
 msgid "No result"
 msgstr ""
 
@@ -10238,21 +10542,22 @@ msgstr ""
 msgid "Subject: %s"
 msgstr "Onderwerp: %s\n"
 
-#: ../src/session.py:433 ../src/session.py:468
+#: ../src/session.py:447 ../src/session.py:491
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:435
+#: ../src/session.py:448
 #, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
+"The remote client wants '\n"
+"                            'to negotiate an session with these features:\n"
 "\n"
 "%s\n"
 "\n"
 "Are these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:469
+#: ../src/session.py:492
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10262,16 +10567,16 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/statusicon.py:210
+#: ../src/statusicon.py:227
 msgid "_Change Status Message..."
 msgstr "_Wijzig Statusbericht..."
 
-#: ../src/statusicon.py:322
+#: ../src/statusicon.py:339
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "niet in het rooster"
 
-#: ../src/statusicon.py:333
+#: ../src/statusicon.py:350
 msgid "Hide this menu"
 msgstr "Verberg dit menu"
 
@@ -10413,34 +10718,34 @@ msgstr ""
 "Deze service kon niet antwoorde met gedetaileerde informatie.\n"
 "Het is waarschijnlijk veroudert of kapot"
 
-#: ../src/vcard.py:251
+#: ../src/vcard.py:265
 msgid "?Client:Unknown"
 msgstr "?Client:Onbekend"
 
-#: ../src/vcard.py:253
+#: ../src/vcard.py:267
 msgid "?OS:Unknown"
 msgstr "?OS:Onbekend"
 
-#: ../src/vcard.py:274
+#: ../src/vcard.py:288
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "?Client:Onbekend"
 
-#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
+#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Doorbladeren van %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:345
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:349
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Toepassingen</b>"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:357
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10448,7 +10753,7 @@ msgstr ""
 "Deze contact is geïnteresseert in jou aanwezigheid, maar jij niet in zijn/"
 "haar aanwezigheid"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:359
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10456,31 +10761,72 @@ msgstr ""
 "Je bent geïnteresseert in de contact z'n aanwezigheid, maar hij/zij niet in "
 "jouw aanwezigheid"
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:361
 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:349
+#: ../src/vcard.py:363
 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:356
+#: ../src/vcard.py:370
 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:358
+#: ../src/vcard.py:372
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
+#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
 msgid " resource with priority "
 msgstr " bron met prioriteit"
 
+#, fuzzy
+#~ msgid "_Show event in systray"
+#~ msgstr "Alleen in _rooster weergeven"
+
+#, fuzzy
+#~ msgid "Autodetect on every Gajim startup"
+#~ msgstr "Automatisch _verbinding maken als Gajim opstart"
+
+#, fuzzy
+#~ msgid "Show systray:"
+#~ msgstr "Alleen in _rooster weergeven"
+
+#, fuzzy
+#~ msgid "Nickname not allowed: %s"
+#~ msgstr "Bijnaam niet gevonden: %s"
+
+#, fuzzy
+#~ msgid "Room has been destroyed"
+#~ msgstr "Machtiging is verwijdert"
+
+#~ msgid "I would like to add you to my roster."
+#~ msgstr "Ik zou je graag aan mijn rooster willen toevoegen."
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "we zijn nu op %s geabonneert"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "afmelding verzocht van %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "we zijn nu van %s afgemeld"
+
+#, fuzzy
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "Jid %s is niet in lijn met de RFC. Het zal niet toegevoegd worden aan "
+#~ "jouw rooster. Gebruik een roostermanagement applicatie zoals http://jru."
+#~ "jabberstudio.org/ om het te verwijderen"
+
 #~ msgid "Account Modification"
 #~ msgstr "Account Wijziging"
 
@@ -10542,34 +10888,6 @@ msgstr " bron met prioriteit"
 #~ msgid "gtk-delete"
 #~ msgstr "Wis MOTD"
 
-#, fuzzy
-#~ msgid "Add this contact to roster (Ctrl+D)"
-#~ msgstr "Voegt contact toe aan rooster"
-
-#, fuzzy
-#~ msgid "Bookmark this room (Ctrl+B)"
-#~ msgstr "Maak _Bladwijzer Voor Deze Ruimte"
-
-#, fuzzy
-#~ msgid "Change your nickname (Ctrl+N)"
-#~ msgstr "Verander Bij_naam"
-
-#, fuzzy
-#~ msgid "Invite contacts to the conversation (Ctrl+G)"
-#~ msgstr "let op deze conversatie"
-
-#, fuzzy
-#~ msgid "Show a list of emoticons (Alt+M)"
-#~ msgstr "Klik om een emoticon in te voegen (Alt+E)"
-
-#, fuzzy
-#~ msgid "Show a list of formattings"
-#~ msgstr "Klik om een emoticon in te voegen (Alt+E)"
-
-#, fuzzy
-#~ msgid "Show a menu of advanced functions (Alt+D)"
-#~ msgstr "Klik om een emoticon in te voegen (Alt+E)"
-
 #~ msgid ""
 #~ "All chat states\n"
 #~ "Composing only\n"
@@ -10597,9 +10915,6 @@ msgstr " bron met prioriteit"
 #~ msgid "gtk-cancel"
 #~ msgstr "Wis MOTD"
 
-#~ msgid "_Preferences"
-#~ msgstr "_Voorkeuren"
-
 #~ msgid "_Quit"
 #~ msgstr "A_fsluiten"
 
@@ -10968,10 +11283,6 @@ msgstr " bron met prioriteit"
 #~ msgid "The auto not available status message"
 #~ msgstr "Het statusbericht voor automatisch niet beschikbaar"
 
-#, fuzzy
-#~ msgid "Use t_rayicon (aka. notification area icon)"
-#~ msgstr "_Icoon in mededelingsgebied"
-
 #, fuzzy
 #~ msgid ""
 #~ "When a new event (message, file transfer request etc..) is received, the "
@@ -11091,14 +11402,6 @@ msgstr " bron met prioriteit"
 #~ msgstr ""
 #~ "Sessiebeheer ondersteuning is niet beschikbaar (gnome.ui module ontbreekt)"
 
-#, fuzzy
-#~ msgid ""
-#~ "Usage: %s %s %s \n"
-#~ "\t %s"
-#~ msgstr ""
-#~ "Gebruik: %s %s %s \n"
-#~ "\t"
-
 #, fuzzy
 #~ msgid "Private Chat"
 #~ msgstr "Start Gesprek"
diff --git a/po/no.po b/po/no.po
index 537f3a2eba02830663d71321c4866f3146ec17e0..63f062025903b633eabf9f715b6c10c84a086a4d 100644
--- a/po/no.po
+++ b/po/no.po
@@ -2,11 +2,15 @@
 # This file is distributed under the same license as the Gajim package.
 # Stian B. Barmen <stian@jabber.no>, 2005.
 #
+#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 11:28+0200\n"
+"POT-Creation-Date: 2010-10-01 20:39+0200\n"
 "PO-Revision-Date: 2009-11-18 15:50+0100\n"
 "Last-Translator: Stian B. Barmen <stian@barmen.nu>\n"
 "Language-Team: <>\n"
@@ -25,7 +29,7 @@ msgstr "Bli med i _Gruppe Samtale..."
 msgid "_Add Contact..."
 msgstr "_Legg til Kontakt..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:17
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
 msgid "_Discover Services"
 msgstr "_Oppdag Tjenester"
 
@@ -45,7 +49,7 @@ msgstr "_Ã…pne Gmail Innboks"
 msgid "_Personal Events"
 msgstr "_Personlige Hendelser"
 
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:23
+#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
 msgid "_Start Chat..."
 msgstr "_Start Samtale..."
 
@@ -77,10 +81,6 @@ msgid "<b>Please select a server</b>"
 msgstr "<b>Vennligst velg en server</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid "@"
-msgstr "@"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
@@ -88,64 +88,64 @@ msgstr ""
 "Legg til dette sertifikatet til listen over tiltrodde leverandører.\n"
 "SHA1 fingeravtrykk til sertifikatet:\n"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:10
 msgid "Anon_ymous authentication"
 msgstr "Anon_ym autentisering"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Connect when I press Finish"
 msgstr "Koble til når jeg klikker Ferdig"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Konto Opprettings Veiviser"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "I already have an account I want to _use"
 msgstr "Jeg har allerede en konto jeg ønsker å _bruke"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I want to _register for a new account"
 msgstr "Jeg ønsker å _registrere en ny konto"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:16
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 #: ../data/gui/accounts_window.ui.h:28
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Dersom valgt vil Gajim huske passordet for kontoen"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:17
+#: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Behandle..."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:18
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
 #: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2263 ../src/config.py:2342
-#: ../src/config.py:2355 ../src/config.py:3596 ../src/config.py:3671
-#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513
-#: ../src/dialogs.py:526 ../src/roster_window.py:2890
-#: ../src/roster_window.py:2896 ../src/roster_window.py:2901
+#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
+#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
+#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
+#: ../src/dialogs.py:527 ../src/roster_window.py:2956
+#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
 msgid "None"
 msgstr "Ingen"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:19
+#: ../data/gui/account_creation_wizard_window.ui.h:18
 msgid "Prox_y:"
 msgstr "Prox_y:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #: ../data/gui/accounts_window.ui.h:48
 msgid "Save pass_word"
 msgstr "Lagre pass_ord"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:21
+#: ../data/gui/account_creation_wizard_window.ui.h:20
 msgid "Set my profile when I connect"
 msgstr "Klargjør profilen min når jeg kobler til"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:22
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Use custom hostname/port"
 msgstr "Bruk egendefinert maskinnavn/port"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:23
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -153,34 +153,34 @@ msgstr ""
 "Du trenger en konto før du kan koble\n"
 "til Jabber nettverket."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-#: ../data/gui/roster_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:16
 msgid "_Advanced"
 msgstr "_Avansert"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:25
 msgid "_Finish"
 msgstr "_Avslutt"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:27
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Hostname:"
 msgstr "_Maskinnavn:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #: ../data/gui/accounts_window.ui.h:62
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:28
 #: ../data/gui/accounts_window.ui.h:64
 msgid "_Password:"
 msgstr "_Passord:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:29
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:31
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Server:"
 msgstr "_Server:"
 
@@ -288,17 +288,17 @@ msgstr "Fornavn:"
 #. No configured account
 #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
 #: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592
-#: ../src/notify.py:608
+#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
+#: ../src/notify.py:616
 msgid "Gajim"
 msgstr "Gajim"
 
 #. FIXME: Ugly workaround.
 #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
 #. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:61
-#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121
-#: ../src/roster_window.py:2832 ../src/roster_window.py:5379
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
+#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
 msgid "General"
 msgstr "Generelle"
 
@@ -355,7 +355,7 @@ msgstr "Informasjon om deg, slik som den er lagret på serveren"
 
 #: ../data/gui/accounts_window.ui.h:35
 #: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:830
+#: ../src/dialogs.py:831
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -369,7 +369,7 @@ msgid "Mer_ge accounts"
 msgstr "Sammenslåin_g av kontoer"
 
 #: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2356
+#: ../src/config.py:2358
 msgid "No key selected"
 msgstr "Ingen nøkkel valgt"
 
@@ -396,7 +396,7 @@ msgid "Priority will change automatically according to your status."
 msgstr "Prioritet vil endres automatisk etter din status."
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5329
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
 msgid "Re_name"
 msgstr "Gi _nytt navn"
 
@@ -621,38 +621,43 @@ msgid "Deletes Message of the Day"
 msgstr "Sletter Meling for Dagen"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
+#, fuzzy
+msgid "Edit Archi_ving Preferences"
+msgstr "_Instillinger"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Edit _Privacy Lists..."
 msgstr "Rediger _Private Lister..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sends a message to users currently connected to this server"
 msgstr "Sender en melding til alle tilkoblede brukere på denne serveren"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Set MOTD..."
 msgstr "Sett MOTD..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Setter Melding for Dagen"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Show _XML Console"
 msgstr "Vis _XML Konsoll"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "Update MOTD..."
 msgstr "Oppdater MOTD..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "Uppdaterer Melding for Dagen"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:11
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:11
+#: ../data/gui/advanced_menuitem_menu.ui.h:12
 msgid "_Send Server Message..."
 msgstr "_Send Server Melding..."
 
@@ -686,7 +691,7 @@ msgid "All statuses"
 msgstr "Alle statuser"
 
 #: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:233
+#: ../src/common/commands.py:106 ../src/common/helpers.py:239
 #: ../src/tooltips.py:193
 msgid "Away"
 msgstr "Borte"
@@ -739,7 +744,7 @@ msgid "Have "
 msgstr "Har"
 
 #: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:249
 msgid "Invisible"
 msgstr "Usynlig"
 
@@ -748,7 +753,7 @@ msgid "Launch a command"
 msgstr "Kjør en kommando"
 
 #: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:216 ../src/tooltips.py:197
+#: ../src/common/helpers.py:222 ../src/tooltips.py:197
 msgid "Not Available"
 msgstr "Ikke tilgjengelig"
 
@@ -793,12 +798,13 @@ msgid "_Disable existing sound for this event"
 msgstr "_Deaktiver eksisterende lyd for denne hendelsen"
 
 #: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in roster"
+#, fuzzy
+msgid "_Disable showing event in notification area"
 msgstr "_Deaktiver visning av hendelser i kontaktlisten"
 
 #: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in systray"
-msgstr "_Deaktiver visning av hendelser i systemstatusfeltet"
+msgid "_Disable showing event in roster"
+msgstr "_Deaktiver visning av hendelser i kontaktlisten"
 
 #: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
@@ -809,12 +815,13 @@ msgid "_Open chat window with user"
 msgstr "_Ã…pne samtale vindu med bruker"
 
 #: ../data/gui/advanced_notifications_window.ui.h:35
-msgid "_Show event in roster"
+#, fuzzy
+msgid "_Show event in notification area"
 msgstr "_Vis hendelse i kontaktliste"
 
 #: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in systray"
-msgstr "_Vis hendelse i systemstatusfeltet"
+msgid "_Show event in roster"
+msgstr "_Vis hendelse i kontaktliste"
 
 #: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
@@ -842,6 +849,45 @@ msgstr "Grupper"
 msgid "when I'm in"
 msgstr "når jeg er i"
 
+#: ../data/gui/archiving_preferences_window.ui.h:1
+msgid "<i>Method Auto</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "<i>Method Local</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:3
+msgid "<i>Method Manual</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:4
+#, fuzzy
+msgid "Auto"
+msgstr "Auto bli med"
+
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Concede"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "Forbid"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:7
+#, fuzzy
+msgid "No"
+msgstr "Ingen"
+
+#: ../data/gui/archiving_preferences_window.ui.h:8
+#, fuzzy
+msgid "Prefer"
+msgstr "Tilstedeværelse"
+
+#: ../data/gui/archiving_preferences_window.ui.h:9
+msgid "Yes"
+msgstr ""
+
 #: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Entry:"
@@ -868,8 +914,8 @@ msgstr "Blokkerte Kontakter"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5348
-#: ../src/roster_window.py:5476 ../src/roster_window.py:5609
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
+#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
 msgid "_Unblock"
 msgstr "_Frigi"
 
@@ -957,7 +1003,7 @@ msgid "_Start Chat"
 msgstr "_Start Samtale"
 
 #. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4184
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
 msgid "#"
 msgstr "#"
 
@@ -1005,13 +1051,50 @@ msgstr ""
 msgid "9"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:13
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Legg til kontakt til kontaktlisten (Ctrl+D)"
+
 #: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Søk gjennom samtale historikken (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:15
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Inviter kontakter til samtalen (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Vis en liste over uttrykksikon (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
+msgid "Show a list of formattings"
+msgstr "Vis en liste over formatteringer"
+
+#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Vis en meny med avanserte funksjoner (Alt+A)"
+
+#: ../data/gui/chat_control.ui.h:19
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr "Vis kontaktens profil (Ctrl+I)"
+
+#: ../data/gui/chat_control.ui.h:20
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:21
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
 #: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Send"
 
-#: ../data/gui/chat_control.ui.h:15 ../data/gui/groupchat_control.ui.h:3
+#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
 msgid "label"
 msgstr ""
 
@@ -1061,8 +1144,8 @@ msgstr "Rediger _Grupper..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5284
-#: ../src/roster_window.py:5444
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
+#: ../src/roster_window.py:5516
 msgid "In_vite to"
 msgstr "In_viter til"
 
@@ -1074,8 +1157,8 @@ msgstr "Inviter _Kontakter"
 msgid "Remo_ve"
 msgstr "_Fjern"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5294
-#: ../src/roster_window.py:5533
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
+#: ../src/roster_window.py:5605
 msgid "Send Cus_tom Status"
 msgstr "Send Egendefiner_t Status"
 
@@ -1108,8 +1191,8 @@ msgid "_Allow him/her to see my status"
 msgstr "_Tillat han/henne å se min status"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5482 ../src/roster_window.py:5612
+#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
+#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
 msgid "_Block"
 msgstr "_Blokker"
 
@@ -1119,8 +1202,8 @@ msgstr "_Forby han/henne å se min status"
 
 #: ../data/gui/contact_context_menu.ui.h:20
 #: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:21
-#: ../src/roster_window.py:5683
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
+#: ../src/roster_window.py:5755
 msgid "_History"
 msgstr "_Historie"
 
@@ -1253,7 +1336,7 @@ msgstr "<b>Samtalestatus Fane Farger</b>"
 msgid "Account row"
 msgstr "Konto"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:925
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
 msgid "Bold"
 msgstr "Fet"
 
@@ -1291,7 +1374,7 @@ msgstr "Gruppe"
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:926
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
 msgid "Italic"
 msgstr "Kursiv"
 
@@ -1339,7 +1422,7 @@ msgstr "Endre _Tittel..."
 msgid "Configure _Room..."
 msgstr "Konfigurer _Rom..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1782
+#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
 msgid "_Bookmark"
 msgstr "_Bokmerke"
 
@@ -1399,19 +1482,31 @@ msgstr "_Send Privat Melding"
 msgid "_Voice"
 msgstr "_Stemme"
 
+#: ../data/gui/groupchat_control.ui.h:1
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "_Bokmerke dette rommet (Ctrl+B)"
+
+#: ../data/gui/groupchat_control.ui.h:3
+msgid "Change the room's subject (Alt+T)"
+msgstr "Endre rommets emne (Alt+T)"
+
+#: ../data/gui/groupchat_control.ui.h:4
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Endre ditt _Kallenavn (Ctrl+N)"
+
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Lag en ny post"
 
-#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
-msgid "From"
-msgstr "Fra"
+#: ../data/gui/groups_post_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:2
+msgid "From:"
+msgstr "Fra:"
 
-#. holds subject
-#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
-#: ../src/history_manager.py:219
-msgid "Subject"
-msgstr "Tittel"
+#: ../data/gui/groups_post_window.ui.h:3
+#: ../data/gui/single_message_window.ui.h:7
+msgid "Subject:"
+msgstr "Tema:"
 
 #: ../data/gui/history_manager.ui.h:1
 msgid ""
@@ -1428,8 +1523,8 @@ msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Velkommen til Gajims Historikk og Logg Behandler</b></big>"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3208
-#: ../src/dialogs.py:3305
+#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
+#: ../src/dialogs.py:3321
 msgid "Delete"
 msgstr "Slett"
 
@@ -1487,12 +1582,75 @@ msgstr "Søk:"
 msgid "_Log conversation history"
 msgstr "_Logg samtale historikk"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
+msgid "approve"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:2
+msgid "body"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:3
+msgid "concede"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:4
+msgid "expire"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:5
+msgid "false"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:6
+msgid "forbid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:7
+#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+msgid "jid"
+msgstr "jid"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:8
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
+#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
+msgid "message"
+msgstr "melding"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
+msgid "oppose"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
+#, fuzzy
+msgid "otr"
+msgstr "Varm"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:11
+msgid "prefer"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:12
+msgid "require"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:13
+msgid "save"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:14
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
 msgid "Bro_wse Rooms"
 msgstr "_Utforsk"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2180
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
 msgid "Join Group Chat"
 msgstr "Bli med i Gruppesamtale"
 
@@ -1530,8 +1688,8 @@ msgstr "Server:"
 msgid "_Bookmark this room"
 msgstr "Bokmerke dette rommet"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1341
-#: ../src/disco.py:1786
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../src/disco.py:1804
 msgid "_Join"
 msgstr "_Bli med"
 
@@ -1635,6 +1793,75 @@ msgstr "_Brukernavn:"
 msgid "Passphrase"
 msgstr "Passord setning"
 
+#: ../data/gui/plugins_window.ui.h:1
+msgid "&lt;empty&gt;"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:2
+msgid "<empty>"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:3
+#, fuzzy
+msgid "Authors:"
+msgstr "Go_dkjenn"
+
+#: ../data/gui/plugins_window.ui.h:4
+#, fuzzy
+msgid "Available"
+msgstr "_Tilgjengelig"
+
+#: ../data/gui/plugins_window.ui.h:5
+#, fuzzy
+msgid "Configure"
+msgstr "_Konfigurer"
+
+#: ../data/gui/plugins_window.ui.h:6
+#, fuzzy
+msgid "Descrition:"
+msgstr "Beskrivelse:"
+
+#: ../data/gui/plugins_window.ui.h:7
+#, fuzzy
+msgid "Homepage:"
+msgstr "<b>Hjemmeside:</b>"
+
+#: ../data/gui/plugins_window.ui.h:8
+msgid "Install"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:9
+#, fuzzy
+msgid "Installed"
+msgstr "Henger"
+
+#: ../data/gui/plugins_window.ui.h:10
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:11
+msgid "Plugins"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:12
+msgid "Uninstall"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:13
+#, fuzzy
+msgid "Version:"
+msgstr "GTK+ Versjon:"
+
+#: ../data/gui/plugins_window.ui.h:14
+msgid "button"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:15
+msgid "homepage url"
+msgstr ""
+
 #: ../data/gui/popup_notification_window.ui.h:1
 #, fuzzy
 msgid "Event Type"
@@ -1762,123 +1989,103 @@ msgid "Always"
 msgstr "Borte"
 
 #: ../data/gui/preferences_window.ui.h:31
-#, fuzzy
-msgid "Always use GNOME default applications"
-msgstr "Alltid bruk OS/X standard applikasjoner"
-
-#: ../data/gui/preferences_window.ui.h:32
-#, fuzzy
-msgid "Always use KDE default applications"
-msgstr "Alltid bruk OS/X standard applikasjoner"
-
-#: ../data/gui/preferences_window.ui.h:33
-#, fuzzy
-msgid "Always use Xfce default applications"
-msgstr "Alltid bruk OS/X standard applikasjoner"
-
-#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Spør etter status melding når jeg:"
 
-#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
 msgid "Audio / Video"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:33
 msgid "Audio input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Audio output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:38
-#, fuzzy
-msgid "Autodetect on every Gajim startup"
-msgstr "K_oble til når Gajim starter"
-
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:35
 msgid "Chat message:"
 msgstr "Samtale melding:"
 
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:36
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Sjekk ved oppstart om Gajim er _standard Jabber klient"
 
-#: ../data/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:37
 #, fuzzy
 msgid "Composing only"
 msgstr "Skriver"
 
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:38
 msgid "Configure color and font of the interface"
 msgstr "Konfigurer farge og font for grensesnittet"
 
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Samtale melding:"
 
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Kontakt navn"
 
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:41
 msgid "Custom"
 msgstr "Egendefinert"
 
-#: ../data/gui/preferences_window.ui.h:46
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Detached roster with chat grouped by account"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Detached roster with detached chats"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:45
 msgid "Detached roster with single chat"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
-#: ../src/config.py:671
+#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
+#: ../src/config.py:665
 msgid "Disabled"
 msgstr "Deaktivert"
 
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:47
 msgid "Display _activity of contacts in roster"
 msgstr "Vis _aktivitet til kontakter i kontaktlisten"
 
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:48
 msgid "Display _extra email details"
 msgstr "Vis _ekstra e-post detaljer"
 
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:49
 #, fuzzy
 msgid "Display _location of contacts in roster"
 msgstr "Vis h_umør til kontakter i kontaktlisten"
 
-#: ../data/gui/preferences_window.ui.h:54
+#: ../data/gui/preferences_window.ui.h:50
 msgid "Display _tunes of contacts in roster"
 msgstr "Vis _sanger til kontakter i kontaktlisten"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display a_vatars of contacts in roster"
 msgstr "Viser _kontaktikoner for kontakter i kontaktlisten"
 
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display m_ood of contacts in roster"
 msgstr "Vis h_umør til kontakter i kontaktlisten"
 
-#: ../data/gui/preferences_window.ui.h:57
+#: ../data/gui/preferences_window.ui.h:53
 msgid "Display status _messages of contacts in roster"
 msgstr "Viser status _meldinger for kontakter i kontaktlisten"
 
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:54
 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 "
@@ -1888,7 +2095,7 @@ msgstr ""
 "med en kontakt. Her kan du spesifisere hvilke samtalestatuser du ønsker å "
 "vise i samtale vinduer."
 
-#: ../data/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:55
 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 "
@@ -1898,7 +2105,7 @@ msgstr ""
 "med en kontakt. Her kan du spesifisere hvilke samtalestatuser du ønsker å "
 "sende motparten."
 
-#: ../data/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:56
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1906,11 +2113,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/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:58
 msgid "Hide all buttons in chat windows"
 msgstr "Gjem alle knapper i samtale vinduer"
 
-#: ../data/gui/preferences_window.ui.h:63
+#: ../data/gui/preferences_window.ui.h:59
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1918,20 +2125,20 @@ msgstr ""
 "Dersom valgt vil Gajim tillate at andre detekterer hvilket operativsystem du "
 "bruker"
 
-#: ../data/gui/preferences_window.ui.h:64
+#: ../data/gui/preferences_window.ui.h:60
 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/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:61
 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/gui/preferences_window.ui.h:66
+#: ../data/gui/preferences_window.ui.h:62
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1939,7 +2146,7 @@ msgstr ""
 "Dersom valgt vil Gajim endre status til Ikke Tilgjengelig når maskinen ikke "
 "har vert i bruk enda lenger"
 
-#: ../data/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1947,7 +2154,7 @@ msgstr ""
 "Dersom valgt vil Gajim vise ikonbilder for kontakter i kontaktliste vinduet "
 "og i gruppesamtaler"
 
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1955,31 +2162,31 @@ msgstr ""
 "Dersom valg vil Gajim vise status melding til kontakter under kontakt navnet "
 "i kontaktliste vinduet og i gruppesamtaler"
 
-#: ../data/gui/preferences_window.ui.h:69
+#: ../data/gui/preferences_window.ui.h:65
 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/gui/preferences_window.ui.h:70
+#: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the location of contacts in the roster window"
 msgstr "Dersom valgt vil Gajim vise humør for kontakter i kontaktliste vinduet"
 
-#: ../data/gui/preferences_window.ui.h:71
+#: ../data/gui/preferences_window.ui.h:67
 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/gui/preferences_window.ui.h:72
+#: ../data/gui/preferences_window.ui.h:68
 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/gui/preferences_window.ui.h:73
+#: ../data/gui/preferences_window.ui.h:69
 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 "
@@ -1989,7 +2196,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/gui/preferences_window.ui.h:74
+#: ../data/gui/preferences_window.ui.h:70
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1999,7 +2206,7 @@ msgstr ""
 "kontakter. Bruk med varsomhet, fordi det blokkerer alle meldinger fra alle "
 "kontakter som ikke er i kontaktlisten"
 
-#: ../data/gui/preferences_window.ui.h:75
+#: ../data/gui/preferences_window.ui.h:71
 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 "
@@ -2009,14 +2216,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/gui/preferences_window.ui.h:76
+#: ../data/gui/preferences_window.ui.h:72
 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/gui/preferences_window.ui.h:77
+#: ../data/gui/preferences_window.ui.h:73
 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, "
@@ -2025,7 +2232,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/gui/preferences_window.ui.h:78
+#: ../data/gui/preferences_window.ui.h:74
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -2033,7 +2240,7 @@ msgstr ""
 "Dersom valgt vil Gajim ikke spør for en status beskjed. Standard valget for "
 "beskjed vil benyttes isteden."
 
-#: ../data/gui/preferences_window.ui.h:79
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2041,45 +2248,45 @@ msgstr ""
 "Dersom ikke deaktiver, vil Gajim bytte ut ascii smil som ':)' med animerte "
 "eller statiske grafiske uttrykksikoner"
 
-#: ../data/gui/preferences_window.ui.h:80
+#: ../data/gui/preferences_window.ui.h:76
 msgid "Log _encrypted chat session"
 msgstr "Logg _krypterte samtale sesjoner"
 
-#: ../data/gui/preferences_window.ui.h:81
+#: ../data/gui/preferences_window.ui.h:77
 msgid "Ma_ke message windows compact"
 msgstr "Gj_ør meldings vinduet kompakt"
 
-#: ../data/gui/preferences_window.ui.h:82
+#: ../data/gui/preferences_window.ui.h:78
 msgid "Ma_nage..."
 msgstr "Be_handle..."
 
-#: ../data/gui/preferences_window.ui.h:83
+#: ../data/gui/preferences_window.ui.h:79
 #, fuzzy
 msgid "Never"
 msgstr "_Aldri"
 
-#: ../data/gui/preferences_window.ui.h:84
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Notifications"
 msgstr "Kunngjøringer"
 
-#: ../data/gui/preferences_window.ui.h:85
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Notify me about contacts that sign _in"
 msgstr "Varsle meg om kontakter som logger _inn"
 
-#: ../data/gui/preferences_window.ui.h:86
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Notify me about contacts that sign _out"
 msgstr "Varsle meg om kontakter som logger _ut"
 
-#: ../data/gui/preferences_window.ui.h:87
+#: ../data/gui/preferences_window.ui.h:83
 #, fuzzy
 msgid "Notify me about it"
 msgstr "_Gi meg beskjed om det"
 
-#: ../data/gui/preferences_window.ui.h:88
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notify on new _GMail email"
 msgstr "Alarmér om nye _Gmail e-post"
 
-#: ../data/gui/preferences_window.ui.h:89
+#: ../data/gui/preferences_window.ui.h:85
 #, fuzzy
 msgid "Only when pending events"
 msgstr ""
@@ -2087,56 +2294,57 @@ msgstr ""
 "Bare når hendelser venter\n"
 "Alltid"
 
-#: ../data/gui/preferences_window.ui.h:90
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Personal Events"
 msgstr "Personlige Hendelser"
 
-#: ../data/gui/preferences_window.ui.h:91
+#: ../data/gui/preferences_window.ui.h:87
 msgid "Play _sounds"
 msgstr "Spill av _lyder"
 
-#: ../data/gui/preferences_window.ui.h:92
+#: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
 msgid "Pop it up"
 msgstr "_Sprett opp"
 
-#: ../data/gui/preferences_window.ui.h:93
+#: ../data/gui/preferences_window.ui.h:89
 msgid "Preferences"
 msgstr "Tilstedeværelse"
 
-#: ../data/gui/preferences_window.ui.h:94
+#: ../data/gui/preferences_window.ui.h:90
 msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:96
+#: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
 msgid "STUN server:"
 msgstr "Server:"
 
-#: ../data/gui/preferences_window.ui.h:97
+#: ../data/gui/preferences_window.ui.h:93
+#, fuzzy
+msgid "Show notification area icon:"
+msgstr "Bruk Ikon i s_ystemstatusfelt (også kjent som systray)"
+
+#: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
 msgid "Show only in roster"
 msgstr "Vis bare i _kontaktliste"
 
-#: ../data/gui/preferences_window.ui.h:98
-msgid "Show systray:"
-msgstr "Vis systemstatus:"
-
-#: ../data/gui/preferences_window.ui.h:99
+#: ../data/gui/preferences_window.ui.h:95
 msgid "Sign _in"
 msgstr "Logger _inn"
 
-#: ../data/gui/preferences_window.ui.h:100
+#: ../data/gui/preferences_window.ui.h:96
 msgid "Sign _out"
 msgstr "Logger _ut"
 
-#: ../data/gui/preferences_window.ui.h:101
+#: ../data/gui/preferences_window.ui.h:97
 msgid "Single window for everything"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:102
+#: ../data/gui/preferences_window.ui.h:98
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2144,27 +2352,27 @@ msgstr ""
 "Noen meldinger kan inkludere rikt innhold (formatering, farger osv). Dersom "
 "valgt vil Gajim kun vise rå meldings tekst."
 
-#: ../data/gui/preferences_window.ui.h:103
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sort contacts by status"
 msgstr "Sorter kontakter etter status"
 
-#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
 msgid "Status"
 msgstr "Status"
 
-#: ../data/gui/preferences_window.ui.h:105
+#: ../data/gui/preferences_window.ui.h:101
 msgid "Status _iconset:"
 msgstr "Standard _ikonsamling:"
 
-#: ../data/gui/preferences_window.ui.h:106
+#: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Stil"
 
-#: ../data/gui/preferences_window.ui.h:107
+#: ../data/gui/preferences_window.ui.h:103
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/gui/preferences_window.ui.h:108
+#: ../data/gui/preferences_window.ui.h:104
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2176,7 +2384,7 @@ msgstr ""
 "$S byttes ut av tidligere status melding\n"
 "$T byttest ut av automatisk-borte tidsavbrudd"
 
-#: ../data/gui/preferences_window.ui.h:111
+#: ../data/gui/preferences_window.ui.h:107
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2188,121 +2396,126 @@ msgstr ""
 "$S vil byttes ut av forrige status melding\n"
 "$T vil byttes ut av automatisk-ikke-tilgjengelig tidsavbrudd"
 
-#: ../data/gui/preferences_window.ui.h:114
+#: ../data/gui/preferences_window.ui.h:110
 msgid "Use _transports icons"
 msgstr "Bruk _transport ikoner"
 
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:111
+#, fuzzy
+msgid "Use default applications"
+msgstr "Alltid bruk OS/X standard applikasjoner"
+
+#: ../data/gui/preferences_window.ui.h:112
 msgid "Use system _default"
 msgstr "Bruk systemets _standardinstillinger"
 
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:113
 msgid "Video framerate"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:117
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Video input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:118
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Video output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:119
+#: ../data/gui/preferences_window.ui.h:116
 msgid "Video size"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:120
+#: ../data/gui/preferences_window.ui.h:117
 msgid "When new event is received:"
 msgstr "NÃ¥r en ny hendelse blir motatt:"
 
-#: ../data/gui/preferences_window.ui.h:121
+#: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
 msgid "Your message:"
 msgstr "Feil melding: %s"
 
-#: ../data/gui/preferences_window.ui.h:122
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your nickname:"
 msgstr "F_ør kallenavn:"
 
-#: ../data/gui/preferences_window.ui.h:123
+#: ../data/gui/preferences_window.ui.h:120
 msgid "_Away after:"
 msgstr "_Borte etter:"
 
-#: ../data/gui/preferences_window.ui.h:124
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Nettleser:"
 
-#: ../data/gui/preferences_window.ui.h:125
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Display chat state notifications:"
 msgstr "_Vis samtale status opplysninger:"
 
-#: ../data/gui/preferences_window.ui.h:126
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Emoticons:"
 msgstr "_Uttrykksikoner:"
 
-#: ../data/gui/preferences_window.ui.h:127
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_File manager:"
 msgstr "_Fil behandler:"
 
-#: ../data/gui/preferences_window.ui.h:128
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_Highlight misspelled words"
 msgstr "_Uthev feilstavede ord"
 
-#: ../data/gui/preferences_window.ui.h:129
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorér hendelser fra kontakter som ikke er i kontaktlisten"
 
-#: ../data/gui/preferences_window.ui.h:130
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignorér rik tekst innhold i innkommende meldinger"
 
-#: ../data/gui/preferences_window.ui.h:131
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Log status changes of contacts"
 msgstr "_Logg status endringer til kontakter"
 
-#: ../data/gui/preferences_window.ui.h:132
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Mail client:"
 msgstr "_Post klient:"
 
-#: ../data/gui/preferences_window.ui.h:133
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Not available after:"
 msgstr "_Ikke tilgjengelig etter:"
 
-#: ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Open..."
 msgstr "_Ã…pne..."
 
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Reset to Default Colors"
 msgstr "_Tilbakestill til Standard Farger"
 
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Send chat state notifications:"
 msgstr "_Send Samtale status opplysninger:"
 
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Status message:"
 msgstr "_Status melding:"
 
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_URL highlight:"
 msgstr "_URL utheving:"
 
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_Window behavior:"
 msgstr "_Vindusoppførsel:"
 
-#: ../data/gui/preferences_window.ui.h:140
+#: ../data/gui/preferences_window.ui.h:137
 msgid "in _group chats"
 msgstr "i _gruppe samtale"
 
-#: ../data/gui/preferences_window.ui.h:141
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _roster"
 msgstr "i _kontaktliste"
 
-#: ../data/gui/preferences_window.ui.h:142
+#: ../data/gui/preferences_window.ui.h:139
 msgid "minutes"
 msgstr "minutter"
 
@@ -2354,7 +2567,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Rekkefølge:"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3436
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
 msgid "Privacy List"
 msgstr "Liste over Utestengte"
 
@@ -2565,8 +2778,8 @@ msgstr "Fjern konto fra Gajim og fra _serveren"
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5492 ../src/roster_window.py:5622
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
+#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
 msgid "_Remove"
 msgstr "_Fjern"
 
@@ -2612,56 +2825,60 @@ msgid "Help online"
 msgstr "Hjelp online"
 
 #: ../data/gui/roster_window.ui.h:8
+msgid "P_lugins"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:9
 msgid "Profile, A_vatar"
 msgstr "Profil, B_ilde"
 
-#: ../data/gui/roster_window.ui.h:9
+#: ../data/gui/roster_window.ui.h:10
 msgid "Show Only _Active Contacts"
 msgstr "Vis Bare _Aktive Kontakter"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
 msgid "Show Trans_ports"
 msgstr "Vis Trans_porter"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
 msgid "Show _Offline Contacts"
 msgstr "Vis _Frakoblede Kontakter"
 
-#: ../data/gui/roster_window.ui.h:12 ../src/statusicon.py:326
+#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
 msgid "Show _Roster"
 msgstr "Vis _Kontaktliste"
 
-#: ../data/gui/roster_window.ui.h:13
+#: ../data/gui/roster_window.ui.h:14
 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/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
 #: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Handlinger"
 
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../data/gui/roster_window.ui.h:18 ../src/disco.py:1502
+#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
 msgid "_Edit"
 msgstr "_Rediger"
 
-#: ../data/gui/roster_window.ui.h:19
+#: ../data/gui/roster_window.ui.h:20
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../data/gui/roster_window.ui.h:22
+#: ../data/gui/roster_window.ui.h:23
 msgid "_Send Single Message..."
 msgstr "_Send Enkeltmelding..."
 
-#: ../data/gui/roster_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:25
 msgid "_View"
 msgstr "_Vis"
 
@@ -2678,11 +2895,11 @@ msgid "_Add contact"
 msgstr "_Legg til kontakt"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5634
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
 msgid "_Information"
 msgstr "_Informasjon"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1353
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
 msgid "_Search"
 msgstr "_Søk"
 
@@ -2702,10 +2919,6 @@ msgstr "Registrer til:"
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../data/gui/single_message_window.ui.h:2
-msgid "From:"
-msgstr "Fra:"
-
 #: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Svar på denne meldingen"
@@ -2722,10 +2935,6 @@ msgstr "Send melding"
 msgid "Send message and close window"
 msgstr "Send melding og lukk vinduet"
 
-#: ../data/gui/single_message_window.ui.h:7
-msgid "Subject:"
-msgstr "Tema:"
-
 #: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Til:"
@@ -2935,25 +3144,35 @@ msgstr "Gajim Instant Messenger"
 msgid "Jabber IM Client"
 msgstr "Jabber IM Klient"
 
-#: ../src/adhoc_commands.py:314
+#: ../src/adhoc_commands.py:323
 msgid "Cancel confirmation"
 msgstr "Avbryt bekreftelse"
 
-#: ../src/adhoc_commands.py:315
+#: ../src/adhoc_commands.py:324
 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:351 ../src/adhoc_commands.py:374
+#: ../src/adhoc_commands.py:370
+#, fuzzy
+msgid "Invalid Form"
+msgstr "Ugyldig rom"
+
+#: ../src/adhoc_commands.py:371
+#, fuzzy
+msgid "The form is not filled correctly."
+msgstr "Kallenavnet inneholder ulovlige tegn"
+
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
 msgid "Service sent malformed data"
 msgstr "Tjenesten sendte ødelagte data"
 
-#: ../src/adhoc_commands.py:360
+#: ../src/adhoc_commands.py:399
 msgid "Service changed the session identifier."
 msgstr "Tjenesten endret sesjons identifikasjon. "
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:471
+#: ../src/adhoc_commands.py:513
 msgid "Service returned an error."
 msgstr "Tjenesten returnerte en feil."
 
@@ -2978,7 +3197,7 @@ msgstr "Nummer"
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:945
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
 msgid "Color"
 msgstr "Farge"
 
@@ -3015,185 +3234,185 @@ msgstr[1] "Du har motatt nye hendelser (og %(count)d vises ikke):"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "English"
 msgstr "Engelsk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Belarusian"
 msgstr "Bulgarsk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Bulgarian"
 msgstr "Bulgarsk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Breton"
 msgstr "Bretagner"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Czech"
 msgstr "Tsjekkisk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "German"
 msgstr "Tysk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Greek"
 msgstr "Gresk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "British"
 msgstr "Brtisk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Spanish"
 msgstr "Spansk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Basque"
 msgstr "Baskisk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "French"
 msgstr "Fransk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Croatian"
 msgstr "Kroatisk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Italian"
 msgstr "Italiensk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian (b)"
 msgstr "Norsk (b)"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Dutch"
 msgstr "Nederlansk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian"
 msgstr "Norsk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Polish"
 msgstr "Polsk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Portuguese"
 msgstr "Portugisisk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Brazilian Portuguese"
 msgstr "Brasiliansk Portugisisk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Russian"
 msgstr "Russisk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Slovak"
 msgstr "Slovakisk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Swedish"
 msgstr "Svensk"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Chinese (Ch)"
 msgstr "Kinesisk (Ch)"
 
-#: ../src/chat_control.py:479
+#: ../src/chat_control.py:496
 msgid "Spelling language"
 msgstr "Stavekontroll språk"
 
 #. we are not connected
-#: ../src/chat_control.py:511 ../src/chat_control.py:720
+#: ../src/chat_control.py:528 ../src/chat_control.py:737
 msgid "A connection is not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/chat_control.py:512 ../src/chat_control.py:721
+#: ../src/chat_control.py:529 ../src/chat_control.py:738
 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:927
+#: ../src/chat_control.py:944
 msgid "Underline"
 msgstr "Understrek"
 
-#: ../src/chat_control.py:928
+#: ../src/chat_control.py:945
 msgid "Strike"
 msgstr "Streik"
 
-#: ../src/chat_control.py:951
+#: ../src/chat_control.py:968
 msgid "Font"
 msgstr "Font"
 
-#: ../src/chat_control.py:960
+#: ../src/chat_control.py:977
 msgid "Clear formating"
 msgstr "Fjern formattering"
 
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1055
 msgid "Really send file?"
 msgstr "Virkelig send fil?"
 
-#: ../src/chat_control.py:1039
+#: ../src/chat_control.py:1056
 #, 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:1503 ../src/chat_control.py:1987
+#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
 msgid "GPG encryption enabled"
 msgstr "GPG kryptering påslått"
 
 #. Add to roster
-#: ../src/chat_control.py:1528 ../src/common/contacts.py:158
+#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
 #: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:245 ../src/dialogs.py:1064 ../src/dialogs.py:2078
-#: ../src/dialogs.py:2107 ../src/gui_interface.py:674
+#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
+#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
 #: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1610 ../src/roster_window.py:1612
-#: ../src/roster_window.py:1942 ../src/roster_window.py:3289
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
+#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
+#: ../src/roster_window.py:3382
 msgid "Not in Roster"
 msgstr "Ikke i kontaktliste"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1575
 msgid "This contact does not support file transfer."
 msgstr "Denne kontakten støtter ikke filoverføring."
 
-#: ../src/chat_control.py:1561
+#: ../src/chat_control.py:1578
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr "Du må vite det ekte "
 
-#: ../src/chat_control.py:1656
+#: ../src/chat_control.py:1677
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:1869
 #, 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:1967 ../src/dialogs.py:4866
+#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
 msgid "No GPG key assigned"
 msgstr "Ingen GPG nøkkel tildelt"
 
-#: ../src/chat_control.py:1968
+#: ../src/chat_control.py:1991
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3201,50 +3420,50 @@ msgstr ""
 "Ingen GPG nøkkel er tildelt denne kontakten, så du kan ikke kryptere "
 "meldinger med GPG."
 
-#: ../src/chat_control.py:1977
+#: ../src/chat_control.py:2000
 msgid "GPG encryption disabled"
 msgstr "GPG kryptering avslått"
 
-#: ../src/chat_control.py:2003
+#: ../src/chat_control.py:2026
 msgid "Session WILL be logged"
 msgstr "Sesjonen VIL bli logget"
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:2028
 msgid "Session WILL NOT be logged"
 msgstr "Sesjonen VIL IKKE bli logget"
 
 #. encryption %s active
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is"
 msgstr "er"
 
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is NOT"
 msgstr "er IKKE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will"
 msgstr "vil"
 
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will NOT"
 msgstr "vil IKKE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2051
 msgid "and authenticated"
 msgstr "og autentisert"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2032
+#: ../src/chat_control.py:2055
 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:2039
+#: ../src/chat_control.py:2062
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3253,23 +3472,32 @@ msgstr ""
 "%(type)s kryptering %(status)s aktiv %(authenticated)s.\n"
 "Din samtale sesjon %(logged)s bli logget."
 
-#: ../src/chat_control.py:2182
+#: ../src/chat_control.py:2205
 msgid "Session negotiation cancelled"
 msgstr "Sesjons forhandlinger avbrutt"
 
-#: ../src/chat_control.py:2191
+#: ../src/chat_control.py:2215
+msgid "This session WILL be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2217
+#, fuzzy
+msgid "This session WILL NOT be archived on server"
+msgstr "Sesjonen VIL IKKE bli logget"
+
+#: ../src/chat_control.py:2226
 msgid "This session is encrypted"
 msgstr "Denne sesjonen er kryptert"
 
-#: ../src/chat_control.py:2194
+#: ../src/chat_control.py:2229
 msgid " and WILL be logged"
 msgstr "og VIL bli logget"
 
-#: ../src/chat_control.py:2196
+#: ../src/chat_control.py:2231
 msgid " and WILL NOT be logged"
 msgstr "og VIL IKKE bli logget"
 
-#: ../src/chat_control.py:2201
+#: ../src/chat_control.py:2236
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3277,25 +3505,25 @@ msgstr ""
 "Kontaktens identitet ikke bekreftet. Klikk på skjold knappen for flere "
 "detaljer."
 
-#: ../src/chat_control.py:2203
+#: ../src/chat_control.py:2238
 msgid "E2E encryption disabled"
 msgstr "E2E kryptering avslått"
 
-#: ../src/chat_control.py:2241 ../src/chat_control.py:2254
+#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
 msgid "The following message was NOT encrypted"
 msgstr "Den følgende meldingen ble IKKE kryptert"
 
-#: ../src/chat_control.py:2247
+#: ../src/chat_control.py:2288
 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:2519
+#: ../src/chat_control.py:2566
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du fikk akkurat en ny melding fra \"%s\""
 
-#: ../src/chat_control.py:2520
+#: ../src/chat_control.py:2567
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3303,15 +3531,13 @@ msgstr ""
 "Dersom du lukker vinduet og du har slått av historikk, så vil meldingen bli "
 "mistet."
 
-#: ../src/chat_control.py:2663 ../src/common/connection_handlers.py:1635
-#: ../src/common/connection_handlers.py:1758
-#: ../src/common/connection_handlers.py:1960
-#: ../src/common/connection_handlers.py:2110 ../src/common/connection.py:452
+#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
 #: ../src/gajim.py:159 ../src/session.py:138
 msgid "Database Error"
 msgstr "Database feil"
 
-#: ../src/chat_control.py:2664
+#: ../src/chat_control.py:2714
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3320,7 +3546,7 @@ msgstr ""
 "Database filen (%s) kan ikke leses. Prøv å reparer den eller fjern den (all "
 "historikk vil bli tapt)."
 
-#: ../src/chat_control.py:2906
+#: ../src/chat_control.py:2962
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s er nå %(status)s"
@@ -3334,28 +3560,28 @@ msgstr "lager logg database"
 msgid "creating cache database"
 msgstr "lager logg database"
 
-#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
-#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
-#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
-#: ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
 #, 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:275 ../src/common/check_paths.py:282
-#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
-#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
-#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:333
+#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
+#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
+#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
 msgid "Gajim will now exit"
 msgstr "Gajim vill nå lukkes"
 
-#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
+#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
 #, 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:342
+#: ../src/common/check_paths.py:351
 #, python-format
 msgid "creating %s directory"
 msgstr "lager %s mappe"
@@ -3419,9 +3645,9 @@ msgstr "Velg hvilke samtalegrupper du ønsker å forlate"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:801
-#: ../src/roster_window.py:1614 ../src/roster_window.py:1616
-#: ../src/roster_window.py:5251
+#: ../src/common/helpers.py:57 ../src/roster_window.py:815
+#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
+#: ../src/roster_window.py:5323
 msgid "Groupchats"
 msgstr "Gruppesamtaler"
 
@@ -3481,7 +3707,9 @@ 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:88
-msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+#, fuzzy
+msgid ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 "Når skal systemikon vises. Kan være 'aldri', 'ved_hendelse', 'alltid'. "
 
@@ -3532,9 +3760,9 @@ msgstr ""
 "Liste (mellomrom separert) av rader (kontoer og grupper) som er kollapset."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:501
-#: ../src/common/optparser.py:290 ../src/common/optparser.py:486
-#: ../src/common/optparser.py:520 ../src/gui_interface.py:3370
+#: ../src/common/config.py:106 ../src/common/config.py:505
+#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
+#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
 msgid "default"
 msgstr "standard"
 
@@ -3761,7 +3989,8 @@ msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard sier KiB = 1024 bytes, KB = 1000 bytes."
 
 #: ../src/common/config.py:197
-msgid "Notify of events in the system trayicon."
+#, fuzzy
+msgid "Notify of events in the notification area."
 msgstr "Varsle om hendelser i system-statusfelt ikonet."
 
 #: ../src/common/config.py:203
@@ -3797,9 +4026,10 @@ msgid ""
 msgstr "En semikolon-delt liste av ord som vil bli uthevet i gruppesamtaler."
 
 #: ../src/common/config.py:221
+#, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
+"setting is taken into account only if notification icon is used."
 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. "
@@ -4071,9 +4301,10 @@ msgstr ""
 "Maksimalt antall linjer som vises i samtaler. De eldste linjene fjernes."
 
 #: ../src/common/config.py:270
+#, fuzzy
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
-"systray icon."
+"notification icon."
 msgstr ""
 "Dersom True vil kunngjøringsvinduer fra notification-deamon bli festet til "
 "systray ikonet."
@@ -4273,11 +4504,15 @@ msgstr ""
 msgid "Message that is sent to contacts you want to add"
 msgstr "Vennligst fyll inn dataene til kontakten du ønsker å legge til"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:374
+msgid "Last time we syncronized with logs from server."
+msgstr ""
+
+#: ../src/common/config.py:436
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Er OpenPGP tilgjengelig for denne kontakten?"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4285,101 +4520,108 @@ msgstr ""
 "Skal Gajim automatisk starte en kryptert sesjon med denne kontakten når "
 "mulig?"
 
-#: ../src/common/config.py:437 ../src/common/config.py:440
+#: ../src/common/config.py:438 ../src/common/config.py:441
 msgid "Language for which we want to check misspelled words"
 msgstr "Språk som vi ønsker å sjekke feilstavede ord med"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:447
 msgid "all or space separated status"
 msgstr "alle eller mellomroms separert status"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:448
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', eller 'both'"
 
-#: ../src/common/config.py:448 ../src/common/config.py:450
-#: ../src/common/config.py:451 ../src/common/config.py:454
-#: ../src/common/config.py:455
+#: ../src/common/config.py:449 ../src/common/config.py:451
+#: ../src/common/config.py:452 ../src/common/config.py:455
+#: ../src/common/config.py:456
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' eller ''"
 
-#: ../src/common/config.py:461 ../src/common/pep.py:157
+#: ../src/common/config.py:460
+msgid ""
+"State whether plugins should be activated on exit (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
+msgstr ""
+
+#: ../src/common/config.py:465 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back soon"
 msgstr "Snart tilbake"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back in some minutes."
 msgstr "Tilbake om noen minutter."
 
-#: ../src/common/config.py:463 ../src/common/pep.py:127
+#: ../src/common/config.py:467 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Spiser"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:467
 msgid "I'm eating, so leave me a message."
 msgstr "Jeg spiser, så legg igjen en beskjed"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "I'm watching a movie."
 msgstr "Jeg ser på en film."
 
-#: ../src/common/config.py:465 ../src/common/pep.py:186
+#: ../src/common/config.py:469 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Jobber"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:469
 msgid "I'm working."
 msgstr "Jeg jobber."
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "I'm on the phone."
 msgstr "Jeg sitter i telefonen."
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "Out"
 msgstr "Ute"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "I'm out enjoying life."
 msgstr "Jeg er ute og lever livet."
 
-#: ../src/common/config.py:478
+#: ../src/common/config.py:482
 msgid "I'm available."
 msgstr "Jeg er tilgjengelig."
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:483
 msgid "I'm free for chat."
 msgstr "Ledig for prat."
 
-#: ../src/common/config.py:480 ../src/config.py:1600
+#: ../src/common/config.py:484 ../src/config.py:1600
 msgid "Be right back."
 msgstr "Snart tilbake."
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:485
 msgid "I'm not available."
 msgstr "Jeg er ikke tilgjengelig."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:486
 msgid "Do not disturb."
 msgstr "Ikke forstyrr."
 
-#: ../src/common/config.py:483 ../src/common/config.py:484
+#: ../src/common/config.py:487 ../src/common/config.py:488
 msgid "Bye!"
 msgstr "Hade bra!"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:498
 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."
@@ -4388,50 +4630,50 @@ msgstr ""
 "muc_highlight_words, eller når en samtalerom melding inneholder ditt "
 "kallenavn."
 
-#: ../src/common/config.py:495
+#: ../src/common/config.py:499
 msgid "Sound to play when any MUC message arrives."
 msgstr "Lyd som spilles når en ny samtalerom melding mottas."
 
-#: ../src/common/config.py:504 ../src/common/optparser.py:304
+#: ../src/common/config.py:508 ../src/common/optparser.py:308
 msgid "green"
 msgstr "grønn"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:290
+#: ../src/common/config.py:512 ../src/common/optparser.py:294
 msgid "grocery"
 msgstr "varehandel"
 
-#: ../src/common/config.py:512
+#: ../src/common/config.py:516
 msgid "human"
 msgstr "menneskelig"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:520
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:84
+#: ../src/common/connection_handlers.py:94
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Klarer ikke å uvirksom modulen"
 
-#: ../src/common/connection_handlers.py:117
+#: ../src/common/connection_handlers.py:127
 #, 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:124
+#: ../src/common/connection_handlers.py:134
 msgid "Registration succeeded"
 msgstr "Registrering vellykket"
 
-#: ../src/common/connection_handlers.py:125
+#: ../src/common/connection_handlers.py:135
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registrering med agenten %s var vellykket"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 msgid "Registration failed"
 msgstr "Registrering feilet"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -4439,38 +4681,34 @@ msgstr ""
 "Registrering med agenten %(agent)s feilet med melding %(error)s: "
 "%(error_msg)s"
 
-#: ../src/common/connection_handlers.py:445
-#: ../src/common/connection_handlers.py:1633
-#: ../src/common/connection_handlers.py:1756
-#: ../src/common/connection_handlers.py:1957
-#: ../src/common/connection_handlers.py:2108 ../src/common/connection.py:449
+#: ../src/common/connection_handlers.py:466
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
 #: ../src/gajim.py:341
 msgid "Disk Write Error"
 msgstr "Disk Skrive Feil"
 
-#: ../src/common/connection_handlers.py:678 ../src/common/connection.py:1472
+#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
 msgid "Invisibility not supported"
 msgstr "Usynlighet ikke støttet"
 
-#: ../src/common/connection_handlers.py:679 ../src/common/connection.py:1473
+#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Konto %s støtter ikke usynlighet."
 
-#: ../src/common/connection_handlers.py:1446 ../src/common/connection.py:253
-#: ../src/config.py:2091 ../src/config.py:2100 ../src/config.py:2168
-#: ../src/config.py:3560 ../src/dataforms_widget.py:597 ../src/dialogs.py:2931
+#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
+#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
+#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
 msgid "Invalid Jabber ID"
 msgstr "Ugyldig Jabber ID"
 
-#: ../src/common/connection_handlers.py:1447
+#: ../src/common/connection_handlers.py:1405
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr "En melding fra en ikke-gyldig JID ankom, den har blitt ignorert."
 
-#: ../src/common/connection_handlers.py:1636
-#: ../src/common/connection_handlers.py:1759
-#: ../src/common/connection_handlers.py:1961
-#: ../src/common/connection_handlers.py:2111 ../src/common/connection.py:453
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
 #: ../src/gajim.py:160 ../src/session.py:139
 #, python-format
 msgid ""
@@ -4480,90 +4718,6 @@ 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:1805
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Kallenavn ikke lovlig: %s"
-
-#: ../src/common/connection_handlers.py:1902
-#: ../src/common/connection_handlers.py:1911
-#: ../src/common/connection_handlers.py:1918
-#: ../src/common/connection_handlers.py:1922
-#: ../src/common/connection_handlers.py:1926
-#: ../src/common/connection_handlers.py:1931 ../src/gui_interface.py:139
-msgid "Unable to join group chat"
-msgstr "Klarer ikke å gå inn i gruppesamtale"
-
-#: ../src/common/connection_handlers.py:1903
-#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr "Maksimum antall brukere for %s er nådd"
-
-#: ../src/common/connection_handlers.py:1912
-#, python-format
-msgid "You are banned from group chat %s."
-msgstr "Du er uønsket fra gruppesamtalen %s."
-
-#: ../src/common/connection_handlers.py:1919
-#, python-format
-msgid "Group chat %s does not exist."
-msgstr "Gruppesamtalerom %s finnes ikke."
-
-#: ../src/common/connection_handlers.py:1923
-msgid "Group chat creation is restricted."
-msgstr "Gruppesamtale oppretting er begrenset."
-
-#: ../src/common/connection_handlers.py:1927
-#, 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:1932
-#, 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:1976
-msgid "Room has been destroyed"
-msgstr "Rommet har blitt ødelagt"
-
-#: ../src/common/connection_handlers.py:1984
-#, 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:2020
-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:2041
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "vi abonnerer nå på %s"
-
-#: ../src/common/connection_handlers.py:2043
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "frakoblings ønske fra %s"
-
-#: ../src/common/connection_handlers.py:2045
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "vi abonnerer ikke lenger på %s"
-
-#: ../src/common/connection_handlers.py:2240
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"JID %s er ikke RFC kompatibel. Den vil ikke bli lagt til kontaktlisten. Bruk "
-"kontaktliste administrasjons verktøy som http://jru.jabberstudio.org/ for å "
-"fjerne den"
-
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr "Ikke i stand til å få utsteders sertifikat"
@@ -4692,16 +4846,16 @@ msgstr "Nøkkel bruk inkluderer ikke sertifikats signering"
 msgid "Application verification failure"
 msgstr "Applikasjons verifiserings feil"
 
-#: ../src/common/connection.py:254 ../src/dialogs.py:2932
+#: ../src/common/connection.py:256 ../src/dialogs.py:2948
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Det er ikke mulig å sende en melding til %s, JID er ikke gyldig."
 
-#: ../src/common/connection.py:276
+#: ../src/common/connection.py:278
 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:279
+#: ../src/common/connection.py:281
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr ""
@@ -4709,11 +4863,11 @@ msgstr ""
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:331
+#: ../src/common/connection.py:333
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Denne meldingen er *kryptert* (Se :XEP:`27`]"
 
-#: ../src/common/connection.py:439
+#: ../src/common/connection.py:441
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4722,77 +4876,77 @@ msgstr ""
 "Tittel: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:807
+#: ../src/common/connection.py:809
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Tilkobling til konto \"%s\" har blitt mistet"
 
-#: ../src/common/connection.py:808
+#: ../src/common/connection.py:810
 msgid "Reconnect manually."
 msgstr "Automatisk tilkobling."
 
-#: ../src/common/connection.py:820
+#: ../src/common/connection.py:822
 #, 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:854
+#: ../src/common/connection.py:856
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s tilbyr et annet registrerings skjema"
 
-#: ../src/common/connection.py:867
+#: ../src/common/connection.py:869
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Ukjent SSL feil: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:882
+#: ../src/common/connection.py:884
 msgid "Invalid answer"
 msgstr "Ugyldig svar"
 
-#: ../src/common/connection.py:883
+#: ../src/common/connection.py:885
 #, 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:1165 ../src/common/connection.py:1294
-#: ../src/common/connection.py:1784
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
+#: ../src/common/connection.py:1792
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kunne ikke koble til \"%s\""
 
-#: ../src/common/connection.py:1166 ../src/gui_interface.py:755
+#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
 msgid "Check your connection or try again later."
 msgstr "Sjekk nettverkstilkoblingen eller prøv igjen senere."
 
-#: ../src/common/connection.py:1171
+#: ../src/common/connection.py:1173
 #, python-format
 msgid "Server replied: %s"
 msgstr "Servern svarte: %s"
 
-#: ../src/common/connection.py:1184
+#: ../src/common/connection.py:1186
 msgid "Connection to proxy failed"
 msgstr "Tilkobling til proxy feilet"
 
-#: ../src/common/connection.py:1215 ../src/common/connection.py:1274
+#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Kunne ikke koble til kontoen %s"
 
-#: ../src/common/connection.py:1216 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
 #, 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:1241
+#: ../src/common/connection.py:1243
 #, 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:1244
+#: ../src/common/connection.py:1246
 #, python-format
 msgid ""
 "\n"
@@ -4801,7 +4955,7 @@ msgstr ""
 "\n"
 "SSL Feil: <b>%s</b>"
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1248
 #, python-format
 msgid ""
 "\n"
@@ -4810,24 +4964,24 @@ msgstr ""
 "\n"
 "Ukjent SSL feil: %d"
 
-#: ../src/common/connection.py:1295
+#: ../src/common/connection.py:1297
 msgid "Check your connection or try again later"
 msgstr "Sjekk nettverkstilgangen din og prøv igjen senere "
 
-#: ../src/common/connection.py:1324
+#: ../src/common/connection.py:1329
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentisering feilet med \"%s\""
 
-#: ../src/common/connection.py:1326
+#: ../src/common/connection.py:1331
 msgid "Please check your login and password for correctness."
 msgstr "Vennligst sjekk at brukernavn og passord er korrekt."
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1400
 msgid "Error while removing privacy list"
 msgstr "Feil ved fjerning av liste over uønskede"
 
-#: ../src/common/connection.py:1396
+#: ../src/common/connection.py:1401
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4836,39 +4990,39 @@ 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:1650
+#: ../src/common/connection.py:1658
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Sendt kontakt: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1653
+#: ../src/common/connection.py:1661
 msgid "Sent contacts:"
 msgstr "Sendt kontakter:"
 
-#: ../src/common/connection.py:1799 ../src/common/connection.py:1822
+#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
 msgid "Not fetched because of invisible status"
 msgstr "Ikke hentet på grunn av usynlig status"
 
-#: ../src/common/connection.py:2254
+#: ../src/common/connection.py:2262
 msgid "Unregister failed"
 msgstr "Avregistrering feilet"
 
-#: ../src/common/connection.py:2255
+#: ../src/common/connection.py:2263
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr "Avregistrering med server %(server)s feilet: %(error)s"
 
 #: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:674
+#: ../src/gui_interface.py:551
 msgid "Observers"
 msgstr "Observerere"
 
 #: ../src/common/contacts.py:139 ../src/common/contacts.py:366
 #: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1499 ../src/gui_interface.py:424
-#: ../src/roster_window.py:840 ../src/roster_window.py:1525
-#: ../src/roster_window.py:1606 ../src/roster_window.py:1608
-#: ../src/roster_window.py:1769
+#: ../src/disco.py:1517 ../src/roster_window.py:854
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
+#: ../src/roster_window.py:2466
 msgid "Transports"
 msgstr "Transporter"
 
@@ -5093,203 +5247,219 @@ msgstr "Slutten av uken"
 msgid "Weekend!"
 msgstr "Helg!"
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:148
+msgid "Username must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:153
 msgid "Invalid character in username."
 msgstr "Ugyldig karakter i brukernavn."
 
-#: ../src/common/helpers.py:156
-msgid "Server address required."
-msgstr "Server adresse kreves."
+#: ../src/common/helpers.py:159
+msgid "Server must be between 1 and 1023 chars"
+msgstr ""
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 msgid "Invalid character in hostname."
 msgstr "Ugyldig karakter i domene navn."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:166
+msgid "Server address required."
+msgstr "Server adresse kreves."
+
+#: ../src/common/helpers.py:170
+msgid "Resource must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:175
 msgid "Invalid character in resource."
 msgstr "Ugyldig karakter i ressurs."
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:215
 msgid "_Busy"
 msgstr "_Opptatt"
 
-#: ../src/common/helpers.py:211 ../src/tooltips.py:195
+#: ../src/common/helpers.py:217 ../src/tooltips.py:195
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:220
 msgid "_Not Available"
 msgstr "_Ikke Tilgjengelig"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:225
 msgid "_Free for Chat"
 msgstr "_Ledig for Samtale"
 
-#: ../src/common/helpers.py:221 ../src/tooltips.py:191
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Free for Chat"
 msgstr "Ledig for Prat"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:230
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?transfer status:Pauset"
 
-#: ../src/common/helpers.py:226 ../src/tooltips.py:189
+#: ../src/common/helpers.py:232 ../src/tooltips.py:189
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?transfer status:Pauset"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:234
 msgid "Connecting"
 msgstr "Kobler til"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:237
 msgid "A_way"
 msgstr "B_orte"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:242
 msgid "_Offline"
 msgstr "_Frakoblet"
 
-#: ../src/common/helpers.py:238 ../src/tooltips.py:199
+#: ../src/common/helpers.py:244 ../src/tooltips.py:199
 msgid "Offline"
 msgstr "Frakoblet"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:247
 msgid "_Invisible"
 msgstr "_Usynlig"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:253
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Ukjent"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:255
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Har feilmeldinger"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:260
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Ingen"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:262
 msgid "To"
 msgstr "Til"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
+msgid "From"
+msgstr "Fra"
+
+#: ../src/common/helpers.py:266
 msgid "Both"
 msgstr "Begge"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:274
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Ingen"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:276
 msgid "Subscribe"
 msgstr "Abonnér"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:285
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:288
 msgid "Moderators"
 msgstr "Ordstyrere"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:290
 msgid "Moderator"
 msgstr "Ordstyrer"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:293
 msgid "Participants"
 msgstr "Deltakere"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:295
 msgid "Participant"
 msgstr "Deltaker"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:298
 msgid "Visitors"
 msgstr "Besøkende"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:300
 msgid "Visitor"
 msgstr "Besøk"
 
-#: ../src/common/helpers.py:300 ../src/tooltips.py:210
+#: ../src/common/helpers.py:306 ../src/tooltips.py:210
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Ingen"
 
-#: ../src/common/helpers.py:302 ../src/tooltips.py:216
+#: ../src/common/helpers.py:308 ../src/tooltips.py:216
 msgid "Owner"
 msgstr "Eier"
 
-#: ../src/common/helpers.py:304 ../src/tooltips.py:214
+#: ../src/common/helpers.py:310 ../src/tooltips.py:214
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:212
+#: ../src/common/helpers.py:312 ../src/tooltips.py:212
 msgid "Member"
 msgstr "Medlem"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:351
 msgid "is paying attention to the conversation"
 msgstr "er fokusert på en annen samtale"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:353
 msgid "is doing something else"
 msgstr "gjør noe annet"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:355
 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:352
+#: ../src/common/helpers.py:358
 msgid "paused composing a message"
 msgstr "tok pause i skriving av en melding"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:360
 msgid "has closed the chat window or tab"
 msgstr "har lukket samtalevinduet eller fanen"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:619
+#: ../src/common/helpers.py:625
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:622
+#: ../src/common/helpers.py:628
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:626
+#: ../src/common/helpers.py:632
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:629
+#: ../src/common/helpers.py:635
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:633
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:636
+#: ../src/common/helpers.py:642
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:645
 #, python-format
 msgid "%s B"
 msgstr "%s B"
@@ -5332,12 +5502,12 @@ msgstr "Gajim - %s"
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:111
+#: ../src/common/jingle_rtp.py:107
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Rom Instillinger"
 
-#: ../src/common/jingle_rtp.py:112
+#: ../src/common/jingle_rtp.py:108
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5349,30 +5519,30 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:209
+#: ../src/common/jingle_rtp.py:205
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:210
+#: ../src/common/jingle_rtp.py:206
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Feil melding: %s"
 
-#: ../src/common/jingle_rtp.py:336
+#: ../src/common/jingle_rtp.py:335
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:339
+#: ../src/common/jingle_rtp.py:338
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:382
+#: ../src/common/jingle_rtp.py:381
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:390
+#: ../src/common/jingle_rtp.py:389
 msgid "video output"
 msgstr ""
 
@@ -5449,11 +5619,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "feil: kan ikke åpne %s for lesing"
 
-#: ../src/common/optparser.py:299 ../src/common/optparser.py:300
+#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
 msgid "cyan"
 msgstr "turkis"
 
-#: ../src/common/optparser.py:379
+#: ../src/common/optparser.py:383
 msgid "migrating logs database to indices"
 msgstr "migrerer logg databaser til indekser"
 
@@ -6126,7 +6296,7 @@ msgstr ""
 "avbrutt."
 
 #. we're not english
-#: ../src/common/stanza_session.py:303
+#: ../src/common/stanza_session.py:423
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6134,11 +6304,11 @@ msgstr ""
 "[Dette er en del av en kryptert sesjon. Dersom du ser denne meldingen gikk "
 "noe galt.]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:178
+#: ../src/common/zeroconf/connection_zeroconf.py:181
 msgid "Avahi error"
 msgstr "Avahi feil"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:179
+#: ../src/common/zeroconf/connection_zeroconf.py:182
 #, python-format
 msgid ""
 "%s\n"
@@ -6147,44 +6317,44 @@ msgstr ""
 "%s\n"
 "Link-lokal meldinger fungerer muligens ikke riktig."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:190
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Vennligst sjekk om Avahi eller Bonjour er installert."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:199
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Could not start local service"
 msgstr "Kunne ikke starte lokal tjeneste"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Klarer ikke å lytte til port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-#: ../src/common/zeroconf/connection_zeroconf.py:283
-#: ../src/common/zeroconf/connection_zeroconf.py:294
-#: ../src/common/zeroconf/connection_zeroconf.py:308
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:286
+#: ../src/common/zeroconf/connection_zeroconf.py:297
+#: ../src/common/zeroconf/connection_zeroconf.py:311
 msgid "Please check if avahi-daemon is running."
 msgstr "Vennligst sjekk om avahi-tjenesten kjører."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:282
-#: ../src/common/zeroconf/connection_zeroconf.py:293
-#: ../src/common/zeroconf/connection_zeroconf.py:307
+#: ../src/common/zeroconf/connection_zeroconf.py:285
+#: ../src/common/zeroconf/connection_zeroconf.py:296
+#: ../src/common/zeroconf/connection_zeroconf.py:310
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Kunne ikke endre status til konto \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:325
+#: ../src/common/zeroconf/connection_zeroconf.py:328
 msgid "Your message could not be sent."
 msgstr "Din melding kunne ikke bli sendt."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:335
+#: ../src/common/zeroconf/connection_zeroconf.py:338
 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:360
+#: ../src/common/zeroconf/connection_zeroconf.py:363
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6205,16 +6375,16 @@ msgstr "Standard Melding"
 msgid "Enabled"
 msgstr "Påslått"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3078
+#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:739 ../src/dialogs.py:1395
+#: ../src/config.py:733 ../src/dialogs.py:1409
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Ordliste for språk %s er ikke tilgjengelig"
 
-#: ../src/config.py:740
+#: ../src/config.py:734
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6232,9 +6402,9 @@ msgid "status message text"
 msgstr "status melding tekst"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2383 ../src/dialogs.py:2449
-#: ../src/dialogs.py:3215 ../src/disco.py:866 ../src/disco.py:1726
-#: ../src/disco.py:2030 ../src/history_window.py:90
+#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
+#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
+#: ../src/disco.py:2048 ../src/history_window.py:90
 msgid "Name"
 msgstr "Navn"
 
@@ -6269,7 +6439,7 @@ msgstr "Du har åpne samtaler på konto %s"
 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:1976 ../src/config.py:2509 ../src/config.py:2545
+#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
 msgid "You are currently connected to the server"
 msgstr "Du er for øyeblikket tilkoblet til serveren"
 
@@ -6305,131 +6475,131 @@ msgstr "Konto navn kan ikke være tomt."
 msgid "Account name cannot contain spaces."
 msgstr "Konto navn kan ikke inneholde mellomrom."
 
-#: ../src/config.py:2072
+#: ../src/config.py:2074
 msgid "Rename Account"
 msgstr "Omdøpe Konto"
 
-#: ../src/config.py:2073
+#: ../src/config.py:2075
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Skriv inn nytt navn for konto %s"
 
-#: ../src/config.py:2101
+#: ../src/config.py:2103
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "En Jabber ID må skrives som \"bruker@servernavn\"."
 
-#: ../src/config.py:2318 ../src/config.py:3606
+#: ../src/config.py:2320 ../src/config.py:3623
 msgid "Invalid entry"
 msgstr "Ugyldig innlegg"
 
-#: ../src/config.py:2319 ../src/config.py:3607
+#: ../src/config.py:2321 ../src/config.py:3624
 msgid "Custom port must be a port number."
 msgstr "Egendefinert port må være et port nummer"
 
-#: ../src/config.py:2340
+#: ../src/config.py:2342
 msgid "Failed to get secret keys"
 msgstr "Klarte ikke å hente hemmelig nøkkel"
 
-#: ../src/config.py:2341
+#: ../src/config.py:2343
 msgid "There is no OpenPGP secret key available."
 msgstr "Det er ingen OpenPGP hemmelig nøkkel tilgjengelig."
 
-#: ../src/config.py:2375
+#: ../src/config.py:2377
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Nøkkel Valg"
 
-#: ../src/config.py:2376
+#: ../src/config.py:2378
 msgid "Choose your OpenPGP key"
 msgstr "Velg din OpenPGP nøkkel"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2385
 msgid "No such account available"
 msgstr "Ingen slik konto tilgjengelig"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2386
 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:2391 ../src/dialogs.py:2136 ../src/dialogs.py:2371
-#: ../src/dialogs.py:2557 ../src/disco.py:511 ../src/profile_window.py:339
+#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
+#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilkoblet til serveren"
 
-#: ../src/config.py:2392
+#: ../src/config.py:2394
 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:2396
+#: ../src/config.py:2398
 msgid "Your server doesn't support Vcard"
 msgstr "Din server støtter ikke Vcard"
 
-#: ../src/config.py:2397
+#: ../src/config.py:2399
 msgid "Your server can't save your personal information."
 msgstr "Din server kan ikke lagre din personlige informasjon."
 
-#: ../src/config.py:2510 ../src/config.py:2546
+#: ../src/config.py:2512 ../src/config.py:2548
 msgid "To disable the account, you must be disconnected."
 msgstr "For å deaktivere kontoen, må du være tilkoblet."
 
-#: ../src/config.py:2515
+#: ../src/config.py:2517
 msgid "Account Local already exists."
 msgstr "Konto Lokal eksisterer allerede."
 
-#: ../src/config.py:2516
+#: ../src/config.py:2518
 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:2673
+#: ../src/config.py:2675
 #, python-format
 msgid "Edit %s"
 msgstr "Rediger %s"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2677
 #, python-format
 msgid "Register to %s"
 msgstr "Registrer til %s"
 
 #. list at the beginning
-#: ../src/config.py:2711
+#: ../src/config.py:2713
 msgid "Ban List"
 msgstr "Listen over Utestengte"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2714
 msgid "Member List"
 msgstr "Medlems Liste"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2714
 msgid "Owner List"
 msgstr "Eier Liste"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2715
 msgid "Administrator List"
 msgstr "Administrator Liste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2763 ../src/disco.py:873 ../src/history_manager.py:201
+#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2773
+#: ../src/config.py:2789
 msgid "Reason"
 msgstr "Grunn"
 
-#: ../src/config.py:2780
+#: ../src/config.py:2796
 msgid "Nick"
 msgstr "Kallenavn"
 
-#: ../src/config.py:2786
+#: ../src/config.py:2802
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2813
+#: ../src/config.py:2829
 msgid "Banning..."
 msgstr "Utvis..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2815
+#: ../src/config.py:2831
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6437,11 +6607,11 @@ msgstr ""
 "<b>Hvem ønsker du å utvise?</b>\n"
 "\n"
 
-#: ../src/config.py:2817
+#: ../src/config.py:2833
 msgid "Adding Member..."
 msgstr "Legger til Medlem..."
 
-#: ../src/config.py:2818
+#: ../src/config.py:2834
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6449,11 +6619,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2836
 msgid "Adding Owner..."
 msgstr "Legger til Eier..."
 
-#: ../src/config.py:2821
+#: ../src/config.py:2837
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6461,11 +6631,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til en eier?</b>\n"
 "\n"
 
-#: ../src/config.py:2823
+#: ../src/config.py:2839
 msgid "Adding Administrator..."
 msgstr "Legger til Administrator..."
 
-#: ../src/config.py:2824
+#: ../src/config.py:2840
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6473,7 +6643,7 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2825
+#: ../src/config.py:2841
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6489,109 +6659,109 @@ msgstr ""
 "4. domene (domene selv treffer, samt treffer alle bruker@domene,\n"
 "domene/ressurs, eller adresser som inneholder et underdomene)."
 
-#: ../src/config.py:2926
+#: ../src/config.py:2943
 #, python-format
 msgid "Removing %s account"
 msgstr "Fjerner %s kontoen"
 
-#: ../src/config.py:2941
+#: ../src/config.py:2958
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Uttryksikoner avslått"
 
-#: ../src/config.py:2942
+#: ../src/config.py:2959
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2955 ../src/gui_interface.py:1132
-#: ../src/gui_interface.py:1243
+#: ../src/config.py:2972 ../src/gui_interface.py:311
+#: ../src/gui_interface.py:1048
 msgid "Password Required"
 msgstr "Krever Passord"
 
-#: ../src/config.py:2956 ../src/gui_interface.py:1223
+#: ../src/config.py:2973 ../src/gui_interface.py:1028
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv inn passord for kontoen %s"
 
-#: ../src/config.py:2957 ../src/gui_interface.py:1243
+#: ../src/config.py:2974 ../src/gui_interface.py:1048
 msgid "Save password"
 msgstr "Lagre passord"
 
-#: ../src/config.py:2967
+#: ../src/config.py:2984
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kontoen \"%s\" er tilkoblet til serveren"
 
-#: ../src/config.py:2968
+#: ../src/config.py:2985
 msgid "If you remove it, the connection will be lost."
 msgstr "Dersom du fjerner den vil tilkoblingen mistes."
 
-#: ../src/config.py:2982
+#: ../src/config.py:2999
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Tilkobling til proxy feilet"
 
-#: ../src/config.py:2983
+#: ../src/config.py:3000
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Hva ønsker du å gjøre?"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3001
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Fjern kontoe _bare fra Gajim"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3002
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3078
+#: ../src/config.py:3095
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
 
-#: ../src/config.py:3079
+#: ../src/config.py:3096
 msgid "Enter and leave only"
 msgstr "GÃ¥ inn og legg igjen bare"
 
-#: ../src/config.py:3080
+#: ../src/config.py:3097
 msgid "?print_status:None"
 msgstr "?print_status:Ingen"
 
-#: ../src/config.py:3150
+#: ../src/config.py:3167
 msgid "New Group Chat"
 msgstr "Ny Gruppesamtale"
 
-#: ../src/config.py:3183
+#: ../src/config.py:3200
 msgid "This bookmark has invalid data"
 msgstr "Dette bokmerket har ugyldig innhold"
 
-#: ../src/config.py:3184
+#: ../src/config.py:3201
 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."
 
 #. invalid char
-#: ../src/config.py:3302 ../src/dialogs.py:1934
+#: ../src/config.py:3319 ../src/dialogs.py:1950
 msgid "Invalid nickname"
 msgstr "Ugyldig kallenavn"
 
-#: ../src/config.py:3303 ../src/config.py:3317 ../src/config.py:3331
+#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
 msgid "Character not allowed"
 msgstr "Tegn ikke lovlig"
 
-#: ../src/config.py:3316 ../src/config.py:3582
+#: ../src/config.py:3333 ../src/config.py:3599
 msgid "Invalid server"
 msgstr "Ugyldig server"
 
-#: ../src/config.py:3330
+#: ../src/config.py:3347
 msgid "Invalid room"
 msgstr "Ugyldig rom"
 
-#: ../src/config.py:3498
+#: ../src/config.py:3515
 msgid "Account has been added successfully"
 msgstr "Kontoen har blitt lagt til uten feilmeldinger"
 
-#: ../src/config.py:3499 ../src/config.py:3505
+#: ../src/config.py:3516 ../src/config.py:3522
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menu item under the Edit menu from the main "
@@ -6601,33 +6771,33 @@ msgstr ""
 "eller senere ved å klikke under Kontoer menyvalget, under Rediger menyen fra "
 "hovedvinduet."
 
-#: ../src/config.py:3504
+#: ../src/config.py:3521
 msgid "Your new account has been created successfully"
 msgstr "Din nye konto har blitt opprettet uten feilmeldinger"
 
-#: ../src/config.py:3543
+#: ../src/config.py:3560
 msgid "Invalid username"
 msgstr "Ugyldig brukernavn"
 
-#: ../src/config.py:3545
+#: ../src/config.py:3562
 msgid "You must provide a username to configure this account."
 msgstr "Du må oppgi et brukernavn for å konfigurere denne kontoen."
 
-#: ../src/config.py:3583
+#: ../src/config.py:3600
 msgid "Please provide a server on which you want to register."
 msgstr "Vennlist skriv inn serveren du ønsker å registrere."
 
-#: ../src/config.py:3639 ../src/gui_interface.py:1904
+#: ../src/config.py:3656 ../src/gui_interface.py:1693
 msgid "Certificate Already in File"
 msgstr "Sertifikat Allerede i Katalogen"
 
-#: ../src/config.py:3640 ../src/gui_interface.py:1905
+#: ../src/config.py:3657 ../src/gui_interface.py:1694
 #, 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:3717
+#: ../src/config.py:3734
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6642,7 +6812,7 @@ msgstr ""
 "SSL Feil: %(error)s\n"
 "Ønsker du fortsatt å koble til denne serveren?"
 
-#: ../src/config.py:3723 ../src/gui_interface.py:1932
+#: ../src/config.py:3740 ../src/gui_interface.py:1721
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6653,63 +6823,72 @@ msgstr ""
 "SHA1 fingeravtrykk til sertifikatet:\n"
 "%s"
 
-#: ../src/config.py:3755 ../src/config.py:3789
+#: ../src/config.py:3772 ../src/config.py:3806
 msgid "An error occurred during account creation"
 msgstr "Det skjedde en feil under oppretting av kontoen"
 
-#: ../src/config.py:3854
+#: ../src/config.py:3871
 msgid "Account name is in use"
 msgstr "Konto navnet er i bruk"
 
-#: ../src/config.py:3855
+#: ../src/config.py:3872
 msgid "You already have an account using this name."
 msgstr "Du har allerede en konto med dette navnet."
 
-#: ../src/config.py:4009
+#: ../src/config.py:3991
+msgid "PEP node was not removed"
+msgstr "PEP noden ble ikke fjernet"
+
+#: ../src/config.py:3992
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr "PEP noden %(node)s ble ikke fjernet: %(message)s"
+
+#: ../src/config.py:4036
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:4017
+#: ../src/config.py:4044
 msgid "Event"
 msgstr "Hendelse"
 
-#: ../src/config.py:4052
+#: ../src/config.py:4079
 msgid "First Message Received"
 msgstr "Første Melding Motatt"
 
-#: ../src/config.py:4053
+#: ../src/config.py:4080
 msgid "Next Message Received Focused"
 msgstr "Neste Melding Motatt i Fokus"
 
-#: ../src/config.py:4055
+#: ../src/config.py:4082
 msgid "Next Message Received Unfocused"
 msgstr "Neste Melding Motatt ikke i Fokus"
 
-#: ../src/config.py:4056
+#: ../src/config.py:4083
 msgid "Contact Connected"
 msgstr "Kontakt Koblet til"
 
-#: ../src/config.py:4057
+#: ../src/config.py:4084
 msgid "Contact Disconnected"
 msgstr "Kontakt Frakoblet"
 
-#: ../src/config.py:4058
+#: ../src/config.py:4085
 msgid "Message Sent"
 msgstr "Melding Sendt"
 
-#: ../src/config.py:4059
+#: ../src/config.py:4086
 msgid "Group Chat Message Highlight"
 msgstr "Gruppe Samtale Melding Utheving"
 
-#: ../src/config.py:4060
+#: ../src/config.py:4087
 msgid "Group Chat Message Received"
 msgstr "Gruppe Samtale Melding Motatt"
 
-#: ../src/config.py:4061
+#: ../src/config.py:4088
 msgid "GMail Email Received"
 msgstr "Gmail E-post Motatt"
 
-#: ../src/conversation_textview.py:600
+#: ../src/conversation_textview.py:601
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6719,7 +6898,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:619
+#: ../src/conversation_textview.py:620
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6727,44 +6906,44 @@ 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:739
+#: ../src/conversation_textview.py:740
 msgid "_Quote"
 msgstr "_Sitat"
 
-#: ../src/conversation_textview.py:746
+#: ../src/conversation_textview.py:747
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Handlinger for \"%s\""
 
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Read _Wikipedia Article"
 msgstr "Les_Wikipedia Artikkel"
 
-#: ../src/conversation_textview.py:763
+#: ../src/conversation_textview.py:765
 msgid "Look it up in _Dictionary"
 msgstr "Slå det opp i _Ordbok"
 
-#: ../src/conversation_textview.py:780
+#: ../src/conversation_textview.py:782
 #, 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:793
+#: ../src/conversation_textview.py:795
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Søk URL mangler en \"%s\""
 
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 msgid "Web _Search for it"
 msgstr "Web _Søk etter den"
 
-#: ../src/conversation_textview.py:802
+#: ../src/conversation_textview.py:804
 msgid "Open as _Link"
 msgstr "Ã…pne som _Link"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1296
+#: ../src/conversation_textview.py:1298
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6772,188 +6951,193 @@ msgstr[0] "I går"
 msgstr[1] "I går"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1344 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tittel: %s\n"
 
-#: ../src/dataforms_widget.py:544
+#: ../src/dataforms_widget.py:545
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Klarer ikke å uvirksom modulen"
 
-#: ../src/dataforms_widget.py:546
+#: ../src/dataforms_widget.py:547
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Usynlighet ikke støttet"
 
-#: ../src/dataforms_widget.py:601
+#: ../src/dataforms_widget.py:562
+msgid "This field is required"
+msgstr ""
+
+#: ../src/dataforms_widget.py:607
 msgid "Jabber ID already in list"
 msgstr "Jabber ID allerede i listen"
 
-#: ../src/dataforms_widget.py:602
+#: ../src/dataforms_widget.py:608
 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:613
+#: ../src/dataforms_widget.py:619
 msgid "new@jabber.id"
 msgstr "ny@jabber.id"
 
-#: ../src/dataforms_widget.py:616 ../src/dataforms_widget.py:618
+#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "ny%d@jabber.id"
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontakt navn: <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:195
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/dialogs.py:201
+#: ../src/dialogs.py:202
 msgid "In the group"
 msgstr "I gruppen"
 
-#: ../src/dialogs.py:292
+#: ../src/dialogs.py:293
 msgid "KeyID"
 msgstr "NøkkelID"
 
-#: ../src/dialogs.py:297
+#: ../src/dialogs.py:298
 msgid "Contact name"
 msgstr "Kontakt navn"
 
-#: ../src/dialogs.py:469
+#: ../src/dialogs.py:470
 msgid "Set Mood"
 msgstr "Sett Stemning"
 
-#: ../src/dialogs.py:589
+#: ../src/dialogs.py:590
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Melding"
 
-#: ../src/dialogs.py:603
+#: ../src/dialogs.py:604
 msgid "Status Message"
 msgstr "Status Melding"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:794
 msgid "Overwrite Status Message?"
 msgstr "Overskriv Status Melding?"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:795
 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:802
+#: ../src/dialogs.py:803
 msgid "Save as Preset Status Message"
 msgstr "Lagre som Forvalgt Status Melding"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:804
 msgid "Please type a name for this status message"
 msgstr "Vennligst skriv inn et navn for denne status meldingen"
 
-#: ../src/dialogs.py:831
+#: ../src/dialogs.py:832
 msgid "AIM Address:"
 msgstr "AIM Adresse:"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:833
 msgid "GG Number:"
 msgstr "GG Nummer:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:834
 msgid "ICQ Number:"
 msgstr "ICQ Nummer:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:835
 msgid "MSN Address:"
 msgstr "MSN Adresse:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:836
 msgid "Yahoo! Address:"
 msgstr "Yahoo Adresse:"
 
-#: ../src/dialogs.py:872
+#: ../src/dialogs.py:873
 #, 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:875
+#: ../src/dialogs.py:876
 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:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
+#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
+#: ../src/dialogs.py:3464
 msgid "Invalid User ID"
 msgstr "Ugyldig Bruker ID"
 
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1052
 msgid "The user ID must not contain a resource."
 msgstr "Bruker IDen må ikke inneholde en ressurs."
 
-#: ../src/dialogs.py:1051
+#: ../src/dialogs.py:1057
 msgid "You cannot add yourself to your roster."
 msgstr "Du kan ikke legge til deg selv i din kontaktliste."
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1071
 msgid "Contact already in roster"
 msgstr "Kontakt allerede i kontaktlisten"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1072
 msgid "This contact is already listed in your roster."
 msgstr "Kontakten er allerede listet  i din kontaktliste."
 
-#: ../src/dialogs.py:1112
+#: ../src/dialogs.py:1118
 msgid "User ID:"
 msgstr "Bruker ID:"
 
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1189
 msgid "A GTK+ jabber client"
 msgstr "En GTK+ Jabber klient"
 
-#: ../src/dialogs.py:1176
+#: ../src/dialogs.py:1190
 msgid "GTK+ Version:"
 msgstr "GTK+ Versjon:"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1191
 msgid "PyGTK Version:"
 msgstr "PyGTK Versjon:"
 
-#: ../src/dialogs.py:1187
+#: ../src/dialogs.py:1201
 msgid "Current Developers:"
 msgstr "Nåværende Utviklere:"
 
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1203
 msgid "Past Developers:"
 msgstr "Tidligere Utviklere:"
 
-#: ../src/dialogs.py:1195
+#: ../src/dialogs.py:1209
 msgid "THANKS:"
 msgstr "TUSEN TAKK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1215
 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:1213
+#: ../src/dialogs.py:1227
 msgid "translator-credits"
 msgstr "Stian B. Barmen <stian@barmen.nu>"
 
-#: ../src/dialogs.py:1396
+#: ../src/dialogs.py:1410
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6966,101 +7150,101 @@ msgstr ""
 "\n"
 "Utheving av feilstavede ord vil ikke bli brukt"
 
-#: ../src/dialogs.py:1935 ../src/dialogs.py:2322
+#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
 msgid "The nickname has not allowed characters."
 msgstr "Kallenavnet inneholder ulovlige tegn"
 
-#: ../src/dialogs.py:2053
+#: ../src/dialogs.py:2069
 #, 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:2056
+#: ../src/dialogs.py:2072
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnerings ønske fra %s"
 
-#: ../src/dialogs.py:2131 ../src/gui_interface.py:2672
+#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Du er allerede i gruppesamtale %s"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2153
 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:2178
+#: ../src/dialogs.py:2194
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Bli med i samtalegruppe med konto %s"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2325
 msgid "Invalid Account"
 msgstr "Ugyldig Konto"
 
-#: ../src/dialogs.py:2310
+#: ../src/dialogs.py:2326
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr ""
 "Du har valgt en konto som du ønsker å bruke for å gå inn i samtalerommet."
 
-#: ../src/dialogs.py:2321
+#: ../src/dialogs.py:2337
 msgid "Invalid Nickname"
 msgstr "Ugyldig Kallenavn"
 
-#: ../src/dialogs.py:2326 ../src/dialogs.py:2332
-#: ../src/groupchat_control.py:1832
+#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
+#: ../src/groupchat_control.py:1847
 msgid "Invalid group chat Jabber ID"
 msgstr "Ugyldig gruppesamtale Jabber ID"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2343
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "Gruppesamtalens Jabber ID inneholder ulovlige symboler."
 
-#: ../src/dialogs.py:2333 ../src/groupchat_control.py:1833
+#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Gruppesamtalens Jabber ID inneholder ulovlige symboler."
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2356
 msgid "This is not a group chat"
 msgstr "Dette er ikke en samtalegruppe"
 
-#: ../src/dialogs.py:2341
+#: ../src/dialogs.py:2357
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s er ikke navnet til en gruppesamtale."
 
-#: ../src/dialogs.py:2372
+#: ../src/dialogs.py:2388
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Du kan ikke synkronisere kontakter uten å være tilkoblet."
 
-#: ../src/dialogs.py:2386
+#: ../src/dialogs.py:2402
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2421
+#: ../src/dialogs.py:2437
 msgid "This account is not connected to the server"
 msgstr "Denne kontoen er ikke tilkoblet til serveren"
 
-#: ../src/dialogs.py:2422
+#: ../src/dialogs.py:2438
 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:2446
+#: ../src/dialogs.py:2462
 msgid "Synchronise"
 msgstr "Synkroniser"
 
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2523
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start samtale med konto %s"
 
-#: ../src/dialogs.py:2509
+#: ../src/dialogs.py:2525
 msgid "Start Chat"
 msgstr "Start Samtale"
 
-#: ../src/dialogs.py:2510
+#: ../src/dialogs.py:2526
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7069,168 +7253,168 @@ msgstr ""
 "Ã¥ sende en samtale melding til:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2536 ../src/dialogs.py:2917 ../src/dialogs.py:3129
+#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
 msgid "Connection not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/dialogs.py:2537 ../src/dialogs.py:2918 ../src/dialogs.py:3130
+#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vennligst sjekk at du er tilkoblet med \"%s\"."
 
-#: ../src/dialogs.py:2546 ../src/dialogs.py:2549
+#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
 msgid "Invalid JID"
 msgstr "Ugyldig JID"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2565
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kan ikke analysere \"%s\"."
 
-#: ../src/dialogs.py:2558
+#: ../src/dialogs.py:2574
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan ikke endre passordet ditt uten å være tilkoblet."
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "Invalid password"
 msgstr "Ugyldig passord"
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "You must enter a password."
 msgstr "Du må skrive inn et passord."
 
-#: ../src/dialogs.py:2581
+#: ../src/dialogs.py:2597
 msgid "Passwords do not match"
 msgstr "Passordene er ikke like"
 
-#: ../src/dialogs.py:2582
+#: ../src/dialogs.py:2598
 msgid "The passwords typed in both fields must be identical."
 msgstr "Passordene du skriver inn i begge felt må være identiske."
 
 #. default value
-#: ../src/dialogs.py:2619 ../src/notify.py:247 ../src/notify.py:473
+#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
 msgid "Contact Signed In"
 msgstr "Kontakt Logget PÃ¥"
 
-#: ../src/dialogs.py:2621 ../src/notify.py:255 ../src/notify.py:475
+#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
 msgid "Contact Signed Out"
 msgstr "Kontakt Logget Av"
 
 #. chat message
-#: ../src/dialogs.py:2623 ../src/notify.py:277 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
 msgid "New Message"
 msgstr "Ny Melding"
 
 #. single message
-#: ../src/dialogs.py:2623 ../src/notify.py:259 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
 msgid "New Single Message"
 msgstr "Ny Melding"
 
 #. private message
-#: ../src/dialogs.py:2624 ../src/notify.py:265 ../src/notify.py:478
+#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
 msgid "New Private Message"
 msgstr "Ny Privat Melding"
 
-#: ../src/dialogs.py:2624 ../src/gui_interface.py:1358 ../src/notify.py:487
+#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: ../src/dialogs.py:2626 ../src/gui_interface.py:1420 ../src/notify.py:480
+#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
 msgid "File Transfer Request"
 msgstr "Fil Overførings Forespørsel"
 
-#: ../src/dialogs.py:2628 ../src/gui_interface.py:1320
-#: ../src/gui_interface.py:1389 ../src/notify.py:482
+#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
+#: ../src/gui_interface.py:1186 ../src/notify.py:482
 msgid "File Transfer Error"
 msgstr "Fil Overføring Feilet"
 
-#: ../src/dialogs.py:2630 ../src/gui_interface.py:1466
-#: ../src/gui_interface.py:1489 ../src/gui_interface.py:1506
+#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
+#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
 #: ../src/notify.py:484
 msgid "File Transfer Completed"
 msgstr "Fil Overføring Komplett"
 
-#: ../src/dialogs.py:2631 ../src/gui_interface.py:1469 ../src/notify.py:485
+#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
 msgid "File Transfer Stopped"
 msgstr "Fil Overføring Stoppet"
 
-#: ../src/dialogs.py:2633 ../src/gui_interface.py:1152 ../src/notify.py:489
+#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
 msgid "Groupchat Invitation"
 msgstr "Gruppesamtale invitasjon"
 
-#: ../src/dialogs.py:2635 ../src/notify.py:239 ../src/notify.py:491
+#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
 msgid "Contact Changed Status"
 msgstr "Kontakt Endret Status"
 
-#: ../src/dialogs.py:2836
+#: ../src/dialogs.py:2852
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Enkelt Melding med konto %s"
 
-#: ../src/dialogs.py:2838
+#: ../src/dialogs.py:2854
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Enkelt Melding i konto %s"
 
-#: ../src/dialogs.py:2840
+#: ../src/dialogs.py:2856
 msgid "Single Message"
 msgstr "Melding"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2843
+#: ../src/dialogs.py:2859
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:2882
 #, python-format
 msgid "Received %s"
 msgstr "Motatt %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2889
+#: ../src/dialogs.py:2905
 #, 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:2968
+#: ../src/dialogs.py:2984
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:2985
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:3028
+#: ../src/dialogs.py:3044
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsoll for %s"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3046
 msgid "XML Console"
 msgstr "XML Konsoll"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "add"
 msgstr "Lei seg"
 
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "modify"
 msgstr "Endre"
 
-#: ../src/dialogs.py:3160
+#: ../src/dialogs.py:3176
 #, fuzzy
 msgid "remove"
 msgstr "_Fjern"
 
-#: ../src/dialogs.py:3188
+#: ../src/dialogs.py:3204
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7238,156 +7422,190 @@ msgid ""
 msgstr "<b>%s</b> ønsker at du <b>%s</b> noen kontakter i kontaktlisten. "
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3204 ../src/dialogs.py:3250
+#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
 msgid "Add"
 msgstr "Legg til"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3206 ../src/dialogs.py:3281
+#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
 msgid "Modify"
 msgstr "Endre"
 
-#: ../src/dialogs.py:3212
+#: ../src/dialogs.py:3228
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3218
+#: ../src/dialogs.py:3234
 msgid "Groups"
 msgstr "Grupper"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3342
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s anbefalte meg å legge til deg i min kontaktliste. "
 
-#: ../src/dialogs.py:3340
+#: ../src/dialogs.py:3356
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "_Legg til kontakt"
 
-#: ../src/dialogs.py:3377
+#: ../src/dialogs.py:3393
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Fjerner kontakt fra kontaktlisten"
 
-#: ../src/dialogs.py:3430
+#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#, python-format
+msgid "Archiving Preferences for %s"
+msgstr ""
+
+#: ../src/dialogs.py:3473
+#, fuzzy
+msgid "Invalid expire value"
+msgstr "Ugyldig Servernavn"
+
+#: ../src/dialogs.py:3474
+msgid "Expire must be a valid positive integer."
+msgstr ""
+
+#: ../src/dialogs.py:3521
+msgid "There is an error with the form"
+msgstr ""
+
+#: ../src/dialogs.py:3732
+#, fuzzy
+msgid "There is an error"
+msgstr "Tjenesten returnerte en feil."
+
+#: ../src/dialogs.py:3796
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Liste over Uønskede <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3434
+#: ../src/dialogs.py:3800
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Liste over Uønskede for %s"
 
-#: ../src/dialogs.py:3490
+#: ../src/dialogs.py:3856
 #, 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:3495
+#: ../src/dialogs.py:3861
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Rekkefølge: %(order)s, handling: %(action)s"
 
-#: ../src/dialogs.py:3539
+#: ../src/dialogs.py:3905
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Rediger en regel</b>"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:4016
 msgid "<b>Add a rule</b>"
 msgstr "<b>Legg til regel</b>"
 
-#: ../src/dialogs.py:3750
+#: ../src/dialogs.py:4116
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Liste over Uønskede for %s"
 
-#: ../src/dialogs.py:3752
+#: ../src/dialogs.py:4118
 msgid "Privacy Lists"
 msgstr "Liste overUønskede"
 
-#: ../src/dialogs.py:3822
+#: ../src/dialogs.py:4188
 msgid "Invalid List Name"
 msgstr "Listenavnet er Ugyldig"
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4189
 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:3855
+#: ../src/dialogs.py:4221
 msgid "You are invited to a groupchat"
 msgstr "Du er invitert til en gruppesamtale"
 
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4224
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact har invitert deg til en gruppesamtale"
 
-#: ../src/dialogs.py:3860
+#: ../src/dialogs.py:4226
 #, 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:3868
+#: ../src/dialogs.py:4234
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4236
 msgid "Do you want to accept the invitation?"
 msgstr "Ønsker du å akseptere invitasjonen?"
 
-#: ../src/dialogs.py:3932
+#: ../src/dialogs.py:4298
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:3942 ../src/dialogs.py:3985 ../src/dialogs.py:4041
+#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
+#: ../src/dialogs.py:4495
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/dialogs.py:3947
+#: ../src/dialogs.py:4313
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:3975
+#: ../src/dialogs.py:4341
 msgid "Choose Sound"
 msgstr "Velg Lyd"
 
-#: ../src/dialogs.py:3990
+#: ../src/dialogs.py:4356
 msgid "Wav Sounds"
 msgstr "Wav Lyder"
 
-#: ../src/dialogs.py:4028
+#: ../src/dialogs.py:4394
 msgid "Choose Image"
 msgstr "Velg Bilde"
 
-#: ../src/dialogs.py:4046
+#: ../src/dialogs.py:4412
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:4113
+#: ../src/dialogs.py:4482
+#, fuzzy
+msgid "Choose Archive"
+msgstr "Velg Bilde"
+
+#: ../src/dialogs.py:4500
+#, fuzzy
+msgid "Zip files"
+msgstr "Alle filer"
+
+#: ../src/dialogs.py:4525
 #, python-format
 msgid "When %s becomes:"
 msgstr "NÃ¥r %s blir:"
 
-#: ../src/dialogs.py:4115
+#: ../src/dialogs.py:4527
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Legg til Spesiell Alarm for %s"
 
-#: ../src/dialogs.py:4190
+#: ../src/dialogs.py:4602
 msgid "Condition"
 msgstr "Betingelse"
 
-#: ../src/dialogs.py:4310
+#: ../src/dialogs.py:4722
 msgid "when I am "
 msgstr "nå jeg er"
 
-#: ../src/dialogs.py:4786
+#: ../src/dialogs.py:5198
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7398,19 +7616,19 @@ msgstr ""
 "\n"
 "Denne sesjonens Short Authentication String er <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4789
+#: ../src/dialogs.py:5201
 msgid "You have already verified this contact's identity."
 msgstr "Du har allerede verifisert denne kontaktens identitet."
 
-#: ../src/dialogs.py:4795 ../src/dialogs.py:4879
+#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
 msgid "Contact's identity verified"
 msgstr "Kontaktens identitet verifisert"
 
-#: ../src/dialogs.py:4801
+#: ../src/dialogs.py:5213
 msgid "Verify again..."
 msgstr "Verifiser igjen..."
 
-#: ../src/dialogs.py:4806
+#: ../src/dialogs.py:5218
 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 "
@@ -7420,19 +7638,19 @@ msgstr ""
 "meldinger eller sende meldinger, må du verifisere identiteten ved å klikke "
 "på knappen under. "
 
-#: ../src/dialogs.py:4809 ../src/dialogs.py:4860 ../src/dialogs.py:4873
+#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktens identitet IKKE verifisert"
 
-#: ../src/dialogs.py:4814
+#: ../src/dialogs.py:5226
 msgid "Verify..."
 msgstr "Verifiser..."
 
-#: ../src/dialogs.py:4825
+#: ../src/dialogs.py:5237
 msgid "Have you verified the contact's identity?"
 msgstr "Har du verifisert kontaktens identitet?"
 
-#: ../src/dialogs.py:4826
+#: ../src/dialogs.py:5238
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7447,23 +7665,23 @@ msgstr ""
 "\n"
 "Denne sesjonens Short Authentication String er <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4827
+#: ../src/dialogs.py:5239
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Har du snakket med kontakten og verifisert SASen?"
 
-#: ../src/dialogs.py:4861
+#: ../src/dialogs.py:5273
 #, 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:4867
+#: ../src/dialogs.py:5279
 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:4874
+#: ../src/dialogs.py:5286
 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."
@@ -7472,7 +7690,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:4880
+#: ../src/dialogs.py:5292
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7480,19 +7698,19 @@ msgstr ""
 "GPG nøkkel er tildelt denne kontakten, og du stoler på den, så meldinger vil "
 "bli kryptert."
 
-#: ../src/dialogs.py:4945
+#: ../src/dialogs.py:5357
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4947
+#: ../src/dialogs.py:5359
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4949
+#: ../src/dialogs.py:5361
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4953
+#: ../src/dialogs.py:5365
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7508,24 +7726,24 @@ msgstr "Andre"
 msgid "Conference"
 msgstr "Konferanse"
 
-#: ../src/disco.py:512
+#: ../src/disco.py:513
 msgid "Without a connection, you can not browse available services"
 msgstr "Uten en tilkobling kan du ikke liste ut tilgjengelige tjenester"
 
-#: ../src/disco.py:589
+#: ../src/disco.py:600
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Se etter Tjenester med %s kontoen"
 
-#: ../src/disco.py:591
+#: ../src/disco.py:602
 msgid "Service Discovery"
 msgstr "Se etter Tjenester"
 
-#: ../src/disco.py:741
+#: ../src/disco.py:758
 msgid "The service could not be found"
 msgstr "Tjenesten ble ikke funnet"
 
-#: ../src/disco.py:742
+#: ../src/disco.py:759
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7533,93 +7751,93 @@ msgstr ""
 "Det er ingen tjeneste på adressen du oppgav, eller den svarer ikke. Sjekk "
 "adressen og prøv igjen."
 
-#: ../src/disco.py:746 ../src/disco.py:1082
+#: ../src/disco.py:763 ../src/disco.py:1100
 msgid "The service is not browsable"
 msgstr "Ikke mulig å utforske tjeneste"
 
-#: ../src/disco.py:747
+#: ../src/disco.py:764
 msgid "This type of service does not contain any items to browse."
 msgstr "Denne typen tjeneste inneholder ingen elementer å utforske"
 
-#: ../src/disco.py:786 ../src/disco.py:796
+#: ../src/disco.py:804 ../src/disco.py:814
 msgid "Invalid Server Name"
 msgstr "Ugyldig Servernavn"
 
-#: ../src/disco.py:850
+#: ../src/disco.py:868
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Utforsk %(address)s med kontoen %(account)s"
 
-#: ../src/disco.py:894
+#: ../src/disco.py:912
 msgid "_Browse"
 msgstr "_Utforsk"
 
-#: ../src/disco.py:1083
+#: ../src/disco.py:1101
 msgid "This service does not contain any items to browse."
 msgstr "Denne tjenesten innholer ingen elementer å utforske."
 
-#: ../src/disco.py:1323
+#: ../src/disco.py:1341
 msgid "_Execute Command"
 msgstr "_Kjør Kommando"
 
-#: ../src/disco.py:1333 ../src/disco.py:1504
+#: ../src/disco.py:1351 ../src/disco.py:1522
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
-#: ../src/disco.py:1545
+#: ../src/disco.py:1563
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanner %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1736
+#: ../src/disco.py:1754
 msgid "Users"
 msgstr "Brukere"
 
 #. Description column
-#: ../src/disco.py:1744
+#: ../src/disco.py:1762
 msgid "Description"
 msgstr "Beskrivelse"
 
 #. Id column
-#: ../src/disco.py:1752
+#: ../src/disco.py:1770
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1817 ../src/gui_interface.py:3182
+#: ../src/disco.py:1835 ../src/gui_interface.py:2995
 msgid "Bookmark already set"
 msgstr "Bokmerke allerede satt"
 
-#: ../src/disco.py:1818 ../src/gui_interface.py:3183
+#: ../src/disco.py:1836 ../src/gui_interface.py:2996
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Gruppesamtalen \"%s\" er allerede i dine bokmerker."
 
-#: ../src/disco.py:1827 ../src/gui_interface.py:3197
+#: ../src/disco.py:1845 ../src/gui_interface.py:3010
 msgid "Bookmark has been added successfully"
 msgstr "Bokmerke har blitt lagt til"
 
-#: ../src/disco.py:1828 ../src/gui_interface.py:3198
+#: ../src/disco.py:1846 ../src/gui_interface.py:3011
 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:2039
+#: ../src/disco.py:2057
 msgid "Subscribed"
 msgstr "Abonnerte"
 
-#: ../src/disco.py:2047
+#: ../src/disco.py:2065
 msgid "Node"
 msgstr "Node"
 
-#: ../src/disco.py:2111
+#: ../src/disco.py:2129
 msgid "New post"
 msgstr "Ny post"
 
-#: ../src/disco.py:2117
+#: ../src/disco.py:2135
 msgid "_Subscribe"
 msgstr "_Abonnér"
 
-#: ../src/disco.py:2123
+#: ../src/disco.py:2141
 msgid "_Unsubscribe"
 msgstr "_Fjern Abonnement"
 
@@ -7791,17 +8009,19 @@ msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Transformer LaTeX uttrykk mellom $$ $$."
 
 #: ../src/features_window.py:95
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
-"in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 "Krever texlive-latex-base og dvipng. Du må sette 'use_latex' til True i "
 "Avansert Konfigurasjons Editoren."
 
 #: ../src/features_window.py:96
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
+"You have to set 'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 "Krever texlive-latex-base og dvipng (Alt er i MikTeX). Du må sette "
 "'use_latex' til True i Avansert Konfigurasjons Editoren."
@@ -7958,12 +8178,12 @@ msgstr "Beskrivelse: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s ønsker å sende deg en fil:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Kan ikke overskrive eksisterende fil \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -7971,22 +8191,22 @@ msgstr ""
 "En fil med dette navnet eksisterer og du har ikke rettigheter til å "
 "overskrive den."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 msgid "This file already exists"
 msgstr "Denne filen finnes fra før"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 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:369 ../src/gtkgui_helpers.py:914
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Katalogen \"%s\" er ikke skrivbar"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
 msgid "You do not have permission to create files in this directory."
 msgstr "Du har ikke rettigheter til å lage filer i denne katalogen."
 
@@ -8089,28 +8309,28 @@ msgstr ""
 "En annen instans av Gajim ser ut til å kjøre\n"
 "Start likevel?"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
 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:80
+#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
 msgid "command"
 msgstr "kommando"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "vis hjelp for kommando"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Vis eller skjul kontaktliste vinduet"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
 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:93
+#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8118,6 +8338,13 @@ msgstr ""
 "Skriv ut en liste over alle kontakter i kontaklisten. Hver kontakt kommer på "
 "en egen linje"
 
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
+#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
+#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
+#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
 #: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
 #: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
 #: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
@@ -8129,43 +8356,35 @@ msgstr ""
 msgid "account"
 msgstr "konto"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "vis bare kontakter for denne kontoen"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Skriv ut en liste over registrerte kontoer"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
 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:109
+#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106
 #, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"accoun't previous status"
+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:110 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
-msgid "message"
-msgstr "melding"
-
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "status melding"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8173,43 +8392,20 @@ 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:117
-msgid "Changes the priority of account or accounts"
-msgstr "Endrer prioritet på konto eller kontoer"
-
-#: ../src/gajim-remote.py:119
-msgid "priority"
-msgstr "prioritet"
-
-#: ../src/gajim-remote.py:119
-msgid "priority you want to give to the account"
-msgstr "prioritet du ønsker å gi til kontoen"
-
-#: ../src/gajim-remote.py:121
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-msgstr ""
-"endre prioritet til en konto. Dersom uspesifisert, endre status til alle "
-"kontoer som har \"synkroniser med global status\" valget påslått"
-
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
 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:129
+#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID til kontakten du ønsker å snakke med"
 
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
 #: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 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:134
-msgid "message content. The account must be specified or \"\""
-msgstr "meldings innhold. Kontoen må spesifiseres eller \"\""
-
-#: ../src/gajim-remote.py:139
+#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
 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 "
@@ -8219,30 +8415,35 @@ 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-plugin.py:127 ../src/gajim-remote-plugin.py:140
 #: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID til kontakten som vil motta meldingen"
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
+#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "meldings innhold"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "pgp nøkkel"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 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:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
+#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
 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:152
+#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
 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 "
@@ -8252,143 +8453,285 @@ 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:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "tittel"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "meldings tittel"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
 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:168
+#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "JID til rommet som vil motta meldingen"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Henter detaljert informasjon om en kontakt"
 
+#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
+#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
 #: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
 #: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID til kontakten"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Henter detaljert informasjon om en konto"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Navn på kontoen"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Sender fil til en kontakt"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "file"
 msgstr "fil"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Fil sti"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "dersom spesifisert, vil filen bli sendt fra denne kontoen"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Viser alle innstillingsmuligheter og gjeldende verdier"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Setter verdien av 'nøkkel' til 'verdi',"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "nøkkel=verdi"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 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:207
+#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Sletter en innstilling"
 
-#: ../src/gajim-remote.py:209
-msgid "key"
-msgstr "nøkkel"
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "key"
+msgstr "nøkkel"
+
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "name of the preference to be deleted"
+msgstr "navnet på innstillingen som skal slettes"
+
+#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+msgid "Writes the current state of Gajim preferences to the .config file"
+msgstr "Skriver gjeldende Gajim innstillinger til .config filen"
+
+#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
+msgid "Removes contact from roster"
+msgstr "Fjerner kontakt fra kontaktlisten"
+
+#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+msgid "Adds contact to roster"
+msgstr "Legger til kontakt til kontaktlisten"
+
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+msgid "Adds new contact to this account"
+msgstr "Legger til en ny kontakt til denne kontoen."
+
+#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+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-plugin.py:226
+#, fuzzy
+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-plugin.py:233 ../src/gajim-remote.py:249
+msgid "Returns number of unread messages"
+msgstr "Returnerer antall uleste meldinger"
+
+#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+msgid "Opens 'Start Chat' dialog"
+msgstr "Ã…pner 'Start Samtale' dialogen"
+
+#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+msgid "Starts chat, using this account"
+msgstr "Starter samtale, med denne kontoen"
+
+#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+msgid "Sends custom XML"
+msgstr "Send egendefinert XML"
+
+#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+msgid "XML to send"
+msgstr "XML for sending"
+
+#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+"Kontoen som xmlen vil bli sendt; dersom ikke spesifisert vil xmlen bli sendt "
+"til alle kontoer"
+
+#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
+msgid "Handle a xmpp:/ uri"
+msgstr "HÃ¥ndtere en xmpp:/ uri"
+
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
+msgid "uri"
+msgstr "uri"
+
+#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+msgid "Join a MUC room"
+msgstr "Bli med i et MUC rom"
+
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+msgid "room"
+msgstr "rom"
+
+#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+msgid "nick"
+msgstr "kallenavn"
+
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+msgid "password"
+msgstr "passord"
+
+#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+msgid "Check if Gajim is running"
+msgstr "Sjekk om Gajim kjører"
+
+#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
+#: ../src/gajim-remote.py:300
+msgid "Shows or hides the ipython window"
+msgstr "Vis eller skjul ipython vindu"
+
+#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+msgid "Missing argument \"contact_jid\""
+msgstr "Mangler argument \"contact_jid\""
+
+#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#, python-format
+msgid ""
+"'%s' is not in your roster.\n"
+"Please specify account for sending the message."
+msgstr ""
+"'%s' er ikke in kontaktlisten din.\n"
+"Vennligst spesifiser konto for sending av meldingen."
+
+#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+msgid "You have no active account"
+msgstr "Du har ingen aktiv konto"
 
-#: ../src/gajim-remote.py:209
-msgid "name of the preference to be deleted"
-msgstr "navnet på innstillingen som skal slettes"
+#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+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:213
-msgid "Writes the current state of Gajim preferences to the .config file"
-msgstr "Skriver gjeldende Gajim innstillinger til .config filen"
+#: ../src/gajim-remote-plugin.py:412
+#, python-format
+msgid ""
+"Usage: %s %s %s \n"
+"\t %s"
+msgstr ""
+"Bruk: %s %s %s \n"
+"\t %s"
 
-#: ../src/gajim-remote.py:218
-msgid "Removes contact from roster"
-msgstr "Fjerner kontakt fra kontaktlisten"
+#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+msgid "Arguments:"
+msgstr "Argumenter:"
 
-#: ../src/gajim-remote.py:227
-msgid "Adds contact to roster"
-msgstr "Legger til kontakt til kontaktlisten"
+#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#, python-format
+msgid "%s not found"
+msgstr "%s ikke funnet"
 
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "jid"
+#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
+#, python-format
+msgid ""
+"Usage: %s command [arguments]\n"
+"Command is one of:\n"
+msgstr ""
+"Bruk: %s kommando [argumenter]\n"
+"Kommando er en av:\n"
 
-#: ../src/gajim-remote.py:230
-msgid "Adds new contact to this account"
-msgstr "Legger til en ny kontakt til denne kontoen."
+#: ../src/gajim-remote-plugin.py:496
+#, fuzzy, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"For mange argumenter. \n"
+"Skriv \"%(basename)s hjelp %(command)s\" for mer informasjon"
 
-#: ../src/gajim-remote.py:235
-msgid "Returns current status (the global one unless account is specified)"
+#: ../src/gajim-remote-plugin.py:500
+#, fuzzy, python-format
+msgid ""
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
 msgstr ""
-"Returnerer innstillinger (globale innstillinger om ikke en konto er "
-"spesifisert)"
+"Argumentet \"%(arg)s\" er ikke spesifisert. \n"
+"Skriv \"%(basename)s hjelp %(command)s\" for mer informasjon"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
+msgid "Wrong uri"
+msgstr "Feil uri"
+
+#: ../src/gajim-remote.py:109
+#, fuzzy
 msgid ""
-"Returns current status message (the global one unless account is specified)"
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
 msgstr ""
-"Returnerer gjeldende status melding (den globale om ikke en konto er "
-"spesifisert)"
+"en av: frakoblet, tilkoblet, samtale, borte, mer borte, ikke forstyrr, "
+"usynlig"
 
-#: ../src/gajim-remote.py:249
-msgid "Returns number of unread messages"
-msgstr "Returnerer antall uleste meldinger"
+#: ../src/gajim-remote.py:117
+msgid "Changes the priority of account or accounts"
+msgstr "Endrer prioritet på konto eller kontoer"
 
-#: ../src/gajim-remote.py:253
-msgid "Opens 'Start Chat' dialog"
-msgstr "Ã…pner 'Start Samtale' dialogen"
+#: ../src/gajim-remote.py:119
+msgid "priority"
+msgstr "prioritet"
 
-#: ../src/gajim-remote.py:255
-msgid "Starts chat, using this account"
-msgstr "Starter samtale, med denne kontoen"
+#: ../src/gajim-remote.py:119
+msgid "priority you want to give to the account"
+msgstr "prioritet du ønsker å gi til kontoen"
 
-#: ../src/gajim-remote.py:259
-msgid "Sends custom XML"
-msgstr "Send egendefinert XML"
+#: ../src/gajim-remote.py:121
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"endre prioritet til en konto. Dersom uspesifisert, endre status til alle "
+"kontoer som har \"synkroniser med global status\" valget påslått"
 
-#: ../src/gajim-remote.py:261
-msgid "XML to send"
-msgstr "XML for sending"
+#: ../src/gajim-remote.py:134
+msgid "message content. The account must be specified or \"\""
+msgstr "meldings innhold. Kontoen må spesifiseres eller \"\""
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:242
 msgid ""
-"Account in which the xml will be sent; if not specified, xml will be sent to "
-"all accounts"
+"Returns current status message (the global one unless account is specified)"
 msgstr ""
-"Kontoen som xmlen vil bli sendt; dersom ikke spesifisert vil xmlen bli sendt "
-"til alle kontoer"
+"Returnerer gjeldende status melding (den globale om ikke en konto er "
+"spesifisert)"
 
 #: ../src/gajim-remote.py:268
 #, fuzzy
@@ -8409,14 +8752,6 @@ msgstr ""
 "Kontoen som xmlen vil bli sendt; dersom ikke spesifisert vil xmlen bli sendt "
 "til alle kontoer"
 
-#: ../src/gajim-remote.py:277
-msgid "Handle a xmpp:/ uri"
-msgstr "HÃ¥ndtere en xmpp:/ uri"
-
-#: ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "uri"
-
 #: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr "URI til håndgrep"
@@ -8429,30 +8764,14 @@ msgstr "Konto som du ønsker å benytte for å håndtere det"
 msgid "Message content"
 msgstr "Meldings innhold"
 
-#: ../src/gajim-remote.py:286
-msgid "Join a MUC room"
-msgstr "Bli med i et MUC rom"
-
-#: ../src/gajim-remote.py:288
-msgid "room"
-msgstr "rom"
-
 #: ../src/gajim-remote.py:288
 msgid "Room JID"
 msgstr "Rom JID"
 
-#: ../src/gajim-remote.py:289
-msgid "nick"
-msgstr "kallenavn"
-
 #: ../src/gajim-remote.py:289
 msgid "Nickname to use"
 msgstr "Kallenavn å bruke"
 
-#: ../src/gajim-remote.py:290
-msgid "password"
-msgstr "passord"
-
 #: ../src/gajim-remote.py:290
 msgid "Password to enter the room"
 msgstr "Passord for å komme inn i rommet"
@@ -8461,35 +8780,6 @@ msgstr "Passord for å komme inn i rommet"
 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:296
-msgid "Check if Gajim is running"
-msgstr "Sjekk om Gajim kjører"
-
-#: ../src/gajim-remote.py:300
-msgid "Shows or hides the ipython window"
-msgstr "Vis eller skjul ipython vindu"
-
-#: ../src/gajim-remote.py:327
-msgid "Missing argument \"contact_jid\""
-msgstr "Mangler argument \"contact_jid\""
-
-#: ../src/gajim-remote.py:348
-#, python-format
-msgid ""
-"'%s' is not in your roster.\n"
-"Please specify account for sending the message."
-msgstr ""
-"'%s' er ikke in kontaktlisten din.\n"
-"Vennligst spesifiser konto for sending av meldingen."
-
-#: ../src/gajim-remote.py:351
-msgid "You have no active account"
-msgstr "Du har ingen aktiv konto"
-
-#: ../src/gajim-remote.py:404
-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:431
 #, python-format
 msgid ""
@@ -8499,24 +8789,6 @@ msgstr ""
 "Bruk: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:435
-msgid "Arguments:"
-msgstr "Argumenter:"
-
-#: ../src/gajim-remote.py:439
-#, python-format
-msgid "%s not found"
-msgstr "%s ikke funnet"
-
-#: ../src/gajim-remote.py:445
-#, python-format
-msgid ""
-"Usage: %s command [arguments]\n"
-"Command is one of:\n"
-msgstr ""
-"Bruk: %s kommando [argumenter]\n"
-"Kommando er en av:\n"
-
 #: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
@@ -8539,10 +8811,6 @@ msgstr ""
 msgid "No uri given"
 msgstr ""
 
-#: ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Feil uri"
-
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Tema"
@@ -8568,180 +8836,178 @@ msgstr "Du kan ikke slette ditt gjeldene tema"
 msgid "Please first choose another for your current theme."
 msgstr "Vennligst velg en annen for ditt gjeldende tema."
 
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:170
 msgid "Sending private message failed"
 msgstr "Sending av privat melding feilet"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:171
+#: ../src/groupchat_control.py:172
 #, 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:455
 msgid "Insert Nickname"
 msgstr "Skriv inn Kallenavn"
 
-#: ../src/groupchat_control.py:631
+#: ../src/groupchat_control.py:636
 msgid "Conversation with "
 msgstr "Samtale med"
 
-#: ../src/groupchat_control.py:633
+#: ../src/groupchat_control.py:638
 msgid "Continued conversation"
 msgstr "Fortsettende samtale"
 
-#. Can be a message (see handle_event_gc_config_change in
-#. gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1272 ../src/gui_interface.py:1080
+#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Enhver deltaker får log å se din fulle JID"
 
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1286
 msgid "Room logging is enabled"
 msgstr "Rom logging er påslått"
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1288
 msgid "A new room has been created"
 msgstr "Et nytt rom har blitt laget"
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1291
 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:1287
+#: ../src/groupchat_control.py:1297
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blitt utvist: %(reason)s"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1300
 #, 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:1300
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s er blitt uønsket: %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1312
 #, 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:1314 ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nå kjent som %s"
 
-#: ../src/groupchat_control.py:1330 ../src/gui_interface.py:919
+#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s er nå kjent som %(new_nick)s"
 
-#: ../src/groupchat_control.py:1372 ../src/groupchat_control.py:1377
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1392
 #, 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:1374
+#: ../src/groupchat_control.py:1383
 msgid "affiliation changed"
 msgstr "tilhørighet endret"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1388
 msgid "room configuration changed to members-only"
 msgstr "rom konfigurasjon er endret til kun-for-medlemmer"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1394
 msgid "system shutdown"
 msgstr "systemet slår seg av"
 
-#: ../src/groupchat_control.py:1470
+#: ../src/groupchat_control.py:1477
 #, 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:1474
+#: ../src/groupchat_control.py:1481
 #, 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:1489
+#: ../src/groupchat_control.py:1496
 #, 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:1493
+#: ../src/groupchat_control.py:1500
 #, 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:1522
+#: ../src/groupchat_control.py:1530
 #, python-format
 msgid "%s has left"
 msgstr "%s har dratt"
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1535
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s har blitt med i gruppesamtalen"
 
-#: ../src/groupchat_control.py:1529 ../src/gui_interface.py:946
+#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
 #: ../src/history_window.py:447 ../src/notify.py:234
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s er nå %(status)s"
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1774
 #, 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:1761
+#: ../src/groupchat_control.py:1776
 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:1765 ../src/gui_interface.py:1216
-#: ../src/gui_interface.py:1992 ../src/gui_interface.py:2029
-#: ../src/gui_interface.py:2064 ../src/message_window.py:224
-#: ../src/roster_window.py:2739 ../src/roster_window.py:3399
-#: ../src/roster_window.py:4123
+#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
+#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
+#: ../src/gui_interface.py:1853 ../src/message_window.py:224
+#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
+#: ../src/roster_window.py:4195
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Ikke spør meg igjen"
 
-#: ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:1814
 msgid "Changing Subject"
 msgstr "Endrer Tittel"
 
-#: ../src/groupchat_control.py:1800
+#: ../src/groupchat_control.py:1815
 msgid "Please specify the new subject:"
 msgstr "Vennlist skriv inn ny tittel:"
 
-#: ../src/groupchat_control.py:1807
+#: ../src/groupchat_control.py:1822
 msgid "Changing Nickname"
 msgstr "Endrer Kallenavn"
 
-#: ../src/groupchat_control.py:1808
+#: ../src/groupchat_control.py:1823
 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:1839
+#: ../src/groupchat_control.py:1854
 #, python-format
 msgid "Destroying %s"
 msgstr "Ødelegger %s"
 
-#: ../src/groupchat_control.py:1840
+#: ../src/groupchat_control.py:1855
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8749,22 +9015,22 @@ msgstr ""
 "Du kommer garantert til å ødelegge dette rommet.\n"
 "Du kan skrive en årsak under:"
 
-#: ../src/groupchat_control.py:1842
+#: ../src/groupchat_control.py:1857
 msgid "You may also enter an alternate venue:"
 msgstr "Du kan også skrive et alternativt møtested:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2028
+#: ../src/groupchat_control.py:2046
 #, python-format
 msgid "Kicking %s"
 msgstr "Utkasting %s"
 
-#: ../src/groupchat_control.py:2029 ../src/groupchat_control.py:2356
+#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
 msgid "You may specify a reason below:"
 msgstr "Du kan spesifisere grunn under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2355
+#: ../src/groupchat_control.py:2373
 #, python-format
 msgid "Banning %s"
 msgstr "Utvise %s"
@@ -8790,53 +9056,62 @@ msgid "Details"
 msgstr "Detaljer"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
+#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Feil: kan ikke åpne %s for lesing"
 
-#: ../src/gtkgui_helpers.py:400
+#: ../src/gtkgui_helpers.py:404
 msgid "Error reading file:"
 msgstr "Feil under lesing av fil:"
 
-#: ../src/gtkgui_helpers.py:403
+#: ../src/gtkgui_helpers.py:407
 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:444
+#: ../src/gtkgui_helpers.py:448
 #, 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:818
+#: ../src/gtkgui_helpers.py:822
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim er ikke standard Jabber klient"
 
-#: ../src/gtkgui_helpers.py:819
+#: ../src/gtkgui_helpers.py:823
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Ønsker du å sette Gajim til standard Jabber klient?"
 
-#: ../src/gtkgui_helpers.py:820
+#: ../src/gtkgui_helpers.py:824
 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:887
+#: ../src/gtkgui_helpers.py:891
 msgid "Extension not supported"
 msgstr "Utvidelse ikke støttet"
 
-#: ../src/gtkgui_helpers.py:888
+#: ../src/gtkgui_helpers.py:892
 #, 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:924
+#: ../src/gtkgui_helpers.py:928
 msgid "Save Image as..."
 msgstr "Lagre Bilde som..."
 
-#: ../src/gui_interface.py:140
+#. we are banned
+#. group chat does not exist
+#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
+#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
+#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
+#: ../src/gui_interface.py:348
+msgid "Unable to join group chat"
+msgstr "Klarer ikke å gå inn i gruppesamtale"
+
+#: ../src/gui_interface.py:138
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8847,58 +9122,92 @@ msgstr ""
 "en annen samtalebruker.\n"
 "Vennligst skriv et annet kallenavn under:"
 
-#: ../src/gui_interface.py:143
+#: ../src/gui_interface.py:141
 msgid "Always use this nickname when there is a conflict"
 msgstr "Alltid bruk dette kallenavnet når det er en konflikt"
 
-#: ../src/gui_interface.py:159
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Godtar du denne forespørselen?"
 
-#: ../src/gui_interface.py:161
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Godtar du denne forespørselen på konto %s?"
 
-#: ../src/gui_interface.py:164
+#: ../src/gui_interface.py:163
 #, 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/gui_interface.py:213 ../src/notify.py:493
+#: ../src/gui_interface.py:209 ../src/notify.py:493
 msgid "Connection Failed"
 msgstr "Tilkobling Feilet"
 
-#: ../src/gui_interface.py:606 ../src/gui_interface.py:610
+#: ../src/gui_interface.py:312
+#, 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/gui_interface.py:324
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr "Maksimum antall brukere for %s er nådd"
+
+#: ../src/gui_interface.py:333
+#, python-format
+msgid "You are banned from group chat %s."
+msgstr "Du er uønsket fra gruppesamtalen %s."
+
+#: ../src/gui_interface.py:338
+#, python-format
+msgid "Group chat %s does not exist."
+msgstr "Gruppesamtalerom %s finnes ikke."
+
+#: ../src/gui_interface.py:341
+msgid "Group chat creation is restricted."
+msgstr "Gruppesamtale oppretting er begrenset."
+
+#: ../src/gui_interface.py:344
+#, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Ditt registrerte kallenavn må brukes i gruppesamtale %s. "
+
+#: ../src/gui_interface.py:349
+#, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Du er ikke i medlemslisten i gruppesamtale %s."
+
+#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Feil %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:621 ../src/gui_interface.py:636
+#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "feil ved sending %(message)s ( %(error)s )"
 
-#: ../src/gui_interface.py:663 ../src/notify.py:495
+#: ../src/gui_interface.py:540 ../src/notify.py:495
 msgid "Subscription request"
 msgstr "Abonnerings forespørsel"
 
-#: ../src/gui_interface.py:688
+#: ../src/gui_interface.py:565
 msgid "Authorization accepted"
 msgstr "Godkjenningsforespørel akseptert"
 
-#: ../src/gui_interface.py:689
+#: ../src/gui_interface.py:566
 #, 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/gui_interface.py:702
+#: ../src/gui_interface.py:579
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakten \"%s\" fjernet abonnementet fra deg"
 
-#: ../src/gui_interface.py:703
+#: ../src/gui_interface.py:580
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8906,59 +9215,54 @@ msgstr ""
 "Du vil alltid se han eller henne som frakoblet.\n"
 "Ønsker du å fjerne han eller henne fra din kontakt liste?"
 
-#: ../src/gui_interface.py:727 ../src/notify.py:497
+#: ../src/gui_interface.py:604 ../src/notify.py:497
 msgid "Unsubscribed"
 msgstr "Fjern Abonnement"
 
-#: ../src/gui_interface.py:754
+#: ../src/gui_interface.py:631
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan ikke opprettes"
 
-#: ../src/gui_interface.py:1015
+#: ../src/gui_interface.py:859
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s har satt tittel til %(subject)s"
 
-#: ../src/gui_interface.py:1083
+#: ../src/gui_interface.py:926
 msgid "Room now shows unavailable member"
 msgstr "Rommet viser nå utilgjengelig medlem"
 
-#: ../src/gui_interface.py:1085
+#: ../src/gui_interface.py:928
 msgid "room now does not show unavailable members"
 msgstr "rommet viser nå ikke utilgjengelige medlemmer"
 
-#: ../src/gui_interface.py:1087
+#: ../src/gui_interface.py:930
 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/gui_interface.py:1091
+#: ../src/gui_interface.py:934
 msgid "Room logging is now enabled"
 msgstr "Rom logging er nå påslått"
 
-#: ../src/gui_interface.py:1093
+#: ../src/gui_interface.py:936
 msgid "Room logging is now disabled"
 msgstr "Rom logging er nå avslått"
 
-#: ../src/gui_interface.py:1095
+#: ../src/gui_interface.py:938
 msgid "Room is now non-anonymous"
 msgstr "Rommet er nå ikke-anonymisert"
 
-#: ../src/gui_interface.py:1098
+#: ../src/gui_interface.py:941
 msgid "Room is now semi-anonymous"
 msgstr "Rommet er nå semi-anonymisert"
 
-#: ../src/gui_interface.py:1101
+#: ../src/gui_interface.py:944
 msgid "Room is now fully-anonymous"
 msgstr "Romet er nå full-anonymisert"
 
-#: ../src/gui_interface.py:1133
-#, 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/gui_interface.py:1180
+#: ../src/gui_interface.py:985
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -8966,23 +9270,23 @@ 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/gui_interface.py:1182 ../src/gui_interface.py:1189
+#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du er nå tilkoblet uten din OpenPGP nøkkel."
 
-#: ../src/gui_interface.py:1184
+#: ../src/gui_interface.py:989
 msgid "Your passphrase is incorrect"
 msgstr "Passord setningen din er ikke riktig"
 
-#: ../src/gui_interface.py:1188
+#: ../src/gui_interface.py:993
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "OpenGPG Passordord er ikke riktig"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid "GPG key not trusted"
 msgstr "GPG nøkkel ikke tiltrodd"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
@@ -8990,7 +9294,7 @@ msgstr ""
 "GPG nøkkelen brukt til å kryptere denne samtalen er ikke tiltrodd. Ønsker du "
 "virkelig å kryptere denne meldingen?"
 
-#: ../src/gui_interface.py:1226
+#: ../src/gui_interface.py:1031
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not                 correctly started "
@@ -8999,19 +9303,19 @@ msgstr ""
 "Gnome Keyring er installert men ikke \t\t\t\tstartet riktig (system variabel "
 "sikkert ikke \t\t\t\tsatt riktig)"
 
-#: ../src/gui_interface.py:1330
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Ny e-post på %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1332
+#: ../src/gui_interface.py:1133
 #, 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/gui_interface.py:1345
+#: ../src/gui_interface.py:1146
 #, python-format
 msgid ""
 "\n"
@@ -9026,42 +9330,42 @@ msgstr ""
 "Tittel: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1418
+#: ../src/gui_interface.py:1215
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s ønsker å sende deg en fil."
 
-#: ../src/gui_interface.py:1455 ../src/roster_window.py:1856
+#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
 msgid "Remote contact stopped transfer"
 msgstr "Kontakten stoppet overføring"
 
-#: ../src/gui_interface.py:1458 ../src/roster_window.py:1858
+#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
 msgid "Error opening file"
 msgstr "Feil under åpning av fil"
 
-#: ../src/gui_interface.py:1490
+#: ../src/gui_interface.py:1287
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Du har vellykket motatt %(filename)s fra %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1494
+#: ../src/gui_interface.py:1291
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Fil overføring av %(filename)s fra %(name)s stoppet."
 
-#: ../src/gui_interface.py:1507
+#: ../src/gui_interface.py:1304
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Du har vellykket sendt %(filename)s til %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1511
+#: ../src/gui_interface.py:1308
 #, 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/gui_interface.py:1623
+#: ../src/gui_interface.py:1426
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -9070,36 +9374,36 @@ msgstr ""
 "Ikke mulig å dekryptere melding fra %s\n"
 "Den kan ha blitt endret."
 
-#: ../src/gui_interface.py:1630
+#: ../src/gui_interface.py:1433
 msgid "Unable to decrypt message"
 msgstr "Klarer ikke å dekryptere meldingen"
 
-#: ../src/gui_interface.py:1702
+#: ../src/gui_interface.py:1505
 msgid "Username Conflict"
 msgstr "Brukernavn Konflikt"
 
-#: ../src/gui_interface.py:1703
+#: ../src/gui_interface.py:1506
 msgid "Please type a new username for your local account"
 msgstr "Vennligst skriv inn et nytt brukernavn for din lokale konto"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1519
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gui_interface.py:1729
+#: ../src/gui_interface.py:1532
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gui_interface.py:1740
+#: ../src/gui_interface.py:1543
 msgid "Error."
 msgstr "Feil."
 
-#: ../src/gui_interface.py:1768
+#: ../src/gui_interface.py:1556
 msgid "Resource Conflict"
 msgstr "Ressurs Konflikt"
 
-#: ../src/gui_interface.py:1769
+#: ../src/gui_interface.py:1557
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -9108,21 +9412,21 @@ msgstr ""
 "et annet"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1816
+#: ../src/gui_interface.py:1604
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s ønsker å sende deg en fil."
 
-#: ../src/gui_interface.py:1819
+#: ../src/gui_interface.py:1607
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Fil Overførings Forespørsel"
 
-#: ../src/gui_interface.py:1927
+#: ../src/gui_interface.py:1716
 msgid "Error verifying SSL certificate"
 msgstr "Feil ved verifisering av SSL sertifikat"
 
-#: ../src/gui_interface.py:1928
+#: ../src/gui_interface.py:1717
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9133,15 +9437,15 @@ msgstr ""
 "server: %(error)s\n"
 "Ønsker du fortsatt å koble til denne serveren?"
 
-#: ../src/gui_interface.py:1936
+#: ../src/gui_interface.py:1725
 msgid "Ignore this error for this certificate."
 msgstr "Ignorer denne feilen for dette sertifikatet"
 
-#: ../src/gui_interface.py:1956
+#: ../src/gui_interface.py:1745
 msgid "SSL certificate error"
 msgstr "SSL sertifikats feil"
 
-#: ../src/gui_interface.py:1957
+#: ../src/gui_interface.py:1746
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9158,12 +9462,12 @@ msgstr ""
 "\n"
 "Ønsker du fortsatt å koble til og oppdatere fingeravtrykket til sertifikatet?"
 
-#: ../src/gui_interface.py:1987 ../src/gui_interface.py:2024
-#: ../src/gui_interface.py:2060
+#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
+#: ../src/gui_interface.py:1849
 msgid "Insecure connection"
 msgstr "Usikker tilkobling"
 
-#: ../src/gui_interface.py:1988
+#: ../src/gui_interface.py:1777
 #, fuzzy
 msgid ""
 "You are about to connect to the server with an insecure connection. This "
@@ -9174,12 +9478,12 @@ msgstr ""
 "burde installere PyOpenSSL for å motvirke dette. Er du sikker på at du "
 "ønsker å fortsette?"
 
-#: ../src/gui_interface.py:1991 ../src/gui_interface.py:2028
-#: ../src/gui_interface.py:2063
+#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
+#: ../src/gui_interface.py:1852
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ja, jeg ønsker å koble til usikkert"
 
-#: ../src/gui_interface.py:2025
+#: ../src/gui_interface.py:1814
 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?"
@@ -9188,7 +9492,7 @@ msgstr ""
 "burde installere PyOpenSSL for å motvirke dette. Er du sikker på at du "
 "ønsker å fortsette?"
 
-#: ../src/gui_interface.py:2061
+#: ../src/gui_interface.py:1850
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9198,11 +9502,11 @@ msgstr ""
 "at du ønsker å gjøre det?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2624 ../src/gui_interface.py:2647
+#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
 msgid "Emoticons disabled"
 msgstr "Uttryksikoner avslått"
 
-#: ../src/gui_interface.py:2625
+#: ../src/gui_interface.py:2423
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -9210,7 +9514,7 @@ msgstr ""
 "Ditt konfigurerte følelsesikon tema ble ikke funnet, så følelsesikoner har "
 "blitt slått av. "
 
-#: ../src/gui_interface.py:2648
+#: ../src/gui_interface.py:2446
 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 "
@@ -9220,40 +9524,40 @@ msgstr ""
 "oppdatere formatet på emoticons.py filen. Se http://trac.gajim.org/wiki/"
 "Emoticons for flere detaljer."
 
-#: ../src/gui_interface.py:2679 ../src/roster_window.py:3560
+#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
 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/gui_interface.py:3058
+#: ../src/gui_interface.py:2871
 msgid "Could not save your settings and preferences"
 msgstr "Kan ikke lagre dine innstillinger og valg"
 
-#: ../src/gui_interface.py:3592
+#: ../src/gui_interface.py:3411
 msgid "Passphrase Required"
 msgstr "Passordsetning Kreves"
 
-#: ../src/gui_interface.py:3593
+#: ../src/gui_interface.py:3412
 #, 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/gui_interface.py:3607
+#: ../src/gui_interface.py:3426
 msgid "GPG key expired"
 msgstr "GPG nøkkel utgått"
 
-#: ../src/gui_interface.py:3608
+#: ../src/gui_interface.py:3427
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Din GPG nøkkel er utgått, du vil bli koblet til %s uten OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3617
+#: ../src/gui_interface.py:3436
 msgid "Wrong Passphrase"
 msgstr "Feil Passordsetning"
 
-#: ../src/gui_interface.py:3618
+#: ../src/gui_interface.py:3437
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Vennligst skriv inn GPG passordsetningen igjen eller trykk Avbryt."
 
@@ -9291,6 +9595,11 @@ msgstr "Kallenavn"
 msgid "Message"
 msgstr "Melding"
 
+#. holds subject
+#: ../src/history_manager.py:188 ../src/history_manager.py:219
+msgid "Subject"
+msgstr "Tittel"
+
 #: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -9385,19 +9694,19 @@ msgstr "Du kommer til å lukke flere tabber"
 msgid "Do you really want to close them all?"
 msgstr "Ønsker du virkelig å lukke alle?"
 
-#: ../src/message_window.py:484
+#: ../src/message_window.py:485
 msgid "Chats"
 msgstr "Samtaler"
 
-#: ../src/message_window.py:486
+#: ../src/message_window.py:487
 msgid "Group Chats"
 msgstr "Gruppe Samtaler"
 
-#: ../src/message_window.py:488
+#: ../src/message_window.py:489
 msgid "Private Chats"
 msgstr "Private Samtaler"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:495
 msgid "Messages"
 msgstr "Meldinger"
 
@@ -9453,56 +9762,56 @@ msgstr "Ny Melding fra %(nickname)s"
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../src/profile_window.py:57
+#: ../src/profile_window.py:58
 msgid "Retrieving profile..."
 msgstr "Henter profil..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2935
+#: ../src/profile_window.py:111 ../src/roster_window.py:3001
 msgid "File is empty"
 msgstr "Filen er tom"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2938
+#: ../src/profile_window.py:114 ../src/roster_window.py:3004
 msgid "File does not exist"
 msgstr "Filen finnes ikke"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2940 ../src/roster_window.py:2951
+#: ../src/profile_window.py:128 ../src/profile_window.py:144
+#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
 msgid "Could not load image"
 msgstr "Kunne ikke laste bilde"
 
-#: ../src/profile_window.py:214
+#: ../src/profile_window.py:215
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Kontaktinformasjon"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:216
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Format: YYYY-MM-DD"
 
-#: ../src/profile_window.py:269
+#: ../src/profile_window.py:270
 msgid "Information received"
 msgstr "Informasjon motatt"
 
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:341
 msgid "Without a connection you can not publish your contact information."
 msgstr "Uten en tilkobling kan du ikke publisere din kontakt informasjon."
 
-#: ../src/profile_window.py:353
+#: ../src/profile_window.py:354
 msgid "Sending profile..."
 msgstr "Sender profil..."
 
-#: ../src/profile_window.py:368
+#: ../src/profile_window.py:369
 msgid "Information NOT published"
 msgstr "Informasjon IKKE publisert"
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:376
 msgid "vCard publication failed"
 msgstr "vCard publisering feilet"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:377
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9510,53 +9819,53 @@ msgstr ""
 "Det skjedde en feil med publisering av din personlige informasjon, prøv "
 "igjen senere."
 
-#: ../src/roster_window.py:256 ../src/roster_window.py:1012
+#: ../src/roster_window.py:262 ../src/roster_window.py:1026
 msgid "Merged accounts"
 msgstr "Samlede kontoer"
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1942
 msgid "Authorization has been sent"
 msgstr "Godkjenning har blitt sendt"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1943
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "NÃ¥ vil \"%s\" kunne se din status."
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1966
 msgid "Subscription request has been sent"
 msgstr "Abonnerings forespørsel er sendt"
 
-#: ../src/roster_window.py:1944
+#: ../src/roster_window.py:1967
 #, 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:1958
+#: ../src/roster_window.py:1981
 msgid "Authorization has been removed"
 msgstr "Godkjenning har blitt fjernet"
 
-#: ../src/roster_window.py:1959
+#: ../src/roster_window.py:1982
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "NÃ¥ vil \"%s\" alltid se deg som frakoblet."
 
-#: ../src/roster_window.py:1986
+#: ../src/roster_window.py:2009
 msgid "GPG is not usable"
 msgstr "GPG fungerer ikke"
 
-#: ../src/roster_window.py:1987
+#: ../src/roster_window.py:2010
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Du vil bli tilkoblet til %s uten OpenPGP."
 
-#: ../src/roster_window.py:2199 ../src/roster_window.py:3496
+#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
 msgid "You are participating in one or more group chats"
 msgstr "Du er med i en eller flere gruppesamtaler"
 
-#: ../src/roster_window.py:2200 ../src/roster_window.py:3497
+#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9564,38 +9873,38 @@ 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:2226
+#: ../src/roster_window.py:2249
 msgid "desync'ed"
 msgstr "ute av synk"
 
-#: ../src/roster_window.py:2288
+#: ../src/roster_window.py:2311
 msgid "Really quit Gajim?"
 msgstr "Virkelig avslutte Gajim?"
 
-#: ../src/roster_window.py:2289
+#: ../src/roster_window.py:2312
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Er du sikker på at du vil avslutte Gajim?"
 
-#: ../src/roster_window.py:2290
+#: ../src/roster_window.py:2313
 msgid "Always close Gajim"
 msgstr "Alltid lukk Gajim"
 
-#: ../src/roster_window.py:2373
+#: ../src/roster_window.py:2396
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Avbryt filoverføring"
 
-#: ../src/roster_window.py:2374
+#: ../src/roster_window.py:2397
 msgid ""
-"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2405 ../src/roster_window.py:2653
+#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
 msgid "You have unread messages"
 msgstr "Du har uleste meldinger"
 
-#: ../src/roster_window.py:2406
+#: ../src/roster_window.py:2429
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9603,16 +9912,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:2654
+#: ../src/roster_window.py:2720
 msgid "You must read them before removing this transport."
 msgstr "Du må lese dem før du fjerner denne transporten."
 
-#: ../src/roster_window.py:2657
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" vil bli fjernet"
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2724
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9620,11 +9929,11 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger med kontakter som bruker "
 "denne transporten."
 
-#: ../src/roster_window.py:2661
+#: ../src/roster_window.py:2727
 msgid "Transports will be removed"
 msgstr "Transportene vil bli fjernet"
 
-#: ../src/roster_window.py:2666
+#: ../src/roster_window.py:2732
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9633,12 +9942,12 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger med kontakter fra disse "
 "transportene: %s"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2800
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "Du skal til å blokkere en kontakt. Er du sikker på at du ønsker å fortsette?"
 
-#: ../src/roster_window.py:2736
+#: ../src/roster_window.py:2802
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -9647,57 +9956,57 @@ msgstr ""
 "sender deg."
 
 #. it's jid
-#: ../src/roster_window.py:2827
+#: ../src/roster_window.py:2893
 msgid "Rename Contact"
 msgstr "Omdøpe Kontakt"
 
-#: ../src/roster_window.py:2828
+#: ../src/roster_window.py:2894
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Skriv inn et nytt kallenavn for kontakt %s"
 
-#: ../src/roster_window.py:2835
+#: ../src/roster_window.py:2901
 msgid "Rename Group"
 msgstr "Omdøpe Gruppe"
 
-#: ../src/roster_window.py:2836
+#: ../src/roster_window.py:2902
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Skriv inn nytt navn for gruppe %s"
 
-#: ../src/roster_window.py:2881
+#: ../src/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Fjern Gruppe"
 
-#: ../src/roster_window.py:2882
+#: ../src/roster_window.py:2948
 #, 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:2883
+#: ../src/roster_window.py:2949
 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:2922
+#: ../src/roster_window.py:2988
 msgid "Assign OpenPGP Key"
 msgstr "Tilegn OpenPGP Nøkkel"
 
-#: ../src/roster_window.py:2923
+#: ../src/roster_window.py:2989
 msgid "Select a key to apply to the contact"
 msgstr "Velger en nøkkel til en kontakt"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3372
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
 
-#: ../src/roster_window.py:3308
+#: ../src/roster_window.py:3374
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 "Du er i ferd med å fjerne \"%(name)s\" (%(jid)s) fra din kontaktliste.\n"
 
-#: ../src/roster_window.py:3313
+#: ../src/roster_window.py:3379
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9706,11 +10015,11 @@ msgstr ""
 "eller henne alltid vil se deg som frakoblet."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3319
+#: ../src/roster_window.py:3385
 msgid "Do you want to continue?"
 msgstr "Ønsker du å fortsette?"
 
-#: ../src/roster_window.py:3323
+#: ../src/roster_window.py:3389
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9718,16 +10027,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:3326
+#: ../src/roster_window.py:3392
 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:3330
+#: ../src/roster_window.py:3396
 msgid "Contacts will be removed from your roster"
 msgstr "Kontaktene vil bli fjernet fra din kontaktliste"
 
-#: ../src/roster_window.py:3335
+#: ../src/roster_window.py:3401
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9737,7 +10046,7 @@ msgstr ""
 "fjerner du også autorisasjonen som gjør at de alltid vil se deg som "
 "frakoblet."
 
-#: ../src/roster_window.py:3393
+#: ../src/roster_window.py:3459
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want  to continue?"
@@ -9745,7 +10054,7 @@ msgstr ""
 "Du skal til å sende en individuell status. Er du sikker på at du ønsker å "
 "fortsette?"
 
-#: ../src/roster_window.py:3395
+#: ../src/roster_window.py:3461
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -9754,19 +10063,19 @@ msgstr ""
 "Denne kontakten vil midlertidig se deg som %(status)s, men bare til du "
 "endrer status igjen. Da vil han se din nye globale status. "
 
-#: ../src/roster_window.py:3414
+#: ../src/roster_window.py:3480
 msgid "No account available"
 msgstr "Ingen konto tilgjengelig"
 
-#: ../src/roster_window.py:3415
+#: ../src/roster_window.py:3481
 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:4023
+#: ../src/roster_window.py:4095
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakter lagring støttes ikke av din server"
 
-#: ../src/roster_window.py:4025
+#: ../src/roster_window.py:4097
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9774,13 +10083,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:4117
+#: ../src/roster_window.py:4189
 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:4119
+#: ../src/roster_window.py:4191
 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 "
@@ -9790,23 +10099,23 @@ msgstr ""
 "brukes dette når samme person har flere Jabber kontoer eller transport "
 "kontoer."
 
-#: ../src/roster_window.py:4234
+#: ../src/roster_window.py:4306
 msgid "Invalid file URI:"
 msgstr "Ugyldig fil URI:"
 
-#: ../src/roster_window.py:4246
+#: ../src/roster_window.py:4318
 #, 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:4361
+#: ../src/roster_window.py:4433
 #, python-format
 msgid "Send %s to %s"
 msgstr "Send %s til %s"
 
-#: ../src/roster_window.py:4367
+#: ../src/roster_window.py:4439
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Gjør %s og %s metakontakter"
@@ -9816,143 +10125,143 @@ msgstr "Gjør %s og %s metakontakter"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4816 ../src/roster_window.py:4889
-#: ../src/roster_window.py:4898 ../src/statusicon.py:246
-#: ../src/statusicon.py:293 ../src/statusicon.py:299
+#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
+#: ../src/roster_window.py:4970 ../src/statusicon.py:263
+#: ../src/statusicon.py:310 ../src/statusicon.py:316
 #, python-format
 msgid "using account %s"
 msgstr "bruker kontoen %s"
 
 #. add
-#: ../src/roster_window.py:4905
+#: ../src/roster_window.py:4977
 #, python-format
 msgid "to %s account"
 msgstr "til %s kontoen"
 
 #. disco
-#: ../src/roster_window.py:4910
+#: ../src/roster_window.py:4982
 #, python-format
 msgid "using %s account"
 msgstr "på %s kontoen"
 
-#: ../src/roster_window.py:4948 ../src/statusicon.py:309
+#: ../src/roster_window.py:5020 ../src/statusicon.py:326
 msgid "_Manage Bookmarks..."
 msgstr "_Behandle Bokmerker..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4968
+#: ../src/roster_window.py:5040
 #, python-format
 msgid "of account %s"
 msgstr "for konto %s"
 
-#: ../src/roster_window.py:5009
+#: ../src/roster_window.py:5081
 #, python-format
 msgid "for account %s"
 msgstr "for kontoen %s"
 
-#: ../src/roster_window.py:5069 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
 msgid "_Change Status Message"
 msgstr "_Endre Status Melding"
 
-#: ../src/roster_window.py:5102
+#: ../src/roster_window.py:5174
 msgid "Publish Tune"
 msgstr "Publiser Sang"
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5176
 #, fuzzy
 msgid "Publish Location"
 msgstr "Publiser Sang"
 
-#: ../src/roster_window.py:5107
+#: ../src/roster_window.py:5179
 msgid "Configure Services..."
 msgstr "Konfigurer Tjenester..."
 
-#: ../src/roster_window.py:5252
+#: ../src/roster_window.py:5324
 msgid "_Maximize All"
 msgstr "_Maksimer Alle"
 
-#: ../src/roster_window.py:5262 ../src/roster_window.py:5436
+#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
 msgid "Send Group M_essage"
 msgstr "Send Gruppe M_elding"
 
-#: ../src/roster_window.py:5270
+#: ../src/roster_window.py:5342
 msgid "To all users"
 msgstr "Til alle brukere"
 
-#: ../src/roster_window.py:5274
+#: ../src/roster_window.py:5346
 msgid "To all online users"
 msgstr "Til alle påloggede brukere"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5456
+#: ../src/roster_window.py:5528
 msgid "_Manage Contacts"
 msgstr "_Behandle Kontakter"
 
 #. Edit Groups
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5537
 msgid "Edit _Groups"
 msgstr "Rediger _Grupper"
 
 #. Send single message
-#: ../src/roster_window.py:5520
+#: ../src/roster_window.py:5592
 msgid "Send Single Message"
 msgstr "Send en Melding"
 
 #. Execute Command
-#: ../src/roster_window.py:5567
+#: ../src/roster_window.py:5639
 msgid "Execute Command..."
 msgstr "Kjør Kommando..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5577
+#: ../src/roster_window.py:5649
 msgid "_Manage Transport"
 msgstr "_Behandle Transporter"
 
 #. Modify Transport
-#: ../src/roster_window.py:5586
+#: ../src/roster_window.py:5658
 msgid "_Modify Transport"
 msgstr "_Endre Transporter"
 
 #. Rename
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5668
 msgid "_Rename"
 msgstr "_Gi Nytt Navn"
 
-#: ../src/roster_window.py:5656
+#: ../src/roster_window.py:5728
 msgid "_Maximize"
 msgstr "_Maksimer"
 
-#: ../src/roster_window.py:5665
+#: ../src/roster_window.py:5737
 msgid "_Reconnect"
 msgstr "_Koble til på nytt"
 
-#: ../src/roster_window.py:5672
+#: ../src/roster_window.py:5744
 msgid "_Disconnect"
 msgstr "_Koble ifra"
 
 #. History manager
-#: ../src/roster_window.py:5754
+#: ../src/roster_window.py:5833
 msgid "History Manager"
 msgstr "Historikk Behandler"
 
-#: ../src/roster_window.py:5765
+#: ../src/roster_window.py:5844
 msgid "_Join New Group Chat"
 msgstr "_Bli med i Gruppesamtale"
 
-#: ../src/roster_window.py:5938
+#: ../src/roster_window.py:6019
 msgid "Change Status Message..."
 msgstr "Endre Status Melding..."
 
-#: ../src/search_window.py:94
+#: ../src/search_window.py:105
 msgid "Waiting for results"
 msgstr "Venter på resultater"
 
-#: ../src/search_window.py:132 ../src/search_window.py:210
+#: ../src/search_window.py:143 ../src/search_window.py:220
 msgid "Error in received dataform"
 msgstr "Feil i motatt dataskjema"
 
 #. No result
-#: ../src/search_window.py:166 ../src/search_window.py:202
+#: ../src/search_window.py:177 ../src/search_window.py:212
 msgid "No result"
 msgstr "Ingen resultater"
 
@@ -9965,14 +10274,15 @@ msgstr "Disk SkriveFeil"
 msgid "Subject: %s"
 msgstr "Tittel: %s"
 
-#: ../src/session.py:433 ../src/session.py:468
+#: ../src/session.py:447 ../src/session.py:491
 msgid "Confirm these session options"
 msgstr "Bekreft disse sesjons valgene"
 
-#: ../src/session.py:435
+#: ../src/session.py:448
 #, fuzzy, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
+"The remote client wants '\n"
+"                            'to negotiate an session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -9984,7 +10294,7 @@ msgstr ""
 "\n"
 "\tEr disse valgene akseptable?"
 
-#: ../src/session.py:469
+#: ../src/session.py:492
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9999,16 +10309,16 @@ msgstr ""
 "\n"
 "Fortsett med sesjonen?"
 
-#: ../src/statusicon.py:210
+#: ../src/statusicon.py:227
 msgid "_Change Status Message..."
 msgstr "_Endre Status Melding..."
 
-#: ../src/statusicon.py:322
+#: ../src/statusicon.py:339
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "i _kontaktliste"
 
-#: ../src/statusicon.py:333
+#: ../src/statusicon.py:350
 msgid "Hide this menu"
 msgstr "Gjem dette vinduet"
 
@@ -10147,32 +10457,32 @@ msgstr ""
 "Denne tjenesten kunne ikke svare med detaljert informasjon.\n"
 "Den er sannsynligvis utdatert eller ødelagt"
 
-#: ../src/vcard.py:251
+#: ../src/vcard.py:265
 msgid "?Client:Unknown"
 msgstr "?Client:Ukjent"
 
-#: ../src/vcard.py:253
+#: ../src/vcard.py:267
 msgid "?OS:Unknown"
 msgstr "?OS:Ukjent"
 
-#: ../src/vcard.py:274
+#: ../src/vcard.py:288
 msgid "?Time:Unknown"
 msgstr "?Time:Ukjent"
 
-#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
+#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
 #, python-format
 msgid "since %s"
 msgstr "siden %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:345
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:349
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Tilhørighet:</b>"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:357
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10180,7 +10490,7 @@ msgstr ""
 "Denne kontakten er interessert i din tilstedeværelses informasjon, men du er "
 "ikke interessert i hans/hennes status."
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:359
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10188,13 +10498,13 @@ msgstr ""
 "Du er interessert i denne kontaktens tilstedeværelses informasjon, men han/"
 "hun er ikke interessert i din."
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:361
 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:349
+#: ../src/vcard.py:363
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10202,26 +10512,70 @@ msgstr ""
 "Du er ikke interessert i kontaktens tilstedeværelses informasjon, ei heller "
 "han/hun i din."
 
-#: ../src/vcard.py:356
+#: ../src/vcard.py:370
 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:358
+#: ../src/vcard.py:372
 msgid "There is no pending subscription request."
 msgstr "Det er ingen ventende abonnements forespørsler."
 
-#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
+#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
 msgid " resource with priority "
 msgstr " ressurs med prioritet"
 
-#~ msgid "_Available"
-#~ msgstr "_Tilgjengelig"
+#~ msgid "@"
+#~ msgstr "@"
+
+#~ msgid "_Disable showing event in systray"
+#~ msgstr "_Deaktiver visning av hendelser i systemstatusfeltet"
 
-#~ msgid "PEP node was not removed"
-#~ msgstr "PEP noden ble ikke fjernet"
+#~ msgid "_Show event in systray"
+#~ msgstr "_Vis hendelse i systemstatusfeltet"
 
-#~ msgid "PEP node %(node)s was not removed: %(message)s"
-#~ msgstr "PEP noden %(node)s ble ikke fjernet: %(message)s"
+#, fuzzy
+#~ msgid "Always use GNOME default applications"
+#~ msgstr "Alltid bruk OS/X standard applikasjoner"
+
+#, fuzzy
+#~ msgid "Always use Xfce default applications"
+#~ msgstr "Alltid bruk OS/X standard applikasjoner"
+
+#, fuzzy
+#~ msgid "Autodetect on every Gajim startup"
+#~ msgstr "K_oble til når Gajim starter"
+
+#~ msgid "Show systray:"
+#~ msgstr "Vis systemstatus:"
+
+#~ msgid "Nickname not allowed: %s"
+#~ msgstr "Kallenavn ikke lovlig: %s"
+
+#~ msgid "Room has been destroyed"
+#~ msgstr "Rommet har blitt ødelagt"
+
+#~ msgid "You can join this room instead: %s"
+#~ msgstr "Du kan bli med i dette rommet isteden: %s"
+
+#~ msgid "I would like to add you to my roster."
+#~ msgstr "Jeg vil legge deg til min kontaktliste."
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "vi abonnerer nå på %s"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "frakoblings ønske fra %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "vi abonnerer ikke lenger på %s"
+
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "JID %s er ikke RFC kompatibel. Den vil ikke bli lagt til kontaktlisten. "
+#~ "Bruk kontaktliste administrasjons verktøy som http://jru.jabberstudio."
+#~ "org/ for å fjerne den"
 
 #~ msgid "Account Modification"
 #~ msgstr "Konto Endring"
@@ -10331,40 +10685,9 @@ msgstr " ressurs med prioritet"
 #~ msgid "gtk-delete"
 #~ msgstr "delete"
 
-#~ msgid "Add this contact to roster (Ctrl+D)"
-#~ msgstr "Legg til kontakt til kontaktlisten (Ctrl+D)"
-
-#~ msgid "Bookmark this room (Ctrl+B)"
-#~ msgstr "_Bokmerke dette rommet (Ctrl+B)"
-
-#~ msgid "Browse the chat history (Ctrl+H)"
-#~ msgstr "Søk gjennom samtale historikken (Ctrl+H)"
-
-#~ msgid "Change the room's subject (Alt+T)"
-#~ msgstr "Endre rommets emne (Alt+T)"
-
-#~ msgid "Change your nickname (Ctrl+N)"
-#~ msgstr "Endre ditt _Kallenavn (Ctrl+N)"
-
-#~ msgid "Invite contacts to the conversation (Ctrl+G)"
-#~ msgstr "Inviter kontakter til samtalen (Ctrl+G)"
-
 #~ msgid "Send a file (Ctrl+F)"
 #~ msgstr "Send en fil (Ctrl+F)"
 
-#~ msgid "Show a list of emoticons (Alt+M)"
-#~ msgstr "Vis en liste over uttrykksikon (Alt+M)"
-
-#~ msgid "Show a list of formattings"
-#~ msgstr "Vis en liste over formatteringer"
-
-#, fuzzy
-#~ msgid "Show a menu of advanced functions (Alt+D)"
-#~ msgstr "Vis en meny med avanserte funksjoner (Alt+A)"
-
-#~ msgid "Show the contact's profile (Ctrl+I)"
-#~ msgstr "Vis kontaktens profil (Ctrl+I)"
-
 #~ msgid ""
 #~ "All chat states\n"
 #~ "Composing only\n"
@@ -10423,9 +10746,6 @@ msgstr " ressurs med prioritet"
 #~ msgid "gtk-cancel"
 #~ msgstr "Avbryt"
 
-#~ msgid "_Preferences"
-#~ msgstr "_Instillinger"
-
 #~ msgid "_Quit"
 #~ msgstr "_Avslutt"
 
@@ -10916,9 +11236,6 @@ msgstr " ressurs med prioritet"
 #~ msgid "Treat all incoming messages as:"
 #~ msgstr "Behandle alle innkommende meldinger som:"
 
-#~ msgid "Use t_rayicon (aka. notification area icon)"
-#~ msgstr "Bruk Ikon i s_ystemstatusfelt (også kjent som systray)"
-
 #~ msgid ""
 #~ "When a new event (message, file transfer request etc..) is received, the "
 #~ "following methods may be used to inform you about it. Please note that "
@@ -11041,13 +11358,6 @@ msgstr " ressurs med prioritet"
 #~ msgstr ""
 #~ "Sesjons Administrasjons støtte ikke tilgjengelig (mangler gnome.ui modul)"
 
-#~ msgid ""
-#~ "Usage: %s %s %s \n"
-#~ "\t %s"
-#~ msgstr ""
-#~ "Bruk: %s %s %s \n"
-#~ "\t %s"
-
 #~ msgid "Private Chat"
 #~ msgstr "Privat Samtale"
 
diff --git a/po/pl.po b/po/pl.po
index fdcb9c7031d2245e74a8ded10eedf04a07098f9e..ab078bdd1977df122a9c4a7bbdcd29fd55e45a5b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,11 +5,15 @@
 # Automatically generated, 2005.
 #
 #
+#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 11:28+0200\n"
+"POT-Creation-Date: 2010-10-01 20:39+0200\n"
 "PO-Revision-Date: 2010-01-01 20:42+0100\n"
 "Last-Translator: Dominik Kozaczko <dominik@kozaczko.info>\n"
 "Language-Team: Polish <dominik@kozaczko.info, translation-team-pl@lists."
@@ -31,7 +35,7 @@ msgstr "Dołącz do _pokoju"
 msgid "_Add Contact..."
 msgstr "_Dodaj kontakt..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:17
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
 msgid "_Discover Services"
 msgstr "_Wyszukuj usługi"
 
@@ -51,7 +55,7 @@ msgstr "_Otwórz skrzynkę Gmail"
 msgid "_Personal Events"
 msgstr "_Zdarzenia"
 
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:23
+#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
 msgid "_Start Chat..."
 msgstr "_Rozpocznij rozmowÄ™"
 
@@ -83,10 +87,6 @@ msgid "<b>Please select a server</b>"
 msgstr "<b>Wybierz serwer</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid "@"
-msgstr "@"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
@@ -94,64 +94,64 @@ msgstr ""
 "Dodaj ten certyfikat do listy zaufanych.\n"
 "Odcisk klucza SHA1 tego certyfikatu:\n"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:10
 msgid "Anon_ymous authentication"
 msgstr "Anonimowa autentykacja"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Connect when I press Finish"
 msgstr "Połącz po wciśnięciu przycisku Zakończ"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Kreator Konta"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "I already have an account I want to _use"
 msgstr "_Mam już konto i chcę z niego korzystać"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I want to _register for a new account"
 msgstr "Chcę za_rejestrować nowe konto Jabbera"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:16
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 #: ../data/gui/accounts_window.ui.h:28
 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/gui/account_creation_wizard_window.ui.h:17
+#: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "ZarzÄ…dzaj..."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:18
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
 #: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2263 ../src/config.py:2342
-#: ../src/config.py:2355 ../src/config.py:3596 ../src/config.py:3671
-#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513
-#: ../src/dialogs.py:526 ../src/roster_window.py:2890
-#: ../src/roster_window.py:2896 ../src/roster_window.py:2901
+#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
+#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
+#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
+#: ../src/dialogs.py:527 ../src/roster_window.py:2956
+#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
 msgid "None"
 msgstr "Żaden"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:19
+#: ../data/gui/account_creation_wizard_window.ui.h:18
 msgid "Prox_y:"
 msgstr "Prox_y:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #: ../data/gui/accounts_window.ui.h:48
 msgid "Save pass_word"
 msgstr "Zapisz _hasło"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:21
+#: ../data/gui/account_creation_wizard_window.ui.h:20
 msgid "Set my profile when I connect"
 msgstr "Ustaw profil po połączeniu"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:22
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Use custom hostname/port"
 msgstr "Użyj własnej nazwy hosta/portu"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:23
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -159,34 +159,34 @@ msgstr ""
 "Musisz posiadać konto aby połączyć się\n"
 " z sieciÄ… Jabber."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-#: ../data/gui/roster_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:16
 msgid "_Advanced"
 msgstr "_Zaawansowane"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:25
 msgid "_Finish"
 msgstr "_Zakończ"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:27
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Hostname:"
 msgstr "_Nazwa hosta: "
 
-#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #: ../data/gui/accounts_window.ui.h:62
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:28
 #: ../data/gui/accounts_window.ui.h:64
 msgid "_Password:"
 msgstr "_Hasło:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:29
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:31
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Server:"
 msgstr "_Serwer:"
 
@@ -295,17 +295,17 @@ msgstr "ImiÄ™:"
 #. No configured account
 #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
 #: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592
-#: ../src/notify.py:608
+#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
+#: ../src/notify.py:616
 msgid "Gajim"
 msgstr "Gajim"
 
 #. FIXME: Ugly workaround.
 #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
 #. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:61
-#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121
-#: ../src/roster_window.py:2832 ../src/roster_window.py:5379
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
+#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
 msgid "General"
 msgstr "Ogólne"
 
@@ -363,7 +363,7 @@ msgstr "Informacje o Tobie, takie jakie sÄ… przechowywane na serwerze"
 
 #: ../data/gui/accounts_window.ui.h:35
 #: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:830
+#: ../src/dialogs.py:831
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -377,7 +377,7 @@ msgid "Mer_ge accounts"
 msgstr "_Połącz konta"
 
 #: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2356
+#: ../src/config.py:2358
 msgid "No key selected"
 msgstr "Nie wybrano żadnego klucza"
 
@@ -404,7 +404,7 @@ msgid "Priority will change automatically according to your status."
 msgstr "Priorytet ulegnie zmianie automatycznie, stosownie do twojego statusu."
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5329
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
 msgid "Re_name"
 msgstr "_Zmień nazwę"
 
@@ -630,38 +630,43 @@ msgid "Deletes Message of the Day"
 msgstr "Usuwa Wiadomość Dnia"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
+#, fuzzy
+msgid "Edit Archi_ving Preferences"
+msgstr "_Ustawienia"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Edit _Privacy Lists..."
 msgstr "_Edytuj listy prywatności"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sends a message to users currently connected to this server"
 msgstr "Wysyła wiadomość do użytkowników aktualnie połączonych z tym serwerem"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Set MOTD..."
 msgstr "Ustaw MOTD"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Ustawia Wiadomość Dnia"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Show _XML Console"
 msgstr "Konsola _XML"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "Update MOTD..."
 msgstr "Uaktualnij MOTD..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "Uaktualnia Wiadomość Dnia"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:11
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:11
+#: ../data/gui/advanced_menuitem_menu.ui.h:12
 msgid "_Send Server Message..."
 msgstr "_Wyślij wiadomość do serwera..."
 
@@ -695,7 +700,7 @@ msgid "All statuses"
 msgstr "Dowolny status"
 
 #: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:233
+#: ../src/common/commands.py:106 ../src/common/helpers.py:239
 #: ../src/tooltips.py:193
 msgid "Away"
 msgstr "Zaraz wracam"
@@ -748,7 +753,7 @@ msgid "Have "
 msgstr "rozmawiam "
 
 #: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:249
 msgid "Invisible"
 msgstr "Niewidoczny"
 
@@ -757,7 +762,7 @@ msgid "Launch a command"
 msgstr "Wykonaj komendÄ™"
 
 #: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:216 ../src/tooltips.py:197
+#: ../src/common/helpers.py:222 ../src/tooltips.py:197
 msgid "Not Available"
 msgstr "Nieobecny"
 
@@ -799,12 +804,13 @@ msgid "_Disable existing sound for this event"
 msgstr "_Wyłącz dźwięki dla tego zdarzenia"
 
 #: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in roster"
+#, fuzzy
+msgid "_Disable showing event in notification area"
 msgstr "Wyłącz _pokazywanie zdarzenia na liście kontaktów"
 
 #: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in systray"
-msgstr "Wyłącz pokazywanie _zdarzenia w obszarze powiadamiania"
+msgid "_Disable showing event in roster"
+msgstr "Wyłącz _pokazywanie zdarzenia na liście kontaktów"
 
 #: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
@@ -815,12 +821,13 @@ msgid "_Open chat window with user"
 msgstr "_Otwórz okno rozmowy z kontaktem"
 
 #: ../data/gui/advanced_notifications_window.ui.h:35
-msgid "_Show event in roster"
+#, fuzzy
+msgid "_Show event in notification area"
 msgstr "_Pokaż zdarzenie na liście kontaktów"
 
 #: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in systray"
-msgstr "Pokaż _zdarzenie w obszarze powiadamiania"
+msgid "_Show event in roster"
+msgstr "_Pokaż zdarzenie na liście kontaktów"
 
 #: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
@@ -848,6 +855,45 @@ msgstr "Grupy"
 msgid "when I'm in"
 msgstr "kiedy jestem obecny"
 
+#: ../data/gui/archiving_preferences_window.ui.h:1
+msgid "<i>Method Auto</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "<i>Method Local</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:3
+msgid "<i>Method Manual</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:4
+#, fuzzy
+msgid "Auto"
+msgstr "Połącz automatycznie"
+
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Concede"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "Forbid"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:7
+#, fuzzy
+msgid "No"
+msgstr "Żaden"
+
+#: ../data/gui/archiving_preferences_window.ui.h:8
+#, fuzzy
+msgid "Prefer"
+msgstr "Ustawienia"
+
+#: ../data/gui/archiving_preferences_window.ui.h:9
+msgid "Yes"
+msgstr ""
+
 #: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Wpis:"
@@ -874,8 +920,8 @@ msgstr "Zablokowane kontakty"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5348
-#: ../src/roster_window.py:5476 ../src/roster_window.py:5609
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
+#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
 msgid "_Unblock"
 msgstr "_Cofnij blokadÄ™"
 
@@ -963,7 +1009,7 @@ msgid "_Start Chat"
 msgstr "_Rozpocznij rozmowÄ™"
 
 #. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4184
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
 msgid "#"
 msgstr "Nr"
 
@@ -1011,13 +1057,49 @@ msgstr ""
 msgid "9"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:13
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Dodaje kontakt do listy kontaktów (Ctrl+D)"
+
 #: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Historia wiadomości (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:15
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "ZaproÅ› kontakt do rozmowy (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Kliknij by wyświetlić listę emotikon (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
+msgid "Show a list of formattings"
+msgstr "Pokaż formatowanie tekstu"
+
+#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Pokaż menu zaawansowanych funkcji (Alt+D)"
+
+#: ../data/gui/chat_control.ui.h:19
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr "Pokaż profil kontaktu (Ctrl+I)"
+
+#: ../data/gui/chat_control.ui.h:20
+msgid "Toggle audio session"
+msgstr "Przełącz sesję audio"
+
+#: ../data/gui/chat_control.ui.h:21
+msgid "Toggle video session"
+msgstr "Przełącz sesję wideo"
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
 #: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Wyślij"
 
-#: ../data/gui/chat_control.ui.h:15 ../data/gui/groupchat_control.ui.h:3
+#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
 msgid "label"
 msgstr ""
 
@@ -1067,8 +1149,8 @@ msgstr "Modyfikuj _grupy..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5284
-#: ../src/roster_window.py:5444
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
+#: ../src/roster_window.py:5516
 msgid "In_vite to"
 msgstr "Za_proÅ› do"
 
@@ -1080,8 +1162,8 @@ msgstr "ZaproÅ› kontakty"
 msgid "Remo_ve"
 msgstr "Us_uń"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5294
-#: ../src/roster_window.py:5533
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
+#: ../src/roster_window.py:5605
 msgid "Send Cus_tom Status"
 msgstr "Wyślij odrębny status"
 
@@ -1114,8 +1196,8 @@ msgid "_Allow him/her to see my status"
 msgstr "_Pozwól mu/jej widzieć swój status"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5482 ../src/roster_window.py:5612
+#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
+#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
 msgid "_Block"
 msgstr "_Zablokuj"
 
@@ -1125,8 +1207,8 @@ msgstr "_Zabroń mu/jej widzieć twój status"
 
 #: ../data/gui/contact_context_menu.ui.h:20
 #: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:21
-#: ../src/roster_window.py:5683
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
+#: ../src/roster_window.py:5755
 msgid "_History"
 msgstr "_Historia"
 
@@ -1259,7 +1341,7 @@ msgstr "<b>Kolory kart w oknie czatu</b>"
 msgid "Account row"
 msgstr "Konto"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:925
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
 msgid "Bold"
 msgstr "Wytłuszczone"
 
@@ -1297,7 +1379,7 @@ msgstr "Grupa"
 msgid "Inactive"
 msgstr "Nieaktywny"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:926
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
 msgid "Italic"
 msgstr "Kursywa"
 
@@ -1345,7 +1427,7 @@ msgstr "Zmień _temat..."
 msgid "Configure _Room..."
 msgstr "Konfiguruj _pokój..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1782
+#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
 msgid "_Bookmark"
 msgstr "Dodaj _zakładkę dla tego pokoju"
 
@@ -1405,19 +1487,31 @@ msgstr "_Wyślij prywatną wiadomość"
 msgid "_Voice"
 msgstr "_GÅ‚os"
 
+#: ../data/gui/groupchat_control.ui.h:1
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Dodaj pokój do zakładek (Ctrl+B)"
+
+#: ../data/gui/groupchat_control.ui.h:3
+msgid "Change the room's subject (Alt+T)"
+msgstr "Zmień temat pokoju (Ctrl+T)"
+
+#: ../data/gui/groupchat_control.ui.h:4
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Zmień swoją nazwę (Ctrl+N)"
+
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Utwórz nowy wpis"
 
-#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
-msgid "From"
-msgstr "Od"
+#: ../data/gui/groups_post_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:2
+msgid "From:"
+msgstr "Od:"
 
-#. holds subject
-#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
-#: ../src/history_manager.py:219
-msgid "Subject"
-msgstr "Temat"
+#: ../data/gui/groups_post_window.ui.h:3
+#: ../data/gui/single_message_window.ui.h:7
+msgid "Subject:"
+msgstr "Temat:"
 
 #: ../data/gui/history_manager.ui.h:1
 msgid ""
@@ -1435,8 +1529,8 @@ msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Witaj w menedżerze historii rozmów Gajima</b></big>"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3208
-#: ../src/dialogs.py:3305
+#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
+#: ../src/dialogs.py:3321
 msgid "Delete"
 msgstr "Usuń"
 
@@ -1495,12 +1589,75 @@ msgstr "Szukaj"
 msgid "_Log conversation history"
 msgstr "_Zapisuj historiÄ™ rozmowy"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
+msgid "approve"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:2
+msgid "body"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:3
+msgid "concede"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:4
+msgid "expire"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:5
+msgid "false"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:6
+msgid "forbid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:7
+#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+msgid "jid"
+msgstr "jid"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:8
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
+#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
+msgid "message"
+msgstr "wiadomość"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
+msgid "oppose"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
+#, fuzzy
+msgid "otr"
+msgstr "Inne czynności"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:11
+msgid "prefer"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:12
+msgid "require"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:13
+msgid "save"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:14
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
 msgid "Bro_wse Rooms"
 msgstr "Prze_glÄ…daj"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2180
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
 msgid "Join Group Chat"
 msgstr "Dołącz do pokoju"
 
@@ -1538,8 +1695,8 @@ msgstr "Serwer:"
 msgid "_Bookmark this room"
 msgstr "Dodaj pokój do zakładek"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1341
-#: ../src/disco.py:1786
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../src/disco.py:1804
 msgid "_Join"
 msgstr "_Dołącz"
 
@@ -1643,6 +1800,75 @@ msgstr "_Nazwa użytkownika:"
 msgid "Passphrase"
 msgstr "Hasło"
 
+#: ../data/gui/plugins_window.ui.h:1
+msgid "&lt;empty&gt;"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:2
+msgid "<empty>"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:3
+#, fuzzy
+msgid "Authors:"
+msgstr "_Autoryzuj"
+
+#: ../data/gui/plugins_window.ui.h:4
+#, fuzzy
+msgid "Available"
+msgstr "_Dostępny"
+
+#: ../data/gui/plugins_window.ui.h:5
+#, fuzzy
+msgid "Configure"
+msgstr "_Konfiguruj"
+
+#: ../data/gui/plugins_window.ui.h:6
+#, fuzzy
+msgid "Descrition:"
+msgstr "Opis: "
+
+#: ../data/gui/plugins_window.ui.h:7
+#, fuzzy
+msgid "Homepage:"
+msgstr "<b>Strona domowa:</b>"
+
+#: ../data/gui/plugins_window.ui.h:8
+msgid "Install"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:9
+#, fuzzy
+msgid "Installed"
+msgstr "Wygaszony"
+
+#: ../data/gui/plugins_window.ui.h:10
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:11
+msgid "Plugins"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:12
+msgid "Uninstall"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:13
+#, fuzzy
+msgid "Version:"
+msgstr "Wersja GTK+:"
+
+#: ../data/gui/plugins_window.ui.h:14
+msgid "button"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:15
+msgid "homepage url"
+msgstr ""
+
 #: ../data/gui/popup_notification_window.ui.h:1
 #, fuzzy
 msgid "Event Type"
@@ -1771,122 +1997,102 @@ msgid "Always"
 msgstr "Zaraz wracam"
 
 #: ../data/gui/preferences_window.ui.h:31
-#, fuzzy
-msgid "Always use GNOME default applications"
-msgstr "Zawsze używaj domyślnych apikacji OS X"
-
-#: ../data/gui/preferences_window.ui.h:32
-#, fuzzy
-msgid "Always use KDE default applications"
-msgstr "Zawsze używaj domyślnych apikacji OS X"
-
-#: ../data/gui/preferences_window.ui.h:33
-#, fuzzy
-msgid "Always use Xfce default applications"
-msgstr "Zawsze używaj domyślnych apikacji OS X"
-
-#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Pytaj o opis przy zmianie statusu na:"
 
-#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
 msgid "Audio / Video"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:33
 msgid "Audio input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Audio output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:38
-#, fuzzy
-msgid "Autodetect on every Gajim startup"
-msgstr "P_ołącz przy starcie programu"
-
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:35
 msgid "Chat message:"
 msgstr "Wiadomość:"
 
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:36
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr ""
 "Przy starcie zawsze sprawdzaj czy Gajim jest _domyślnym klientem Jabbera"
 
-#: ../data/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:37
 #, fuzzy
 msgid "Composing only"
 msgstr "Tworzenie wiadomości"
 
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:38
 msgid "Configure color and font of the interface"
 msgstr "Konfiguruj kolor i czcionkÄ™ interfejsu"
 
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:39
 msgid "Contact's message:"
 msgstr "Wiadomość:"
 
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:40
 msgid "Contact's nickname:"
 msgstr "Pseudonim kontaktu:"
 
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:41
 msgid "Custom"
 msgstr "WÅ‚asne"
 
-#: ../data/gui/preferences_window.ui.h:46
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Detached roster with chat grouped by account"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Detached roster with detached chats"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:45
 msgid "Detached roster with single chat"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
-#: ../src/config.py:671
+#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
+#: ../src/config.py:665
 msgid "Disabled"
 msgstr "Wyłączone"
 
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:47
 msgid "Display _activity of contacts in roster"
 msgstr "Wyświetlaj aktywność kontaktów z listy"
 
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:48
 msgid "Display _extra email details"
 msgstr "Wyświetlaj _dodatkowe informacje o poczcie e-mail"
 
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:49
 #, fuzzy
 msgid "Display _location of contacts in roster"
 msgstr "Wyświetlaj nastroje kontaktów z listy"
 
-#: ../data/gui/preferences_window.ui.h:54
+#: ../data/gui/preferences_window.ui.h:50
 msgid "Display _tunes of contacts in roster"
 msgstr "Wyświetlaj muzyczne ikonki kontaktów z listy"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display a_vatars of contacts in roster"
 msgstr "Wyświetlaj awatary kontaktów z listy"
 
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display m_ood of contacts in roster"
 msgstr "Wyświetlaj nastroje kontaktów z listy"
 
-#: ../data/gui/preferences_window.ui.h:57
+#: ../data/gui/preferences_window.ui.h:53
 msgid "Display status _messages of contacts in roster"
 msgstr "Wyświetlaj _opisy statusu kontaktu na liście kontaktów"
 
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:54
 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 "
@@ -1896,7 +2102,7 @@ msgstr ""
 "W tym miejscu możesz zdecydować, które z tych danych chcesz wyświetlać w "
 "oknie rozmowy."
 
-#: ../data/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:55
 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 "
@@ -1905,7 +2111,7 @@ msgstr ""
 "Gajim może wysyłać i odbierać meta-infomacje związane z prowadzoną rozmową. "
 "W tym miejscu możesz zdecydować, jakie dane chcesz wysyłać do rozmówcy."
 
-#: ../data/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:56
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1913,11 +2119,11 @@ msgstr ""
 "Gajim powiadomi automatycznie przy pomocy okna w prawym dolnym rogu o "
 "kontaktach które zmieniają status na Rozłączony"
 
-#: ../data/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:58
 msgid "Hide all buttons in chat windows"
 msgstr "Ukryj przyciski w oknie rozmowy"
 
-#: ../data/gui/preferences_window.ui.h:63
+#: ../data/gui/preferences_window.ui.h:59
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1925,7 +2131,7 @@ msgstr ""
 "Zaznaczenie tej opcji umożliwi innym wykrywanie jakiego systemu operacyjnego "
 "używasz"
 
-#: ../data/gui/preferences_window.ui.h:64
+#: ../data/gui/preferences_window.ui.h:60
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1933,14 +2139,14 @@ msgstr ""
 "Jeżeli opcja ta zostanie uaktywniona, Gajim będzie również wyświetlał "
 "informacje o nadawcach nowej poczty w twojej skrzynce"
 
-#: ../data/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:61
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Uaktywnienie tej opcji spowoduje, że Gajim będzie zmieniał status na Zaraz "
 "wracam gdy komputer nie będzie używany."
 
-#: ../data/gui/preferences_window.ui.h:66
+#: ../data/gui/preferences_window.ui.h:62
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1948,7 +2154,7 @@ msgstr ""
 "Użycie tej opcji oznacza, że Gajim zmieni status na Niedostępny po dłuższym "
 "okresie bezczynności"
 
-#: ../data/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1956,7 +2162,7 @@ msgstr ""
 "Zaznaczenie tej opcji spowoduje wyświetlanie awatarów w oknie listy "
 "kontaktów (roster oraz okno czatu)"
 
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1964,14 +2170,14 @@ msgstr ""
 "Jeśli jest zaznaczone, Gajim będzie wyświetlał opis statusu kontaktu pod "
 "jego nazwą na liście kontaktów"
 
-#: ../data/gui/preferences_window.ui.h:69
+#: ../data/gui/preferences_window.ui.h:65
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "Zaznaczenie tej opcji spowoduje wyświetlanie aktywności kontaktów z listy "
 "kontaktów"
 
-#: ../data/gui/preferences_window.ui.h:70
+#: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the location of contacts in the roster window"
@@ -1979,21 +2185,21 @@ msgstr ""
 "Zaznaczenie tej opcji spowoduje wyświetlanie nastrojów w oknie listy "
 "kontaktów (roster oraz okno czatu)"
 
-#: ../data/gui/preferences_window.ui.h:71
+#: ../data/gui/preferences_window.ui.h:67
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
 "Zaznaczenie tej opcji spowoduje wyświetlanie nastrojów w oknie listy "
 "kontaktów (roster oraz okno czatu)"
 
-#: ../data/gui/preferences_window.ui.h:72
+#: ../data/gui/preferences_window.ui.h:68
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Zaznaczenie tej opcji spowoduje wyświetlanie muzycznych ikonek w oknie listy "
 "kontaktów (roster oraz okno czatu)"
 
-#: ../data/gui/preferences_window.ui.h:73
+#: ../data/gui/preferences_window.ui.h:69
 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 "
@@ -2003,7 +2209,7 @@ msgstr ""
 "w oknach rozmów. Jeżeli nie wskazano konkrentego słownika, program użyje "
 "słownika domyślnego."
 
-#: ../data/gui/preferences_window.ui.h:74
+#: ../data/gui/preferences_window.ui.h:70
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -2013,7 +2219,7 @@ msgstr ""
 "wiadomościami. Stosuj ją ostrożnie, ponieważ powoduje ona blokowanie "
 "wszystkich wiadomości od osób, których nie masz na liście kontaktów"
 
-#: ../data/gui/preferences_window.ui.h:75
+#: ../data/gui/preferences_window.ui.h:71
 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 "
@@ -2023,7 +2229,7 @@ msgstr ""
 "przez GPG oraz E2E. W przypadku E2E zgodę na logowanie wyrazić musi "
 "rozmówca. Jeżeli zgoda nie zostanie udzielona, wiadomości NIE BĘDĄ logowane."
 
-#: ../data/gui/preferences_window.ui.h:76
+#: ../data/gui/preferences_window.ui.h:72
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -2031,7 +2237,7 @@ msgstr ""
 "Jeżeli opcja ta zostanie uaktywniona, Gajim będzie również wyświetlał "
 "informacje o nowej poczty w twojej skrzynce GMail"
 
-#: ../data/gui/preferences_window.ui.h:77
+#: ../data/gui/preferences_window.ui.h:73
 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, "
@@ -2041,7 +2247,7 @@ msgstr ""
 "transportu, np. kontakt z MSN będzie miał odpowiednie ikony statusu "
 "dostępny, zaraz wracam, zajęty, itd"
 
-#: ../data/gui/preferences_window.ui.h:78
+#: ../data/gui/preferences_window.ui.h:74
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -2049,7 +2255,7 @@ msgstr ""
 "Po uaktywnieniu tej opcji Gajim nie będzie prosił o opis statusu. Zostanie "
 "użyty opis domyślny."
 
-#: ../data/gui/preferences_window.ui.h:79
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2057,45 +2263,45 @@ msgstr ""
 "Zaznaczenie tej opcji spowoduje zastÄ…pienie emotikon tekstowych jak ':)' "
 "emotikonami graficznymi"
 
-#: ../data/gui/preferences_window.ui.h:80
+#: ../data/gui/preferences_window.ui.h:76
 msgid "Log _encrypted chat session"
 msgstr "Loguj _zaszyfrowane wiadomości"
 
-#: ../data/gui/preferences_window.ui.h:81
+#: ../data/gui/preferences_window.ui.h:77
 msgid "Ma_ke message windows compact"
 msgstr "_Spraw by okna rozmowy były zwarte"
 
-#: ../data/gui/preferences_window.ui.h:82
+#: ../data/gui/preferences_window.ui.h:78
 msgid "Ma_nage..."
 msgstr "Za_rzÄ…dzaj..."
 
-#: ../data/gui/preferences_window.ui.h:83
+#: ../data/gui/preferences_window.ui.h:79
 #, fuzzy
 msgid "Never"
 msgstr "_Nigdy"
 
-#: ../data/gui/preferences_window.ui.h:84
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Notifications"
 msgstr "Powiadomienia"
 
-#: ../data/gui/preferences_window.ui.h:85
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Notify me about contacts that sign _in"
 msgstr "Powiadom mnie o kontaktach, które się _logują"
 
-#: ../data/gui/preferences_window.ui.h:86
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Notify me about contacts that sign _out"
 msgstr "Powiadom mnie o kontaktach, które się _wylogowują "
 
-#: ../data/gui/preferences_window.ui.h:87
+#: ../data/gui/preferences_window.ui.h:83
 #, fuzzy
 msgid "Notify me about it"
 msgstr "Powia_dom mnie o tym"
 
-#: ../data/gui/preferences_window.ui.h:88
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notify on new _GMail email"
 msgstr "Powiadamiaj o nowej poczcie na koncie _Gmail"
 
-#: ../data/gui/preferences_window.ui.h:89
+#: ../data/gui/preferences_window.ui.h:85
 #, fuzzy
 msgid "Only when pending events"
 msgstr ""
@@ -2103,56 +2309,57 @@ msgstr ""
 "Tylko, kiedy wystÄ…piÄ… jakieÅ› zdarzeniaZawsze\n"
 "Zawsze"
 
-#: ../data/gui/preferences_window.ui.h:90
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Personal Events"
 msgstr "Zdarzenia"
 
-#: ../data/gui/preferences_window.ui.h:91
+#: ../data/gui/preferences_window.ui.h:87
 msgid "Play _sounds"
 msgstr "Odtwórz _dźwięk"
 
-#: ../data/gui/preferences_window.ui.h:92
+#: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
 msgid "Pop it up"
 msgstr "_Wyświetl"
 
-#: ../data/gui/preferences_window.ui.h:93
+#: ../data/gui/preferences_window.ui.h:89
 msgid "Preferences"
 msgstr "Ustawienia"
 
-#: ../data/gui/preferences_window.ui.h:94
+#: ../data/gui/preferences_window.ui.h:90
 msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:96
+#: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
 msgid "STUN server:"
 msgstr "Serwer:"
 
-#: ../data/gui/preferences_window.ui.h:97
+#: ../data/gui/preferences_window.ui.h:93
+#, fuzzy
+msgid "Show notification area icon:"
+msgstr "_Ikona w obszarze powiadamiania"
+
+#: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
 msgid "Show only in roster"
 msgstr "Pokaż tylko _listę kontaktów"
 
-#: ../data/gui/preferences_window.ui.h:98
-msgid "Show systray:"
-msgstr "Pokaż _zdarzenie w obszarze powiadamiania"
-
-#: ../data/gui/preferences_window.ui.h:99
+#: ../data/gui/preferences_window.ui.h:95
 msgid "Sign _in"
 msgstr "_Połączony"
 
-#: ../data/gui/preferences_window.ui.h:100
+#: ../data/gui/preferences_window.ui.h:96
 msgid "Sign _out"
 msgstr "R_ozłączony"
 
-#: ../data/gui/preferences_window.ui.h:101
+#: ../data/gui/preferences_window.ui.h:97
 msgid "Single window for everything"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:102
+#: ../data/gui/preferences_window.ui.h:98
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2161,27 +2368,27 @@ msgstr ""
 "formatowanie. Jeżeli ta opcja jest aktywna, Gajim będzie ignorował te "
 "dodatki i wyświetlał czysty tekst."
 
-#: ../data/gui/preferences_window.ui.h:103
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sort contacts by status"
 msgstr "Sortuj kontakty według statusu"
 
-#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
 msgid "Status"
 msgstr "Status"
 
-#: ../data/gui/preferences_window.ui.h:105
+#: ../data/gui/preferences_window.ui.h:101
 msgid "Status _iconset:"
 msgstr "Zestaw ikon _statusu:"
 
-#: ../data/gui/preferences_window.ui.h:106
+#: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Styl"
 
-#: ../data/gui/preferences_window.ui.h:107
+#: ../data/gui/preferences_window.ui.h:103
 msgid "T_heme:"
 msgstr "_Motyw:"
 
-#: ../data/gui/preferences_window.ui.h:108
+#: ../data/gui/preferences_window.ui.h:104
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2193,7 +2400,7 @@ msgstr ""
 "$S będzie zastąpione przez poprzedni opis statusu\n"
 "$T będzie zastąpione przez czas, który jesteś nieaktywny"
 
-#: ../data/gui/preferences_window.ui.h:111
+#: ../data/gui/preferences_window.ui.h:107
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2206,119 +2413,124 @@ msgstr ""
 "$T będzie zastąpione przez czas, po którym ma zostać ustawiono status "
 "\"Nieobecny\""
 
-#: ../data/gui/preferences_window.ui.h:114
+#: ../data/gui/preferences_window.ui.h:110
 msgid "Use _transports icons"
 msgstr "Używaj zestawów ikon _transportów"
 
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:111
+#, fuzzy
+msgid "Use default applications"
+msgstr "Zawsze używaj domyślnych apikacji OS X"
+
+#: ../data/gui/preferences_window.ui.h:112
 msgid "Use system _default"
 msgstr "Użyj _domyślnej dla systemu"
 
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:113
 msgid "Video framerate"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:117
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Video input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:118
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Video output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:119
+#: ../data/gui/preferences_window.ui.h:116
 msgid "Video size"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:120
+#: ../data/gui/preferences_window.ui.h:117
 msgid "When new event is received:"
 msgstr "Gdy odebrane zostanie nowe zdarzenie"
 
-#: ../data/gui/preferences_window.ui.h:121
+#: ../data/gui/preferences_window.ui.h:118
 msgid "Your message:"
 msgstr "Twoja wiadomość:"
 
-#: ../data/gui/preferences_window.ui.h:122
+#: ../data/gui/preferences_window.ui.h:119
 msgid "Your nickname:"
 msgstr "Twój pseudonim:"
 
-#: ../data/gui/preferences_window.ui.h:123
+#: ../data/gui/preferences_window.ui.h:120
 msgid "_Away after:"
 msgstr "Automatyczny status '_Zaraz wracam' po:"
 
-#: ../data/gui/preferences_window.ui.h:124
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "Prze_glÄ…darka:"
 
-#: ../data/gui/preferences_window.ui.h:125
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Display chat state notifications:"
 msgstr "Wyświetlaj informacje stanie kontaktu:"
 
-#: ../data/gui/preferences_window.ui.h:126
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Emoticons:"
 msgstr "_Emotikony:"
 
-#: ../data/gui/preferences_window.ui.h:127
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_File manager:"
 msgstr "Menadżer _plików:"
 
-#: ../data/gui/preferences_window.ui.h:128
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_Highlight misspelled words"
 msgstr "Podś_wietlaj błędy w pisowni"
 
-#: ../data/gui/preferences_window.ui.h:129
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignoruj wiadomości od osób spoza listy kontaktów"
 
-#: ../data/gui/preferences_window.ui.h:130
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore rich content in incoming messages"
 msgstr "Ignoruj wzbogaconą treść w wiadomościach"
 
-#: ../data/gui/preferences_window.ui.h:131
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Log status changes of contacts"
 msgstr "_Zapisuj w logach zmiany statusów kontaktów"
 
-#: ../data/gui/preferences_window.ui.h:132
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Mail client:"
 msgstr "Klient _poczty:"
 
-#: ../data/gui/preferences_window.ui.h:133
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Not available after:"
 msgstr "Automatyczny status '_Nieobecny' po:"
 
-#: ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Open..."
 msgstr "_Otwórz..."
 
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Reset to Default Colors"
 msgstr "Wróć do kolorów _domyślnych"
 
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Send chat state notifications:"
 msgstr "Rodzaje powiadomień wysyłanych podczas rozmowy:"
 
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Status message:"
 msgstr "_Informacja o statusie:"
 
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_URL highlight:"
 msgstr "_Podświetlanie URL:"
 
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_Window behavior:"
 msgstr "_Zachowanie okna:"
 
-#: ../data/gui/preferences_window.ui.h:140
+#: ../data/gui/preferences_window.ui.h:137
 msgid "in _group chats"
 msgstr "w _konferencji"
 
-#: ../data/gui/preferences_window.ui.h:141
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _roster"
 msgstr "w _liście kontaktów"
 
-#: ../data/gui/preferences_window.ui.h:142
+#: ../data/gui/preferences_window.ui.h:139
 msgid "minutes"
 msgstr "minutach"
 
@@ -2370,7 +2582,7 @@ msgstr "JID"
 msgid "Order:"
 msgstr "Kolejność:"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3436
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
 msgid "Privacy List"
 msgstr "Poufna Lista"
 
@@ -2581,8 +2793,8 @@ msgstr "Usuń konto z Gajima i z _serwera"
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5492 ../src/roster_window.py:5622
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
+#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
 msgid "_Remove"
 msgstr "_Usuń"
 
@@ -2626,56 +2838,60 @@ msgid "Help online"
 msgstr "Pomoc w sieci"
 
 #: ../data/gui/roster_window.ui.h:8
+msgid "P_lugins"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:9
 msgid "Profile, A_vatar"
 msgstr "Profil, _Awatar"
 
-#: ../data/gui/roster_window.ui.h:9
+#: ../data/gui/roster_window.ui.h:10
 msgid "Show Only _Active Contacts"
 msgstr "Pokaż kontakty _połączone"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
 msgid "Show Trans_ports"
 msgstr "Pokaż trans_porty"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
 msgid "Show _Offline Contacts"
 msgstr "Pokaż kontakty _niepołączone"
 
-#: ../data/gui/roster_window.ui.h:12 ../src/statusicon.py:326
+#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
 msgid "Show _Roster"
 msgstr "Pokaż _listę kontaktów"
 
-#: ../data/gui/roster_window.ui.h:13
+#: ../data/gui/roster_window.ui.h:14
 msgid "_Accounts"
 msgstr "_Konta"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
 #: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Działania"
 
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
 msgid "_Contents"
 msgstr "_Zawartość"
 
-#: ../data/gui/roster_window.ui.h:18 ../src/disco.py:1502
+#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: ../data/gui/roster_window.ui.h:19
+#: ../data/gui/roster_window.ui.h:20
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Help"
 msgstr "_Pomoc"
 
-#: ../data/gui/roster_window.ui.h:22
+#: ../data/gui/roster_window.ui.h:23
 msgid "_Send Single Message..."
 msgstr "Wyślij _wiadomość..."
 
-#: ../data/gui/roster_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:25
 msgid "_View"
 msgstr "_Widok"
 
@@ -2692,11 +2908,11 @@ msgid "_Add contact"
 msgstr "Dodaj _kontakt"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5634
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
 msgid "_Information"
 msgstr "Informacje o kontakcie"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1353
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
 msgid "_Search"
 msgstr "_Szukaj"
 
@@ -2716,10 +2932,6 @@ msgstr "Zarejestruj w"
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: ../data/gui/single_message_window.ui.h:2
-msgid "From:"
-msgstr "Od:"
-
 #: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Odpowiedz na tę wiadomość"
@@ -2736,10 +2948,6 @@ msgstr "Wyślij wiadomość"
 msgid "Send message and close window"
 msgstr "Wyślij wiadomość i zamknij okno"
 
-#: ../data/gui/single_message_window.ui.h:7
-msgid "Subject:"
-msgstr "Temat:"
-
 #: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Do:"
@@ -2949,25 +3157,35 @@ msgstr "Komunikator Gajim"
 msgid "Jabber IM Client"
 msgstr "Klient komunikatora Jabber"
 
-#: ../src/adhoc_commands.py:314
+#: ../src/adhoc_commands.py:323
 msgid "Cancel confirmation"
 msgstr "Cofnij potwierdzenie"
 
-#: ../src/adhoc_commands.py:315
+#: ../src/adhoc_commands.py:324
 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:351 ../src/adhoc_commands.py:374
+#: ../src/adhoc_commands.py:370
+#, fuzzy
+msgid "Invalid Form"
+msgstr "Niepoprawny pokój"
+
+#: ../src/adhoc_commands.py:371
+#, fuzzy
+msgid "The form is not filled correctly."
+msgstr "Używany przez ciebie pseudonim zawiera niedozwolone znaki."
+
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
 msgid "Service sent malformed data"
 msgstr "Usługa wysłała niepoprawne dane"
 
-#: ../src/adhoc_commands.py:360
+#: ../src/adhoc_commands.py:399
 msgid "Service changed the session identifier."
 msgstr "Klient na %s anulował negocjację sesji"
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:471
+#: ../src/adhoc_commands.py:513
 msgid "Service returned an error."
 msgstr "Usługa zwróciła komunikat błędu."
 
@@ -2992,7 +3210,7 @@ msgstr "Liczba całkowita"
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:945
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
 msgid "Color"
 msgstr "Kolor"
 
@@ -3030,184 +3248,184 @@ msgstr[2] "Otrzymano nowe wpisy (i %d nie wyświetlonych):"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "English"
 msgstr "angielski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Belarusian"
 msgstr "bułgarski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Bulgarian"
 msgstr "bułgarski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Breton"
 msgstr "bretoński"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Czech"
 msgstr "czeski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "German"
 msgstr "niemiecki"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Greek"
 msgstr "grecki"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "British"
 msgstr "brytyjski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Esperanto"
 msgstr "esperanto"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Spanish"
 msgstr "hiszpański"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Basque"
 msgstr "baskijski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "French"
 msgstr "francuski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Croatian"
 msgstr "chorwacki"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Italian"
 msgstr "włoski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian (b)"
 msgstr "norweski (b)"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Dutch"
 msgstr "holenderski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian"
 msgstr "norweski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Polish"
 msgstr "polski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Portuguese"
 msgstr "portugalski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Brazilian Portuguese"
 msgstr "portugalski (Brazylia)"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Russian"
 msgstr "rosyjski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Serbian"
 msgstr "serbski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Slovak"
 msgstr "słowacki"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Swedish"
 msgstr "szwedzki"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Chinese (Ch)"
 msgstr "chiński (Ch)"
 
-#: ../src/chat_control.py:479
+#: ../src/chat_control.py:496
 msgid "Spelling language"
 msgstr "Wybierz słownik"
 
 #. we are not connected
-#: ../src/chat_control.py:511 ../src/chat_control.py:720
+#: ../src/chat_control.py:528 ../src/chat_control.py:737
 msgid "A connection is not available"
 msgstr "Połączenie jest niemożliwe"
 
-#: ../src/chat_control.py:512 ../src/chat_control.py:721
+#: ../src/chat_control.py:529 ../src/chat_control.py:738
 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:927
+#: ../src/chat_control.py:944
 msgid "Underline"
 msgstr "Podkreślenie"
 
-#: ../src/chat_control.py:928
+#: ../src/chat_control.py:945
 msgid "Strike"
 msgstr "Przekreślenie"
 
-#: ../src/chat_control.py:951
+#: ../src/chat_control.py:968
 msgid "Font"
 msgstr "Czcionka:"
 
-#: ../src/chat_control.py:960
+#: ../src/chat_control.py:977
 msgid "Clear formating"
 msgstr "Usuń formatowanie"
 
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1055
 msgid "Really send file?"
 msgstr "Na pewno wysłać ten plik?"
 
-#: ../src/chat_control.py:1039
+#: ../src/chat_control.py:1056
 #, 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:1503 ../src/chat_control.py:1987
+#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
 msgid "GPG encryption enabled"
 msgstr "Szyfrowanie GPG włączone"
 
 #. Add to roster
-#: ../src/chat_control.py:1528 ../src/common/contacts.py:158
+#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
 #: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:245 ../src/dialogs.py:1064 ../src/dialogs.py:2078
-#: ../src/dialogs.py:2107 ../src/gui_interface.py:674
+#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
+#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
 #: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1610 ../src/roster_window.py:1612
-#: ../src/roster_window.py:1942 ../src/roster_window.py:3289
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
+#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
+#: ../src/roster_window.py:3382
 msgid "Not in Roster"
 msgstr "spoza listy kontaktów"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1575
 msgid "This contact does not support file transfer."
 msgstr "Ten kontakt nie może przesyłać i odbierać plików."
 
-#: ../src/chat_control.py:1561
+#: ../src/chat_control.py:1578
 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:1656
+#: ../src/chat_control.py:1677
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:1869
 #, 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:1967 ../src/dialogs.py:4866
+#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
 msgid "No GPG key assigned"
 msgstr "Nie ma przypisanego klucza GPG"
 
-#: ../src/chat_control.py:1968
+#: ../src/chat_control.py:1991
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3215,50 +3433,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:1977
+#: ../src/chat_control.py:2000
 msgid "GPG encryption disabled"
 msgstr "Szyfrowanie GPG wyłączone"
 
-#: ../src/chat_control.py:2003
+#: ../src/chat_control.py:2026
 msgid "Session WILL be logged"
 msgstr "Sesja BĘDZIE logowana"
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:2028
 msgid "Session WILL NOT be logged"
 msgstr "Sesja NIE BĘDZIE logowana"
 
 #. encryption %s active
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is"
 msgstr "jest"
 
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is NOT"
 msgstr "NIE jest"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will"
 msgstr "będzie"
 
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will NOT"
 msgstr "NIE będzie"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2051
 msgid "and authenticated"
 msgstr "oraz autoryzowana"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2032
+#: ../src/chat_control.py:2055
 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:2039
+#: ../src/chat_control.py:2062
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3267,23 +3485,32 @@ msgstr ""
 "%(type)s szyfrowanie %(status)s aktywne %(authenticated)s.\n"
 "Twoja sesja %(logged)s będzie logowana."
 
-#: ../src/chat_control.py:2182
+#: ../src/chat_control.py:2205
 msgid "Session negotiation cancelled"
 msgstr "Negocjowanie sesji zostało przerwane"
 
-#: ../src/chat_control.py:2191
+#: ../src/chat_control.py:2215
+msgid "This session WILL be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2217
+#, fuzzy
+msgid "This session WILL NOT be archived on server"
+msgstr "Sesja NIE BĘDZIE logowana"
+
+#: ../src/chat_control.py:2226
 msgid "This session is encrypted"
 msgstr "[Ta wiadomość jest zaszyfrowana]"
 
-#: ../src/chat_control.py:2194
+#: ../src/chat_control.py:2229
 msgid " and WILL be logged"
 msgstr "i BĘDZIE logowana"
 
-#: ../src/chat_control.py:2196
+#: ../src/chat_control.py:2231
 msgid " and WILL NOT be logged"
 msgstr "i NIE BĘDZIE logowana"
 
-#: ../src/chat_control.py:2201
+#: ../src/chat_control.py:2236
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3291,25 +3518,25 @@ msgstr ""
 "Tożsamość zdalnego rozmówny nie jest zweryfikowana. Kliknij na przycisk "
 "tarczy po więcej szczegółów."
 
-#: ../src/chat_control.py:2203
+#: ../src/chat_control.py:2238
 msgid "E2E encryption disabled"
 msgstr "Szyfrowanie E2E wyłączone"
 
-#: ../src/chat_control.py:2241 ../src/chat_control.py:2254
+#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
 msgid "The following message was NOT encrypted"
 msgstr "Ta wiadomość NIE została zaszyfrowana"
 
-#: ../src/chat_control.py:2247
+#: ../src/chat_control.py:2288
 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:2519
+#: ../src/chat_control.py:2566
 #, 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:2520
+#: ../src/chat_control.py:2567
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3317,15 +3544,13 @@ msgstr ""
 "Jeśli zamkniesz tę kartę, a nie masz uaktywnionej opcji historii, to "
 "utracisz tę wiadomość."
 
-#: ../src/chat_control.py:2663 ../src/common/connection_handlers.py:1635
-#: ../src/common/connection_handlers.py:1758
-#: ../src/common/connection_handlers.py:1960
-#: ../src/common/connection_handlers.py:2110 ../src/common/connection.py:452
+#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
 #: ../src/gajim.py:159 ../src/session.py:138
 msgid "Database Error"
 msgstr "BÅ‚Ä…d bazy danych"
 
-#: ../src/chat_control.py:2664
+#: ../src/chat_control.py:2714
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3334,7 +3559,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:2906
+#: ../src/chat_control.py:2962
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s ma teraz status %(status)s"
@@ -3348,28 +3573,28 @@ msgstr "tworzenie bazy danych z logami"
 msgid "creating cache database"
 msgstr "tworzenie bazy danych z logami"
 
-#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
-#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
-#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
-#: ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
 #, 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:275 ../src/common/check_paths.py:282
-#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
-#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
-#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:333
+#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
+#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
+#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
 msgid "Gajim will now exit"
 msgstr "Gajim zakończy teraz działanie"
 
-#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
+#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
 #, 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:342
+#: ../src/common/check_paths.py:351
 #, python-format
 msgid "creating %s directory"
 msgstr "tworzenie katalogu %s"
@@ -3433,9 +3658,9 @@ msgstr "Wybierz pokoje, które chcesz opuścić"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:801
-#: ../src/roster_window.py:1614 ../src/roster_window.py:1616
-#: ../src/roster_window.py:5251
+#: ../src/common/helpers.py:57 ../src/roster_window.py:815
+#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
+#: ../src/roster_window.py:5323
 msgid "Groupchats"
 msgstr "Pokoje"
 
@@ -3497,7 +3722,9 @@ msgstr ""
 "$S zostanie zastąpiony bieżącym opisem stanu, $T przez czas nieobecności"
 
 #: ../src/common/config.py:88
-msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+#, fuzzy
+msgid ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 "Kiedy pokazać ikonę w obszarze powiadomienia. Dostępne wartości to "
 "'never' (nigdy), 'on_event' (podczas zdarzenia), 'always' (zawsze)."
@@ -3549,9 +3776,9 @@ msgid ""
 msgstr "Lista (oddzielona spacjami) kolumn (kont lub grup), które są zwinięte."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:501
-#: ../src/common/optparser.py:290 ../src/common/optparser.py:486
-#: ../src/common/optparser.py:520 ../src/gui_interface.py:3370
+#: ../src/common/config.py:106 ../src/common/config.py:505
+#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
+#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
 msgid "default"
 msgstr "domyślny"
 
@@ -3780,7 +4007,8 @@ 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:197
-msgid "Notify of events in the system trayicon."
+#, fuzzy
+msgid "Notify of events in the notification area."
 msgstr "Powiadamiaj o zdarzeniach za pomocÄ… ikony w obszarze powiadamiania."
 
 #: ../src/common/config.py:203
@@ -3819,9 +4047,10 @@ msgstr ""
 "rozmowy w pokoju."
 
 #: ../src/common/config.py:221
+#, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
+"setting is taken into account only if notification icon is used."
 msgstr ""
 "Jeśli ma wartość True, to Gajim jest zamykany po wciśnięciu przycisku X "
 "Menadżera Okien. Ta opcja jest brana pod uwagę tylko gdy używana jest tacka "
@@ -4111,9 +4340,10 @@ msgstr ""
 "usuwane."
 
 #: ../src/common/config.py:270
+#, fuzzy
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
-"systray icon."
+"notification icon."
 msgstr ""
 "Po nadaniu wartości True okna powiadomień będą połączone z obszarem "
 "powiadomień."
@@ -4308,11 +4538,15 @@ msgstr ""
 msgid "Message that is sent to contacts you want to add"
 msgstr "Wypełnij informacje o kontakcie, który chcesz dodać"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:374
+msgid "Last time we syncronized with logs from server."
+msgstr ""
+
+#: ../src/common/config.py:436
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Czy OpenPGP jest włączone dla tego kontaktu?"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4320,101 +4554,108 @@ msgstr ""
 "Czy Gajim powinien automatycznie rozpoczynać zaszyfrowana sesję z tym "
 "kontaktem, jeśli to możliwe?"
 
-#: ../src/common/config.py:437 ../src/common/config.py:440
+#: ../src/common/config.py:438 ../src/common/config.py:441
 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:446
+#: ../src/common/config.py:447
 msgid "all or space separated status"
 msgstr "all lub komunikaty stanu rozdzielone spacjami"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:448
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no' lub 'both'"
 
-#: ../src/common/config.py:448 ../src/common/config.py:450
-#: ../src/common/config.py:451 ../src/common/config.py:454
-#: ../src/common/config.py:455
+#: ../src/common/config.py:449 ../src/common/config.py:451
+#: ../src/common/config.py:452 ../src/common/config.py:455
+#: ../src/common/config.py:456
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' lub \""
 
-#: ../src/common/config.py:461 ../src/common/pep.py:157
+#: ../src/common/config.py:460
+msgid ""
+"State whether plugins should be activated on exit (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
+msgstr ""
+
+#: ../src/common/config.py:465 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "ÅšpiÄ™"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back soon"
 msgstr "Niedługo wrócę"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back in some minutes."
 msgstr "Wrócę za jakiś czas."
 
-#: ../src/common/config.py:463 ../src/common/pep.py:127
+#: ../src/common/config.py:467 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Jem"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:467
 msgid "I'm eating, so leave me a message."
 msgstr "Jem. Zostaw wiadomość."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "I'm watching a movie."
 msgstr "OglÄ…dam film."
 
-#: ../src/common/config.py:465 ../src/common/pep.py:186
+#: ../src/common/config.py:469 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Praca"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:469
 msgid "I'm working."
 msgstr "PracujÄ™."
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "I'm on the phone."
 msgstr "Rozmawiam przez telefon."
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "Out"
 msgstr "Wyszedłem"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "I'm out enjoying life."
 msgstr "Wyszedłem cieszyć się życiem."
 
-#: ../src/common/config.py:478
+#: ../src/common/config.py:482
 msgid "I'm available."
 msgstr "Dostępny."
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:483
 msgid "I'm free for chat."
 msgstr "Chętny do rozmowy."
 
-#: ../src/common/config.py:480 ../src/config.py:1600
+#: ../src/common/config.py:484 ../src/config.py:1600
 msgid "Be right back."
 msgstr "Zaraz wracam."
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:485
 msgid "I'm not available."
 msgstr "Nieobecny."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:486
 msgid "Do not disturb."
 msgstr "Nie przeszkadzać."
 
-#: ../src/common/config.py:483 ../src/common/config.py:484
+#: ../src/common/config.py:487 ../src/common/config.py:488
 msgid "Bye!"
 msgstr "Żegnaj!"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:498
 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."
@@ -4423,88 +4664,84 @@ msgstr ""
 "wyrazów ze zmiennej muc_highlight_words lub gdy wiadomość MUC zawierać "
 "będzie twój pseudonim."
 
-#: ../src/common/config.py:495
+#: ../src/common/config.py:499
 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:504 ../src/common/optparser.py:304
+#: ../src/common/config.py:508 ../src/common/optparser.py:308
 msgid "green"
 msgstr "zielony"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:290
+#: ../src/common/config.py:512 ../src/common/optparser.py:294
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:512
+#: ../src/common/config.py:516
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:520
 msgid "marine"
 msgstr "morski"
 
-#: ../src/common/connection_handlers.py:84
+#: ../src/common/connection_handlers.py:94
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Nie można załadować modułu idle"
 
-#: ../src/common/connection_handlers.py:117
+#: ../src/common/connection_handlers.py:127
 #, 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:124
+#: ../src/common/connection_handlers.py:134
 msgid "Registration succeeded"
 msgstr "Rejestracja zakończyła się sukcesem"
 
-#: ../src/common/connection_handlers.py:125
+#: ../src/common/connection_handlers.py:135
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Rejestracja z %s zakończyła się sukcesem"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 msgid "Registration failed"
 msgstr "Rejestracja nie powiodła się"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 #, 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:445
-#: ../src/common/connection_handlers.py:1633
-#: ../src/common/connection_handlers.py:1756
-#: ../src/common/connection_handlers.py:1957
-#: ../src/common/connection_handlers.py:2108 ../src/common/connection.py:449
+#: ../src/common/connection_handlers.py:466
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
 #: ../src/gajim.py:341
 msgid "Disk Write Error"
 msgstr "BÅ‚Ä…d zapisu na dysk"
 
-#: ../src/common/connection_handlers.py:678 ../src/common/connection.py:1472
+#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
 msgid "Invisibility not supported"
 msgstr "Niewidoczność nie jest obsługiwana"
 
-#: ../src/common/connection_handlers.py:679 ../src/common/connection.py:1473
+#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Konto %s nie obsługuje niewidoczności."
 
-#: ../src/common/connection_handlers.py:1446 ../src/common/connection.py:253
-#: ../src/config.py:2091 ../src/config.py:2100 ../src/config.py:2168
-#: ../src/config.py:3560 ../src/dataforms_widget.py:597 ../src/dialogs.py:2931
+#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
+#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
+#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
 msgid "Invalid Jabber ID"
 msgstr "Niepoprawny Jabber ID"
 
-#: ../src/common/connection_handlers.py:1447
+#: ../src/common/connection_handlers.py:1405
 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:1636
-#: ../src/common/connection_handlers.py:1759
-#: ../src/common/connection_handlers.py:1961
-#: ../src/common/connection_handlers.py:2111 ../src/common/connection.py:453
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
 #: ../src/gajim.py:160 ../src/session.py:139
 #, python-format
 msgid ""
@@ -4515,90 +4752,6 @@ msgstr ""
 "http://trac.gajim.org/wiki/DatabaseBackup) lub usuń ten plik(całe archiwum "
 "rozmów zostanie usunięte)."
 
-#: ../src/common/connection_handlers.py:1805
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Pseudonim jest niedozwolony: %s"
-
-#: ../src/common/connection_handlers.py:1902
-#: ../src/common/connection_handlers.py:1911
-#: ../src/common/connection_handlers.py:1918
-#: ../src/common/connection_handlers.py:1922
-#: ../src/common/connection_handlers.py:1926
-#: ../src/common/connection_handlers.py:1931 ../src/gui_interface.py:139
-msgid "Unable to join group chat"
-msgstr "Nie można dołączyć do pokoju"
-
-#: ../src/common/connection_handlers.py:1903
-#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr "Osiągnięto maksymalną liczbę użytkowników dla %s"
-
-#: ../src/common/connection_handlers.py:1912
-#, python-format
-msgid "You are banned from group chat %s."
-msgstr "Zostałeś zabanowany w pokoju %s."
-
-#: ../src/common/connection_handlers.py:1919
-#, python-format
-msgid "Group chat %s does not exist."
-msgstr "Pokój %s nie istnieje."
-
-#: ../src/common/connection_handlers.py:1923
-msgid "Group chat creation is restricted."
-msgstr "Tworzenie pokoi jest ograniczone."
-
-#: ../src/common/connection_handlers.py:1927
-#, 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:1932
-#, 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:1976
-msgid "Room has been destroyed"
-msgstr "Pokój został usunięty"
-
-#: ../src/common/connection_handlers.py:1984
-#, 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:2020
-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:2041
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "Zapisaliśmy się do %s"
-
-#: ../src/common/connection_handlers.py:2043
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "Prośba o cofnięcie autoryzacji od %s"
-
-#: ../src/common/connection_handlers.py:2045
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "Wypisaliśmy się z %s"
-
-#: ../src/common/connection_handlers.py:2240
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"Jid %s nie jest kompatybilny z RFC. Nie zostanie dodany do listy kontaktów. "
-"Skorzystaj z narzędzi do zarządzania listą kontaktów, takich jak http://jru."
-"jabberstudio.org/ aby go usunąć"
-
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr "Nie można uzyskać certyfikatu wystawcy"
@@ -4727,29 +4880,29 @@ msgstr "Tym kluczem nie można podpisywać certyfikatu"
 msgid "Application verification failure"
 msgstr "BÅ‚Ä…d weryfikacji aplikacji"
 
-#: ../src/common/connection.py:254 ../src/dialogs.py:2932
+#: ../src/common/connection.py:256 ../src/dialogs.py:2948
 #, 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:276
+#: ../src/common/connection.py:278
 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:279
+#: ../src/common/connection.py:281
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 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:331
+#: ../src/common/connection.py:333
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Ta wiadomość jest zaszyfrowana (Zobacz :XEP: '27']"
 
-#: ../src/common/connection.py:439
+#: ../src/common/connection.py:441
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4758,80 +4911,80 @@ msgstr ""
 "Temat: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:807
+#: ../src/common/connection.py:809
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Połączenie z kontem \"%s\"zostało zerwane."
 
-#: ../src/common/connection.py:808
+#: ../src/common/connection.py:810
 msgid "Reconnect manually."
 msgstr "Połącz ponownie ręcznie."
 
-#: ../src/common/connection.py:820
+#: ../src/common/connection.py:822
 #, 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:854
+#: ../src/common/connection.py:856
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Serwer %s przesłał niezgodny formularz rejestracyjny"
 
-#: ../src/common/connection.py:867
+#: ../src/common/connection.py:869
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Nieznany błąd SSL: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:882
+#: ../src/common/connection.py:884
 msgid "Invalid answer"
 msgstr "Niepoprawna odpowiedź"
 
-#: ../src/common/connection.py:883
+#: ../src/common/connection.py:885
 #, 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:1165 ../src/common/connection.py:1294
-#: ../src/common/connection.py:1784
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
+#: ../src/common/connection.py:1792
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nie można połączyć się z \"%s\""
 
-#: ../src/common/connection.py:1166 ../src/gui_interface.py:755
+#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
 msgid "Check your connection or try again later."
 msgstr "Sprawdź swoje połączenie lub spróbuj później."
 
-#: ../src/common/connection.py:1171
+#: ../src/common/connection.py:1173
 #, python-format
 msgid "Server replied: %s"
 msgstr "Serwer odpowiedział: %s"
 
-#: ../src/common/connection.py:1184
+#: ../src/common/connection.py:1186
 msgid "Connection to proxy failed"
 msgstr "Połączenie z serwerem proxy nie powiodło się"
 
-#: ../src/common/connection.py:1215 ../src/common/connection.py:1274
+#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Nie można połączyć się %s"
 
-#: ../src/common/connection.py:1216 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
 #, 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:1241
+#: ../src/common/connection.py:1243
 #, 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:1244
+#: ../src/common/connection.py:1246
 #, python-format
 msgid ""
 "\n"
@@ -4840,7 +4993,7 @@ msgstr ""
 "\n"
 "BÅ‚Ä…d SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1248
 #, python-format
 msgid ""
 "\n"
@@ -4849,24 +5002,24 @@ msgstr ""
 "\n"
 "Nieznany błąd SSL: %d"
 
-#: ../src/common/connection.py:1295
+#: ../src/common/connection.py:1297
 msgid "Check your connection or try again later"
 msgstr "Sprawdź swoje połączenie lub spróbuj później"
 
-#: ../src/common/connection.py:1324
+#: ../src/common/connection.py:1329
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autoryzacja z \"%s\" nie powiodła się"
 
-#: ../src/common/connection.py:1326
+#: ../src/common/connection.py:1331
 msgid "Please check your login and password for correctness."
 msgstr "Spawdź czy twój login i hasło są poprawne."
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1400
 msgid "Error while removing privacy list"
 msgstr "Błąd usuwaniu listy prywatności"
 
-#: ../src/common/connection.py:1396
+#: ../src/common/connection.py:1401
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4875,39 +5028,39 @@ 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:1650
+#: ../src/common/connection.py:1658
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Wysłany kontakt: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1653
+#: ../src/common/connection.py:1661
 msgid "Sent contacts:"
 msgstr "Wyślij kontakty:"
 
-#: ../src/common/connection.py:1799 ../src/common/connection.py:1822
+#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
 msgid "Not fetched because of invisible status"
 msgstr "Nie wysłano z powodu statusu 'niewidoczny'"
 
-#: ../src/common/connection.py:2254
+#: ../src/common/connection.py:2262
 msgid "Unregister failed"
 msgstr "BÅ‚Ä…d przy usuwaniu konta"
 
-#: ../src/common/connection.py:2255
+#: ../src/common/connection.py:2263
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr "Wypisanie się z serwera %(server)s nie powiodło się: %(error)s"
 
 #: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:674
+#: ../src/gui_interface.py:551
 msgid "Observers"
 msgstr "Obserwatorzy"
 
 #: ../src/common/contacts.py:139 ../src/common/contacts.py:366
 #: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1499 ../src/gui_interface.py:424
-#: ../src/roster_window.py:840 ../src/roster_window.py:1525
-#: ../src/roster_window.py:1606 ../src/roster_window.py:1608
-#: ../src/roster_window.py:1769
+#: ../src/disco.py:1517 ../src/roster_window.py:854
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
+#: ../src/roster_window.py:2466
 msgid "Transports"
 msgstr "Transporty"
 
@@ -5137,203 +5290,219 @@ msgstr "Koniec tygodnia"
 msgid "Weekend!"
 msgstr "Weekend!"
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:148
+msgid "Username must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:153
 msgid "Invalid character in username."
 msgstr "Niepoprawna litera w nazwie użytkownika."
 
-#: ../src/common/helpers.py:156
-msgid "Server address required."
-msgstr "Wymagany adres serwera."
+#: ../src/common/helpers.py:159
+msgid "Server must be between 1 and 1023 chars"
+msgstr ""
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 msgid "Invalid character in hostname."
 msgstr "Niepoprawna litera w nazwie hosta."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:166
+msgid "Server address required."
+msgstr "Wymagany adres serwera."
+
+#: ../src/common/helpers.py:170
+msgid "Resource must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:175
 msgid "Invalid character in resource."
 msgstr "Niepoprawna litera w zasobach."
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:215
 msgid "_Busy"
 msgstr "_Zajęty"
 
-#: ../src/common/helpers.py:211 ../src/tooltips.py:195
+#: ../src/common/helpers.py:217 ../src/tooltips.py:195
 msgid "Busy"
 msgstr "Zajęty"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:220
 msgid "_Not Available"
 msgstr "Nie_obecny"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:225
 msgid "_Free for Chat"
 msgstr "_Chętny do rozmowy"
 
-#: ../src/common/helpers.py:221 ../src/tooltips.py:191
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Free for Chat"
 msgstr "Chętny do rozmowy"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:230
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?status transferu:wstrzymany"
 
-#: ../src/common/helpers.py:226 ../src/tooltips.py:189
+#: ../src/common/helpers.py:232 ../src/tooltips.py:189
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?status transferu:wstrzymany"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:234
 msgid "Connecting"
 msgstr "Łączę się"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:237
 msgid "A_way"
 msgstr "Zaraz _wracam"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:242
 msgid "_Offline"
 msgstr "R_ozłączony"
 
-#: ../src/common/helpers.py:238 ../src/tooltips.py:199
+#: ../src/common/helpers.py:244 ../src/tooltips.py:199
 msgid "Offline"
 msgstr "Rozłączony"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:247
 msgid "_Invisible"
 msgstr "N_iewidoczny"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:253
 msgid "?contact has status:Unknown"
 msgstr "?contact ma status: Nieznany"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:255
 msgid "?contact has status:Has errors"
 msgstr "?contact ma status: Wystąpiły błędy"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:260
 msgid "?Subscription we already have:None"
 msgstr "?Posiadane autoryzacje: Brak"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:262
 msgid "To"
 msgstr "Do"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
+msgid "From"
+msgstr "Od"
+
+#: ../src/common/helpers.py:266
 msgid "Both"
 msgstr "Obustronna"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:274
 msgid "?Ask (for Subscription):None"
 msgstr "?PoproÅ› (o autoryzacjÄ™): Brak"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:276
 msgid "Subscribe"
 msgstr "Autoryzuj"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:285
 msgid "?Group Chat Contact Role:None"
 msgstr "?Funkcja kontaktu w pokoju: Brak"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:288
 msgid "Moderators"
 msgstr "Moderatorzy"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:290
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:293
 msgid "Participants"
 msgstr "Uczestnicy"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:295
 msgid "Participant"
 msgstr "Uczestnik"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:298
 msgid "Visitors"
 msgstr "Goście"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:300
 msgid "Visitor"
 msgstr "Gość"
 
-#: ../src/common/helpers.py:300 ../src/tooltips.py:210
+#: ../src/common/helpers.py:306 ../src/tooltips.py:210
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?PowiÄ…zanie kontaktu z czata: brak"
 
-#: ../src/common/helpers.py:302 ../src/tooltips.py:216
+#: ../src/common/helpers.py:308 ../src/tooltips.py:216
 msgid "Owner"
 msgstr "Właściciel"
 
-#: ../src/common/helpers.py:304 ../src/tooltips.py:214
+#: ../src/common/helpers.py:310 ../src/tooltips.py:214
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:212
+#: ../src/common/helpers.py:312 ../src/tooltips.py:212
 msgid "Member"
 msgstr "Uczestnik"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:351
 msgid "is paying attention to the conversation"
 msgstr "jest skupiony na rozmowie"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:353
 msgid "is doing something else"
 msgstr "robi coÅ› innego"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:355
 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:352
+#: ../src/common/helpers.py:358
 msgid "paused composing a message"
 msgstr "przerwał pisanie wiadomości"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:360
 msgid "has closed the chat window or tab"
 msgstr "zamknÄ…Å‚ okno lub kartÄ™ rozmowy"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:619
+#: ../src/common/helpers.py:625
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:622
+#: ../src/common/helpers.py:628
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:626
+#: ../src/common/helpers.py:632
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:629
+#: ../src/common/helpers.py:635
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:633
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:636
+#: ../src/common/helpers.py:642
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:645
 #, python-format
 msgid "%s B"
 msgstr "%s B"
@@ -5378,12 +5547,12 @@ msgstr "Gajim - %s"
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:111
+#: ../src/common/jingle_rtp.py:107
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Konfiguracja pokoju"
 
-#: ../src/common/jingle_rtp.py:112
+#: ../src/common/jingle_rtp.py:108
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5395,30 +5564,30 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:209
+#: ../src/common/jingle_rtp.py:205
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:210
+#: ../src/common/jingle_rtp.py:206
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Komunikat błędu: %s"
 
-#: ../src/common/jingle_rtp.py:336
+#: ../src/common/jingle_rtp.py:335
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:339
+#: ../src/common/jingle_rtp.py:338
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:382
+#: ../src/common/jingle_rtp.py:381
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:390
+#: ../src/common/jingle_rtp.py:389
 msgid "video output"
 msgstr ""
 
@@ -5495,11 +5664,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "błąd: nie można otworzyć %s do odczytu"
 
-#: ../src/common/optparser.py:299 ../src/common/optparser.py:300
+#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
 msgid "cyan"
 msgstr "cyjan"
 
-#: ../src/common/optparser.py:379
+#: ../src/common/optparser.py:383
 msgid "migrating logs database to indices"
 msgstr "indeksowanie archiwum rozmów"
 
@@ -6172,7 +6341,7 @@ msgstr ""
 "anulowane."
 
 #. we're not english
-#: ../src/common/stanza_session.py:303
+#: ../src/common/stanza_session.py:423
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6180,11 +6349,11 @@ msgstr ""
 "[To jest część zaszyfrowanej wiadomości. Jeżeli widzisz tą wiadomość, "
 "oznacza to, że coś poszło źle.]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:178
+#: ../src/common/zeroconf/connection_zeroconf.py:181
 msgid "Avahi error"
 msgstr "BÅ‚Ä…d Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:179
+#: ../src/common/zeroconf/connection_zeroconf.py:182
 #, python-format
 msgid ""
 "%s\n"
@@ -6193,44 +6362,44 @@ msgstr ""
 "%s\n"
 "Przesyłanie wiadomości między adresami link-local może nie działać poprawnie."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:190
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Proszę sprawdzić czy zainstalowano Avahi lub Bonjour"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:199
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Could not start local service"
 msgstr "Nie można uruchomić usługi lokalnej"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Nie można podłączyć się do portu %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-#: ../src/common/zeroconf/connection_zeroconf.py:283
-#: ../src/common/zeroconf/connection_zeroconf.py:294
-#: ../src/common/zeroconf/connection_zeroconf.py:308
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:286
+#: ../src/common/zeroconf/connection_zeroconf.py:297
+#: ../src/common/zeroconf/connection_zeroconf.py:311
 msgid "Please check if avahi-daemon is running."
 msgstr "Proszę sprawdzić czy uruchomiony jest demon Avahi."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:282
-#: ../src/common/zeroconf/connection_zeroconf.py:293
-#: ../src/common/zeroconf/connection_zeroconf.py:307
+#: ../src/common/zeroconf/connection_zeroconf.py:285
+#: ../src/common/zeroconf/connection_zeroconf.py:296
+#: ../src/common/zeroconf/connection_zeroconf.py:310
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Nie można zmienić statusu konta \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:325
+#: ../src/common/zeroconf/connection_zeroconf.py:328
 msgid "Your message could not be sent."
 msgstr "Twoja wiadomość nie mogła zostać wysłana."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:335
+#: ../src/common/zeroconf/connection_zeroconf.py:338
 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:360
+#: ../src/common/zeroconf/connection_zeroconf.py:363
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6250,16 +6419,16 @@ msgstr "Domyśla wiadomość"
 msgid "Enabled"
 msgstr "WÅ‚Ä…czone"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3078
+#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
 msgid "Default"
 msgstr "Domyślny"
 
-#: ../src/config.py:739 ../src/dialogs.py:1395
+#: ../src/config.py:733 ../src/dialogs.py:1409
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Brak słownika dla tego języka (%s)"
 
-#: ../src/config.py:740
+#: ../src/config.py:734
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6277,9 +6446,9 @@ msgid "status message text"
 msgstr "treść informacji o statusie"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2383 ../src/dialogs.py:2449
-#: ../src/dialogs.py:3215 ../src/disco.py:866 ../src/disco.py:1726
-#: ../src/disco.py:2030 ../src/history_window.py:90
+#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
+#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
+#: ../src/disco.py:2048 ../src/history_window.py:90
 msgid "Name"
 msgstr "Nazwa"
 
@@ -6316,7 +6485,7 @@ 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:1976 ../src/config.py:2509 ../src/config.py:2545
+#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
 msgid "You are currently connected to the server"
 msgstr "Jesteś połączony z serwerem"
 
@@ -6351,132 +6520,132 @@ msgstr "Nazwa konta nie może być pusta."
 msgid "Account name cannot contain spaces."
 msgstr "Nazwa konta nie może zawierać spacji."
 
-#: ../src/config.py:2072
+#: ../src/config.py:2074
 msgid "Rename Account"
 msgstr "Zmień nazwę konta"
 
-#: ../src/config.py:2073
+#: ../src/config.py:2075
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Wpisz nowÄ… nazwÄ™ dla kontaktu %s."
 
-#: ../src/config.py:2101
+#: ../src/config.py:2103
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID musi być postaci \"użytkownik@nazwaserwera\"."
 
-#: ../src/config.py:2318 ../src/config.py:3606
+#: ../src/config.py:2320 ../src/config.py:3623
 msgid "Invalid entry"
 msgstr "Niepoprawny wpis"
 
-#: ../src/config.py:2319 ../src/config.py:3607
+#: ../src/config.py:2321 ../src/config.py:3624
 msgid "Custom port must be a port number."
 msgstr "Wybrany port musi być numerem portu."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2342
 msgid "Failed to get secret keys"
 msgstr "Pobieranie kluczy prywatnych nie powiodło się"
 
-#: ../src/config.py:2341
+#: ../src/config.py:2343
 msgid "There is no OpenPGP secret key available."
 msgstr "Brak tajnego klucza OpenPGP."
 
-#: ../src/config.py:2375
+#: ../src/config.py:2377
 msgid "OpenPGP Key Selection"
 msgstr "Wybór klucza OpenPGP"
 
-#: ../src/config.py:2376
+#: ../src/config.py:2378
 msgid "Choose your OpenPGP key"
 msgstr "Wybierz klucz OpenPGP"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2385
 msgid "No such account available"
 msgstr "Takie konto nie jest dostępne"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2386
 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:2391 ../src/dialogs.py:2136 ../src/dialogs.py:2371
-#: ../src/dialogs.py:2557 ../src/disco.py:511 ../src/profile_window.py:339
+#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
+#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
 msgid "You are not connected to the server"
 msgstr "Nie jesteś połączony z serwerem"
 
-#: ../src/config.py:2392
+#: ../src/config.py:2394
 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:2396
+#: ../src/config.py:2398
 msgid "Your server doesn't support Vcard"
 msgstr "Twój serwer nie akceptuje Vcard"
 
-#: ../src/config.py:2397
+#: ../src/config.py:2399
 msgid "Your server can't save your personal information."
 msgstr "Twój serwer nie potrafi zapisać informacji osobistych."
 
-#: ../src/config.py:2510 ../src/config.py:2546
+#: ../src/config.py:2512 ../src/config.py:2548
 msgid "To disable the account, you must be disconnected."
 msgstr "Aby wyłączyć konto, musisz się rozłączyć."
 
-#: ../src/config.py:2515
+#: ../src/config.py:2517
 msgid "Account Local already exists."
 msgstr "Konto o takiej nazwie już istnieje."
 
-#: ../src/config.py:2516
+#: ../src/config.py:2518
 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:2673
+#: ../src/config.py:2675
 #, python-format
 msgid "Edit %s"
 msgstr "Modyfikuj %s"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2677
 #, python-format
 msgid "Register to %s"
 msgstr "Zarejestruj na %s"
 
 #. list at the beginning
-#: ../src/config.py:2711
+#: ../src/config.py:2713
 msgid "Ban List"
 msgstr "Lista kontaktów zablokowanych"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2714
 msgid "Member List"
 msgstr "_Lista uczestników"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2714
 msgid "Owner List"
 msgstr "_Lista właścicieli"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2715
 msgid "Administrator List"
 msgstr "_Administratorzy"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2763 ../src/disco.py:873 ../src/history_manager.py:201
+#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2773
+#: ../src/config.py:2789
 msgid "Reason"
 msgstr "Powód"
 
-#: ../src/config.py:2780
+#: ../src/config.py:2796
 msgid "Nick"
 msgstr "Nick"
 
-#: ../src/config.py:2786
+#: ../src/config.py:2802
 msgid "Role"
 msgstr "Funkcja:"
 
-#: ../src/config.py:2813
+#: ../src/config.py:2829
 msgid "Banning..."
 msgstr "Blokuję użytkownika..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2815
+#: ../src/config.py:2831
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6484,11 +6653,11 @@ msgstr ""
 "<b>Którego użytkownika chcesz zablokować?</b>\n"
 "\n"
 
-#: ../src/config.py:2817
+#: ../src/config.py:2833
 msgid "Adding Member..."
 msgstr "Dodaję członka..."
 
-#: ../src/config.py:2818
+#: ../src/config.py:2834
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6496,11 +6665,11 @@ msgstr ""
 "<b>Status którego użytkownika chcesz zmienić?</b>\n"
 "\n"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2836
 msgid "Adding Owner..."
 msgstr "Dodaję właściciela..."
 
-#: ../src/config.py:2821
+#: ../src/config.py:2837
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6508,11 +6677,11 @@ msgstr ""
 "<b>Którego użytkownika chcesz uczynić właścicielem pokoju?</b>\n"
 "\n"
 
-#: ../src/config.py:2823
+#: ../src/config.py:2839
 msgid "Adding Administrator..."
 msgstr "DodajÄ™ administratora..."
 
-#: ../src/config.py:2824
+#: ../src/config.py:2840
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6520,7 +6689,7 @@ msgstr ""
 "<b>Którego użytkownika chcesz uczynić administratorem?</b>\n"
 "\n"
 
-#: ../src/config.py:2825
+#: ../src/config.py:2841
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6536,109 +6705,109 @@ 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:2926
+#: ../src/config.py:2943
 #, python-format
 msgid "Removing %s account"
 msgstr "Usuwanie konta %s"
 
-#: ../src/config.py:2941
+#: ../src/config.py:2958
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Emotoikony wyłączone"
 
-#: ../src/config.py:2942
+#: ../src/config.py:2959
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2955 ../src/gui_interface.py:1132
-#: ../src/gui_interface.py:1243
+#: ../src/config.py:2972 ../src/gui_interface.py:311
+#: ../src/gui_interface.py:1048
 msgid "Password Required"
 msgstr "Wymagane hasło"
 
-#: ../src/config.py:2956 ../src/gui_interface.py:1223
+#: ../src/config.py:2973 ../src/gui_interface.py:1028
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Wpisz hasło dla konta %s"
 
-#: ../src/config.py:2957 ../src/gui_interface.py:1243
+#: ../src/config.py:2974 ../src/gui_interface.py:1048
 msgid "Save password"
 msgstr "Zapisz hasło"
 
-#: ../src/config.py:2967
+#: ../src/config.py:2984
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" jest połączone z serwerem."
 
-#: ../src/config.py:2968
+#: ../src/config.py:2985
 msgid "If you remove it, the connection will be lost."
 msgstr "Jeśli to usuniesz, połączenie zostanie zerwane."
 
-#: ../src/config.py:2982
+#: ../src/config.py:2999
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Połączenie z serwerem proxy nie powiodło się"
 
-#: ../src/config.py:2983
+#: ../src/config.py:3000
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "<b>Co chcesz zrobić?</b>"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3001
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Usuń konto _tylko z Gajima"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3002
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3078
+#: ../src/config.py:3095
 msgid "?print_status:All"
 msgstr "?print_status:Wszystkie"
 
-#: ../src/config.py:3079
+#: ../src/config.py:3096
 msgid "Enter and leave only"
 msgstr "Jedynie wejdź i wyjdź"
 
-#: ../src/config.py:3080
+#: ../src/config.py:3097
 msgid "?print_status:None"
 msgstr "?print_status:Żaden"
 
-#: ../src/config.py:3150
+#: ../src/config.py:3167
 msgid "New Group Chat"
 msgstr "Nowa rozmowa grupowa"
 
-#: ../src/config.py:3183
+#: ../src/config.py:3200
 msgid "This bookmark has invalid data"
 msgstr "Ta zakładka zawiera niepoprawne dane"
 
-#: ../src/config.py:3184
+#: ../src/config.py:3201
 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ę."
 
 #. invalid char
-#: ../src/config.py:3302 ../src/dialogs.py:1934
+#: ../src/config.py:3319 ../src/dialogs.py:1950
 msgid "Invalid nickname"
 msgstr "Niepoprawny pseudonim"
 
-#: ../src/config.py:3303 ../src/config.py:3317 ../src/config.py:3331
+#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
 msgid "Character not allowed"
 msgstr "Niedozwolony znak"
 
-#: ../src/config.py:3316 ../src/config.py:3582
+#: ../src/config.py:3333 ../src/config.py:3599
 msgid "Invalid server"
 msgstr "Niepoprawna nazwa serwera"
 
-#: ../src/config.py:3330
+#: ../src/config.py:3347
 msgid "Invalid room"
 msgstr "Niepoprawny pokój"
 
-#: ../src/config.py:3498
+#: ../src/config.py:3515
 msgid "Account has been added successfully"
 msgstr "Konto zostało pomyślnie dodane"
 
-#: ../src/config.py:3499 ../src/config.py:3505
+#: ../src/config.py:3516 ../src/config.py:3522
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menu item under the Edit menu from the main "
@@ -6647,34 +6816,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:3504
+#: ../src/config.py:3521
 msgid "Your new account has been created successfully"
 msgstr "Twoje konto zostało założone"
 
-#: ../src/config.py:3543
+#: ../src/config.py:3560
 msgid "Invalid username"
 msgstr "Niepoprawna nazwa użytkownika"
 
-#: ../src/config.py:3545
+#: ../src/config.py:3562
 msgid "You must provide a username to configure this account."
 msgstr "Musisz wpisać nazwę użytkownika aby skonfigurować to konto."
 
-#: ../src/config.py:3583
+#: ../src/config.py:3600
 msgid "Please provide a server on which you want to register."
 msgstr "Wpisz adres serwera, na którym chcesz się zarejestrować."
 
-#: ../src/config.py:3639 ../src/gui_interface.py:1904
+#: ../src/config.py:3656 ../src/gui_interface.py:1693
 msgid "Certificate Already in File"
 msgstr "Certyfikat znajduje się już w pliku"
 
-#: ../src/config.py:3640 ../src/gui_interface.py:1905
+#: ../src/config.py:3657 ../src/gui_interface.py:1694
 #, 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:3717
+#: ../src/config.py:3734
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6689,7 +6858,7 @@ msgstr ""
 "BÅ‚Ä…d SSL: %(error)s\n"
 "Czy nadal chcesz się połączyć z tym serwerem?"
 
-#: ../src/config.py:3723 ../src/gui_interface.py:1932
+#: ../src/config.py:3740 ../src/gui_interface.py:1721
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6700,63 +6869,72 @@ msgstr ""
 "Odcisk klucza SHA1 certyfikatu:\n"
 "%s"
 
-#: ../src/config.py:3755 ../src/config.py:3789
+#: ../src/config.py:3772 ../src/config.py:3806
 msgid "An error occurred during account creation"
 msgstr "Wystąpił błąd w trakcie tworzenia konta"
 
-#: ../src/config.py:3854
+#: ../src/config.py:3871
 msgid "Account name is in use"
 msgstr "Nazwa konta jest już zajęta"
 
-#: ../src/config.py:3855
+#: ../src/config.py:3872
 msgid "You already have an account using this name."
 msgstr "Masz już konto o takiej nazwie."
 
-#: ../src/config.py:4009
+#: ../src/config.py:3991
+msgid "PEP node was not removed"
+msgstr "Węzeł PEP nie został usunięty"
+
+#: ../src/config.py:3992
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr "Węzeł PEP %(node)s nie został usunięty: %(message)s"
+
+#: ../src/config.py:4036
 msgid "Active"
 msgstr "Aktywny"
 
-#: ../src/config.py:4017
+#: ../src/config.py:4044
 msgid "Event"
 msgstr "Zdarzenie"
 
-#: ../src/config.py:4052
+#: ../src/config.py:4079
 msgid "First Message Received"
 msgstr "Otrzymano pierwszą wiadomość"
 
-#: ../src/config.py:4053
+#: ../src/config.py:4080
 msgid "Next Message Received Focused"
 msgstr "Otrzymałeś następną wiadomość"
 
-#: ../src/config.py:4055
+#: ../src/config.py:4082
 msgid "Next Message Received Unfocused"
 msgstr "Otrzymałeś następną wiadomość w tle"
 
-#: ../src/config.py:4056
+#: ../src/config.py:4083
 msgid "Contact Connected"
 msgstr "Kontakt połączył się"
 
-#: ../src/config.py:4057
+#: ../src/config.py:4084
 msgid "Contact Disconnected"
 msgstr "Kontakt rozłączył się"
 
-#: ../src/config.py:4058
+#: ../src/config.py:4085
 msgid "Message Sent"
 msgstr "Wiadomość została wysłana"
 
-#: ../src/config.py:4059
+#: ../src/config.py:4086
 msgid "Group Chat Message Highlight"
 msgstr "Podświetlenie wiadomości z czatu"
 
-#: ../src/config.py:4060
+#: ../src/config.py:4087
 msgid "Group Chat Message Received"
 msgstr "Otrzymano wiadomość na czacie"
 
-#: ../src/config.py:4061
+#: ../src/config.py:4088
 msgid "GMail Email Received"
 msgstr "Nowa poczta na koncie Gmail"
 
-#: ../src/conversation_textview.py:600
+#: ../src/conversation_textview.py:601
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6766,7 +6944,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:619
+#: ../src/conversation_textview.py:620
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6774,44 +6952,44 @@ 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:739
+#: ../src/conversation_textview.py:740
 msgid "_Quote"
 msgstr "_Cytuj"
 
-#: ../src/conversation_textview.py:746
+#: ../src/conversation_textview.py:747
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Działania dla wyrażenia \"%s\""
 
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Read _Wikipedia Article"
 msgstr "Przeczytaj artykuł w _Wikipedii"
 
-#: ../src/conversation_textview.py:763
+#: ../src/conversation_textview.py:765
 msgid "Look it up in _Dictionary"
 msgstr "Szukaj w _słowniku"
 
-#: ../src/conversation_textview.py:780
+#: ../src/conversation_textview.py:782
 #, 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:793
+#: ../src/conversation_textview.py:795
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "W URL-u Przeszukiwania Sieci brakuje \"%s\""
 
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 msgid "Web _Search for it"
 msgstr "Szukaj w _Internecie"
 
-#: ../src/conversation_textview.py:802
+#: ../src/conversation_textview.py:804
 msgid "Open as _Link"
 msgstr "Otwórz jako _odnośnik"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1296
+#: ../src/conversation_textview.py:1298
 #, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6820,186 +6998,191 @@ msgstr[1] "%i dni temu"
 msgstr[2] "%i dni temu"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1344 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Temat: %s\n"
 
-#: ../src/dataforms_widget.py:544
+#: ../src/dataforms_widget.py:545
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Nie można załadować modułu idle"
 
-#: ../src/dataforms_widget.py:546
+#: ../src/dataforms_widget.py:547
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Niewidoczność nie jest obsługiwana"
 
-#: ../src/dataforms_widget.py:601
+#: ../src/dataforms_widget.py:562
+msgid "This field is required"
+msgstr ""
+
+#: ../src/dataforms_widget.py:607
 msgid "Jabber ID already in list"
 msgstr "Ten JID jest już na liście"
 
-#: ../src/dataforms_widget.py:602
+#: ../src/dataforms_widget.py:608
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Wprowadzony JID znajduje się już na liście. Wybierz inny."
 
 #. Default jid
-#: ../src/dataforms_widget.py:613
+#: ../src/dataforms_widget.py:619
 msgid "new@jabber.id"
 msgstr "nowy@jabber.id"
 
-#: ../src/dataforms_widget.py:616 ../src/dataforms_widget.py:618
+#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "nowy%d@jabber.id"
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nazwa kontaktu: <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "JID : <i>%s</i>"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:195
 msgid "Group"
 msgstr "Grupa"
 
-#: ../src/dialogs.py:201
+#: ../src/dialogs.py:202
 msgid "In the group"
 msgstr "W grupie"
 
-#: ../src/dialogs.py:292
+#: ../src/dialogs.py:293
 msgid "KeyID"
 msgstr "Identyfikator klucza"
 
-#: ../src/dialogs.py:297
+#: ../src/dialogs.py:298
 msgid "Contact name"
 msgstr "Nazwa kontaktu"
 
-#: ../src/dialogs.py:469
+#: ../src/dialogs.py:470
 msgid "Set Mood"
 msgstr "Ustaw nastrój"
 
-#: ../src/dialogs.py:589
+#: ../src/dialogs.py:590
 #, python-format
 msgid "%s Status Message"
 msgstr "Informacja o statusie %s"
 
-#: ../src/dialogs.py:603
+#: ../src/dialogs.py:604
 msgid "Status Message"
 msgstr "Opis statusu"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:794
 msgid "Overwrite Status Message?"
 msgstr "Zmienić opis statusu?"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:795
 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:802
+#: ../src/dialogs.py:803
 msgid "Save as Preset Status Message"
 msgstr "Szablony opisów"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:804
 msgid "Please type a name for this status message"
 msgstr "Podaj nazwÄ™ dla tego szablonu"
 
-#: ../src/dialogs.py:831
+#: ../src/dialogs.py:832
 msgid "AIM Address:"
 msgstr "_Adres AIM:"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:833
 msgid "GG Number:"
 msgstr "Numer GG:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:834
 msgid "ICQ Number:"
 msgstr "Numer ICQ:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:835
 msgid "MSN Address:"
 msgstr "_Adres MSN:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:836
 msgid "Yahoo! Address:"
 msgstr "Adres _Yahoo:"
 
-#: ../src/dialogs.py:872
+#: ../src/dialogs.py:873
 #, 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:875
+#: ../src/dialogs.py:876
 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:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
+#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
+#: ../src/dialogs.py:3464
 msgid "Invalid User ID"
 msgstr "Niepoprawny identyfikator użytkownika"
 
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1052
 msgid "The user ID must not contain a resource."
 msgstr "ID użytkownika nie może zawierać zasobu."
 
-#: ../src/dialogs.py:1051
+#: ../src/dialogs.py:1057
 msgid "You cannot add yourself to your roster."
 msgstr "Ty nie możesz dodać siebie do swojej listy kontaktów."
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1071
 msgid "Contact already in roster"
 msgstr "Kontakt jest już na liście kontaktów"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1072
 msgid "This contact is already listed in your roster."
 msgstr "Ten kontakt znajduje się już na twojej liście kontaktów."
 
-#: ../src/dialogs.py:1112
+#: ../src/dialogs.py:1118
 msgid "User ID:"
 msgstr "ID uzytkownika:"
 
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1189
 msgid "A GTK+ jabber client"
 msgstr "Klient jabbera w GTK+."
 
-#: ../src/dialogs.py:1176
+#: ../src/dialogs.py:1190
 msgid "GTK+ Version:"
 msgstr "Wersja GTK+:"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1191
 msgid "PyGTK Version:"
 msgstr "Wersja PyGTK:"
 
-#: ../src/dialogs.py:1187
+#: ../src/dialogs.py:1201
 msgid "Current Developers:"
 msgstr "Bieżący deweloperzy:"
 
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1203
 msgid "Past Developers:"
 msgstr "Poprzedni deweloperzy:"
 
-#: ../src/dialogs.py:1195
+#: ../src/dialogs.py:1209
 msgid "THANKS:"
 msgstr "Podziękowania:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1215
 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:1213
+#: ../src/dialogs.py:1227
 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:1396
+#: ../src/dialogs.py:1410
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7011,100 +7194,100 @@ 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:1935 ../src/dialogs.py:2322
+#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
 msgid "The nickname has not allowed characters."
 msgstr "Używany przez ciebie pseudonim zawiera niedozwolone znaki."
 
-#: ../src/dialogs.py:2053
+#: ../src/dialogs.py:2069
 #, 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:2056
+#: ../src/dialogs.py:2072
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Prośba o autoryzację od %s"
 
-#: ../src/dialogs.py:2131 ../src/gui_interface.py:2672
+#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Już jesteś w pokoju %s"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2153
 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:2178
+#: ../src/dialogs.py:2194
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Dołącz do pokoju z konta %s"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2325
 msgid "Invalid Account"
 msgstr "Niepoprawne konto"
 
-#: ../src/dialogs.py:2310
+#: ../src/dialogs.py:2326
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Wskaż konto, z którym chcesz wejść do pokoju"
 
-#: ../src/dialogs.py:2321
+#: ../src/dialogs.py:2337
 msgid "Invalid Nickname"
 msgstr "Niepoprawny pseudonim"
 
-#: ../src/dialogs.py:2326 ../src/dialogs.py:2332
-#: ../src/groupchat_control.py:1832
+#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
+#: ../src/groupchat_control.py:1847
 msgid "Invalid group chat Jabber ID"
 msgstr "Niepoprawny Jabber ID"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2343
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "Proszę wprowadzić JID konferencji w postaci pokój@serwer."
 
-#: ../src/dialogs.py:2333 ../src/groupchat_control.py:1833
+#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Używane przez ciebie Jabber ID zawiera niedozwolone znaki."
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2356
 msgid "This is not a group chat"
 msgstr "To nie jest czat"
 
-#: ../src/dialogs.py:2341
+#: ../src/dialogs.py:2357
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s nie jest nazwÄ… czatu."
 
-#: ../src/dialogs.py:2372
+#: ../src/dialogs.py:2388
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Nie możesz zsynchronizować kontaktów przy niektywnym połączeniu."
 
-#: ../src/dialogs.py:2386
+#: ../src/dialogs.py:2402
 msgid "Server"
 msgstr "Serwer"
 
-#: ../src/dialogs.py:2421
+#: ../src/dialogs.py:2437
 msgid "This account is not connected to the server"
 msgstr "To konto nie jest połączone z serwerem"
 
-#: ../src/dialogs.py:2422
+#: ../src/dialogs.py:2438
 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:2446
+#: ../src/dialogs.py:2462
 msgid "Synchronise"
 msgstr "Synchronizuj"
 
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2523
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Rozpocznij rozmowÄ™ z konta %s"
 
-#: ../src/dialogs.py:2509
+#: ../src/dialogs.py:2525
 msgid "Start Chat"
 msgstr "Rozpocznij rozmowÄ™"
 
-#: ../src/dialogs.py:2510
+#: ../src/dialogs.py:2526
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7113,165 +7296,165 @@ msgstr ""
 "wysłać wiadomość:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2536 ../src/dialogs.py:2917 ../src/dialogs.py:3129
+#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
 msgid "Connection not available"
 msgstr "Połączenie jest niedostępne"
 
-#: ../src/dialogs.py:2537 ../src/dialogs.py:2918 ../src/dialogs.py:3130
+#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Sprawdź, czy jesteś połączony z \"%s\"."
 
-#: ../src/dialogs.py:2546 ../src/dialogs.py:2549
+#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
 msgid "Invalid JID"
 msgstr "Niepoprawny JID"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2565
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nie można sparsować \"%s\"."
 
-#: ../src/dialogs.py:2558
+#: ../src/dialogs.py:2574
 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:2577
+#: ../src/dialogs.py:2593
 msgid "Invalid password"
 msgstr "Niepoprawne hasło"
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "You must enter a password."
 msgstr "Musisz wpisać hasło."
 
-#: ../src/dialogs.py:2581
+#: ../src/dialogs.py:2597
 msgid "Passwords do not match"
 msgstr "Hasła nie zgadzają się"
 
-#: ../src/dialogs.py:2582
+#: ../src/dialogs.py:2598
 msgid "The passwords typed in both fields must be identical."
 msgstr "Hasła wpisane w obydwu polach muszą być identyczne."
 
 #. default value
-#: ../src/dialogs.py:2619 ../src/notify.py:247 ../src/notify.py:473
+#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
 msgid "Contact Signed In"
 msgstr "Kontakt połączył się"
 
-#: ../src/dialogs.py:2621 ../src/notify.py:255 ../src/notify.py:475
+#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
 msgid "Contact Signed Out"
 msgstr "Kontakt rozłączył się"
 
 #. chat message
-#: ../src/dialogs.py:2623 ../src/notify.py:277 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
 msgid "New Message"
 msgstr "Nowa wiadomość"
 
 #. single message
-#: ../src/dialogs.py:2623 ../src/notify.py:259 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
 msgid "New Single Message"
 msgstr "Nowa wiadomość"
 
 #. private message
-#: ../src/dialogs.py:2624 ../src/notify.py:265 ../src/notify.py:478
+#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
 msgid "New Private Message"
 msgstr "Wyślij prywatną wiadomość"
 
-#: ../src/dialogs.py:2624 ../src/gui_interface.py:1358 ../src/notify.py:487
+#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
 msgid "New E-mail"
 msgstr "Nowy adres e-mail"
 
-#: ../src/dialogs.py:2626 ../src/gui_interface.py:1420 ../src/notify.py:480
+#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
 msgid "File Transfer Request"
 msgstr "Pytanie o przysłanie pliku"
 
-#: ../src/dialogs.py:2628 ../src/gui_interface.py:1320
-#: ../src/gui_interface.py:1389 ../src/notify.py:482
+#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
+#: ../src/gui_interface.py:1186 ../src/notify.py:482
 msgid "File Transfer Error"
 msgstr "Błąd przesyłania pliku"
 
-#: ../src/dialogs.py:2630 ../src/gui_interface.py:1466
-#: ../src/gui_interface.py:1489 ../src/gui_interface.py:1506
+#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
+#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
 #: ../src/notify.py:484
 msgid "File Transfer Completed"
 msgstr "Zakończono przesyłanie pliku"
 
-#: ../src/dialogs.py:2631 ../src/gui_interface.py:1469 ../src/notify.py:485
+#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
 msgid "File Transfer Stopped"
 msgstr "Przesyłanie pliku zatrzymane"
 
-#: ../src/dialogs.py:2633 ../src/gui_interface.py:1152 ../src/notify.py:489
+#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
 msgid "Groupchat Invitation"
 msgstr "Zaproszenie na czat"
 
-#: ../src/dialogs.py:2635 ../src/notify.py:239 ../src/notify.py:491
+#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
 msgid "Contact Changed Status"
 msgstr "Kontakt zmienił status"
 
-#: ../src/dialogs.py:2836
+#: ../src/dialogs.py:2852
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Wiadomość z konta %s"
 
-#: ../src/dialogs.py:2838
+#: ../src/dialogs.py:2854
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Wiadomość z konta %s"
 
-#: ../src/dialogs.py:2840
+#: ../src/dialogs.py:2856
 msgid "Single Message"
 msgstr "Pojedyncza wiadomość"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2843
+#: ../src/dialogs.py:2859
 #, python-format
 msgid "Send %s"
 msgstr "Wyślij %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:2882
 #, python-format
 msgid "Received %s"
 msgstr "Odebrane %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2889
+#: ../src/dialogs.py:2905
 #, 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:2968
+#: ../src/dialogs.py:2984
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:2985
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napisał:\n"
 
-#: ../src/dialogs.py:3028
+#: ../src/dialogs.py:3044
 #, python-format
 msgid "XML Console for %s"
 msgstr "Kosola XML dla %s"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3046
 msgid "XML Console"
 msgstr "Konsola XML"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 msgid "add"
 msgstr "dodaj"
 
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 msgid "modify"
 msgstr "modyfikuj"
 
-#: ../src/dialogs.py:3160
+#: ../src/dialogs.py:3176
 msgid "remove"
 msgstr "usuń"
 
-#: ../src/dialogs.py:3188
+#: ../src/dialogs.py:3204
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7280,155 +7463,189 @@ msgstr ""
 "<b>%(jid)s</b> chciałby <b>%(action)s</b> kilka kontaktów w Twoim rosterze."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3204 ../src/dialogs.py:3250
+#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
 msgid "Add"
 msgstr "Dodaj"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3206 ../src/dialogs.py:3281
+#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
 msgid "Modify"
 msgstr "Edytuj"
 
-#: ../src/dialogs.py:3212
+#: ../src/dialogs.py:3228
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3218
+#: ../src/dialogs.py:3234
 msgid "Groups"
 msgstr "Grupy"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3342
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s zasugerował(a), żebym dodał Cię do rostera."
 
-#: ../src/dialogs.py:3340
+#: ../src/dialogs.py:3356
 #, python-format
 msgid "Added  %s contacts"
 msgstr "Dodano %s kontaktów"
 
-#: ../src/dialogs.py:3377
+#: ../src/dialogs.py:3393
 #, python-format
 msgid "Removed  %s contacts"
 msgstr "Usunięto %s kontaktów"
 
-#: ../src/dialogs.py:3430
+#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#, python-format
+msgid "Archiving Preferences for %s"
+msgstr ""
+
+#: ../src/dialogs.py:3473
+#, fuzzy
+msgid "Invalid expire value"
+msgstr "Niepoprawna nazwa serwera"
+
+#: ../src/dialogs.py:3474
+msgid "Expire must be a valid positive integer."
+msgstr ""
+
+#: ../src/dialogs.py:3521
+msgid "There is an error with the form"
+msgstr ""
+
+#: ../src/dialogs.py:3732
+#, fuzzy
+msgid "There is an error"
+msgstr "Usługa zwróciła komunikat błędu."
+
+#: ../src/dialogs.py:3796
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista prywatności <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3434
+#: ../src/dialogs.py:3800
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista prywatności dla %s"
 
-#: ../src/dialogs.py:3490
+#: ../src/dialogs.py:3856
 #, 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:3495
+#: ../src/dialogs.py:3861
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Kolejność: %(order)s, akcja: %(action)s"
 
-#: ../src/dialogs.py:3539
+#: ../src/dialogs.py:3905
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Edytuj regułę</b>"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:4016
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dodaj regułę</b>"
 
-#: ../src/dialogs.py:3750
+#: ../src/dialogs.py:4116
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listy prywatności dla %s"
 
-#: ../src/dialogs.py:3752
+#: ../src/dialogs.py:4118
 msgid "Privacy Lists"
 msgstr "Listy prywatności"
 
-#: ../src/dialogs.py:3822
+#: ../src/dialogs.py:4188
 msgid "Invalid List Name"
 msgstr "Niepoprawna nazwa listy"
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4189
 msgid "You must enter a name to create a privacy list."
 msgstr "Musisz podać nazwę nowej listy prywatności."
 
-#: ../src/dialogs.py:3855
+#: ../src/dialogs.py:4221
 msgid "You are invited to a groupchat"
 msgstr "Jestes zaproszony do rozmowy grupowej"
 
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4224
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact zaprasza ciÄ™ do rozmowy"
 
-#: ../src/dialogs.py:3860
+#: ../src/dialogs.py:4226
 #, 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:3868
+#: ../src/dialogs.py:4234
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentarz: %s"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4236
 msgid "Do you want to accept the invitation?"
 msgstr "Czy chcesz zaakceptować zaproszenie?"
 
-#: ../src/dialogs.py:3932
+#: ../src/dialogs.py:4298
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:3942 ../src/dialogs.py:3985 ../src/dialogs.py:4041
+#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
+#: ../src/dialogs.py:4495
 msgid "All files"
 msgstr "Wszystkie pliki"
 
-#: ../src/dialogs.py:3947
+#: ../src/dialogs.py:4313
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:3975
+#: ../src/dialogs.py:4341
 msgid "Choose Sound"
 msgstr "Wybierz dźwięk"
 
-#: ../src/dialogs.py:3990
+#: ../src/dialogs.py:4356
 msgid "Wav Sounds"
 msgstr "Dźwięki w Wav"
 
-#: ../src/dialogs.py:4028
+#: ../src/dialogs.py:4394
 msgid "Choose Image"
 msgstr "Wybierz obrazek"
 
-#: ../src/dialogs.py:4046
+#: ../src/dialogs.py:4412
 msgid "Images"
 msgstr "Obrazki"
 
-#: ../src/dialogs.py:4113
+#: ../src/dialogs.py:4482
+#, fuzzy
+msgid "Choose Archive"
+msgstr "Wybierz obrazek"
+
+#: ../src/dialogs.py:4500
+#, fuzzy
+msgid "Zip files"
+msgstr "Wszystkie pliki"
+
+#: ../src/dialogs.py:4525
 #, python-format
 msgid "When %s becomes:"
 msgstr "Gdy %s ma status:"
 
-#: ../src/dialogs.py:4115
+#: ../src/dialogs.py:4527
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "DodajÄ™ specjalne powiadomienia dla %s"
 
-#: ../src/dialogs.py:4190
+#: ../src/dialogs.py:4602
 msgid "Condition"
 msgstr "Warunek"
 
-#: ../src/dialogs.py:4310
+#: ../src/dialogs.py:4722
 msgid "when I am "
 msgstr "kiedy mam "
 
-#: ../src/dialogs.py:4786
+#: ../src/dialogs.py:5198
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7439,19 +7656,19 @@ msgstr ""
 "\n"
 "This session's Short Authentication String is <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4789
+#: ../src/dialogs.py:5201
 msgid "You have already verified this contact's identity."
 msgstr "Już zweryfikowałeś tożsamość tego kontaktu."
 
-#: ../src/dialogs.py:4795 ../src/dialogs.py:4879
+#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
 msgid "Contact's identity verified"
 msgstr "Tożsamość rozmówcy zweryfikowana"
 
-#: ../src/dialogs.py:4801
+#: ../src/dialogs.py:5213
 msgid "Verify again..."
 msgstr "Ponowna weryfikacja..."
 
-#: ../src/dialogs.py:4806
+#: ../src/dialogs.py:5218
 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 "
@@ -7461,19 +7678,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:4809 ../src/dialogs.py:4860 ../src/dialogs.py:4873
+#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
 msgid "Contact's identity NOT verified"
 msgstr "Tożsamość rozmówcy NIE zweryfikowana"
 
-#: ../src/dialogs.py:4814
+#: ../src/dialogs.py:5226
 msgid "Verify..."
 msgstr "Weryfikowanie..."
 
-#: ../src/dialogs.py:4825
+#: ../src/dialogs.py:5237
 msgid "Have you verified the contact's identity?"
 msgstr "Czy zweryfikowałeś/zweryfikowałaś tożsamość zdalnego rozmówcy?"
 
-#: ../src/dialogs.py:4826
+#: ../src/dialogs.py:5238
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7487,23 +7704,23 @@ msgstr ""
 "osoba zobaczy ten sam Short Authentication String (SAS) jak ty.\n"
 "Tej sesji Short Authentication String to <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4827
+#: ../src/dialogs.py:5239
 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:4861
+#: ../src/dialogs.py:5273
 #, 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:4867
+#: ../src/dialogs.py:5279
 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:4874
+#: ../src/dialogs.py:5286
 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."
@@ -7512,7 +7729,7 @@ msgstr ""
 "klucza</b>, więc wiadomość <b>nie będzie</b> odszyfrowana. Użyj twojego "
 "klienta GPG, aby importować klucz."
 
-#: ../src/dialogs.py:4880
+#: ../src/dialogs.py:5292
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7520,19 +7737,19 @@ msgstr ""
 "Ten użytkownik ma przypisany klucz, zweryfikowałeś ten klucz, więc "
 "wiadomości będą szyfrowane"
 
-#: ../src/dialogs.py:4945
+#: ../src/dialogs.py:5357
 msgid "an audio and video"
 msgstr "wideo-głosową"
 
-#: ../src/dialogs.py:4947
+#: ../src/dialogs.py:5359
 msgid "an audio"
 msgstr "głosową"
 
-#: ../src/dialogs.py:4949
+#: ../src/dialogs.py:5361
 msgid "a video"
 msgstr "wideo"
 
-#: ../src/dialogs.py:4953
+#: ../src/dialogs.py:5365
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7548,24 +7765,24 @@ msgstr "Inni"
 msgid "Conference"
 msgstr "Konferencja"
 
-#: ../src/disco.py:512
+#: ../src/disco.py:513
 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:589
+#: ../src/disco.py:600
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Przeglądanie usług przy użyciu konta %s"
 
-#: ../src/disco.py:591
+#: ../src/disco.py:602
 msgid "Service Discovery"
 msgstr "Przeglądanie usług"
 
-#: ../src/disco.py:741
+#: ../src/disco.py:758
 msgid "The service could not be found"
 msgstr "Nie można odnaleźć usługi"
 
-#: ../src/disco.py:742
+#: ../src/disco.py:759
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7573,93 +7790,93 @@ msgstr ""
 "Pod wpisanym adresem nie ma żadnych usług lub one nie odpowiadają. Sprawdź "
 "adres i spróbuj ponownie."
 
-#: ../src/disco.py:746 ../src/disco.py:1082
+#: ../src/disco.py:763 ../src/disco.py:1100
 msgid "The service is not browsable"
 msgstr "Tej usługi nie można przeglądać"
 
-#: ../src/disco.py:747
+#: ../src/disco.py:764
 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:786 ../src/disco.py:796
+#: ../src/disco.py:804 ../src/disco.py:814
 msgid "Invalid Server Name"
 msgstr "Niepoprawna nazwa serwera"
 
-#: ../src/disco.py:850
+#: ../src/disco.py:868
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Przeglądanie %(address)s przy użyciu konta %(account)s"
 
-#: ../src/disco.py:894
+#: ../src/disco.py:912
 msgid "_Browse"
 msgstr "Prze_glÄ…daj"
 
-#: ../src/disco.py:1083
+#: ../src/disco.py:1101
 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:1323
+#: ../src/disco.py:1341
 msgid "_Execute Command"
 msgstr "_Wykonaj komendÄ™"
 
-#: ../src/disco.py:1333 ../src/disco.py:1504
+#: ../src/disco.py:1351 ../src/disco.py:1522
 msgid "Re_gister"
 msgstr "Za_rejestruj"
 
-#: ../src/disco.py:1545
+#: ../src/disco.py:1563
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanowanie %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1736
+#: ../src/disco.py:1754
 msgid "Users"
 msgstr "Użytkownicy"
 
 #. Description column
-#: ../src/disco.py:1744
+#: ../src/disco.py:1762
 msgid "Description"
 msgstr "Opis"
 
 #. Id column
-#: ../src/disco.py:1752
+#: ../src/disco.py:1770
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1817 ../src/gui_interface.py:3182
+#: ../src/disco.py:1835 ../src/gui_interface.py:2995
 msgid "Bookmark already set"
 msgstr "Zakładka została już dodana"
 
-#: ../src/disco.py:1818 ../src/gui_interface.py:3183
+#: ../src/disco.py:1836 ../src/gui_interface.py:2996
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Pokój \"%s\" jest już w Twoich zakładkach."
 
-#: ../src/disco.py:1827 ../src/gui_interface.py:3197
+#: ../src/disco.py:1845 ../src/gui_interface.py:3010
 msgid "Bookmark has been added successfully"
 msgstr "Zakładka została dodana"
 
-#: ../src/disco.py:1828 ../src/gui_interface.py:3198
+#: ../src/disco.py:1846 ../src/gui_interface.py:3011
 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:2039
+#: ../src/disco.py:2057
 msgid "Subscribed"
 msgstr "Zasubskrybowano"
 
-#: ../src/disco.py:2047
+#: ../src/disco.py:2065
 msgid "Node"
 msgstr "Węzeł"
 
-#: ../src/disco.py:2111
+#: ../src/disco.py:2129
 msgid "New post"
 msgstr "Nowy wpis"
 
-#: ../src/disco.py:2117
+#: ../src/disco.py:2135
 msgid "_Subscribe"
 msgstr "_Autoryzuj"
 
-#: ../src/disco.py:2123
+#: ../src/disco.py:2141
 msgid "_Unsubscribe"
 msgstr "_Cofnij autoryzacjÄ™"
 
@@ -7834,17 +8051,19 @@ msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Przekształcanie wyrażeń jezyka LaTeX pomiędzy $$ $$."
 
 #: ../src/features_window.py:95
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
-"in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 "Wymaga texlive-latex-base, dvipng. Musisz ustawić zmienną 'use_latex' na "
 "'True'  w Zaawansowanym Edytorze Ustawień."
 
 #: ../src/features_window.py:96
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
+"You have to set 'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 "Wymaga texlive-latex-base, dvipng (Wszystko jest w MikTeX). Musisz ustawić "
 "zmienną 'use_latex' na 'True' w Zaawansowanym Edytorze Ustawień."
@@ -8000,34 +8219,34 @@ msgstr "Opis: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s chce przesłać Ci plik:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Nie można nadpisać pliku \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
 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:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 msgid "This file already exists"
 msgstr "Ten plik już istnieje"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 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:369 ../src/gtkgui_helpers.py:914
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Nie masz uprawnień do zapisu w folderze \"%s\""
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
 msgid "You do not have permission to create files in this directory."
 msgstr "Nie masz uprawnień do tworzenia plików w tym folderze."
 
@@ -8134,28 +8353,28 @@ msgstr ""
 "Wydaje się, że w tle działa już inna kopia Gajima.\n"
 "Czy mimo to chcesz uruchomić program?"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
 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:80
+#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
 msgid "command"
 msgstr "polecenie"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "pokaż pomoc polecenia"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Pokazuje lub ukrywa okno listy kontaktów"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Pokazuje okno z następną nieprzeczytaną wiadomością"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8163,6 +8382,13 @@ msgstr ""
 "Wyświetla listę wszystkich kontaktów. Każdy kontakt zostanie wyświetlony w "
 "osobnej linii"
 
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
+#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
+#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
+#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
 #: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
 #: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
 #: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
@@ -8174,43 +8400,35 @@ msgstr ""
 msgid "account"
 msgstr "konto"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "pokaż tylko kontakty z danego konta"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Wypisuje listÄ™ zarejestrowanych kont"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
 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:109
+#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106
 #, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"accoun't previous status"
+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:110 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
-msgid "message"
-msgstr "wiadomość"
-
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "informacja o statusie"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8219,45 +8437,21 @@ msgstr ""
 "zmienić status wszystkich kont, które mają ustawioną opcję synchronizacji ze "
 "statusem globalnym"
 
-#: ../src/gajim-remote.py:117
-msgid "Changes the priority of account or accounts"
-msgstr "Zmienia priorytet konta lub kont"
-
-#: ../src/gajim-remote.py:119
-msgid "priority"
-msgstr "priorytet"
-
-#: ../src/gajim-remote.py:119
-msgid "priority you want to give to the account"
-msgstr "priorytet, jaki chcesz nadać"
-
-#: ../src/gajim-remote.py:121
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-msgstr ""
-"zmień status podanego konta. Jeśli nie jest on określony, to spróbuj zmienić "
-"status wszystkich kont, które mają ustawioną opcję synchronizacji ze "
-"statusem globalnym"
-
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
 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:129
+#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID osoby, z którą chcesz porozmawiać"
 
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
 #: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 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:134
-msgid "message content. The account must be specified or \"\""
-msgstr ""
-
-#: ../src/gajim-remote.py:139
+#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
 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 "
@@ -8267,30 +8461,35 @@ msgstr ""
 "nie są wymagane. Jeśli chcesz ustawić jedynie 'konto' bez 'klucza OpenPGP', "
 "to ustaw 'klucz OpenPGP' na ''."
 
+#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
 #: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID osoby, która otrzyma wiadomość"
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
+#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "zawartość wiadomości"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "klucz pgp"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "jeśli jest podany, to wiadomość zostanie zaszyfrowana tym kluczem publicznym"
 
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
+#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "jeśli jest podane, to wiadomość zostanie wysłana z tego konta"
 
-#: ../src/gajim-remote.py:152
+#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
 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 "
@@ -8300,139 +8499,280 @@ msgstr ""
 "nie są wymagane. Jeśli chcesz ustawić jedynie 'konto' bez 'klucza OpenPGP', "
 "to ustaw 'klucz OpenPGP' na ''."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "temat"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "temat wiadomości"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Wysyła nową wiadomość na czat, w którym uczestniczysz."
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "JID pokoju, do którego zostanie wysłana wiadomość"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Pobiera szczegółowe informacje o kontakcie"
 
+#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
+#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
 #: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
 #: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID kontaktu"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Pobiera szczegółowe informacje o koncie"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Nazwa konta"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Wysyła plik kontaktowi"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "file"
 msgstr "plik"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Ścieżka do pliku"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "plik zostanie wysłany z tego konta, jeśli jest ono podane"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Wypisuje wszystkie opcje i ich wartości"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Ustawia wartość 'klucza' na 'wartość'."
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "klucz=wartość"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'klucz' jest nazwą opcji, 'wartość' zaś jest jej ustawianą wartością"
 
-#: ../src/gajim-remote.py:207
-msgid "Deletes a preference item"
-msgstr "Usuwa opcjÄ™"
+#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
+msgid "Deletes a preference item"
+msgstr "Usuwa opcjÄ™"
+
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "key"
+msgstr "klucz"
+
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "name of the preference to be deleted"
+msgstr "nazwa opcji do usunięcia"
+
+#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+msgid "Writes the current state of Gajim preferences to the .config file"
+msgstr "Zapisuje obecny stan opcji Gajima do pliku .config"
+
+#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
+msgid "Removes contact from roster"
+msgstr "Usuwa kontakt z listy kontaktów"
+
+#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+msgid "Adds contact to roster"
+msgstr "Dodaje kontakt do listy kontaktów"
+
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+msgid "Adds new contact to this account"
+msgstr "Dodaje nowy kontakt do tego konta"
+
+#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+msgid "Returns current status (the global one unless account is specified)"
+msgstr "Zwraca obecny status (globalny, chyba, że zostało wskazane konto)."
+
+#: ../src/gajim-remote-plugin.py:226
+#, fuzzy
+msgid ""
+"Returns current status message(the global one unless account is specified)"
+msgstr "Zwraca obecny status (globalny, chyba że zostało wskazane konto)."
+
+#: ../src/gajim-remote-plugin.py:233 ../src/gajim-remote.py:249
+msgid "Returns number of unread messages"
+msgstr "Zwraca liczbę nieprzeczytanych wiadomości"
+
+#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+msgid "Opens 'Start Chat' dialog"
+msgstr "Otwiera okno dialogowe 'Rozpocznij rozmowÄ™'"
+
+#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+msgid "Starts chat, using this account"
+msgstr "Rozpocznij rozmowÄ™ z tego konta"
+
+#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+msgid "Sends custom XML"
+msgstr "Wysyła własny XML"
+
+#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+msgid "XML to send"
+msgstr "XML do wysłania"
+
+#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+"Konto, na jaki zostanie wysłany XML. Jeżeli nie jest określone, Gajim wyśle "
+"dane do wszystkich kont"
+
+#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
+msgid "Handle a xmpp:/ uri"
+msgstr "Obsługuj URI xmpp:/"
+
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
+msgid "uri"
+msgstr "URI"
+
+#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+msgid "Join a MUC room"
+msgstr "Dołącz do nowego pokoju"
+
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+msgid "room"
+msgstr "pokój"
+
+#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+msgid "nick"
+msgstr "nick"
+
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+msgid "password"
+msgstr "hasło"
+
+#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+msgid "Check if Gajim is running"
+msgstr "Proszę sprawdzić czy Gajim jest uruchomiony."
+
+#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
+#: ../src/gajim-remote.py:300
+msgid "Shows or hides the ipython window"
+msgstr "Pokazuje lub ukrywa okno iptyhon"
+
+#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+msgid "Missing argument \"contact_jid\""
+msgstr "Brak argumentu \"contact_jid\""
+
+#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#, python-format
+msgid ""
+"'%s' is not in your roster.\n"
+"Please specify account for sending the message."
+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-plugin.py:328 ../src/gajim-remote.py:351
+msgid "You have no active account"
+msgstr "Żadne z twoich kont nie jest aktywne"
 
-#: ../src/gajim-remote.py:209
-msgid "key"
-msgstr "klucz"
+#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+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:209
-msgid "name of the preference to be deleted"
-msgstr "nazwa opcji do usunięcia"
+#: ../src/gajim-remote-plugin.py:412
+#, python-format
+msgid ""
+"Usage: %s %s %s \n"
+"\t %s"
+msgstr ""
+"Użycie: %s %s %s \n"
+"\t %s"
 
-#: ../src/gajim-remote.py:213
-msgid "Writes the current state of Gajim preferences to the .config file"
-msgstr "Zapisuje obecny stan opcji Gajima do pliku .config"
+#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+msgid "Arguments:"
+msgstr "Argumenty:"
 
-#: ../src/gajim-remote.py:218
-msgid "Removes contact from roster"
-msgstr "Usuwa kontakt z listy kontaktów"
+#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#, python-format
+msgid "%s not found"
+msgstr "Nie znaleziono %s"
 
-#: ../src/gajim-remote.py:227
-msgid "Adds contact to roster"
-msgstr "Dodaje kontakt do listy kontaktów"
+#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
+#, python-format
+msgid ""
+"Usage: %s command [arguments]\n"
+"Command is one of:\n"
+msgstr ""
+"Użycie: polecenie %s [argument]\n"
+"Gdzie polecenie to jedna z następujący fraz:\n"
 
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "jid"
+#: ../src/gajim-remote-plugin.py:496
+#, fuzzy, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Za dużo argumentów. \n"
+"Wpisz \"%(basename)s help %(command)s\" aby uzyskać więcej informacji"
 
-#: ../src/gajim-remote.py:230
-msgid "Adds new contact to this account"
-msgstr "Dodaje nowy kontakt do tego konta"
+#: ../src/gajim-remote-plugin.py:500
+#, fuzzy, python-format
+msgid ""
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Argument \"%(arg)s\" nie jest określony. \n"
+"Wpisz \"%(basename)s help %(command)s\" aby uzyskać więcej informacji"
 
-#: ../src/gajim-remote.py:235
-msgid "Returns current status (the global one unless account is specified)"
-msgstr "Zwraca obecny status (globalny, chyba, że zostało wskazane konto)."
+#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
+msgid "Wrong uri"
+msgstr "Błędny adres URI"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:109
+#, fuzzy
 msgid ""
-"Returns current status message (the global one unless account is specified)"
-msgstr "Zwraca obecny status (globalny, chyba że zostało wskazane konto)."
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
+msgstr ""
+"jeden z: rozłączony, dostępny, chętny do rozmowy, zaraz wracam, nieobecny, "
+"zajęty, niewidoczny "
 
-#: ../src/gajim-remote.py:249
-msgid "Returns number of unread messages"
-msgstr "Zwraca liczbę nieprzeczytanych wiadomości"
+#: ../src/gajim-remote.py:117
+msgid "Changes the priority of account or accounts"
+msgstr "Zmienia priorytet konta lub kont"
 
-#: ../src/gajim-remote.py:253
-msgid "Opens 'Start Chat' dialog"
-msgstr "Otwiera okno dialogowe 'Rozpocznij rozmowÄ™'"
+#: ../src/gajim-remote.py:119
+msgid "priority"
+msgstr "priorytet"
 
-#: ../src/gajim-remote.py:255
-msgid "Starts chat, using this account"
-msgstr "Rozpocznij rozmowÄ™ z tego konta"
+#: ../src/gajim-remote.py:119
+msgid "priority you want to give to the account"
+msgstr "priorytet, jaki chcesz nadać"
 
-#: ../src/gajim-remote.py:259
-msgid "Sends custom XML"
-msgstr "Wysyła własny XML"
+#: ../src/gajim-remote.py:121
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"zmień status podanego konta. Jeśli nie jest on określony, to spróbuj zmienić "
+"status wszystkich kont, które mają ustawioną opcję synchronizacji ze "
+"statusem globalnym"
 
-#: ../src/gajim-remote.py:261
-msgid "XML to send"
-msgstr "XML do wysłania"
+#: ../src/gajim-remote.py:134
+msgid "message content. The account must be specified or \"\""
+msgstr ""
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:242
 msgid ""
-"Account in which the xml will be sent; if not specified, xml will be sent to "
-"all accounts"
-msgstr ""
-"Konto, na jaki zostanie wysłany XML. Jeżeli nie jest określone, Gajim wyśle "
-"dane do wszystkich kont"
+"Returns current status message (the global one unless account is specified)"
+msgstr "Zwraca obecny status (globalny, chyba że zostało wskazane konto)."
 
 #: ../src/gajim-remote.py:268
 #, fuzzy
@@ -8453,14 +8793,6 @@ msgstr ""
 "Konto, na jaki zostanie wysłany XML. Jeżeli nie jest określone, Gajim wyśle "
 "dane do wszystkich kont"
 
-#: ../src/gajim-remote.py:277
-msgid "Handle a xmpp:/ uri"
-msgstr "Obsługuj URI xmpp:/"
-
-#: ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "URI"
-
 #: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr "URI do obsługi"
@@ -8473,30 +8805,14 @@ msgstr "Wskaż konto, z którym chcesz zsynchronizować kontakty"
 msgid "Message content"
 msgstr "Treść wiadomości"
 
-#: ../src/gajim-remote.py:286
-msgid "Join a MUC room"
-msgstr "Dołącz do nowego pokoju"
-
-#: ../src/gajim-remote.py:288
-msgid "room"
-msgstr "pokój"
-
 #: ../src/gajim-remote.py:288
 msgid "Room JID"
 msgstr "Pokój:"
 
-#: ../src/gajim-remote.py:289
-msgid "nick"
-msgstr "nick"
-
 #: ../src/gajim-remote.py:289
 msgid "Nickname to use"
 msgstr "Nick"
 
-#: ../src/gajim-remote.py:290
-msgid "password"
-msgstr "hasło"
-
 #: ../src/gajim-remote.py:290
 msgid "Password to enter the room"
 msgstr "Hasło do pokoju"
@@ -8505,35 +8821,6 @@ msgstr "Hasło do pokoju"
 msgid "Account from which you want to enter the room"
 msgstr "Wskaż konto, z którym chcesz wejść do pokoju"
 
-#: ../src/gajim-remote.py:296
-msgid "Check if Gajim is running"
-msgstr "Proszę sprawdzić czy Gajim jest uruchomiony."
-
-#: ../src/gajim-remote.py:300
-msgid "Shows or hides the ipython window"
-msgstr "Pokazuje lub ukrywa okno iptyhon"
-
-#: ../src/gajim-remote.py:327
-msgid "Missing argument \"contact_jid\""
-msgstr "Brak argumentu \"contact_jid\""
-
-#: ../src/gajim-remote.py:348
-#, python-format
-msgid ""
-"'%s' is not in your roster.\n"
-"Please specify account for sending the message."
-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:351
-msgid "You have no active account"
-msgstr "Żadne z twoich kont nie jest aktywne"
-
-#: ../src/gajim-remote.py:404
-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:431
 #, python-format
 msgid ""
@@ -8543,24 +8830,6 @@ msgstr ""
 "Użyto: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:435
-msgid "Arguments:"
-msgstr "Argumenty:"
-
-#: ../src/gajim-remote.py:439
-#, python-format
-msgid "%s not found"
-msgstr "Nie znaleziono %s"
-
-#: ../src/gajim-remote.py:445
-#, python-format
-msgid ""
-"Usage: %s command [arguments]\n"
-"Command is one of:\n"
-msgstr ""
-"Użycie: polecenie %s [argument]\n"
-"Gdzie polecenie to jedna z następujący fraz:\n"
-
 #: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
@@ -8583,10 +8852,6 @@ msgstr ""
 msgid "No uri given"
 msgstr ""
 
-#: ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Błędny adres URI"
-
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Motyw"
@@ -8612,182 +8877,180 @@ msgstr "Nie możesz skasować obecnie używanego motywu"
 msgid "Please first choose another for your current theme."
 msgstr "Ustaw najpierw inny motyw."
 
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:170
 msgid "Sending private message failed"
 msgstr "Wysyłanie prywatnej wiadomości nie powiodło się"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:171
+#: ../src/groupchat_control.py:172
 #, python-format
 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:450
+#: ../src/groupchat_control.py:455
 msgid "Insert Nickname"
 msgstr "Wstaw pseudonim"
 
-#: ../src/groupchat_control.py:631
+#: ../src/groupchat_control.py:636
 msgid "Conversation with "
 msgstr "Rozmowa z"
 
-#: ../src/groupchat_control.py:633
+#: ../src/groupchat_control.py:638
 msgid "Continued conversation"
 msgstr "Kontynuacja rozmowy"
 
-#. Can be a message (see handle_event_gc_config_change in
-#. gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1272 ../src/gui_interface.py:1080
+#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Każdy uczestnik może zobaczyć twój pełny JID"
 
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1286
 msgid "Room logging is enabled"
 msgstr "Zapisywanie rozmów prowadzonych w pokoju jest włączone"
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1288
 msgid "A new room has been created"
 msgstr "Został utworzony nowy pokój"
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1291
 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:1287
+#: ../src/groupchat_control.py:1297
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s został wyrzucony: %(reason)s"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1300
 #, 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:1300
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s został zabanowany: %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1312
 #, 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:1314 ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
 #, python-format
 msgid "You are now known as %s"
 msgstr "Występujesz teraz jako %s"
 
-#: ../src/groupchat_control.py:1330 ../src/gui_interface.py:919
+#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s występuje teraz jako %(new_nick)s"
 
-#: ../src/groupchat_control.py:1372 ../src/groupchat_control.py:1377
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1392
 #, 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:1374
+#: ../src/groupchat_control.py:1383
 msgid "affiliation changed"
 msgstr "afiliacja została zmieniona "
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1388
 msgid "room configuration changed to members-only"
 msgstr "konfiguracja pokoju zmieniona na 'tylko dla członków'"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1394
 msgid "system shutdown"
 msgstr "zamknięcie systemu"
 
-#: ../src/groupchat_control.py:1470
+#: ../src/groupchat_control.py:1477
 #, 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:1474
+#: ../src/groupchat_control.py:1481
 #, 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:1489
+#: ../src/groupchat_control.py:1496
 #, 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:1493
+#: ../src/groupchat_control.py:1500
 #, 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:1522
+#: ../src/groupchat_control.py:1530
 #, python-format
 msgid "%s has left"
 msgstr "%s wychodzi"
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1535
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s dołączył do pokoju"
 
-#: ../src/groupchat_control.py:1529 ../src/gui_interface.py:946
+#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
 #: ../src/history_window.py:447 ../src/notify.py:234
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s ma teraz status %(status)s"
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1774
 #, 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:1761
+#: ../src/groupchat_control.py:1776
 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:1765 ../src/gui_interface.py:1216
-#: ../src/gui_interface.py:1992 ../src/gui_interface.py:2029
-#: ../src/gui_interface.py:2064 ../src/message_window.py:224
-#: ../src/roster_window.py:2739 ../src/roster_window.py:3399
-#: ../src/roster_window.py:4123
+#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
+#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
+#: ../src/gui_interface.py:1853 ../src/message_window.py:224
+#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
+#: ../src/roster_window.py:4195
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Nie pytaj mnie o to ponownie"
 
-#: ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:1814
 msgid "Changing Subject"
 msgstr "Zmiana tematu"
 
-#: ../src/groupchat_control.py:1800
+#: ../src/groupchat_control.py:1815
 msgid "Please specify the new subject:"
 msgstr "Wpisz nowy temat:"
 
-#: ../src/groupchat_control.py:1807
+#: ../src/groupchat_control.py:1822
 msgid "Changing Nickname"
 msgstr "Zmiana pseudonimu"
 
-#: ../src/groupchat_control.py:1808
+#: ../src/groupchat_control.py:1823
 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:1839
+#: ../src/groupchat_control.py:1854
 #, python-format
 msgid "Destroying %s"
 msgstr "Usuwam pokój %s"
 
-#: ../src/groupchat_control.py:1840
+#: ../src/groupchat_control.py:1855
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8795,22 +9058,22 @@ msgstr ""
 "Zamierzasz całkowicie usunąć ten pokój. \n"
 "Poniżej możesz podać powód swojej decyzji:"
 
-#: ../src/groupchat_control.py:1842
+#: ../src/groupchat_control.py:1857
 msgid "You may also enter an alternate venue:"
 msgstr "Możesz również podać alternatywne miejsce spotkań:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2028
+#: ../src/groupchat_control.py:2046
 #, python-format
 msgid "Kicking %s"
 msgstr "Wyrzuć %s"
 
-#: ../src/groupchat_control.py:2029 ../src/groupchat_control.py:2356
+#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
 msgid "You may specify a reason below:"
 msgstr "Podaj przyczynÄ™:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2355
+#: ../src/groupchat_control.py:2373
 #, python-format
 msgid "Banning %s"
 msgstr "Zabanuj %s"
@@ -8836,56 +9099,65 @@ msgid "Details"
 msgstr "Szczegóły"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
+#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "błąd: nie można otworzyć %s do odczytu"
 
-#: ../src/gtkgui_helpers.py:400
+#: ../src/gtkgui_helpers.py:404
 msgid "Error reading file:"
 msgstr "BÅ‚Ä…d odczytu pliku:"
 
-#: ../src/gtkgui_helpers.py:403
+#: ../src/gtkgui_helpers.py:407
 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:444
+#: ../src/gtkgui_helpers.py:448
 #, 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:818
+#: ../src/gtkgui_helpers.py:822
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim nie jest domyślnym klinetem Jabbera"
 
-#: ../src/gtkgui_helpers.py:819
+#: ../src/gtkgui_helpers.py:823
 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:820
+#: ../src/gtkgui_helpers.py:824
 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:887
+#: ../src/gtkgui_helpers.py:891
 msgid "Extension not supported"
 msgstr "Rozszerzenie nie jest obsługiwane"
 
-#: ../src/gtkgui_helpers.py:888
+#: ../src/gtkgui_helpers.py:892
 #, 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:924
+#: ../src/gtkgui_helpers.py:928
 msgid "Save Image as..."
 msgstr "Zapisz plik jako..."
 
-#: ../src/gui_interface.py:140
+#. we are banned
+#. group chat does not exist
+#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
+#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
+#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
+#: ../src/gui_interface.py:348
+msgid "Unable to join group chat"
+msgstr "Nie można dołączyć do pokoju"
+
+#: ../src/gui_interface.py:138
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8896,58 +9168,92 @@ msgstr ""
 "innego w pokoju %s.\n"
 "Podaj inny pseudonim:"
 
-#: ../src/gui_interface.py:143
+#: ../src/gui_interface.py:141
 msgid "Always use this nickname when there is a conflict"
 msgstr "W przypadku konfliktu zawsze używaj tego pseudonimu"
 
-#: ../src/gui_interface.py:159
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Czy akceptujesz tę prośbę?"
 
-#: ../src/gui_interface.py:161
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Czy akceptujesz tę prośbę na koncie %s?"
 
-#: ../src/gui_interface.py:164
+#: ../src/gui_interface.py:163
 #, 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/gui_interface.py:213 ../src/notify.py:493
+#: ../src/gui_interface.py:209 ../src/notify.py:493
 msgid "Connection Failed"
 msgstr "Połączenie nie powiodło się"
 
-#: ../src/gui_interface.py:606 ../src/gui_interface.py:610
+#: ../src/gui_interface.py:312
+#, 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/gui_interface.py:324
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr "Osiągnięto maksymalną liczbę użytkowników dla %s"
+
+#: ../src/gui_interface.py:333
+#, python-format
+msgid "You are banned from group chat %s."
+msgstr "Zostałeś zabanowany w pokoju %s."
+
+#: ../src/gui_interface.py:338
+#, python-format
+msgid "Group chat %s does not exist."
+msgstr "Pokój %s nie istnieje."
+
+#: ../src/gui_interface.py:341
+msgid "Group chat creation is restricted."
+msgstr "Tworzenie pokoi jest ograniczone."
+
+#: ../src/gui_interface.py:344
+#, 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/gui_interface.py:349
+#, 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."
+
+#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "BÅ‚Ä…d %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:621 ../src/gui_interface.py:636
+#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "błąd przy wysyłaniu %(message)s ( %(error)s )"
 
-#: ../src/gui_interface.py:663 ../src/notify.py:495
+#: ../src/gui_interface.py:540 ../src/notify.py:495
 msgid "Subscription request"
 msgstr "Prośba o autoryzację"
 
-#: ../src/gui_interface.py:688
+#: ../src/gui_interface.py:565
 msgid "Authorization accepted"
 msgstr "Autoryzacja przyjęta"
 
-#: ../src/gui_interface.py:689
+#: ../src/gui_interface.py:566
 #, 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/gui_interface.py:702
+#: ../src/gui_interface.py:579
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" cofnÄ…Å‚ Ci autoryzacjÄ™"
 
-#: ../src/gui_interface.py:703
+#: ../src/gui_interface.py:580
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8955,59 +9261,54 @@ msgstr ""
 "Zawsze będziesz widział ten kontakt jako rozłączony.\n"
 "Czy chcesz go usunąć z listy kontaktów?"
 
-#: ../src/gui_interface.py:727 ../src/notify.py:497
+#: ../src/gui_interface.py:604 ../src/notify.py:497
 msgid "Unsubscribed"
 msgstr "Cofnij autoryzacjÄ™"
 
-#: ../src/gui_interface.py:754
+#: ../src/gui_interface.py:631
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Nie można ustanowić połączenia z \"%s\""
 
-#: ../src/gui_interface.py:1015
+#: ../src/gui_interface.py:859
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s ustawił temat na %(subject)s"
 
-#: ../src/gui_interface.py:1083
+#: ../src/gui_interface.py:926
 msgid "Room now shows unavailable member"
 msgstr "Lista zawiera teraz niedostępnych uczestników"
 
-#: ../src/gui_interface.py:1085
+#: ../src/gui_interface.py:928
 msgid "room now does not show unavailable members"
 msgstr "lista nie zawiera teraz niedostępnych użytkowników"
 
-#: ../src/gui_interface.py:1087
+#: ../src/gui_interface.py:930
 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/gui_interface.py:1091
+#: ../src/gui_interface.py:934
 msgid "Room logging is now enabled"
 msgstr "Logowanie rozmów prowadzonych w pokoju jest teraz włączone"
 
-#: ../src/gui_interface.py:1093
+#: ../src/gui_interface.py:936
 msgid "Room logging is now disabled"
 msgstr "Logowanie rozmów prowadzonych w pokoju jest teraz wyłączone"
 
-#: ../src/gui_interface.py:1095
+#: ../src/gui_interface.py:938
 msgid "Room is now non-anonymous"
 msgstr "Pokój nie jest już anonimowy"
 
-#: ../src/gui_interface.py:1098
+#: ../src/gui_interface.py:941
 msgid "Room is now semi-anonymous"
 msgstr "Pokój jest teraz quasi-anonimowy"
 
-#: ../src/gui_interface.py:1101
+#: ../src/gui_interface.py:944
 msgid "Room is now fully-anonymous"
 msgstr "Pokój jest teraz w pełni anonimowy"
 
-#: ../src/gui_interface.py:1133
-#, 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/gui_interface.py:1180
+#: ../src/gui_interface.py:985
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -9015,23 +9316,23 @@ msgstr ""
 "Skonfigurowałeś Gajima by używał agenta GPG, ale agent nie jest uruchomiony "
 "lub zwraca błędne hasło.\n"
 
-#: ../src/gui_interface.py:1182 ../src/gui_interface.py:1189
+#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Jesteś aktualnie połączony bez obsługi OpenPGP."
 
-#: ../src/gui_interface.py:1184
+#: ../src/gui_interface.py:989
 msgid "Your passphrase is incorrect"
 msgstr "Twoje hasło jest niepoprawne"
 
-#: ../src/gui_interface.py:1188
+#: ../src/gui_interface.py:993
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Niepoprawne hasło OpenPGP"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid "GPG key not trusted"
 msgstr "GPG nie jest zaufany"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
@@ -9039,7 +9340,7 @@ msgstr ""
 "Klucz GPG używany do szyfrowania tej rozmowy nie jest zaufany. Czyn naprawdę "
 "chcesz zaszyfrować tą wiadomość?"
 
-#: ../src/gui_interface.py:1226
+#: ../src/gui_interface.py:1031
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not                 correctly started "
@@ -9049,12 +9350,12 @@ msgstr ""
 "\tprawidłowo uruchomiony(zmienna środowiskowa prawdopodobnie nie jest \t\t\t"
 "\t właściwie ustawiona)"
 
-#: ../src/gui_interface.py:1330
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nowa poczta w skrzynce %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1332
+#: ../src/gui_interface.py:1133
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -9062,7 +9363,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/gui_interface.py:1345
+#: ../src/gui_interface.py:1146
 #, python-format
 msgid ""
 "\n"
@@ -9077,42 +9378,42 @@ msgstr ""
 "Temat: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1418
+#: ../src/gui_interface.py:1215
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s chce przesłać ci plik."
 
-#: ../src/gui_interface.py:1455 ../src/roster_window.py:1856
+#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
 msgid "Remote contact stopped transfer"
 msgstr "Druga strona przerwała transfer"
 
-#: ../src/gui_interface.py:1458 ../src/roster_window.py:1858
+#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
 msgid "Error opening file"
 msgstr "BÅ‚Ä…d odczytu pliku"
 
-#: ../src/gui_interface.py:1490
+#: ../src/gui_interface.py:1287
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Otrzymałeś plik %(filename)s od %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1494
+#: ../src/gui_interface.py:1291
 #, 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/gui_interface.py:1507
+#: ../src/gui_interface.py:1304
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Przesłałeś plik %(filename)s do %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1511
+#: ../src/gui_interface.py:1308
 #, 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/gui_interface.py:1623
+#: ../src/gui_interface.py:1426
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -9121,36 +9422,36 @@ msgstr ""
 "Nie można odszyfrować wiadomości od %s\n"
 "To mogło być sfałszowane."
 
-#: ../src/gui_interface.py:1630
+#: ../src/gui_interface.py:1433
 msgid "Unable to decrypt message"
 msgstr "Nie można odszyfrować wiadomości"
 
-#: ../src/gui_interface.py:1702
+#: ../src/gui_interface.py:1505
 msgid "Username Conflict"
 msgstr "Konflikt nazw użytkownika"
 
-#: ../src/gui_interface.py:1703
+#: ../src/gui_interface.py:1506
 msgid "Please type a new username for your local account"
 msgstr "Podaj nazwę użytkownika dla nowego konta lokalnego"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1519
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gui_interface.py:1729
+#: ../src/gui_interface.py:1532
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gui_interface.py:1740
+#: ../src/gui_interface.py:1543
 msgid "Error."
 msgstr "BÅ‚Ä…d."
 
-#: ../src/gui_interface.py:1768
+#: ../src/gui_interface.py:1556
 msgid "Resource Conflict"
 msgstr "Konflikt zasobów"
 
-#: ../src/gui_interface.py:1769
+#: ../src/gui_interface.py:1557
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -9159,20 +9460,20 @@ msgstr ""
 "podać nowy zasób"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1816
+#: ../src/gui_interface.py:1604
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s chce rozpocząć rozmowę głosową."
 
-#: ../src/gui_interface.py:1819
+#: ../src/gui_interface.py:1607
 msgid "Voice Chat Request"
 msgstr "Prośba o rozmowę głosową"
 
-#: ../src/gui_interface.py:1927
+#: ../src/gui_interface.py:1716
 msgid "Error verifying SSL certificate"
 msgstr "BÅ‚Ä…d podczas weryfikacji certyfikatu SSL"
 
-#: ../src/gui_interface.py:1928
+#: ../src/gui_interface.py:1717
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9183,15 +9484,15 @@ msgstr ""
 "%(error)s\n"
 "Czy ciagle chcesz się połączyć z serwerem?"
 
-#: ../src/gui_interface.py:1936
+#: ../src/gui_interface.py:1725
 msgid "Ignore this error for this certificate."
 msgstr "Ignoruj komunikat o tym błędzie."
 
-#: ../src/gui_interface.py:1956
+#: ../src/gui_interface.py:1745
 msgid "SSL certificate error"
 msgstr "BÅ‚Ä…d certyfikatu SSL"
 
-#: ../src/gui_interface.py:1957
+#: ../src/gui_interface.py:1746
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9208,12 +9509,12 @@ msgstr ""
 "\n"
 "Czy nadal chcesz połączyć się i zaktualizować odcisk klucza certyfikatu?"
 
-#: ../src/gui_interface.py:1987 ../src/gui_interface.py:2024
-#: ../src/gui_interface.py:2060
+#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
+#: ../src/gui_interface.py:1849
 msgid "Insecure connection"
 msgstr "Niezabezpieczone połączenie"
 
-#: ../src/gui_interface.py:1988
+#: ../src/gui_interface.py:1777
 #, fuzzy
 msgid ""
 "You are about to connect to the server with an insecure connection. This "
@@ -9223,12 +9524,12 @@ msgstr ""
 "Zamierzasz wysłać hasło wykorzystując niezabezpieczone połączenie. "
 "Powinieneś zainstalować PyOpenSSL by temu zapobiec. Czy jesteś pewien?"
 
-#: ../src/gui_interface.py:1991 ../src/gui_interface.py:2028
-#: ../src/gui_interface.py:2063
+#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
+#: ../src/gui_interface.py:1852
 msgid "Yes, I really want to connect insecurely"
 msgstr "Tak, na prawdę chce się połączyć w trybie niezaszyfrowanym"
 
-#: ../src/gui_interface.py:2025
+#: ../src/gui_interface.py:1814
 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?"
@@ -9236,7 +9537,7 @@ msgstr ""
 "Zamierzasz wysłać hasło wykorzystując niezabezpieczone połączenie. "
 "Powinieneś zainstalować PyOpenSSL by temu zapobiec. Czy jesteś pewien?"
 
-#: ../src/gui_interface.py:2061
+#: ../src/gui_interface.py:1850
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9246,11 +9547,11 @@ msgstr ""
 "pewien?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2624 ../src/gui_interface.py:2647
+#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
 msgid "Emoticons disabled"
 msgstr "Emotoikony wyłączone"
 
-#: ../src/gui_interface.py:2625
+#: ../src/gui_interface.py:2423
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -9258,7 +9559,7 @@ msgstr ""
 "Wybrany przez ciebie styl emotikonów nie został znaleziony, emotikony będą "
 "wyłączone."
 
-#: ../src/gui_interface.py:2648
+#: ../src/gui_interface.py:2446
 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 "
@@ -9268,40 +9569,40 @@ msgstr ""
 "potrzebować aktualizacji  formatu pliku emoticons.file. Aby poznać więcej "
 "szczegółów, zobacz http://trac.gajim.org/wiki/Emoticons."
 
-#: ../src/gui_interface.py:2679 ../src/roster_window.py:3560
+#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
 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/gui_interface.py:3058
+#: ../src/gui_interface.py:2871
 msgid "Could not save your settings and preferences"
 msgstr "Nie można zapisać twoich ustawień i opcji"
 
-#: ../src/gui_interface.py:3592
+#: ../src/gui_interface.py:3411
 msgid "Passphrase Required"
 msgstr "Wymagane hasło"
 
-#: ../src/gui_interface.py:3593
+#: ../src/gui_interface.py:3412
 #, 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/gui_interface.py:3607
+#: ../src/gui_interface.py:3426
 msgid "GPG key expired"
 msgstr "Klucz GPG stracił ważność"
 
-#: ../src/gui_interface.py:3608
+#: ../src/gui_interface.py:3427
 #, python-format
 msgid "Your GPG key has expired, 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/gui_interface.py:3617
+#: ../src/gui_interface.py:3436
 msgid "Wrong Passphrase"
 msgstr "Błędne hasło"
 
-#: ../src/gui_interface.py:3618
+#: ../src/gui_interface.py:3437
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 "Proszę ponownie wprowadzić swoje hasło GPG lub kliknąć przycisk Anuluj."
@@ -9340,6 +9641,11 @@ msgstr "Pseudonim"
 msgid "Message"
 msgstr "Wiadomość"
 
+#. holds subject
+#: ../src/history_manager.py:188 ../src/history_manager.py:219
+msgid "Subject"
+msgstr "Temat"
+
 #: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -9439,19 +9745,19 @@ msgstr "Ty zamierzasz zamknąć wszystkie zakładki"
 msgid "Do you really want to close them all?"
 msgstr "Czy na pewno chcesz zamknąć wszystkie?"
 
-#: ../src/message_window.py:484
+#: ../src/message_window.py:485
 msgid "Chats"
 msgstr "Rozmowy"
 
-#: ../src/message_window.py:486
+#: ../src/message_window.py:487
 msgid "Group Chats"
 msgstr "Czaty"
 
-#: ../src/message_window.py:488
+#: ../src/message_window.py:489
 msgid "Private Chats"
 msgstr "Rozmowy prywatne"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:495
 msgid "Messages"
 msgstr "Wiadomości"
 
@@ -9507,56 +9813,56 @@ msgstr "Nowa wiadomość od %(nickname)s"
 msgid "Ignore"
 msgstr "Ignoruj"
 
-#: ../src/profile_window.py:57
+#: ../src/profile_window.py:58
 msgid "Retrieving profile..."
 msgstr "Pobieranie profilu..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2935
+#: ../src/profile_window.py:111 ../src/roster_window.py:3001
 msgid "File is empty"
 msgstr "Plik jest pusty"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2938
+#: ../src/profile_window.py:114 ../src/roster_window.py:3004
 msgid "File does not exist"
 msgstr "Plik nie istnieje."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2940 ../src/roster_window.py:2951
+#: ../src/profile_window.py:128 ../src/profile_window.py:144
+#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
 msgid "Could not load image"
 msgstr "Nie można załadować obrazka."
 
-#: ../src/profile_window.py:214
+#: ../src/profile_window.py:215
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Informacje o kontakcie"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:216
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Format: RRRR-MM-DD"
 
-#: ../src/profile_window.py:269
+#: ../src/profile_window.py:270
 msgid "Information received"
 msgstr "Informacja została odebrana"
 
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:341
 msgid "Without a connection you can not publish your contact information."
 msgstr "Nie możesz wysłać informacji o sobie jeśli nie jesteś połączony."
 
-#: ../src/profile_window.py:353
+#: ../src/profile_window.py:354
 msgid "Sending profile..."
 msgstr "Wysyłanie profilu..."
 
-#: ../src/profile_window.py:368
+#: ../src/profile_window.py:369
 msgid "Information NOT published"
 msgstr "Informacja NIE ZOSTAŁA opublikowana"
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:376
 msgid "vCard publication failed"
 msgstr "Publikacja vCard nie powiodła się"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:377
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9564,53 +9870,53 @@ msgstr ""
 "W czasie publikowanie informacji o tobie wystąpił błąd, spróbuj ponownie "
 "później."
 
-#: ../src/roster_window.py:256 ../src/roster_window.py:1012
+#: ../src/roster_window.py:262 ../src/roster_window.py:1026
 msgid "Merged accounts"
 msgstr "Połączone konta"
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1942
 msgid "Authorization has been sent"
 msgstr "Autoryzacja została wysłana"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1943
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Teraz \"%s\" będzie znał Twój status."
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1966
 msgid "Subscription request has been sent"
 msgstr "Prośba o autoryzację została wysłana"
 
-#: ../src/roster_window.py:1944
+#: ../src/roster_window.py:1967
 #, 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:1958
+#: ../src/roster_window.py:1981
 msgid "Authorization has been removed"
 msgstr "Autoryzacja została cofnięta"
 
-#: ../src/roster_window.py:1959
+#: ../src/roster_window.py:1982
 #, 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:1986
+#: ../src/roster_window.py:2009
 msgid "GPG is not usable"
 msgstr "GPG nie nadaje się do użycia"
 
-#: ../src/roster_window.py:1987
+#: ../src/roster_window.py:2010
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Zostanie połączony z %s bez obsługi OpenPGP."
 
-#: ../src/roster_window.py:2199 ../src/roster_window.py:3496
+#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
 msgid "You are participating in one or more group chats"
 msgstr "Znajdujesz siÄ™ w jednym lub kilku pokojach"
 
-#: ../src/roster_window.py:2200 ../src/roster_window.py:3497
+#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9618,38 +9924,38 @@ msgstr ""
 "Zmiana statusu na Niewidoczny spowoduje rozłaczeniem z tym pokojami. Czy na "
 "pewno chcesz stać się niewidoczny?"
 
-#: ../src/roster_window.py:2226
+#: ../src/roster_window.py:2249
 msgid "desync'ed"
 msgstr "rozsynchronizowany"
 
-#: ../src/roster_window.py:2288
+#: ../src/roster_window.py:2311
 msgid "Really quit Gajim?"
 msgstr "Na pewno zamknąć Gajima?"
 
-#: ../src/roster_window.py:2289
+#: ../src/roster_window.py:2312
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Na pewno chcesz opuścić program?"
 
-#: ../src/roster_window.py:2290
+#: ../src/roster_window.py:2313
 msgid "Always close Gajim"
 msgstr "Zawsze zamykaj Gajima"
 
-#: ../src/roster_window.py:2373
+#: ../src/roster_window.py:2396
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Usuwa transfer pliku"
 
-#: ../src/roster_window.py:2374
+#: ../src/roster_window.py:2397
 msgid ""
-"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2405 ../src/roster_window.py:2653
+#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
 msgid "You have unread messages"
 msgstr "Masz nieprzeczytane wiadomości"
 
-#: ../src/roster_window.py:2406
+#: ../src/roster_window.py:2429
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9657,16 +9963,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:2654
+#: ../src/roster_window.py:2720
 msgid "You must read them before removing this transport."
 msgstr "Przejrzyj je wszystkie przed usunięciem tego transportu."
 
-#: ../src/roster_window.py:2657
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" zostanie usunięty"
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2724
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9674,11 +9980,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:2661
+#: ../src/roster_window.py:2727
 msgid "Transports will be removed"
 msgstr "Transporty zostaną usunięte"
 
-#: ../src/roster_window.py:2666
+#: ../src/roster_window.py:2732
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9687,11 +9993,11 @@ msgstr ""
 "Nie będziesz już mógł wysyłać i odbierać wiadomości od kontaktów za pomocą "
 "następujących transportów: %s"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2800
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Czy na pewno chcesz zablokować kontakt?"
 
-#: ../src/roster_window.py:2736
+#: ../src/roster_window.py:2802
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -9700,57 +10006,57 @@ msgstr ""
 "żadnych komunikatów."
 
 #. it's jid
-#: ../src/roster_window.py:2827
+#: ../src/roster_window.py:2893
 msgid "Rename Contact"
 msgstr "Zmień nazwę dla kontaktu"
 
-#: ../src/roster_window.py:2828
+#: ../src/roster_window.py:2894
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Wpisz nazwÄ™ dla kontaktu %s."
 
-#: ../src/roster_window.py:2835
+#: ../src/roster_window.py:2901
 msgid "Rename Group"
 msgstr "Zmień nazwę grupy"
 
-#: ../src/roster_window.py:2836
+#: ../src/roster_window.py:2902
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Wpisz nowÄ… nazwÄ™ dla grupy %s."
 
-#: ../src/roster_window.py:2881
+#: ../src/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Usuń grupę"
 
-#: ../src/roster_window.py:2882
+#: ../src/roster_window.py:2948
 #, 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:2883
+#: ../src/roster_window.py:2949
 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:2922
+#: ../src/roster_window.py:2988
 msgid "Assign OpenPGP Key"
 msgstr "Przypisz klucz OpenPGP"
 
-#: ../src/roster_window.py:2923
+#: ../src/roster_window.py:2989
 msgid "Select a key to apply to the contact"
 msgstr "Wybierz klucz, który chcesz przypisać kontaktowi"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3372
 #, 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:3308
+#: ../src/roster_window.py:3374
 #, 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:3313
+#: ../src/roster_window.py:3379
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9759,11 +10065,11 @@ msgstr ""
 "będzie zawsze widział Cię jako rozłączonego."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3319
+#: ../src/roster_window.py:3385
 msgid "Do you want to continue?"
 msgstr "Czy chcesz kontynuować?"
 
-#: ../src/roster_window.py:3323
+#: ../src/roster_window.py:3389
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9771,16 +10077,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:3326
+#: ../src/roster_window.py:3392
 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:3330
+#: ../src/roster_window.py:3396
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakty zostaną usunięte z twojej listy kontaktów"
 
-#: ../src/roster_window.py:3335
+#: ../src/roster_window.py:3401
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9790,32 +10096,32 @@ msgstr ""
 "cofniesz im również autoryzację, co spowoduje, że będziesz dla nich widoczny "
 "jako rozłączony."
 
-#: ../src/roster_window.py:3393
+#: ../src/roster_window.py:3459
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want  to continue?"
 msgstr "Chcesz ustawić indywidualny status. Na pewno chcesz kontynuować?"
 
-#: ../src/roster_window.py:3395
+#: ../src/roster_window.py:3461
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he or she will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3414
+#: ../src/roster_window.py:3480
 msgid "No account available"
 msgstr "Żadne konto nie jest dostępne"
 
-#: ../src/roster_window.py:3415
+#: ../src/roster_window.py:3481
 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:4023
+#: ../src/roster_window.py:4095
 msgid "Metacontacts storage not supported by your server"
 msgstr "Twój serwer uniemożliwia przechowywanie metakontaktów"
 
-#: ../src/roster_window.py:4025
+#: ../src/roster_window.py:4097
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9823,12 +10129,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:4117
+#: ../src/roster_window.py:4189
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Chcesz utworzyć metakontakt. Kontynuować?"
 
-#: ../src/roster_window.py:4119
+#: ../src/roster_window.py:4191
 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 "
@@ -9838,11 +10144,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:4234
+#: ../src/roster_window.py:4306
 msgid "Invalid file URI:"
 msgstr "Niepoprawny adres pliku:"
 
-#: ../src/roster_window.py:4246
+#: ../src/roster_window.py:4318
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9850,12 +10156,12 @@ 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:4361
+#: ../src/roster_window.py:4433
 #, python-format
 msgid "Send %s to %s"
 msgstr "Wyślij %s do %s"
 
-#: ../src/roster_window.py:4367
+#: ../src/roster_window.py:4439
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Przekształć %s oraz %s w metakontakty"
@@ -9865,143 +10171,143 @@ msgstr "Przekształć %s oraz %s w metakontakty"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4816 ../src/roster_window.py:4889
-#: ../src/roster_window.py:4898 ../src/statusicon.py:246
-#: ../src/statusicon.py:293 ../src/statusicon.py:299
+#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
+#: ../src/roster_window.py:4970 ../src/statusicon.py:263
+#: ../src/statusicon.py:310 ../src/statusicon.py:316
 #, python-format
 msgid "using account %s"
 msgstr "używając konta %s"
 
 #. add
-#: ../src/roster_window.py:4905
+#: ../src/roster_window.py:4977
 #, python-format
 msgid "to %s account"
 msgstr "do konta %s"
 
 #. disco
-#: ../src/roster_window.py:4910
+#: ../src/roster_window.py:4982
 #, python-format
 msgid "using %s account"
 msgstr "używając konta %s"
 
-#: ../src/roster_window.py:4948 ../src/statusicon.py:309
+#: ../src/roster_window.py:5020 ../src/statusicon.py:326
 msgid "_Manage Bookmarks..."
 msgstr "_Zarządzaj zakładkami..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4968
+#: ../src/roster_window.py:5040
 #, python-format
 msgid "of account %s"
 msgstr "dla konta %s"
 
-#: ../src/roster_window.py:5009
+#: ../src/roster_window.py:5081
 #, python-format
 msgid "for account %s"
 msgstr "dla konta %s"
 
-#: ../src/roster_window.py:5069 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
 msgid "_Change Status Message"
 msgstr "_Zmień opis statusu"
 
-#: ../src/roster_window.py:5102
+#: ../src/roster_window.py:5174
 msgid "Publish Tune"
 msgstr "_Publikuj Utwór"
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5176
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Publikuj Utwór"
 
-#: ../src/roster_window.py:5107
+#: ../src/roster_window.py:5179
 msgid "Configure Services..."
 msgstr "Konfiguruj Usługi..."
 
-#: ../src/roster_window.py:5252
+#: ../src/roster_window.py:5324
 msgid "_Maximize All"
 msgstr "_Maksymalizuj wszystkie"
 
-#: ../src/roster_window.py:5262 ../src/roster_window.py:5436
+#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
 msgid "Send Group M_essage"
 msgstr "_Wyślij wiadomość grupową"
 
-#: ../src/roster_window.py:5270
+#: ../src/roster_window.py:5342
 msgid "To all users"
 msgstr "Do wszystkich użytkowników"
 
-#: ../src/roster_window.py:5274
+#: ../src/roster_window.py:5346
 msgid "To all online users"
 msgstr "Do wszystkich połączonych użytkowników"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5456
+#: ../src/roster_window.py:5528
 msgid "_Manage Contacts"
 msgstr "_ZarzÄ…dzaj kontaktami"
 
 #. Edit Groups
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5537
 msgid "Edit _Groups"
 msgstr "Modyfikuj _grupy"
 
 #. Send single message
-#: ../src/roster_window.py:5520
+#: ../src/roster_window.py:5592
 msgid "Send Single Message"
 msgstr "Wyślij wiadomość"
 
 #. Execute Command
-#: ../src/roster_window.py:5567
+#: ../src/roster_window.py:5639
 msgid "Execute Command..."
 msgstr "Wykonaj komendÄ™..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5577
+#: ../src/roster_window.py:5649
 msgid "_Manage Transport"
 msgstr "_ZarzÄ…dzaj transportami"
 
 #. Modify Transport
-#: ../src/roster_window.py:5586
+#: ../src/roster_window.py:5658
 msgid "_Modify Transport"
 msgstr "_Modyfikuj transport"
 
 #. Rename
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5668
 msgid "_Rename"
 msgstr "_Zmień nazwę"
 
-#: ../src/roster_window.py:5656
+#: ../src/roster_window.py:5728
 msgid "_Maximize"
 msgstr "_Maksymalizuj"
 
-#: ../src/roster_window.py:5665
+#: ../src/roster_window.py:5737
 msgid "_Reconnect"
 msgstr "_Połącz ponownie"
 
-#: ../src/roster_window.py:5672
+#: ../src/roster_window.py:5744
 msgid "_Disconnect"
 msgstr "_Rozłącz"
 
 #. History manager
-#: ../src/roster_window.py:5754
+#: ../src/roster_window.py:5833
 msgid "History Manager"
 msgstr "Historia rozmów"
 
-#: ../src/roster_window.py:5765
+#: ../src/roster_window.py:5844
 msgid "_Join New Group Chat"
 msgstr "_Dołącz do pokoju"
 
-#: ../src/roster_window.py:5938
+#: ../src/roster_window.py:6019
 msgid "Change Status Message..."
 msgstr "Zmień opis statusu..."
 
-#: ../src/search_window.py:94
+#: ../src/search_window.py:105
 msgid "Waiting for results"
 msgstr "Oczekiwanie na wyniki"
 
-#: ../src/search_window.py:132 ../src/search_window.py:210
+#: ../src/search_window.py:143 ../src/search_window.py:220
 msgid "Error in received dataform"
 msgstr "BÅ‚Ä…d w odebranych danych"
 
 #. No result
-#: ../src/search_window.py:166 ../src/search_window.py:202
+#: ../src/search_window.py:177 ../src/search_window.py:212
 msgid "No result"
 msgstr "Brak wyników"
 
@@ -10014,14 +10320,15 @@ msgstr "BÅ‚Ä…d zapisu na dysk"
 msgid "Subject: %s"
 msgstr "Temat: %s"
 
-#: ../src/session.py:433 ../src/session.py:468
+#: ../src/session.py:447 ../src/session.py:491
 msgid "Confirm these session options"
 msgstr "Potwierdź opcje sesji"
 
-#: ../src/session.py:435
+#: ../src/session.py:448
 #, fuzzy, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
+"The remote client wants '\n"
+"                            'to negotiate an session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -10034,7 +10341,7 @@ msgstr ""
 "\n"
 "\t\tCzy akceptujesz te ustawienia?"
 
-#: ../src/session.py:469
+#: ../src/session.py:492
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10049,16 +10356,16 @@ msgstr ""
 "\n"
 "Kontynuować?"
 
-#: ../src/statusicon.py:210
+#: ../src/statusicon.py:227
 msgid "_Change Status Message..."
 msgstr "_Zmień opis statusu..."
 
-#: ../src/statusicon.py:322
+#: ../src/statusicon.py:339
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "w _liście kontaktów"
 
-#: ../src/statusicon.py:333
+#: ../src/statusicon.py:350
 msgid "Hide this menu"
 msgstr "Ukryj to menu"
 
@@ -10197,32 +10504,32 @@ 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:251
+#: ../src/vcard.py:265
 msgid "?Client:Unknown"
 msgstr "?Klient: Nieznany"
 
-#: ../src/vcard.py:253
+#: ../src/vcard.py:267
 msgid "?OS:Unknown"
 msgstr "?System operacyjny: Nieznany"
 
-#: ../src/vcard.py:274
+#: ../src/vcard.py:288
 msgid "?Time:Unknown"
 msgstr "?Czas: Nieznany"
 
-#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
+#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:345
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:349
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Grupy:</b>"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:357
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10230,7 +10537,7 @@ msgstr ""
 "Ten kontakt jest zaintersowany informacjami o twoim statusie, ale ty nie "
 "interesujesz siÄ™ jego/jej statusem."
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:359
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10238,12 +10545,12 @@ msgstr ""
 "JesteÅ› zainteresowany informacjami o statusie tego kontaktu, ale on/ona nie "
 "jest zainteresowana twoim."
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:361
 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:349
+#: ../src/vcard.py:363
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10251,26 +10558,70 @@ msgstr ""
 "Nie jesteś zainteresowany informacjami o statusie kontaktu i on również nie "
 "jest zainteresowany twoim"
 
-#: ../src/vcard.py:356
+#: ../src/vcard.py:370
 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:358
+#: ../src/vcard.py:372
 msgid "There is no pending subscription request."
 msgstr "Nie ma oczekujących żądań autoryzacji."
 
-#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
+#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
 msgid " resource with priority "
 msgstr " zasób o wysokim priorytecie "
 
-#~ msgid "_Available"
-#~ msgstr "_Dostępny"
+#~ msgid "@"
+#~ msgstr "@"
+
+#~ msgid "_Disable showing event in systray"
+#~ msgstr "Wyłącz pokazywanie _zdarzenia w obszarze powiadamiania"
+
+#~ msgid "_Show event in systray"
+#~ msgstr "Pokaż _zdarzenie w obszarze powiadamiania"
+
+#, fuzzy
+#~ msgid "Always use GNOME default applications"
+#~ msgstr "Zawsze używaj domyślnych apikacji OS X"
+
+#, fuzzy
+#~ msgid "Always use Xfce default applications"
+#~ msgstr "Zawsze używaj domyślnych apikacji OS X"
+
+#, fuzzy
+#~ msgid "Autodetect on every Gajim startup"
+#~ msgstr "P_ołącz przy starcie programu"
+
+#~ msgid "Show systray:"
+#~ msgstr "Pokaż _zdarzenie w obszarze powiadamiania"
+
+#~ msgid "Nickname not allowed: %s"
+#~ msgstr "Pseudonim jest niedozwolony: %s"
+
+#~ msgid "Room has been destroyed"
+#~ msgstr "Pokój został usunięty"
 
-#~ msgid "PEP node was not removed"
-#~ msgstr "Węzeł PEP nie został usunięty"
+#~ msgid "You can join this room instead: %s"
+#~ msgstr "W zamian możesz dołączyć do pokoju %s"
 
-#~ msgid "PEP node %(node)s was not removed: %(message)s"
-#~ msgstr "Węzeł PEP %(node)s nie został usunięty: %(message)s"
+#~ msgid "I would like to add you to my roster."
+#~ msgstr "Chciałbym dodać Cię do listy kontaktów."
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "Zapisaliśmy się do %s"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "Prośba o cofnięcie autoryzacji od %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "Wypisaliśmy się z %s"
+
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "Jid %s nie jest kompatybilny z RFC. Nie zostanie dodany do listy "
+#~ "kontaktów. Skorzystaj z narzędzi do zarządzania listą kontaktów, takich "
+#~ "jak http://jru.jabberstudio.org/ aby go usunąć"
 
 #~ msgid "Account Modification"
 #~ msgstr "Modyfikacja konta"
@@ -10379,45 +10730,9 @@ msgstr " zasób o wysokim priorytecie "
 #~ msgid "gtk-delete"
 #~ msgstr "gtk-delete"
 
-#~ msgid "Add this contact to roster (Ctrl+D)"
-#~ msgstr "Dodaje kontakt do listy kontaktów (Ctrl+D)"
-
-#~ msgid "Bookmark this room (Ctrl+B)"
-#~ msgstr "Dodaj pokój do zakładek (Ctrl+B)"
-
-#~ msgid "Browse the chat history (Ctrl+H)"
-#~ msgstr "Historia wiadomości (Ctrl+H)"
-
-#~ msgid "Change the room's subject (Alt+T)"
-#~ msgstr "Zmień temat pokoju (Ctrl+T)"
-
-#~ msgid "Change your nickname (Ctrl+N)"
-#~ msgstr "Zmień swoją nazwę (Ctrl+N)"
-
-#~ msgid "Invite contacts to the conversation (Ctrl+G)"
-#~ msgstr "ZaproÅ› kontakt do rozmowy (Ctrl+G)"
-
 #~ msgid "Send a file (Ctrl+F)"
 #~ msgstr "Wyślij plik (Ctrl+F)"
 
-#~ msgid "Show a list of emoticons (Alt+M)"
-#~ msgstr "Kliknij by wyświetlić listę emotikon (Alt+M)"
-
-#~ msgid "Show a list of formattings"
-#~ msgstr "Pokaż formatowanie tekstu"
-
-#~ msgid "Show a menu of advanced functions (Alt+D)"
-#~ msgstr "Pokaż menu zaawansowanych funkcji (Alt+D)"
-
-#~ msgid "Show the contact's profile (Ctrl+I)"
-#~ msgstr "Pokaż profil kontaktu (Ctrl+I)"
-
-#~ msgid "Toggle audio session"
-#~ msgstr "Przełącz sesję audio"
-
-#~ msgid "Toggle video session"
-#~ msgstr "Przełącz sesję wideo"
-
 #~ msgid ""
 #~ "All chat states\n"
 #~ "Composing only\n"
@@ -10476,9 +10791,6 @@ msgstr " zasób o wysokim priorytecie "
 #~ msgid "gtk-cancel"
 #~ msgstr "gtk-cancel"
 
-#~ msgid "_Preferences"
-#~ msgstr "_Ustawienia"
-
 #~ msgid "_Quit"
 #~ msgstr "_Zakończ"
 
@@ -10882,20 +11194,10 @@ msgstr " zasób o wysokim priorytecie "
 #~ msgid "sleeping"
 #~ msgstr "ÅšpiÄ™"
 
-#~ msgid "other"
-#~ msgstr "Inne czynności"
-
 #, fuzzy
 #~ msgid "mood"
 #~ msgstr "markotny"
 
-#~ msgid ""
-#~ "Usage: %s %s %s \n"
-#~ "\t %s"
-#~ msgstr ""
-#~ "Użycie: %s %s %s \n"
-#~ "\t %s"
-
 #~ msgid "%s - %s"
 #~ msgstr "%s - %s"
 
@@ -11254,9 +11556,6 @@ msgstr " zasób o wysokim priorytecie "
 #~ msgid "Save _position and size for roster and chat windows"
 #~ msgstr "Zapisz _pozycję i rozmiar okna kontaktów i okna rozmowy"
 
-#~ msgid "Use t_rayicon (aka. notification area icon)"
-#~ msgstr "_Ikona w obszarze powiadamiania"
-
 #~ msgid ""
 #~ "When a new event (message, file transfer request etc..) is received, the "
 #~ "following methods may be used to inform you about it. Please note that "
diff --git a/po/pt.po b/po/pt.po
index 1de4f634f21c45a60ca91e2297322279b7960678..4e844586d76e7c0cc03faa253335963674fd467d 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,11 +2,15 @@
 # Copyright (C) 2005 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the Gajim package.
 #
+#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 11:28+0200\n"
+"POT-Creation-Date: 2010-10-01 20:39+0200\n"
 "PO-Revision-Date: 2005-08-18 18:21-0300\n"
 "Last-Translator: Miguel Fonseca <miguelcsf@gmail.com>\n"
 "Language-Team: none\n"
@@ -24,7 +28,7 @@ msgstr "_Entrar num Chat..."
 msgid "_Add Contact..."
 msgstr "_Adicionar Contacto"
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:17
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
 msgid "_Discover Services"
 msgstr "_Descobrir Recursos"
 
@@ -48,7 +52,7 @@ msgstr "_Abrir Compositor de Email"
 msgid "_Personal Events"
 msgstr "Detalhes Pessoais..."
 
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:23
+#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
 #, fuzzy
 msgid "_Start Chat..."
 msgstr "_Iniciar Conversa"
@@ -83,77 +87,73 @@ msgid "<b>Please select a server</b>"
 msgstr ""
 
 #: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid "@"
-msgstr ""
-
-#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
 msgstr ""
 
-#: ../data/gui/account_creation_wizard_window.ui.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:10
 #, fuzzy
 msgid "Anon_ymous authentication"
 msgstr "Usar autenticação"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Connect when I press Finish"
 msgstr "Ligar quando eu premir Concluir"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Criação Passo-a-passo de uma Conta"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 #, fuzzy
 msgid "I already have an account I want to _use"
 msgstr "Já tenho uma conta e quero usá-la"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I want to _register for a new account"
 msgstr "Quero _registar uma nova conta"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:16
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 #: ../data/gui/accounts_window.ui.h:28
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Se marcado, o Gajim lembrar-se-á da senha para esta conta"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:17
+#: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Gerir..."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:18
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
 #: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2263 ../src/config.py:2342
-#: ../src/config.py:2355 ../src/config.py:3596 ../src/config.py:3671
-#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513
-#: ../src/dialogs.py:526 ../src/roster_window.py:2890
-#: ../src/roster_window.py:2896 ../src/roster_window.py:2901
+#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
+#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
+#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
+#: ../src/dialogs.py:527 ../src/roster_window.py:2956
+#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
 msgid "None"
 msgstr "Nenhum"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:19
+#: ../data/gui/account_creation_wizard_window.ui.h:18
 #, fuzzy
 msgid "Prox_y:"
 msgstr "Proxy:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #: ../data/gui/accounts_window.ui.h:48
 msgid "Save pass_word"
 msgstr "Guardar _senha"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:21
+#: ../data/gui/account_creation_wizard_window.ui.h:20
 #, fuzzy
 msgid "Set my profile when I connect"
 msgstr "Definir uma imagem pessoal (avatar) quando me ligo"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:22
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Use custom hostname/port"
 msgstr "Usar hostname/porta personalizados"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:23
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -161,35 +161,35 @@ msgstr ""
 "Necessita de uma conta para se poder ligar\n"
 "à rede Jabber."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-#: ../data/gui/roster_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:16
 msgid "_Advanced"
 msgstr "Avançado"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:25
 msgid "_Finish"
 msgstr "_Terminar"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:27
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 #, fuzzy
 msgid "_Hostname:"
 msgstr "Nome do Host:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #: ../data/gui/accounts_window.ui.h:62
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:28
 #: ../data/gui/accounts_window.ui.h:64
 msgid "_Password:"
 msgstr "_Senha:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:29
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:31
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Server:"
 msgstr "_Servidor:"
 
@@ -302,17 +302,17 @@ msgstr "Nome:"
 #. No configured account
 #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
 #: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592
-#: ../src/notify.py:608
+#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
+#: ../src/notify.py:616
 msgid "Gajim"
 msgstr "Gajim"
 
 #. FIXME: Ugly workaround.
 #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
 #. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:61
-#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121
-#: ../src/roster_window.py:2832 ../src/roster_window.py:5379
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
+#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
 msgid "General"
 msgstr "Geral"
 
@@ -366,7 +366,7 @@ msgstr "Informações sobre si, tal como estão gravadas no servidor"
 
 #: ../data/gui/accounts_window.ui.h:35
 #: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:830
+#: ../src/dialogs.py:831
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -382,7 +382,7 @@ msgid "Mer_ge accounts"
 msgstr "_Fundir contas"
 
 #: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2356
+#: ../src/config.py:2358
 msgid "No key selected"
 msgstr "Nenhuma chave seleccionada"
 
@@ -409,7 +409,7 @@ msgid "Priority will change automatically according to your status."
 msgstr ""
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5329
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
 msgid "Re_name"
 msgstr "Re_nomear"
 
@@ -654,41 +654,46 @@ msgstr "Apaga a Mensagem do Dia"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
 #, fuzzy
+msgid "Edit Archi_ving Preferences"
+msgstr "_Preferências"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#, fuzzy
 msgid "Edit _Privacy Lists..."
 msgstr "Iniciar Conversa"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 #, fuzzy
 msgid "Sends a message to users currently connected to this server"
 msgstr "Envia uma mensagem aos utilizadores ligados ao servidor neste momento"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 #, fuzzy
 msgid "Set MOTD..."
 msgstr "Definir MOTD"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Define a Mensagem do Dia"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Show _XML Console"
 msgstr "Mostrar Consola _XML"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "Actualizar MOTD"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "Actualiza a Mensagem do Dia"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:11
 msgid "_Administrator"
 msgstr "_Administrador"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:11
+#: ../data/gui/advanced_menuitem_menu.ui.h:12
 #, fuzzy
 msgid "_Send Server Message..."
 msgstr "E_nviar Mensagem de Servidor"
@@ -728,7 +733,7 @@ msgid "All statuses"
 msgstr "Estado: "
 
 #: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:233
+#: ../src/common/commands.py:106 ../src/common/helpers.py:239
 #: ../src/tooltips.py:193
 msgid "Away"
 msgstr "Ausente"
@@ -781,7 +786,7 @@ msgid "Have "
 msgstr ""
 
 #: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:249
 msgid "Invisible"
 msgstr "Invisível"
 
@@ -791,7 +796,7 @@ msgid "Launch a command"
 msgstr "comando"
 
 #: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:216 ../src/tooltips.py:197
+#: ../src/common/helpers.py:222 ../src/tooltips.py:197
 msgid "Not Available"
 msgstr "Indisponível"
 
@@ -837,11 +842,11 @@ msgid "_Disable existing sound for this event"
 msgstr ""
 
 #: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in roster"
+msgid "_Disable showing event in notification area"
 msgstr ""
 
 #: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in systray"
+msgid "_Disable showing event in roster"
 msgstr ""
 
 #: ../data/gui/advanced_notifications_window.ui.h:33
@@ -855,12 +860,12 @@ msgstr "Usar uma única janela de conversa com _abas"
 
 #: ../data/gui/advanced_notifications_window.ui.h:35
 #, fuzzy
-msgid "_Show event in roster"
+msgid "_Show event in notification area"
 msgstr "Mostrar apenas na _lista"
 
 #: ../data/gui/advanced_notifications_window.ui.h:36
 #, fuzzy
-msgid "_Show event in systray"
+msgid "_Show event in roster"
 msgstr "Mostrar apenas na _lista"
 
 #: ../data/gui/advanced_notifications_window.ui.h:37
@@ -890,6 +895,45 @@ msgstr "Grupo"
 msgid "when I'm in"
 msgstr ""
 
+#: ../data/gui/archiving_preferences_window.ui.h:1
+msgid "<i>Method Auto</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "<i>Method Local</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:3
+msgid "<i>Method Manual</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:4
+#, fuzzy
+msgid "Auto"
+msgstr "Entrar automaticamente"
+
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Concede"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "Forbid"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:7
+#, fuzzy
+msgid "No"
+msgstr "Nenhum"
+
+#: ../data/gui/archiving_preferences_window.ui.h:8
+#, fuzzy
+msgid "Prefer"
+msgstr "Preferências"
+
+#: ../data/gui/archiving_preferences_window.ui.h:9
+msgid "Yes"
+msgstr ""
+
 #: ../data/gui/atom_entry_window.ui.h:1
 #, fuzzy
 msgid "Entry:"
@@ -921,8 +965,8 @@ msgstr "Contacto:"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5348
-#: ../src/roster_window.py:5476 ../src/roster_window.py:5609
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
+#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
 msgid "_Unblock"
 msgstr ""
 
@@ -1019,7 +1063,7 @@ msgid "_Start Chat"
 msgstr "_Iniciar Conversa"
 
 #. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4184
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
 msgid "#"
 msgstr ""
 
@@ -1067,13 +1111,55 @@ msgstr ""
 msgid "9"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:13
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Adiciona o contacto à lista"
+
 #: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
+msgid "Browse the chat history (Ctrl+H)"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:15
+#, fuzzy
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "está a prestar atenção à conversa"
+
+#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+#, fuzzy
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Clique para inserir um emoticon (Alt+E)"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
+#, fuzzy
+msgid "Show a list of formattings"
+msgstr "Clique para inserir um emoticon (Alt+E)"
+
+#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Clique para inserir um emoticon (Alt+E)"
+
+#: ../data/gui/chat_control.ui.h:19
+#, fuzzy
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr "Adiciona o contacto à lista"
+
+#: ../data/gui/chat_control.ui.h:20
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:21
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
 #: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "E_nviar"
 
-#: ../data/gui/chat_control.ui.h:15 ../data/gui/groupchat_control.ui.h:3
+#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
 msgid "label"
 msgstr ""
 
@@ -1128,8 +1214,8 @@ msgstr "Editar _Grupos"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5284
-#: ../src/roster_window.py:5444
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
+#: ../src/roster_window.py:5516
 msgid "In_vite to"
 msgstr ""
 
@@ -1143,8 +1229,8 @@ msgstr "Contacto:"
 msgid "Remo_ve"
 msgstr "_Remover"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5294
-#: ../src/roster_window.py:5533
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
+#: ../src/roster_window.py:5605
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Pedir para ver o estado dele/dela"
@@ -1182,8 +1268,8 @@ msgid "_Allow him/her to see my status"
 msgstr "Permitir que ele/ela veja o meu estado"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5482 ../src/roster_window.py:5612
+#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
+#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
 msgid "_Block"
 msgstr ""
 
@@ -1194,8 +1280,8 @@ msgstr "Proibí-lo /-la de ver o meu estado"
 
 #: ../data/gui/contact_context_menu.ui.h:20
 #: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:21
-#: ../src/roster_window.py:5683
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
+#: ../src/roster_window.py:5755
 msgid "_History"
 msgstr "_Histórico"
 
@@ -1342,7 +1428,7 @@ msgstr ""
 msgid "Account row"
 msgstr "Conta"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:925
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
 msgid "Bold"
 msgstr "Negrito"
 
@@ -1383,7 +1469,7 @@ msgstr "Grupo"
 msgid "Inactive"
 msgstr "Activo"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:926
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
 msgid "Italic"
 msgstr "Itálico"
 
@@ -1431,7 +1517,7 @@ msgstr "Muda A_ssunto"
 msgid "Configure _Room..."
 msgstr "Configurar _Sala"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1782
+#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
 #, fuzzy
 msgid "_Bookmark"
 msgstr "Adicionar esta Sala aos _Bookmarks"
@@ -1495,19 +1581,32 @@ msgstr "E_nviar Mensagem Privada"
 msgid "_Voice"
 msgstr "_Voz"
 
+#: ../data/gui/groupchat_control.ui.h:1
+#, fuzzy
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Adicionar esta Sala aos _Bookmarks"
+
+#: ../data/gui/groupchat_control.ui.h:3
+msgid "Change the room's subject (Alt+T)"
+msgstr ""
+
+#: ../data/gui/groupchat_control.ui.h:4
+#, fuzzy
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Muda Alcu_nha"
+
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr ""
 
-#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
-msgid "From"
-msgstr "De"
+#: ../data/gui/groups_post_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:2
+msgid "From:"
+msgstr "De:"
 
-#. holds subject
-#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
-#: ../src/history_manager.py:219
-#, fuzzy
-msgid "Subject"
+#: ../data/gui/groups_post_window.ui.h:3
+#: ../data/gui/single_message_window.ui.h:7
+msgid "Subject:"
 msgstr "Assunto:"
 
 #: ../data/gui/history_manager.ui.h:1
@@ -1522,8 +1621,8 @@ msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr ""
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3208
-#: ../src/dialogs.py:3305
+#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
+#: ../src/dialogs.py:3321
 #, fuzzy
 msgid "Delete"
 msgstr "Apagar MOTD"
@@ -1579,12 +1678,75 @@ msgstr "_Pesquisar"
 msgid "_Log conversation history"
 msgstr "_Histórico das Conversas"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
+msgid "approve"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:2
+msgid "body"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:3
+msgid "concede"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:4
+msgid "expire"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:5
+msgid "false"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:6
+msgid "forbid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:7
+#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+msgid "jid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:8
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
+#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
+msgid "message"
+msgstr "mensagem"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
+msgid "oppose"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
+#, fuzzy
+msgid "otr"
+msgstr "_Host:"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:11
+msgid "prefer"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:12
+msgid "require"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:13
+msgid "save"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:14
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
 msgid "Bro_wse Rooms"
 msgstr "_Explorar"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2180
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
 msgid "Join Group Chat"
 msgstr "Entrar num Chat"
 
@@ -1622,8 +1784,8 @@ msgstr "Servidor:"
 msgid "_Bookmark this room"
 msgstr "Adicionar esta Sala aos _Bookmarks"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1341
-#: ../src/disco.py:1786
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../src/disco.py:1804
 msgid "_Join"
 msgstr "_Entrar"
 
@@ -1733,6 +1895,74 @@ msgstr "Nome de _utilizador"
 msgid "Passphrase"
 msgstr "Frase de acesso"
 
+#: ../data/gui/plugins_window.ui.h:1
+msgid "&lt;empty&gt;"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:2
+msgid "<empty>"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:3
+#, fuzzy
+msgid "Authors:"
+msgstr "_Autorizar"
+
+#: ../data/gui/plugins_window.ui.h:4
+#, fuzzy
+msgid "Available"
+msgstr "Indisponível"
+
+#: ../data/gui/plugins_window.ui.h:5
+#, fuzzy
+msgid "Configure"
+msgstr "_Continuar"
+
+#: ../data/gui/plugins_window.ui.h:6
+#, fuzzy
+msgid "Descrition:"
+msgstr "Descrição: %s"
+
+#: ../data/gui/plugins_window.ui.h:7
+#, fuzzy
+msgid "Homepage:"
+msgstr "Página pessoal:"
+
+#: ../data/gui/plugins_window.ui.h:8
+msgid "Install"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:9
+#, fuzzy
+msgid "Installed"
+msgstr "Interrompida"
+
+#: ../data/gui/plugins_window.ui.h:10
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:11
+msgid "Plugins"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:12
+msgid "Uninstall"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:13
+msgid "Version:"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:14
+msgid "button"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:15
+msgid "homepage url"
+msgstr ""
+
 #: ../data/gui/popup_notification_window.ui.h:1
 #, fuzzy
 msgid "Event Type"
@@ -1871,126 +2101,109 @@ msgid "Always"
 msgstr "Ausente"
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Always use GNOME default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:32
-msgid "Always use KDE default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:33
-msgid "Always use Xfce default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Pedir a mensagem de estado quando eu me: "
 
-#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
 msgid "Audio / Video"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:33
 msgid "Audio input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Audio output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:38
-#, fuzzy
-msgid "Autodetect on every Gajim startup"
-msgstr "_Ligar ao arranque"
-
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:35
 #, fuzzy
 msgid "Chat message:"
 msgstr "Mensagem de estado:"
 
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:36
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:37
 msgid "Composing only"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:38
 msgid "Configure color and font of the interface"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Mensagem de estado:"
 
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Nome do Contacto"
 
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:41
 #, fuzzy
 msgid "Custom"
 msgstr "<b>Definições Personalizadas</b>"
 
-#: ../data/gui/preferences_window.ui.h:46
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Detached roster with chat grouped by account"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Detached roster with detached chats"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:45
 msgid "Detached roster with single chat"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
-#: ../src/config.py:671
+#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
+#: ../src/config.py:665
 msgid "Disabled"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:47
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
 
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:48
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:49
 #, fuzzy
 msgid "Display _location of contacts in roster"
 msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
 
-#: ../data/gui/preferences_window.ui.h:54
+#: ../data/gui/preferences_window.ui.h:50
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:51
 #, fuzzy
 msgid "Display a_vatars of contacts in roster"
 msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
 
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:52
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
 
-#: ../data/gui/preferences_window.ui.h:57
+#: ../data/gui/preferences_window.ui.h:53
 #, fuzzy
 msgid "Display status _messages of contacts in roster"
 msgstr "Exibir mensagens de estado dos contactos na lista"
 
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:54
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -2000,7 +2213,7 @@ msgstr ""
 "Gajim pode enviar e receber meta-informação relativa a uma conversa que "
 "esteja a ter com um contacto "
 
-#: ../data/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:55
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -2010,7 +2223,7 @@ msgstr ""
 "Gajim pode enviar e receber meta-informação relativa a uma conversa que "
 "esteja a ter com um contacto "
 
-#: ../data/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:56
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2018,37 +2231,37 @@ msgstr ""
 "Gajim o notificará através de um popup no canto inferior direito do ecrã "
 "sobre os contactos que se desligarem"
 
-#: ../data/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:58
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../data/gui/preferences_window.ui.h:63
+#: ../data/gui/preferences_window.ui.h:59
 #, 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/gui/preferences_window.ui.h:64
+#: ../data/gui/preferences_window.ui.h:60
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:61
 #, 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/gui/preferences_window.ui.h:66
+#: ../data/gui/preferences_window.ui.h:62
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:63
 #, fuzzy
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
@@ -2057,7 +2270,7 @@ msgstr ""
 "Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
 "lista"
 
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:64
 #, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
@@ -2066,7 +2279,7 @@ msgstr ""
 "Se marcado, Gajim exibirá as mensagens de estado dos contactos debaixo dos "
 "nomes de cada um na janela principal"
 
-#: ../data/gui/preferences_window.ui.h:69
+#: ../data/gui/preferences_window.ui.h:65
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -2074,7 +2287,7 @@ msgstr ""
 "Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
 "lista"
 
-#: ../data/gui/preferences_window.ui.h:70
+#: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the location of contacts in the roster window"
@@ -2082,7 +2295,7 @@ msgstr ""
 "Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
 "lista"
 
-#: ../data/gui/preferences_window.ui.h:71
+#: ../data/gui/preferences_window.ui.h:67
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -2090,7 +2303,7 @@ msgstr ""
 "Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
 "lista"
 
-#: ../data/gui/preferences_window.ui.h:72
+#: ../data/gui/preferences_window.ui.h:68
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -2098,14 +2311,14 @@ msgstr ""
 "Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
 "lista"
 
-#: ../data/gui/preferences_window.ui.h:73
+#: ../data/gui/preferences_window.ui.h:69
 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/gui/preferences_window.ui.h:74
+#: ../data/gui/preferences_window.ui.h:70
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -2116,20 +2329,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/gui/preferences_window.ui.h:75
+#: ../data/gui/preferences_window.ui.h:71
 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/gui/preferences_window.ui.h:76
+#: ../data/gui/preferences_window.ui.h:72
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:77
+#: ../data/gui/preferences_window.ui.h:73
 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, "
@@ -2139,13 +2352,13 @@ msgstr ""
 "(Por exemplo, um contacto do MSN terá o ícone msn equivalente para o estado "
 "disponível, ausente, ocupado, etc...)"
 
-#: ../data/gui/preferences_window.ui.h:78
+#: ../data/gui/preferences_window.ui.h:74
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:79
+#: ../data/gui/preferences_window.ui.h:75
 #, fuzzy
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
@@ -2154,135 +2367,135 @@ msgstr ""
 "Se marcado, o Gajim trocará smilies ASCII tais como ':)' pelos emoticons "
 "gráficos equivalentes."
 
-#: ../data/gui/preferences_window.ui.h:80
+#: ../data/gui/preferences_window.ui.h:76
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:81
+#: ../data/gui/preferences_window.ui.h:77
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "Enviar mensagem e fechar a janela"
 
-#: ../data/gui/preferences_window.ui.h:82
+#: ../data/gui/preferences_window.ui.h:78
 #, fuzzy
 msgid "Ma_nage..."
 msgstr "Gerir..."
 
-#: ../data/gui/preferences_window.ui.h:83
+#: ../data/gui/preferences_window.ui.h:79
 #, fuzzy
 msgid "Never"
 msgstr "_Nunca"
 
-#: ../data/gui/preferences_window.ui.h:84
+#: ../data/gui/preferences_window.ui.h:80
 #, fuzzy
 msgid "Notifications"
 msgstr "Modificação da Conta"
 
-#: ../data/gui/preferences_window.ui.h:85
+#: ../data/gui/preferences_window.ui.h:81
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Notificar-me sobre contactos que acabem de se: "
 
-#: ../data/gui/preferences_window.ui.h:86
+#: ../data/gui/preferences_window.ui.h:82
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Notificar-me sobre contactos que acabem de se: "
 
-#: ../data/gui/preferences_window.ui.h:87
+#: ../data/gui/preferences_window.ui.h:83
 #, fuzzy
 msgid "Notify me about it"
 msgstr "_Notificar-me"
 
-#: ../data/gui/preferences_window.ui.h:88
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notify on new _GMail email"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:89
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Only when pending events"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:90
+#: ../data/gui/preferences_window.ui.h:86
 #, fuzzy
 msgid "Personal Events"
 msgstr "Detalhes Pessoais..."
 
-#: ../data/gui/preferences_window.ui.h:91
+#: ../data/gui/preferences_window.ui.h:87
 msgid "Play _sounds"
 msgstr "Tocar _Sons"
 
-#: ../data/gui/preferences_window.ui.h:92
+#: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
 msgid "Pop it up"
 msgstr "_Mostrar a mensagem como pop-up"
 
-#: ../data/gui/preferences_window.ui.h:93
+#: ../data/gui/preferences_window.ui.h:89
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../data/gui/preferences_window.ui.h:94
+#: ../data/gui/preferences_window.ui.h:90
 msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:96
+#: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
 msgid "STUN server:"
 msgstr "Servidor:"
 
-#: ../data/gui/preferences_window.ui.h:97
+#: ../data/gui/preferences_window.ui.h:93
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Mostrar apenas na _lista"
+msgid "Show notification area icon:"
+msgstr "_Ícone na bandeja (também conhecido por área de notificação)"
 
-#: ../data/gui/preferences_window.ui.h:98
+#: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
-msgid "Show systray:"
+msgid "Show only in roster"
 msgstr "Mostrar apenas na _lista"
 
-#: ../data/gui/preferences_window.ui.h:99
+#: ../data/gui/preferences_window.ui.h:95
 msgid "Sign _in"
 msgstr "_Ligar"
 
-#: ../data/gui/preferences_window.ui.h:100
+#: ../data/gui/preferences_window.ui.h:96
 msgid "Sign _out"
 msgstr "_Desligar"
 
-#: ../data/gui/preferences_window.ui.h:101
+#: ../data/gui/preferences_window.ui.h:97
 msgid "Single window for everything"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:102
+#: ../data/gui/preferences_window.ui.h:98
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:103
+#: ../data/gui/preferences_window.ui.h:99
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "Ordenar contactos por estados"
 
-#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
 msgid "Status"
 msgstr "Estado"
 
-#: ../data/gui/preferences_window.ui.h:105
+#: ../data/gui/preferences_window.ui.h:101
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "Iconset de _estados padrão:"
 
-#: ../data/gui/preferences_window.ui.h:106
+#: ../data/gui/preferences_window.ui.h:102
 #, fuzzy
 msgid "Style"
 msgstr "Interrompida"
 
-#: ../data/gui/preferences_window.ui.h:107
+#: ../data/gui/preferences_window.ui.h:103
 #, fuzzy
 msgid "T_heme:"
 msgstr "Tema:"
 
-#: ../data/gui/preferences_window.ui.h:108
+#: ../data/gui/preferences_window.ui.h:104
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2290,7 +2503,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:111
+#: ../data/gui/preferences_window.ui.h:107
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2298,134 +2511,138 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:114
+#: ../data/gui/preferences_window.ui.h:110
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Usar iconsets de _transportes"
 
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:111
+msgid "Use default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:112
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:113
 msgid "Video framerate"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:117
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Video input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:118
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Video output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:119
+#: ../data/gui/preferences_window.ui.h:116
 msgid "Video size"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:120
+#: ../data/gui/preferences_window.ui.h:117
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Quando um novo evento é recebido"
 
-#: ../data/gui/preferences_window.ui.h:121
+#: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
 msgid "Your message:"
 msgstr "Introduza a sua mensagem :"
 
-#: ../data/gui/preferences_window.ui.h:122
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your nickname:"
 msgstr "Antes da alcunha:"
 
-#: ../data/gui/preferences_window.ui.h:123
+#: ../data/gui/preferences_window.ui.h:120
 #, fuzzy
 msgid "_Away after:"
 msgstr "Marcar automaticamente como _ausente depois de:"
 
-#: ../data/gui/preferences_window.ui.h:124
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../data/gui/preferences_window.ui.h:125
+#: ../data/gui/preferences_window.ui.h:122
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "Noti_ficação do estado da conversa:"
 
-#: ../data/gui/preferences_window.ui.h:126
+#: ../data/gui/preferences_window.ui.h:123
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Gerir Emoticons"
 
-#: ../data/gui/preferences_window.ui.h:127
+#: ../data/gui/preferences_window.ui.h:124
 #, fuzzy
 msgid "_File manager:"
 msgstr "Gestor de ficheiros:"
 
-#: ../data/gui/preferences_window.ui.h:128
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_Highlight misspelled words"
 msgstr "_Destacar palavras mal soletradas"
 
-#: ../data/gui/preferences_window.ui.h:129
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorar eventos de contactos que não estão na lista"
 
-#: ../data/gui/preferences_window.ui.h:130
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore rich content in incoming messages"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:131
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Log status changes of contacts"
 msgstr "_Arquivar mudanças de estado dos contactos"
 
-#: ../data/gui/preferences_window.ui.h:132
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Mail client:"
 msgstr "Cliente de e_mail:"
 
-#: ../data/gui/preferences_window.ui.h:133
+#: ../data/gui/preferences_window.ui.h:130
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Marcar automaticamente como _indisponível depois de:"
 
-#: ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/preferences_window.ui.h:131
 #, fuzzy
 msgid "_Open..."
 msgstr "Abrir..."
 
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:132
 #, fuzzy
 msgid "_Reset to Default Colors"
 msgstr "Voltar às Cores Padrão"
 
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:133
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "Noti_ficação do estado da conversa:"
 
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:134
 #, fuzzy
 msgid "_Status message:"
 msgstr "Mensagem de estado:"
 
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:140
+#: ../data/gui/preferences_window.ui.h:137
 #, fuzzy
 msgid "in _group chats"
 msgstr "_Entrar num Chat"
 
-#: ../data/gui/preferences_window.ui.h:141
+#: ../data/gui/preferences_window.ui.h:138
 #, fuzzy
 msgid "in _roster"
 msgstr "Fora da lista"
 
-#: ../data/gui/preferences_window.ui.h:142
+#: ../data/gui/preferences_window.ui.h:139
 msgid "minutes"
 msgstr "minutos"
 
@@ -2483,7 +2700,7 @@ msgstr "Jabber ID:"
 msgid "Order:"
 msgstr "Servidor:"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3436
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
 msgid "Privacy List"
 msgstr ""
 
@@ -2723,8 +2940,8 @@ msgstr "Remover conta do Gajim e do _servidor"
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5492 ../src/roster_window.py:5622
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
+#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
 msgid "_Remove"
 msgstr "_Remover"
 
@@ -2770,61 +2987,65 @@ msgid "Help online"
 msgstr "Ajuda online"
 
 #: ../data/gui/roster_window.ui.h:8
+msgid "P_lugins"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:9
 #, fuzzy
 msgid "Profile, A_vatar"
 msgstr "Perfil, Avatar"
 
-#: ../data/gui/roster_window.ui.h:9
+#: ../data/gui/roster_window.ui.h:10
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "Mostrar Contactos _Offline"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
 #, fuzzy
 msgid "Show Trans_ports"
 msgstr "Transportes"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
 msgid "Show _Offline Contacts"
 msgstr "Mostrar Contactos _Offline"
 
-#: ../data/gui/roster_window.ui.h:12 ../src/statusicon.py:326
+#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
 msgid "Show _Roster"
 msgstr "Mostrar _Lista de Contactos"
 
-#: ../data/gui/roster_window.ui.h:13
+#: ../data/gui/roster_window.ui.h:14
 #, 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/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
 #: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Acções"
 
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
 msgid "_Contents"
 msgstr "_Conteúdo"
 
-#: ../data/gui/roster_window.ui.h:18 ../src/disco.py:1502
+#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../data/gui/roster_window.ui.h:19
+#: ../data/gui/roster_window.ui.h:20
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../data/gui/roster_window.ui.h:22
+#: ../data/gui/roster_window.ui.h:23
 #, fuzzy
 msgid "_Send Single Message..."
 msgstr "Enviar _Mensagem Simples"
 
-#: ../data/gui/roster_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:25
 #, fuzzy
 msgid "_View"
 msgstr "_Voz"
@@ -2847,12 +3068,12 @@ msgid "_Add contact"
 msgstr "Adicionar _Contacto"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5634
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
 #, fuzzy
 msgid "_Information"
 msgstr "Informações do Contacto"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1353
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
 msgid "_Search"
 msgstr "_Pesquisar"
 
@@ -2872,10 +3093,6 @@ msgstr "Registar para"
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../data/gui/single_message_window.ui.h:2
-msgid "From:"
-msgstr "De:"
-
 #: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Responder a esta mensagem"
@@ -2892,10 +3109,6 @@ msgstr "Enviar mensagem"
 msgid "Send message and close window"
 msgstr "Enviar mensagem e fechar a janela"
 
-#: ../data/gui/single_message_window.ui.h:7
-msgid "Subject:"
-msgstr "Assunto:"
-
 #: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Para:"
@@ -3123,26 +3336,36 @@ msgstr ""
 msgid "Jabber IM Client"
 msgstr "Cliente de IM Jabber"
 
-#: ../src/adhoc_commands.py:314
+#: ../src/adhoc_commands.py:323
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Informações do Contacto"
 
-#: ../src/adhoc_commands.py:315
+#: ../src/adhoc_commands.py:324
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:351 ../src/adhoc_commands.py:374
+#: ../src/adhoc_commands.py:370
+#, fuzzy
+msgid "Invalid Form"
+msgstr "Entrada inválida"
+
+#: ../src/adhoc_commands.py:371
+#, fuzzy
+msgid "The form is not filled correctly."
+msgstr "Alcunha não encontrada: %s"
+
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:360
+#: ../src/adhoc_commands.py:399
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:471
+#: ../src/adhoc_commands.py:513
 msgid "Service returned an error."
 msgstr ""
 
@@ -3170,7 +3393,7 @@ msgstr "Neste grupo"
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:945
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
 msgid "Color"
 msgstr ""
 
@@ -3207,240 +3430,240 @@ msgstr[1] ""
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "English"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Belarusian"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Bulgarian"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Breton"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Czech"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "German"
 msgstr "Geral"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Greek"
 msgstr "green"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "British"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Esperanto"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Spanish"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Basque"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "French"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Croatian"
 msgstr "Morada"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Italian"
 msgstr "Itálico"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian (b)"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Dutch"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Polish"
 msgstr "_Publicar"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Portuguese"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Russian"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Serbian"
 msgstr "Geral"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Slovak"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Swedish"
 msgstr ""
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:479
+#: ../src/chat_control.py:496
 msgid "Spelling language"
 msgstr ""
 
 #. we are not connected
-#: ../src/chat_control.py:511 ../src/chat_control.py:720
+#: ../src/chat_control.py:528 ../src/chat_control.py:737
 msgid "A connection is not available"
 msgstr "Uma ligação não está disponível"
 
-#: ../src/chat_control.py:512 ../src/chat_control.py:721
+#: ../src/chat_control.py:529 ../src/chat_control.py:738
 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:927
+#: ../src/chat_control.py:944
 #, fuzzy
 msgid "Underline"
 msgstr "Sublinhar"
 
-#: ../src/chat_control.py:928
+#: ../src/chat_control.py:945
 #, fuzzy
 msgid "Strike"
 msgstr "Serviço"
 
-#: ../src/chat_control.py:951
+#: ../src/chat_control.py:968
 #, fuzzy
 msgid "Font"
 msgstr "Letra:"
 
-#: ../src/chat_control.py:960
+#: ../src/chat_control.py:977
 #, fuzzy
 msgid "Clear formating"
 msgstr "Informações do Contacto"
 
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1055
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:1039
+#: ../src/chat_control.py:1056
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1503 ../src/chat_control.py:1987
+#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Encriptação activada"
 
 #. Add to roster
-#: ../src/chat_control.py:1528 ../src/common/contacts.py:158
+#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
 #: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:245 ../src/dialogs.py:1064 ../src/dialogs.py:2078
-#: ../src/dialogs.py:2107 ../src/gui_interface.py:674
+#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
+#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
 #: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1610 ../src/roster_window.py:1612
-#: ../src/roster_window.py:1942 ../src/roster_window.py:3289
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
+#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
+#: ../src/roster_window.py:3382
 msgid "Not in Roster"
 msgstr "Fora da lista"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1575
 #, 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:1561
+#: ../src/chat_control.py:1578
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1656
+#: ../src/chat_control.py:1677
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:1869
 #, 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:1967 ../src/dialogs.py:4866
+#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1968
+#: ../src/chat_control.py:1991
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1977
+#: ../src/chat_control.py:2000
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Encriptação desactivada"
 
-#: ../src/chat_control.py:2003
+#: ../src/chat_control.py:2026
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:2028
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2051
 #, fuzzy
 msgid "and authenticated"
 msgstr "Usar autenticação"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2032
+#: ../src/chat_control.py:2055
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Usar autenticação"
@@ -3448,58 +3671,66 @@ 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:2039
+#: ../src/chat_control.py:2062
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2182
+#: ../src/chat_control.py:2205
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2191
+#: ../src/chat_control.py:2215
+msgid "This session WILL be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2217
+msgid "This session WILL NOT be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2226
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Esta mensagem é encriptada]"
 
-#: ../src/chat_control.py:2194
+#: ../src/chat_control.py:2229
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2196
+#: ../src/chat_control.py:2231
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2201
+#: ../src/chat_control.py:2236
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2203
+#: ../src/chat_control.py:2238
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Encriptação desactivada"
 
-#: ../src/chat_control.py:2241 ../src/chat_control.py:2254
+#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Esta mensagem é encriptada]"
 
-#: ../src/chat_control.py:2247
+#: ../src/chat_control.py:2288
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Esta mensagem é encriptada]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2519
+#: ../src/chat_control.py:2566
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Recebeu uma nova mensagem de \"%s\""
 
-#: ../src/chat_control.py:2520
+#: ../src/chat_control.py:2567
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3507,22 +3738,20 @@ msgstr ""
 "Se fechar esta aba e o histórico estiver desactivado, esta mensagem será "
 "perdida."
 
-#: ../src/chat_control.py:2663 ../src/common/connection_handlers.py:1635
-#: ../src/common/connection_handlers.py:1758
-#: ../src/common/connection_handlers.py:1960
-#: ../src/common/connection_handlers.py:2110 ../src/common/connection.py:452
+#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
 #: ../src/gajim.py:159 ../src/session.py:138
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2664
+#: ../src/chat_control.py:2714
 #, 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:2906
+#: ../src/chat_control.py:2962
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s está agora %(status)s"
@@ -3536,28 +3765,28 @@ msgstr "a criar base de dados dos logs"
 msgid "creating cache database"
 msgstr "a criar base de dados dos logs"
 
-#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
-#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
-#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
-#: ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
 #, 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:275 ../src/common/check_paths.py:282
-#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
-#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
-#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:333
+#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
+#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
+#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
 msgid "Gajim will now exit"
 msgstr "Gajim irá agora sair"
 
-#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
+#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
 #, 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:342
+#: ../src/common/check_paths.py:351
 #, python-format
 msgid "creating %s directory"
 msgstr "a criar directório %s"
@@ -3628,9 +3857,9 @@ msgstr ""
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:801
-#: ../src/roster_window.py:1614 ../src/roster_window.py:1616
-#: ../src/roster_window.py:5251
+#: ../src/common/helpers.py:57 ../src/roster_window.py:815
+#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
+#: ../src/roster_window.py:5323
 #, fuzzy
 msgid "Groupchats"
 msgstr "Chat"
@@ -3694,7 +3923,8 @@ msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
 #: ../src/common/config.py:88
-msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgid ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
 #: ../src/common/config.py:93
@@ -3748,9 +3978,9 @@ msgid ""
 msgstr ""
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:501
-#: ../src/common/optparser.py:290 ../src/common/optparser.py:486
-#: ../src/common/optparser.py:520 ../src/gui_interface.py:3370
+#: ../src/common/config.py:106 ../src/common/config.py:505
+#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
+#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
 #, fuzzy
 msgid "default"
 msgstr "Apagar MOTD"
@@ -3942,7 +4172,7 @@ 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:197
-msgid "Notify of events in the system trayicon."
+msgid "Notify of events in the notification area."
 msgstr ""
 
 #: ../src/common/config.py:203
@@ -3980,9 +4210,10 @@ msgstr ""
 "num chat de vários utilizadores."
 
 #: ../src/common/config.py:221
+#, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
+"setting is taken into account only if notification icon is used."
 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."
@@ -4217,7 +4448,7 @@ msgstr ""
 #: ../src/common/config.py:270
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
-"systray icon."
+"notification icon."
 msgstr ""
 
 #: ../src/common/config.py:271
@@ -4383,116 +4614,127 @@ msgstr ""
 msgid "Message that is sent to contacts you want to add"
 msgstr "Por favor preencha os dados do contacto que deseja adicionar"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:374
+msgid "Last time we syncronized with logs from server."
+msgstr ""
+
+#: ../src/common/config.py:436
 #, fuzzy
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Não é possível usar OpenPGP neste computador"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:437 ../src/common/config.py:440
+#: ../src/common/config.py:438 ../src/common/config.py:441
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:447
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:448
 msgid "'yes', 'no', or 'both'"
 msgstr ""
 
-#: ../src/common/config.py:448 ../src/common/config.py:450
-#: ../src/common/config.py:451 ../src/common/config.py:454
-#: ../src/common/config.py:455
+#: ../src/common/config.py:449 ../src/common/config.py:451
+#: ../src/common/config.py:452 ../src/common/config.py:455
+#: ../src/common/config.py:456
 msgid "'yes', 'no' or ''"
 msgstr ""
 
-#: ../src/common/config.py:461 ../src/common/pep.py:157
+#: ../src/common/config.py:460
+msgid ""
+"State whether plugins should be activated on exit (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
+msgstr ""
+
+#: ../src/common/config.py:465 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "A dormir"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back soon"
 msgstr "Volto logo"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back in some minutes."
 msgstr "Volto daqui a alguns minutos"
 
-#: ../src/common/config.py:463 ../src/common/pep.py:127
+#: ../src/common/config.py:467 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "A comer"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:467
 msgid "I'm eating, so leave me a message."
 msgstr "Estou a comer, por isso deixe-me uma mensagem"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "Movie"
 msgstr "Filme"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "I'm watching a movie."
 msgstr "Estou a ver um filme."
 
-#: ../src/common/config.py:465 ../src/common/pep.py:186
+#: ../src/common/config.py:469 ../src/common/pep.py:186
 msgid "Working"
 msgstr "A trabalhar"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:469
 msgid "I'm working."
 msgstr "Estou a trabalhar"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "Phone"
 msgstr "Telefone"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "I'm on the phone."
 msgstr "Estou ao telefone."
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "Out"
 msgstr "Estou fora"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Estou fora, fui apreciar a vida"
 
-#: ../src/common/config.py:478
+#: ../src/common/config.py:482
 #, fuzzy
 msgid "I'm available."
 msgstr "Disponível"
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:483
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Livre para conversar"
 
-#: ../src/common/config.py:480 ../src/config.py:1600
+#: ../src/common/config.py:484 ../src/config.py:1600
 msgid "Be right back."
 msgstr ""
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:485
 #, fuzzy
 msgid "I'm not available."
 msgstr "Serviço não disponível"
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:486
 msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:483 ../src/common/config.py:484
+#: ../src/common/config.py:487 ../src/common/config.py:488
 msgid "Bye!"
 msgstr ""
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:498
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -4501,183 +4743,92 @@ 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:495
+#: ../src/common/config.py:499
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: ../src/common/config.py:504 ../src/common/optparser.py:304
+#: ../src/common/config.py:508 ../src/common/optparser.py:308
 msgid "green"
 msgstr "green"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:290
+#: ../src/common/config.py:512 ../src/common/optparser.py:294
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:512
+#: ../src/common/config.py:516
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:520
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:84
+#: ../src/common/connection_handlers.py:94
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 #, fuzzy
 msgid "Unable to load idle module"
 msgstr "Impossível entrar na sala"
 
-#: ../src/common/connection_handlers.py:117
+#: ../src/common/connection_handlers.py:127
 #, 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:124
-#, fuzzy
-msgid "Registration succeeded"
-msgstr "Publicação vCard deu-se com sucesso"
-
-#: ../src/common/connection_handlers.py:125
-#, python-format
-msgid "Registration with agent %s succeeded"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:133
-#, fuzzy
-msgid "Registration failed"
-msgstr "Publicação vCard falhou"
-
-#: ../src/common/connection_handlers.py:133
-#, python-format
-msgid ""
-"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:445
-#: ../src/common/connection_handlers.py:1633
-#: ../src/common/connection_handlers.py:1756
-#: ../src/common/connection_handlers.py:1957
-#: ../src/common/connection_handlers.py:2108 ../src/common/connection.py:449
-#: ../src/gajim.py:341
-msgid "Disk Write Error"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:678 ../src/common/connection.py:1472
-msgid "Invisibility not supported"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:679 ../src/common/connection.py:1473
-#, python-format
-msgid "Account %s doesn't support invisibility."
-msgstr ""
-
-#: ../src/common/connection_handlers.py:1446 ../src/common/connection.py:253
-#: ../src/config.py:2091 ../src/config.py:2100 ../src/config.py:2168
-#: ../src/config.py:3560 ../src/dataforms_widget.py:597 ../src/dialogs.py:2931
-msgid "Invalid Jabber ID"
-msgstr "Jabber ID Inválido"
-
-#: ../src/common/connection_handlers.py:1447
-msgid "A message from a non-valid JID arrived, it has been ignored."
-msgstr ""
-
-#: ../src/common/connection_handlers.py:1636
-#: ../src/common/connection_handlers.py:1759
-#: ../src/common/connection_handlers.py:1961
-#: ../src/common/connection_handlers.py:2111 ../src/common/connection.py:453
-#: ../src/gajim.py:160 ../src/session.py:139
-#, 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:1805
-#, fuzzy, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Alcunha não encontrada: %s"
-
-#: ../src/common/connection_handlers.py:1902
-#: ../src/common/connection_handlers.py:1911
-#: ../src/common/connection_handlers.py:1918
-#: ../src/common/connection_handlers.py:1922
-#: ../src/common/connection_handlers.py:1926
-#: ../src/common/connection_handlers.py:1931 ../src/gui_interface.py:139
-#, fuzzy
-msgid "Unable to join group chat"
-msgstr "Impossível entrar na sala"
-
-#: ../src/common/connection_handlers.py:1903
-#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:1912
-#, fuzzy, python-format
-msgid "You are banned from group chat %s."
-msgstr "Está banido/a desta sala."
-
-#: ../src/common/connection_handlers.py:1919
-#, fuzzy, python-format
-msgid "Group chat %s does not exist."
-msgstr "Tal sala não existe."
+msgstr "Informação de registo para o transport %s não chegou a tempo"
 
-#: ../src/common/connection_handlers.py:1923
+#: ../src/common/connection_handlers.py:134
 #, fuzzy
-msgid "Group chat creation is restricted."
-msgstr "Criação de salas encontra-se restrita."
-
-#: ../src/common/connection_handlers.py:1927
-#, fuzzy, python-format
-msgid "Your registered nickname must be used in group chat %s."
-msgstr "A sua alcunha registada tem de ser usada."
+msgid "Registration succeeded"
+msgstr "Publicação vCard deu-se com sucesso"
 
-#: ../src/common/connection_handlers.py:1932
-#, fuzzy, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Não está na lista de membros."
+#: ../src/common/connection_handlers.py:135
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr ""
 
-#. Room has been destroyed. see
-#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:1976
+#: ../src/common/connection_handlers.py:143
 #, fuzzy
-msgid "Room has been destroyed"
-msgstr "Autorização foi removida"
+msgid "Registration failed"
+msgstr "Publicação vCard falhou"
 
-#: ../src/common/connection_handlers.py:1984
+#: ../src/common/connection_handlers.py:143
 #, python-format
-msgid "You can join this room instead: %s"
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2020
-msgid "I would like to add you to my roster."
-msgstr "Eu gostaria de o adicionar à minha lista"
+#: ../src/common/connection_handlers.py:466
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
+#: ../src/gajim.py:341
+msgid "Disk Write Error"
+msgstr ""
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2041
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "estamos agora subscritos a %s"
+#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
+msgid "Invisibility not supported"
+msgstr ""
 
-#: ../src/common/connection_handlers.py:2043
+#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
 #, python-format
-msgid "unsubscribe request from %s"
-msgstr "pedido de remoção de subscrição por %s"
+msgid "Account %s doesn't support invisibility."
+msgstr ""
 
-#: ../src/common/connection_handlers.py:2045
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "já não estamos subscritos a %s"
+#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
+#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
+#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
+msgid "Invalid Jabber ID"
+msgstr "Jabber ID Inválido"
 
-#: ../src/common/connection_handlers.py:2240
-#, fuzzy, python-format
+#: ../src/common/connection_handlers.py:1405
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
+#: ../src/gajim.py:160 ../src/session.py:139
+#, python-format
 msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
+"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 ""
-"JID %s não é compatível com RFC. Não será adicionado à sua lista. Utilize "
-"ferramentas de gestão de lista (roster) tais como http://jru.jabberstudio."
-"org/ para o remover."
 
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
@@ -4809,28 +4960,28 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:254 ../src/dialogs.py:2932
+#: ../src/common/connection.py:256 ../src/dialogs.py:2948
 #, 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:276
+#: ../src/common/connection.py:278
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:281
 #, 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:331
+#: ../src/common/connection.py:333
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Esta mensagem é encriptada]"
 
-#: ../src/common/connection.py:439
+#: ../src/common/connection.py:441
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4839,152 +4990,152 @@ msgstr ""
 "Assunto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:807
+#: ../src/common/connection.py:809
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Ligação com conta \"%s\" foi perdida"
 
-#: ../src/common/connection.py:808
+#: ../src/common/connection.py:810
 msgid "Reconnect manually."
 msgstr ""
 
-#: ../src/common/connection.py:820
+#: ../src/common/connection.py:822
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: ../src/common/connection.py:854
+#: ../src/common/connection.py:856
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:867
+#: ../src/common/connection.py:869
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Versão D-Bus desconhecida: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:882
+#: ../src/common/connection.py:884
 #, fuzzy
 msgid "Invalid answer"
 msgstr "Senha Inválida"
 
-#: ../src/common/connection.py:883
+#: ../src/common/connection.py:885
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: ../src/common/connection.py:1165 ../src/common/connection.py:1294
-#: ../src/common/connection.py:1784
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
+#: ../src/common/connection.py:1792
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Impossível ligar a \"%s\""
 
-#: ../src/common/connection.py:1166 ../src/gui_interface.py:755
+#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
 msgid "Check your connection or try again later."
 msgstr "Verifique a sua ligação ou tente novamente mais tarde."
 
-#: ../src/common/connection.py:1171
+#: ../src/common/connection.py:1173
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Guardado em: %s"
 
-#: ../src/common/connection.py:1184
+#: ../src/common/connection.py:1186
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Ligação"
 
-#: ../src/common/connection.py:1215 ../src/common/connection.py:1274
+#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Impossível ligar a \"%s\""
 
-#: ../src/common/connection.py:1216 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
 #, 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:1241
+#: ../src/common/connection.py:1243
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1244
+#: ../src/common/connection.py:1246
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1248
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Versão D-Bus desconhecida: %s"
 
-#: ../src/common/connection.py:1295
+#: ../src/common/connection.py:1297
 msgid "Check your connection or try again later"
 msgstr "Verifique a sua ligação ou tente novamente mais tarde"
 
-#: ../src/common/connection.py:1324
+#: ../src/common/connection.py:1329
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falha na autenticação com \"%s\""
 
-#: ../src/common/connection.py:1326
+#: ../src/common/connection.py:1331
 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:1395
+#: ../src/common/connection.py:1400
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "erro ao enviar"
 
-#: ../src/common/connection.py:1396
+#: ../src/common/connection.py:1401
 #, 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:1650
+#: ../src/common/connection.py:1658
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1653
+#: ../src/common/connection.py:1661
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Contacto:"
 
-#: ../src/common/connection.py:1799 ../src/common/connection.py:1822
+#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
 msgid "Not fetched because of invisible status"
 msgstr ""
 
-#: ../src/common/connection.py:2254
+#: ../src/common/connection.py:2262
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Publicação vCard falhou"
 
-#: ../src/common/connection.py:2255
+#: ../src/common/connection.py:2263
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
 #: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:674
+#: ../src/gui_interface.py:551
 #, fuzzy
 msgid "Observers"
 msgstr "Servidor"
 
 #: ../src/common/contacts.py:139 ../src/common/contacts.py:366
 #: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1499 ../src/gui_interface.py:424
-#: ../src/roster_window.py:840 ../src/roster_window.py:1525
-#: ../src/roster_window.py:1606 ../src/roster_window.py:1608
-#: ../src/roster_window.py:1769
+#: ../src/disco.py:1517 ../src/roster_window.py:854
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
+#: ../src/roster_window.py:2466
 msgid "Transports"
 msgstr "Transportes"
 
@@ -5219,207 +5370,223 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:148
+msgid "Username must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:153
 msgid "Invalid character in username."
 msgstr "Caractere inválido no nome de utilizador"
 
-#: ../src/common/helpers.py:156
-msgid "Server address required."
-msgstr "Endereço de servidor necessário."
+#: ../src/common/helpers.py:159
+msgid "Server must be between 1 and 1023 chars"
+msgstr ""
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 msgid "Invalid character in hostname."
 msgstr "Caractere inválido no hostname."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:166
+msgid "Server address required."
+msgstr "Endereço de servidor necessário."
+
+#: ../src/common/helpers.py:170
+msgid "Resource must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:175
 msgid "Invalid character in resource."
 msgstr "Caractere inválido no recurso."
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:215
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: ../src/common/helpers.py:211 ../src/tooltips.py:195
+#: ../src/common/helpers.py:217 ../src/tooltips.py:195
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:220
 msgid "_Not Available"
 msgstr "_Indisponível"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:225
 msgid "_Free for Chat"
 msgstr "_Livre para conversar"
 
-#: ../src/common/helpers.py:221 ../src/tooltips.py:191
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Free for Chat"
 msgstr "Livre para conversar"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:230
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "_Disponível"
 
-#: ../src/common/helpers.py:226 ../src/tooltips.py:189
+#: ../src/common/helpers.py:232 ../src/tooltips.py:189
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Mostrar hora:"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:234
 msgid "Connecting"
 msgstr "Ligando"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:237
 msgid "A_way"
 msgstr "A_usente"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:242
 msgid "_Offline"
 msgstr "_Offline"
 
-#: ../src/common/helpers.py:238 ../src/tooltips.py:199
+#: ../src/common/helpers.py:244 ../src/tooltips.py:199
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:247
 msgid "_Invisible"
 msgstr "In_visível"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:253
 msgid "?contact has status:Unknown"
 msgstr "Desconhecido"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:255
 msgid "?contact has status:Has errors"
 msgstr "Contém erros"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:260
 msgid "?Subscription we already have:None"
 msgstr "Nenhuma"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:262
 msgid "To"
 msgstr "Para"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
+msgid "From"
+msgstr "De"
+
+#: ../src/common/helpers.py:266
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:274
 msgid "?Ask (for Subscription):None"
 msgstr "Nenhum"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:276
 msgid "Subscribe"
 msgstr "Subscrição"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:285
 msgid "?Group Chat Contact Role:None"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:288
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:290
 msgid "Moderator"
 msgstr "Moderador"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:293
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:295
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:298
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:300
 msgid "Visitor"
 msgstr "Visitante"
 
-#: ../src/common/helpers.py:300 ../src/tooltips.py:210
+#: ../src/common/helpers.py:306 ../src/tooltips.py:210
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: ../src/common/helpers.py:302 ../src/tooltips.py:216
+#: ../src/common/helpers.py:308 ../src/tooltips.py:216
 #, fuzzy
 msgid "Owner"
 msgstr "_Dono"
 
-#: ../src/common/helpers.py:304 ../src/tooltips.py:214
+#: ../src/common/helpers.py:310 ../src/tooltips.py:214
 #, fuzzy
 msgid "Administrator"
 msgstr "_Administrador"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:212
+#: ../src/common/helpers.py:312 ../src/tooltips.py:212
 #, fuzzy
 msgid "Member"
 msgstr "_Membro"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:351
 msgid "is paying attention to the conversation"
 msgstr "está a prestar atenção à conversa"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:353
 msgid "is doing something else"
 msgstr "está a fazer outra coisa qualquer"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:355
 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:352
+#: ../src/common/helpers.py:358
 msgid "paused composing a message"
 msgstr "pausa na composição da mensagem"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:360
 msgid "has closed the chat window or tab"
 msgstr "fechou a janela de conversa ou aba"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:619
+#: ../src/common/helpers.py:625
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:622
+#: ../src/common/helpers.py:628
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:626
+#: ../src/common/helpers.py:632
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:629
+#: ../src/common/helpers.py:635
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:633
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:636
+#: ../src/common/helpers.py:642
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:645
 #, python-format
 msgid "%s B"
 msgstr "%s B"
@@ -5462,12 +5629,12 @@ msgstr "Gajim - %s"
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:111
+#: ../src/common/jingle_rtp.py:107
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Configuração da Sala"
 
-#: ../src/common/jingle_rtp.py:112
+#: ../src/common/jingle_rtp.py:108
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5479,30 +5646,30 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:209
+#: ../src/common/jingle_rtp.py:205
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:210
+#: ../src/common/jingle_rtp.py:206
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Introduza a sua mensagem :"
 
-#: ../src/common/jingle_rtp.py:336
+#: ../src/common/jingle_rtp.py:335
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:339
+#: ../src/common/jingle_rtp.py:338
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:382
+#: ../src/common/jingle_rtp.py:381
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:390
+#: ../src/common/jingle_rtp.py:389
 msgid "video output"
 msgstr ""
 
@@ -5579,11 +5746,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "erro: impossível abrir %s para leitura"
 
-#: ../src/common/optparser.py:299 ../src/common/optparser.py:300
+#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:379
+#: ../src/common/optparser.py:383
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "a criar base de dados dos logs"
@@ -6321,62 +6488,62 @@ msgid ""
 msgstr ""
 
 #. we're not english
-#: ../src/common/stanza_session.py:303
+#: ../src/common/stanza_session.py:423
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:178
+#: ../src/common/zeroconf/connection_zeroconf.py:181
 msgid "Avahi error"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:179
+#: ../src/common/zeroconf/connection_zeroconf.py:182
 #, python-format
 msgid ""
 "%s\n"
 "Link-local messaging might not work properly."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:190
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:199
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Could not start local service"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 #, fuzzy, python-format
 msgid "Unable to bind to port %d."
 msgstr "Impossível entrar na sala"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-#: ../src/common/zeroconf/connection_zeroconf.py:283
-#: ../src/common/zeroconf/connection_zeroconf.py:294
-#: ../src/common/zeroconf/connection_zeroconf.py:308
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:286
+#: ../src/common/zeroconf/connection_zeroconf.py:297
+#: ../src/common/zeroconf/connection_zeroconf.py:311
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:282
-#: ../src/common/zeroconf/connection_zeroconf.py:293
-#: ../src/common/zeroconf/connection_zeroconf.py:307
+#: ../src/common/zeroconf/connection_zeroconf.py:285
+#: ../src/common/zeroconf/connection_zeroconf.py:296
+#: ../src/common/zeroconf/connection_zeroconf.py:310
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Impossível ligar a \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:325
+#: ../src/common/zeroconf/connection_zeroconf.py:328
 #, 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:335
+#: ../src/common/zeroconf/connection_zeroconf.py:338
 msgid "Contact is offline. Your message could not be sent."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:363
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6397,17 +6564,17 @@ msgstr "Mensagem de Estado"
 msgid "Enabled"
 msgstr "Activar"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3078
+#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
 #, fuzzy
 msgid "Default"
 msgstr "Apagar MOTD"
 
-#: ../src/config.py:739 ../src/dialogs.py:1395
+#: ../src/config.py:733 ../src/dialogs.py:1409
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Uma ligação não está disponível"
 
-#: ../src/config.py:740
+#: ../src/config.py:734
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6423,9 +6590,9 @@ msgid "status message text"
 msgstr "texto da mensagem de estado"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2383 ../src/dialogs.py:2449
-#: ../src/dialogs.py:3215 ../src/disco.py:866 ../src/disco.py:1726
-#: ../src/disco.py:2030 ../src/history_window.py:90
+#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
+#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
+#: ../src/disco.py:2048 ../src/history_window.py:90
 msgid "Name"
 msgstr "Nome"
 
@@ -6459,7 +6626,7 @@ msgstr "Não tem nenhuma conta activa"
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1976 ../src/config.py:2509 ../src/config.py:2545
+#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
 msgid "You are currently connected to the server"
 msgstr "Está neste momento ligado ao servidor"
 
@@ -6495,184 +6662,184 @@ msgstr "Nome da conta não pode ser vazio"
 msgid "Account name cannot contain spaces."
 msgstr "Nome da conta não pode conter espaços"
 
-#: ../src/config.py:2072
+#: ../src/config.py:2074
 #, fuzzy
 msgid "Rename Account"
 msgstr "Gerir Contas"
 
-#: ../src/config.py:2073
+#: ../src/config.py:2075
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: ../src/config.py:2101
+#: ../src/config.py:2103
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Um Jabber ID deve estar no formato \"utilizador@nomedoservidor\"."
 
-#: ../src/config.py:2318 ../src/config.py:3606
+#: ../src/config.py:2320 ../src/config.py:3623
 msgid "Invalid entry"
 msgstr "Entrada inválida"
 
-#: ../src/config.py:2319 ../src/config.py:3607
+#: ../src/config.py:2321 ../src/config.py:3624
 msgid "Custom port must be a port number."
 msgstr "A porta do proxy deve ser um número de porta"
 
-#: ../src/config.py:2340
+#: ../src/config.py:2342
 msgid "Failed to get secret keys"
 msgstr "Erro ao receber as chaves secretas"
 
-#: ../src/config.py:2341
+#: ../src/config.py:2343
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Houve um problema ao receber as suas chaves secretas OpenPGP."
 
-#: ../src/config.py:2375
+#: ../src/config.py:2377
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "Encriptação OpenPGP"
 
-#: ../src/config.py:2376
+#: ../src/config.py:2378
 msgid "Choose your OpenPGP key"
 msgstr "Escolha sua chave OpenPGP"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2385
 msgid "No such account available"
 msgstr "Tal conta não está disponível"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2386
 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:2391 ../src/dialogs.py:2136 ../src/dialogs.py:2371
-#: ../src/dialogs.py:2557 ../src/disco.py:511 ../src/profile_window.py:339
+#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
+#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
 msgid "You are not connected to the server"
 msgstr "Não está ligado ao servidor"
 
-#: ../src/config.py:2392
+#: ../src/config.py:2394
 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:2396
+#: ../src/config.py:2398
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:2397
+#: ../src/config.py:2399
 #, 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:2510 ../src/config.py:2546
+#: ../src/config.py:2512 ../src/config.py:2548
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Para mudar o nome da conta, deve estar disconectado."
 
-#: ../src/config.py:2515
+#: ../src/config.py:2517
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:2516
+#: ../src/config.py:2518
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2673
+#: ../src/config.py:2675
 #, python-format
 msgid "Edit %s"
 msgstr "_Editar %s"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2677
 #, python-format
 msgid "Register to %s"
 msgstr "Registar para %s"
 
 #. list at the beginning
-#: ../src/config.py:2711
+#: ../src/config.py:2713
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:2712
+#: ../src/config.py:2714
 #, fuzzy
 msgid "Member List"
 msgstr "_Membro"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2714
 #, fuzzy
 msgid "Owner List"
 msgstr "_Dono"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2715
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Administrador"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2763 ../src/disco.py:873 ../src/history_manager.py:201
+#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2773
+#: ../src/config.py:2789
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:2780
+#: ../src/config.py:2796
 #, fuzzy
 msgid "Nick"
 msgstr "_Expulsar"
 
-#: ../src/config.py:2786
+#: ../src/config.py:2802
 #, fuzzy
 msgid "Role"
 msgstr "Função:"
 
-#: ../src/config.py:2813
+#: ../src/config.py:2829
 #, fuzzy
 msgid "Banning..."
 msgstr "Banindo %s"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2815
+#: ../src/config.py:2831
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2817
+#: ../src/config.py:2833
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:2818
+#: ../src/config.py:2834
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2836
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:2821
+#: ../src/config.py:2837
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2823
+#: ../src/config.py:2839
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Administrador"
 
-#: ../src/config.py:2824
+#: ../src/config.py:2840
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2825
+#: ../src/config.py:2841
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6682,86 +6849,86 @@ msgid ""
 "domain/resource, or address containing a subdomain)."
 msgstr ""
 
-#: ../src/config.py:2926
+#: ../src/config.py:2943
 #, python-format
 msgid "Removing %s account"
 msgstr "Removendo %s conta"
 
-#: ../src/config.py:2941
+#: ../src/config.py:2958
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Encriptação desactivada"
 
-#: ../src/config.py:2942
+#: ../src/config.py:2959
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2955 ../src/gui_interface.py:1132
-#: ../src/gui_interface.py:1243
+#: ../src/config.py:2972 ../src/gui_interface.py:311
+#: ../src/gui_interface.py:1048
 msgid "Password Required"
 msgstr "Senha Necessária"
 
-#: ../src/config.py:2956 ../src/gui_interface.py:1223
+#: ../src/config.py:2973 ../src/gui_interface.py:1028
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduza a sua senha para a conta %s"
 
-#: ../src/config.py:2957 ../src/gui_interface.py:1243
+#: ../src/config.py:2974 ../src/gui_interface.py:1048
 msgid "Save password"
 msgstr "Guardar senha"
 
-#: ../src/config.py:2967
+#: ../src/config.py:2984
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Conta \"%s\" está ligada ao servidor"
 
-#: ../src/config.py:2968
+#: ../src/config.py:2985
 msgid "If you remove it, the connection will be lost."
 msgstr "Se remover isto, a ligação será perdida."
 
-#: ../src/config.py:2982
+#: ../src/config.py:2999
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Ligação"
 
-#: ../src/config.py:2983
+#: ../src/config.py:3000
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3001
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Remover conta _apenas do Gajim"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3002
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3078
+#: ../src/config.py:3095
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Mostrar hora:"
 
-#: ../src/config.py:3079
+#: ../src/config.py:3096
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:3080
+#: ../src/config.py:3097
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Mostrar hora:"
 
-#: ../src/config.py:3150
+#: ../src/config.py:3167
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Chat"
 
-#: ../src/config.py:3183
+#: ../src/config.py:3200
 msgid "This bookmark has invalid data"
 msgstr "Este bookmark tem dados inválidos"
 
-#: ../src/config.py:3184
+#: ../src/config.py:3201
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6769,31 +6936,31 @@ msgstr ""
 "bookmark"
 
 #. invalid char
-#: ../src/config.py:3302 ../src/dialogs.py:1934
+#: ../src/config.py:3319 ../src/dialogs.py:1950
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/config.py:3303 ../src/config.py:3317 ../src/config.py:3331
+#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Alcunha não encontrada: %s"
 
-#: ../src/config.py:3316 ../src/config.py:3582
+#: ../src/config.py:3333 ../src/config.py:3599
 #, fuzzy
 msgid "Invalid server"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/config.py:3330
+#: ../src/config.py:3347
 #, fuzzy
 msgid "Invalid room"
 msgstr "Entrada inválida"
 
-#: ../src/config.py:3498
+#: ../src/config.py:3515
 msgid "Account has been added successfully"
 msgstr "A conta foi adicionada com sucesso"
 
-#: ../src/config.py:3499 ../src/config.py:3505
+#: ../src/config.py:3516 ../src/config.py:3522
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6804,34 +6971,34 @@ msgstr ""
 "tarde clicando no item de menu Contas dentro do menu Editar a partir da "
 "janela principal."
 
-#: ../src/config.py:3504
+#: ../src/config.py:3521
 msgid "Your new account has been created successfully"
 msgstr "A sua nova conta foi criada com sucesso"
 
-#: ../src/config.py:3543
+#: ../src/config.py:3560
 msgid "Invalid username"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/config.py:3545
+#: ../src/config.py:3562
 msgid "You must provide a username to configure this account."
 msgstr "Deve introduzir um nome de utilizador para configurar esta conta."
 
-#: ../src/config.py:3583
+#: ../src/config.py:3600
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Por favor, especifique a nova alcunha a usar:"
 
-#: ../src/config.py:3639 ../src/gui_interface.py:1904
+#: ../src/config.py:3656 ../src/gui_interface.py:1693
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Contacto já se encontra na lista"
 
-#: ../src/config.py:3640 ../src/gui_interface.py:1905
+#: ../src/config.py:3657 ../src/gui_interface.py:1694
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3717
+#: ../src/config.py:3734
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6841,7 +7008,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3723 ../src/gui_interface.py:1932
+#: ../src/config.py:3740 ../src/gui_interface.py:1721
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6849,77 +7016,86 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3755 ../src/config.py:3789
+#: ../src/config.py:3772 ../src/config.py:3806
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Ocorreu um erro ao criar a conta"
 
-#: ../src/config.py:3854
+#: ../src/config.py:3871
 msgid "Account name is in use"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:3855
+#: ../src/config.py:3872
 msgid "You already have an account using this name."
 msgstr "Já tem uma conta usando este nome."
 
-#: ../src/config.py:4009
+#: ../src/config.py:3991
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/config.py:3992
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#: ../src/config.py:4036
 msgid "Active"
 msgstr "Activo"
 
-#: ../src/config.py:4017
+#: ../src/config.py:4044
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:4052
+#: ../src/config.py:4079
 msgid "First Message Received"
 msgstr ""
 
-#: ../src/config.py:4053
+#: ../src/config.py:4080
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Nova Mensagem"
 
-#: ../src/config.py:4055
+#: ../src/config.py:4082
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Nova Mensagem"
 
-#: ../src/config.py:4056
+#: ../src/config.py:4083
 #, fuzzy
 msgid "Contact Connected"
 msgstr "Nome do Contacto"
 
-#: ../src/config.py:4057
+#: ../src/config.py:4084
 #, fuzzy
 msgid "Contact Disconnected"
 msgstr "Contacto Entrou"
 
-#: ../src/config.py:4058
+#: ../src/config.py:4085
 #, fuzzy
 msgid "Message Sent"
 msgstr "Mensagem"
 
-#: ../src/config.py:4059
+#: ../src/config.py:4086
 msgid "Group Chat Message Highlight"
 msgstr ""
 
-#: ../src/config.py:4060
+#: ../src/config.py:4087
 msgid "Group Chat Message Received"
 msgstr ""
 
-#: ../src/config.py:4061
+#: ../src/config.py:4088
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Convite Recebido"
 
-#: ../src/conversation_textview.py:600
+#: ../src/conversation_textview.py:601
 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:619
+#: ../src/conversation_textview.py:620
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6928,45 +7104,45 @@ 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:739
+#: ../src/conversation_textview.py:740
 #, fuzzy
 msgid "_Quote"
 msgstr "_Sair"
 
-#: ../src/conversation_textview.py:746
+#: ../src/conversation_textview.py:747
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Acções para \"%s\""
 
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Read _Wikipedia Article"
 msgstr "Ler Artigo _Wikipedia"
 
-#: ../src/conversation_textview.py:763
+#: ../src/conversation_textview.py:765
 msgid "Look it up in _Dictionary"
 msgstr "Procurar no _Dicionário"
 
-#: ../src/conversation_textview.py:780
+#: ../src/conversation_textview.py:782
 #, 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:793
+#: ../src/conversation_textview.py:795
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL de Procura na Web não existe \"%s\""
 
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 msgid "Web _Search for it"
 msgstr "_Pesquisar na Web sobre o assunto"
 
-#: ../src/conversation_textview.py:802
+#: ../src/conversation_textview.py:804
 msgid "Open as _Link"
 msgstr ""
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1296
+#: ../src/conversation_textview.py:1298
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6974,196 +7150,201 @@ msgstr[0] "Ontem"
 msgstr[1] "Ontem"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1344 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Assunto: %s\n"
 
-#: ../src/dataforms_widget.py:544
+#: ../src/dataforms_widget.py:545
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Impossível entrar na sala"
 
-#: ../src/dataforms_widget.py:546
+#: ../src/dataforms_widget.py:547
 #, python-format
 msgid "Media type not supported: %s"
 msgstr ""
 
-#: ../src/dataforms_widget.py:601
+#: ../src/dataforms_widget.py:562
+msgid "This field is required"
+msgstr ""
+
+#: ../src/dataforms_widget.py:607
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Cliente de IM Jabber"
 
-#: ../src/dataforms_widget.py:602
+#: ../src/dataforms_widget.py:608
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:613
+#: ../src/dataforms_widget.py:619
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:616 ../src/dataforms_widget.py:618
+#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:82
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nome do Contacto <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:84
 #, fuzzy, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:195
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:201
+#: ../src/dialogs.py:202
 msgid "In the group"
 msgstr "Neste grupo"
 
-#: ../src/dialogs.py:292
+#: ../src/dialogs.py:293
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:297
+#: ../src/dialogs.py:298
 msgid "Contact name"
 msgstr "Nome do Contacto"
 
-#: ../src/dialogs.py:469
+#: ../src/dialogs.py:470
 #, fuzzy
 msgid "Set Mood"
 msgstr "Definir MOTD"
 
-#: ../src/dialogs.py:589
+#: ../src/dialogs.py:590
 #, python-format
 msgid "%s Status Message"
 msgstr "Mensagem de Estado de %s"
 
-#: ../src/dialogs.py:603
+#: ../src/dialogs.py:604
 msgid "Status Message"
 msgstr "Mensagem de Estado"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:794
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Mensagem de Estado"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:795
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 
-#: ../src/dialogs.py:802
+#: ../src/dialogs.py:803
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Configurar Mensagens de Estado</b>"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:804
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Escreva a sua nova mensagem de estado:"
 
-#: ../src/dialogs.py:831
+#: ../src/dialogs.py:832
 #, fuzzy
 msgid "AIM Address:"
 msgstr "_Endereço:"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:833
 msgid "GG Number:"
 msgstr ""
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:834
 msgid "ICQ Number:"
 msgstr ""
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:835
 #, fuzzy
 msgid "MSN Address:"
 msgstr "_Endereço:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:836
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Complemento:"
 
-#: ../src/dialogs.py:872
+#: ../src/dialogs.py:873
 #, 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:875
+#: ../src/dialogs.py:876
 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:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
+#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
+#: ../src/dialogs.py:3464
 msgid "Invalid User ID"
 msgstr "ID de Utilizador inválido"
 
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1052
 #, 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:1051
+#: ../src/dialogs.py:1057
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Eu gostaria de o adicionar à minha lista"
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1071
 msgid "Contact already in roster"
 msgstr "Contacto já se encontra na lista"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1072
 msgid "This contact is already listed in your roster."
 msgstr "Este contacto já se encontra na sua lista de contactos."
 
-#: ../src/dialogs.py:1112
+#: ../src/dialogs.py:1118
 #, fuzzy
 msgid "User ID:"
 msgstr "ID do Utilizador:"
 
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1189
 msgid "A GTK+ jabber client"
 msgstr "Um cliente Jabber GTK+"
 
-#: ../src/dialogs.py:1176
+#: ../src/dialogs.py:1190
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1191
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1187
+#: ../src/dialogs.py:1201
 msgid "Current Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1203
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:1195
+#: ../src/dialogs.py:1209
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1215
 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:1213
+#: ../src/dialogs.py:1227
 msgid "translator-credits"
 msgstr "Miguel Fonseca <miguelcsf@gmail.com>"
 
-#: ../src/dialogs.py:1396
+#: ../src/dialogs.py:1410
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7172,107 +7353,107 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1935 ../src/dialogs.py:2322
+#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr "Alcunha não encontrada: %s"
 
-#: ../src/dialogs.py:2053
+#: ../src/dialogs.py:2069
 #, 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:2056
+#: ../src/dialogs.py:2072
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Pedido de subscrição de %s"
 
-#: ../src/dialogs.py:2131 ../src/gui_interface.py:2672
+#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
 #, fuzzy, python-format
 msgid "You are already in group chat %s"
 msgstr "Já está na sala %s"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2153
 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:2178
+#: ../src/dialogs.py:2194
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entrar num Chat com a conta %s"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2325
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Nome de conta inválido"
 
-#: ../src/dialogs.py:2310
+#: ../src/dialogs.py:2326
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
 
-#: ../src/dialogs.py:2321
+#: ../src/dialogs.py:2337
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/dialogs.py:2326 ../src/dialogs.py:2332
-#: ../src/groupchat_control.py:1832
+#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
+#: ../src/groupchat_control.py:1847
 #, fuzzy
 msgid "Invalid group chat Jabber ID"
 msgstr "Jabber ID Inválido"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2343
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr ""
 
-#: ../src/dialogs.py:2333 ../src/groupchat_control.py:1833
+#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr ""
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2356
 msgid "This is not a group chat"
 msgstr ""
 
-#: ../src/dialogs.py:2341
+#: ../src/dialogs.py:2357
 #, 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:2372
+#: ../src/dialogs.py:2388
 #, 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:2386
+#: ../src/dialogs.py:2402
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/dialogs.py:2421
+#: ../src/dialogs.py:2437
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Conta \"%s\" está ligada ao servidor"
 
-#: ../src/dialogs.py:2422
+#: ../src/dialogs.py:2438
 #, 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:2446
+#: ../src/dialogs.py:2462
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2523
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar conversa com a conta %s"
 
-#: ../src/dialogs.py:2509
+#: ../src/dialogs.py:2525
 msgid "Start Chat"
 msgstr "Iniciar Conversa"
 
-#: ../src/dialogs.py:2510
+#: ../src/dialogs.py:2526
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -7282,172 +7463,172 @@ msgstr ""
 "de enviar uma mensagem instantânea:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2536 ../src/dialogs.py:2917 ../src/dialogs.py:3129
+#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
 msgid "Connection not available"
 msgstr "Ligação indisponível"
 
-#: ../src/dialogs.py:2537 ../src/dialogs.py:2918 ../src/dialogs.py:3130
+#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, verifique se está ligado com \"%s\"."
 
-#: ../src/dialogs.py:2546 ../src/dialogs.py:2549
+#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Jabber ID Inválido"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2565
 #, fuzzy, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossível escrever ficheiro em %s"
 
-#: ../src/dialogs.py:2558
+#: ../src/dialogs.py:2574
 msgid "Without a connection, you can not change your password."
 msgstr "Tem de estar ligado para poder mudar a sua senha."
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "Invalid password"
 msgstr "Senha Inválida"
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "You must enter a password."
 msgstr "Deve introduzir uma senha."
 
-#: ../src/dialogs.py:2581
+#: ../src/dialogs.py:2597
 msgid "Passwords do not match"
 msgstr "As senhas não conferem"
 
-#: ../src/dialogs.py:2582
+#: ../src/dialogs.py:2598
 msgid "The passwords typed in both fields must be identical."
 msgstr "As senhas introduzidas em ambos os campos devem ser idênticas."
 
 #. default value
-#: ../src/dialogs.py:2619 ../src/notify.py:247 ../src/notify.py:473
+#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
 msgid "Contact Signed In"
 msgstr "Contacto Entrou"
 
-#: ../src/dialogs.py:2621 ../src/notify.py:255 ../src/notify.py:475
+#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
 msgid "Contact Signed Out"
 msgstr "Contacto Saiu"
 
 #. chat message
-#: ../src/dialogs.py:2623 ../src/notify.py:277 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
 msgid "New Message"
 msgstr "Nova Mensagem"
 
 #. single message
-#: ../src/dialogs.py:2623 ../src/notify.py:259 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
 msgid "New Single Message"
 msgstr "Nova Mensagem Instantânea"
 
 #. private message
-#: ../src/dialogs.py:2624 ../src/notify.py:265 ../src/notify.py:478
+#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
 msgid "New Private Message"
 msgstr "Nova Mensagem Privada"
 
-#: ../src/dialogs.py:2624 ../src/gui_interface.py:1358 ../src/notify.py:487
+#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
 #, fuzzy
 msgid "New E-mail"
 msgstr "E-Mail"
 
-#: ../src/dialogs.py:2626 ../src/gui_interface.py:1420 ../src/notify.py:480
+#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
 msgid "File Transfer Request"
 msgstr "Pedido de Transferência de Ficheiro"
 
-#: ../src/dialogs.py:2628 ../src/gui_interface.py:1320
-#: ../src/gui_interface.py:1389 ../src/notify.py:482
+#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
+#: ../src/gui_interface.py:1186 ../src/notify.py:482
 msgid "File Transfer Error"
 msgstr "Erro na Transferência de Ficheiro"
 
-#: ../src/dialogs.py:2630 ../src/gui_interface.py:1466
-#: ../src/gui_interface.py:1489 ../src/gui_interface.py:1506
+#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
+#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
 #: ../src/notify.py:484
 msgid "File Transfer Completed"
 msgstr "Transferência de Ficheiro Completa"
 
-#: ../src/dialogs.py:2631 ../src/gui_interface.py:1469 ../src/notify.py:485
+#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
 msgid "File Transfer Stopped"
 msgstr "Transferência de Ficheiro Parada"
 
-#: ../src/dialogs.py:2633 ../src/gui_interface.py:1152 ../src/notify.py:489
+#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
 #, fuzzy
 msgid "Groupchat Invitation"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: ../src/dialogs.py:2635 ../src/notify.py:239 ../src/notify.py:491
+#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Contacto Saiu"
 
-#: ../src/dialogs.py:2836
+#: ../src/dialogs.py:2852
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Mensagem Simples com a conta %s"
 
-#: ../src/dialogs.py:2838
+#: ../src/dialogs.py:2854
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Mensagem Simples com a conta %s"
 
-#: ../src/dialogs.py:2840
+#: ../src/dialogs.py:2856
 msgid "Single Message"
 msgstr "Mensagem Simples"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2843
+#: ../src/dialogs.py:2859
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:2882
 #, python-format
 msgid "Received %s"
 msgstr "Recebido %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2889
+#: ../src/dialogs.py:2905
 #, 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:2968
+#: ../src/dialogs.py:2984
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:2985
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escreveu:\n"
 
-#: ../src/dialogs.py:3028
+#: ../src/dialogs.py:3044
 #, python-format
 msgid "XML Console for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3046
 msgid "XML Console"
 msgstr "Consola XML"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "add"
 msgstr "Interrompida"
 
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "modify"
 msgstr "_Modificar"
 
-#: ../src/dialogs.py:3160
+#: ../src/dialogs.py:3176
 #, fuzzy
 msgid "remove"
 msgstr "_Remover"
 
-#: ../src/dialogs.py:3188
+#: ../src/dialogs.py:3204
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7455,166 +7636,199 @@ msgid ""
 msgstr "Gostaria de o adicionar à minha lista de contactos."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3204 ../src/dialogs.py:3250
+#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
 #, fuzzy
 msgid "Add"
 msgstr "Endereço"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3206 ../src/dialogs.py:3281
+#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
 #, fuzzy
 msgid "Modify"
 msgstr "_Modificar"
 
-#: ../src/dialogs.py:3212
+#: ../src/dialogs.py:3228
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:3218
+#: ../src/dialogs.py:3234
 #, fuzzy
 msgid "Groups"
 msgstr "Grupo"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3342
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Eu gostaria de o adicionar à minha lista"
 
-#: ../src/dialogs.py:3340
+#: ../src/dialogs.py:3356
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "Adicionar _Contacto"
 
-#: ../src/dialogs.py:3377
+#: ../src/dialogs.py:3393
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Remove o contacto da lista"
 
-#: ../src/dialogs.py:3430
+#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#, python-format
+msgid "Archiving Preferences for %s"
+msgstr ""
+
+#: ../src/dialogs.py:3473
+#, fuzzy
+msgid "Invalid expire value"
+msgstr "Nome de utilizador inválido"
+
+#: ../src/dialogs.py:3474
+msgid "Expire must be a valid positive integer."
+msgstr ""
+
+#: ../src/dialogs.py:3521
+msgid "There is an error with the form"
+msgstr ""
+
+#: ../src/dialogs.py:3732
+msgid "There is an error"
+msgstr ""
+
+#: ../src/dialogs.py:3796
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:3434
+#: ../src/dialogs.py:3800
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3490
+#: ../src/dialogs.py:3856
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3861
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Descrição: %s"
 
-#: ../src/dialogs.py:3539
+#: ../src/dialogs.py:3905
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Formato de uma linha</b>"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:4016
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Formato de uma linha</b>"
 
-#: ../src/dialogs.py:3750
+#: ../src/dialogs.py:4116
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3752
+#: ../src/dialogs.py:4118
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Iniciar Conversa"
 
-#: ../src/dialogs.py:3822
+#: ../src/dialogs.py:4188
 #, fuzzy
 msgid "Invalid List Name"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4189
 #, 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:3855
+#: ../src/dialogs.py:4221
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Está banido/a desta sala."
 
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4224
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "%(contact_jid)s foi convidado(a) para %(room_jid)s."
 
-#: ../src/dialogs.py:3860
+#: ../src/dialogs.py:4226
 #, 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:3868
+#: ../src/dialogs.py:4234
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4236
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3932
+#: ../src/dialogs.py:4298
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:3942 ../src/dialogs.py:3985 ../src/dialogs.py:4041
+#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
+#: ../src/dialogs.py:4495
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: ../src/dialogs.py:3947
+#: ../src/dialogs.py:4313
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:3975
+#: ../src/dialogs.py:4341
 msgid "Choose Sound"
 msgstr "Escolher Som"
 
-#: ../src/dialogs.py:3990
+#: ../src/dialogs.py:4356
 msgid "Wav Sounds"
 msgstr "Sons Wav"
 
-#: ../src/dialogs.py:4028
+#: ../src/dialogs.py:4394
 msgid "Choose Image"
 msgstr "Escolha chave"
 
-#: ../src/dialogs.py:4046
+#: ../src/dialogs.py:4412
 msgid "Images"
 msgstr "Imagens"
 
-#: ../src/dialogs.py:4113
+#: ../src/dialogs.py:4482
+#, fuzzy
+msgid "Choose Archive"
+msgstr "Escolha chave"
+
+#: ../src/dialogs.py:4500
+#, fuzzy
+msgid "Zip files"
+msgstr "Todos os ficheiros"
+
+#: ../src/dialogs.py:4525
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:4115
+#: ../src/dialogs.py:4527
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
-#: ../src/dialogs.py:4190
+#: ../src/dialogs.py:4602
 #, fuzzy
 msgid "Condition"
 msgstr "Ligação"
 
-#: ../src/dialogs.py:4310
+#: ../src/dialogs.py:4722
 msgid "when I am "
 msgstr ""
 
-#: ../src/dialogs.py:4786
+#: ../src/dialogs.py:5198
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7622,38 +7836,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4789
+#: ../src/dialogs.py:5201
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4795 ../src/dialogs.py:4879
+#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4801
+#: ../src/dialogs.py:5213
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4806
+#: ../src/dialogs.py:5218
 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:4809 ../src/dialogs.py:4860 ../src/dialogs.py:4873
+#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4814
+#: ../src/dialogs.py:5226
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4825
+#: ../src/dialogs.py:5237
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4826
+#: ../src/dialogs.py:5238
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7663,44 +7877,44 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4827
+#: ../src/dialogs.py:5239
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4861
+#: ../src/dialogs.py:5273
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4867
+#: ../src/dialogs.py:5279
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4874
+#: ../src/dialogs.py:5286
 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:4880
+#: ../src/dialogs.py:5292
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:4945
+#: ../src/dialogs.py:5357
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4947
+#: ../src/dialogs.py:5359
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4949
+#: ../src/dialogs.py:5361
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4953
+#: ../src/dialogs.py:5365
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7716,24 +7930,24 @@ msgstr "Outros"
 msgid "Conference"
 msgstr "Conferência"
 
-#: ../src/disco.py:512
+#: ../src/disco.py:513
 msgid "Without a connection, you can not browse available services"
 msgstr "Tem de estar ligado para ver os serviços"
 
-#: ../src/disco.py:589
+#: ../src/disco.py:600
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Buscar Serviço usando conta %s"
 
-#: ../src/disco.py:591
+#: ../src/disco.py:602
 msgid "Service Discovery"
 msgstr "Buscar Serviço"
 
-#: ../src/disco.py:741
+#: ../src/disco.py:758
 msgid "The service could not be found"
 msgstr "O serviço não pôde ser encontrado"
 
-#: ../src/disco.py:742
+#: ../src/disco.py:759
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7741,96 +7955,96 @@ 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:746 ../src/disco.py:1082
+#: ../src/disco.py:763 ../src/disco.py:1100
 msgid "The service is not browsable"
 msgstr "Serviço não explorável"
 
-#: ../src/disco.py:747
+#: ../src/disco.py:764
 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:786 ../src/disco.py:796
+#: ../src/disco.py:804 ../src/disco.py:814
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/disco.py:850
+#: ../src/disco.py:868
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "usando a conta %s"
 
-#: ../src/disco.py:894
+#: ../src/disco.py:912
 msgid "_Browse"
 msgstr "_Explorar"
 
-#: ../src/disco.py:1083
+#: ../src/disco.py:1101
 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:1323
+#: ../src/disco.py:1341
 #, fuzzy
 msgid "_Execute Command"
 msgstr "comando"
 
-#: ../src/disco.py:1333 ../src/disco.py:1504
+#: ../src/disco.py:1351 ../src/disco.py:1522
 msgid "Re_gister"
 msgstr "Re_gistar"
 
-#: ../src/disco.py:1545
+#: ../src/disco.py:1563
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Buscando %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1736
+#: ../src/disco.py:1754
 msgid "Users"
 msgstr "Utilizadores"
 
 #. Description column
-#: ../src/disco.py:1744
+#: ../src/disco.py:1762
 msgid "Description"
 msgstr "Descrição"
 
 #. Id column
-#: ../src/disco.py:1752
+#: ../src/disco.py:1770
 msgid "Id"
 msgstr ""
 
-#: ../src/disco.py:1817 ../src/gui_interface.py:3182
+#: ../src/disco.py:1835 ../src/gui_interface.py:2995
 msgid "Bookmark already set"
 msgstr "Bookmark já está configurado"
 
-#: ../src/disco.py:1818 ../src/gui_interface.py:3183
+#: ../src/disco.py:1836 ../src/gui_interface.py:2996
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Sala \"%s\" já existe nos seus bookmarks."
 
-#: ../src/disco.py:1827 ../src/gui_interface.py:3197
+#: ../src/disco.py:1845 ../src/gui_interface.py:3010
 msgid "Bookmark has been added successfully"
 msgstr "Bookmark foi adicionado com sucesso"
 
-#: ../src/disco.py:1828 ../src/gui_interface.py:3198
+#: ../src/disco.py:1846 ../src/gui_interface.py:3011
 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:2039
+#: ../src/disco.py:2057
 #, fuzzy
 msgid "Subscribed"
 msgstr "Subscrição"
 
-#: ../src/disco.py:2047
+#: ../src/disco.py:2065
 msgid "Node"
 msgstr "Nó"
 
-#: ../src/disco.py:2111
+#: ../src/disco.py:2129
 msgid "New post"
 msgstr ""
 
-#: ../src/disco.py:2117
+#: ../src/disco.py:2135
 msgid "_Subscribe"
 msgstr "_Subscrever"
 
-#: ../src/disco.py:2123
+#: ../src/disco.py:2141
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "_Subscrever"
@@ -8007,14 +8221,14 @@ msgstr ""
 
 #: ../src/features_window.py:95
 msgid ""
-"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
-"in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 
 #: ../src/features_window.py:96
 msgid ""
-"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
+"You have to set 'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 
 #: ../src/features_window.py:97
@@ -8173,34 +8387,34 @@ msgstr "Descrição: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s quer enviar-lhe um ficheiro:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 msgid "This file already exists"
 msgstr "Este ficheiro já existe"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 #, 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:369 ../src/gtkgui_helpers.py:914
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -8303,30 +8517,30 @@ msgid ""
 "Run anyway?"
 msgstr ""
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
 #, 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:80
+#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
 msgid "command"
 msgstr "comando"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "mostrar ajuda sobre comando"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Mostra ou esconde a janela principal"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
 #, 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:93
+#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
 #, fuzzy
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
@@ -8335,6 +8549,13 @@ msgstr ""
 "Mostra uma lista de todos os contactos na lista. Cada contacto aparece numa "
 "linha separada"
 
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
+#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
+#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
+#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
 #: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
 #: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
 #: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
@@ -8346,43 +8567,35 @@ msgstr ""
 msgid "account"
 msgstr "conta"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "mostrar apenas contactos da conta indicada"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Mostra uma lista de contas registadas"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
 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:109
+#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
 msgid "status"
 msgstr "estado"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106
 #, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"accoun't previous status"
+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:110 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
-msgid "message"
-msgstr "mensagem"
-
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "mensagem de estado:"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8391,50 +8604,22 @@ msgstr ""
 "estado de todas as contas que têm a opção \"sincronizar com estado global\" "
 "activada"
 
-#: ../src/gajim-remote.py:117
-#, fuzzy
-msgid "Changes the priority of account or accounts"
-msgstr "Muda o estado de uma ou várias contas"
-
-#: ../src/gajim-remote.py:119
-#, fuzzy
-msgid "priority"
-msgstr "_Prioridade"
-
-#: ../src/gajim-remote.py:119
-#, fuzzy
-msgid "priority you want to give to the account"
-msgstr "Quero _registar uma nova conta"
-
-#: ../src/gajim-remote.py:121
-#, fuzzy
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-msgstr ""
-"mudar estado da conta \"account\". Se não especificado, tentará mudar o "
-"estado de todas as contas que têm a opção \"sincronizar com estado global\" "
-"activada"
-
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
 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:129
+#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID do contacto com quem deseja conversar"
 
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
 #: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 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:134
-msgid "message content. The account must be specified or \"\""
-msgstr ""
-
-#: ../src/gajim-remote.py:139
+#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -8445,29 +8630,34 @@ msgstr ""
 "conta são opcionais. Se quiser definir apenas 'conta', sem 'chave OpenPGP', "
 "basta definir 'chave OpenPGP' para ''."
 
+#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
 #: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID do destinatário da mensagem"
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
+#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "conteúdo da mensagem"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "chave pgp"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 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:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
+#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
 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:152
+#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -8478,154 +8668,307 @@ msgstr ""
 "conta são opcionais. Se quiser definir apenas 'conta', sem 'chave OpenPGP', "
 "basta definir 'chave OpenPGP' para ''."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 #, fuzzy
 msgid "subject"
 msgstr "Assunto:"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 #, fuzzy
 msgid "message subject"
 msgstr "Mensagem"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID do destinatário da mensagem"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Busca informações detalhadas sobre um contacto"
 
+#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
+#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
 #: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
 #: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID do contacto"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "Busca informações detalhadas sobre um contacto"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
 #, fuzzy
 msgid "Name of the account"
 msgstr "Não tem nenhuma conta activa"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Envia um ficheiro a um contacto"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "file"
 msgstr "Ficheiro"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Localização do ficheiro"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "se especificado, a mensagem será enviada usadando esta conta"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Exibe todas as preferências e os seus valores"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Define o valor de 'chave' para 'valor'."
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "chave=valor"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 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:207
+#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Apaga um item das preferências"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
 msgid "key"
 msgstr "chave"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "nome da preferência a apagar"
 
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
 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"
+"Escreve o estado actual das preferências do Gajim para o ficheiro .config"
+
+#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
+msgid "Removes contact from roster"
+msgstr "Remove o contacto da lista"
+
+#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+msgid "Adds contact to roster"
+msgstr "Adiciona o contacto à lista"
+
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#, fuzzy
+msgid "Adds new contact to this account"
+msgstr "Adiciona um novo contacto nesta conta."
+
+#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+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-plugin.py:226
+#, fuzzy
+msgid ""
+"Returns current status message(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-plugin.py:233 ../src/gajim-remote.py:249
+#, fuzzy
+msgid "Returns number of unread messages"
+msgstr "Tem mensagens não lidas"
+
+#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+msgid "Opens 'Start Chat' dialog"
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#, fuzzy
+msgid "Starts chat, using this account"
+msgstr "Iniciar conversa com a conta %s"
+
+#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+msgid "Sends custom XML"
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#, fuzzy
+msgid "XML to send"
+msgstr "Consola XML"
+
+#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
+msgid "Handle a xmpp:/ uri"
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
+msgid "uri"
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#, fuzzy
+msgid "Join a MUC room"
+msgstr "_Juntar-se a uma Nova Sala"
+
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+#, fuzzy
+msgid "room"
+msgstr "De"
+
+#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+#, fuzzy
+msgid "nick"
+msgstr "_Expulsar"
+
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+#, fuzzy
+msgid "password"
+msgstr "Senha:"
+
+#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+msgid "Check if Gajim is running"
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
+#: ../src/gajim-remote.py:300
+#, fuzzy
+msgid "Shows or hides the ipython window"
+msgstr "Mostra ou esconde a janela principal"
+
+#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+msgid "Missing argument \"contact_jid\""
+msgstr "Argumento em falta \"contacto_jid\""
+
+#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#, python-format
+msgid ""
+"'%s' is not in your roster.\n"
+"Please specify account for sending the message."
+msgstr ""
+"'%s' não está na sua lista.\n"
+"Por favor, especifique a conta para enviar a mensagem"
+
+#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+msgid "You have no active account"
+msgstr "Não tem nenhuma conta activa"
+
+#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+msgid "It seems Gajim is not running. So you can't use gajim-remote."
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:412
+#, fuzzy, python-format
+msgid ""
+"Usage: %s %s %s \n"
+"\t %s"
+msgstr ""
+"Uso: %s %s %s \n"
+"\t"
 
-#: ../src/gajim-remote.py:218
-msgid "Removes contact from roster"
-msgstr "Remove o contacto da lista"
+#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+msgid "Arguments:"
+msgstr "Argumentos:"
 
-#: ../src/gajim-remote.py:227
-msgid "Adds contact to roster"
-msgstr "Adiciona o contacto à lista"
+#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#, python-format
+msgid "%s not found"
+msgstr "%s não encontrado"
 
-#: ../src/gajim-remote.py:229
-msgid "jid"
+#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
+#, python-format
+msgid ""
+"Usage: %s command [arguments]\n"
+"Command is one of:\n"
 msgstr ""
+"Uso: %s comando [argumentos]\n"
+"Comando é um de:\n"
 
-#: ../src/gajim-remote.py:230
-#, fuzzy
-msgid "Adds new contact to this account"
-msgstr "Adiciona um novo contacto nesta conta."
+#: ../src/gajim-remote-plugin.py:496
+#, fuzzy, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Argumento \"%s\" não está especificado. \n"
+"Escreva \"%s help %s\" para mais informações"
 
-#: ../src/gajim-remote.py:235
-msgid "Returns current status (the global one unless account is specified)"
+#: ../src/gajim-remote-plugin.py:500
+#, fuzzy, python-format
+msgid ""
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
 msgstr ""
-"Indica o estado actual (o estado global, a não ser que uma conta seja "
-"especificada)."
+"Argumento \"%s\" não está especificado. \n"
+"Escreva \"%s help %s\" para mais informações"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
+#, fuzzy
+msgid "Wrong uri"
+msgstr "Frase de acesso"
+
+#: ../src/gajim-remote.py:109
 #, fuzzy
 msgid ""
-"Returns current status message (the global one unless account is specified)"
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
 msgstr ""
-"Indica o estado actual (o estado global, a não ser que uma conta seja "
-"especificada)."
+"um de: offline, disponível, livre para conversar, ausente, indisponível, "
+"ocupado, invisível"
 
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:117
 #, fuzzy
-msgid "Returns number of unread messages"
-msgstr "Tem mensagens não lidas"
+msgid "Changes the priority of account or accounts"
+msgstr "Muda o estado de uma ou várias contas"
 
-#: ../src/gajim-remote.py:253
-msgid "Opens 'Start Chat' dialog"
-msgstr ""
+#: ../src/gajim-remote.py:119
+#, fuzzy
+msgid "priority"
+msgstr "_Prioridade"
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:119
 #, fuzzy
-msgid "Starts chat, using this account"
-msgstr "Iniciar conversa com a conta %s"
+msgid "priority you want to give to the account"
+msgstr "Quero _registar uma nova conta"
 
-#: ../src/gajim-remote.py:259
-msgid "Sends custom XML"
+#: ../src/gajim-remote.py:121
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
 msgstr ""
+"mudar estado da conta \"account\". Se não especificado, tentará mudar o "
+"estado de todas as contas que têm a opção \"sincronizar com estado global\" "
+"activada"
 
-#: ../src/gajim-remote.py:261
-#, fuzzy
-msgid "XML to send"
-msgstr "Consola XML"
+#: ../src/gajim-remote.py:134
+msgid "message content. The account must be specified or \"\""
+msgstr ""
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:242
+#, fuzzy
 msgid ""
-"Account in which the xml will be sent; if not specified, xml will be sent to "
-"all accounts"
+"Returns current status message (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:268
 #, fuzzy
@@ -8643,14 +8986,6 @@ msgid ""
 "be set for all accounts"
 msgstr ""
 
-#: ../src/gajim-remote.py:277
-msgid "Handle a xmpp:/ uri"
-msgstr ""
-
-#: ../src/gajim-remote.py:279
-msgid "uri"
-msgstr ""
-
 #: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr ""
@@ -8664,36 +8999,16 @@ msgstr ""
 msgid "Message content"
 msgstr "conteúdo da mensagem"
 
-#: ../src/gajim-remote.py:286
-#, fuzzy
-msgid "Join a MUC room"
-msgstr "_Juntar-se a uma Nova Sala"
-
-#: ../src/gajim-remote.py:288
-#, fuzzy
-msgid "room"
-msgstr "De"
-
 #: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "Room JID"
 msgstr "Sala:"
 
-#: ../src/gajim-remote.py:289
-#, fuzzy
-msgid "nick"
-msgstr "_Expulsar"
-
 #: ../src/gajim-remote.py:289
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Alcunha não encontrada: %s"
 
-#: ../src/gajim-remote.py:290
-#, fuzzy
-msgid "password"
-msgstr "Senha:"
-
 #: ../src/gajim-remote.py:290
 #, fuzzy
 msgid "Password to enter the room"
@@ -8703,36 +9018,6 @@ msgstr "As senhas não conferem"
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:296
-msgid "Check if Gajim is running"
-msgstr ""
-
-#: ../src/gajim-remote.py:300
-#, fuzzy
-msgid "Shows or hides the ipython window"
-msgstr "Mostra ou esconde a janela principal"
-
-#: ../src/gajim-remote.py:327
-msgid "Missing argument \"contact_jid\""
-msgstr "Argumento em falta \"contacto_jid\""
-
-#: ../src/gajim-remote.py:348
-#, python-format
-msgid ""
-"'%s' is not in your roster.\n"
-"Please specify account for sending the message."
-msgstr ""
-"'%s' não está na sua lista.\n"
-"Por favor, especifique a conta para enviar a mensagem"
-
-#: ../src/gajim-remote.py:351
-msgid "You have no active account"
-msgstr "Não tem nenhuma conta activa"
-
-#: ../src/gajim-remote.py:404
-msgid "It seems Gajim is not running. So you can't use gajim-remote."
-msgstr ""
-
 #: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
@@ -8740,24 +9025,6 @@ msgid ""
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:435
-msgid "Arguments:"
-msgstr "Argumentos:"
-
-#: ../src/gajim-remote.py:439
-#, python-format
-msgid "%s not found"
-msgstr "%s não encontrado"
-
-#: ../src/gajim-remote.py:445
-#, python-format
-msgid ""
-"Usage: %s command [arguments]\n"
-"Command is one of:\n"
-msgstr ""
-"Uso: %s comando [argumentos]\n"
-"Comando é um de:\n"
-
 #: ../src/gajim-remote.py:514
 #, fuzzy, python-format
 msgid ""
@@ -8780,11 +9047,6 @@ msgstr ""
 msgid "No uri given"
 msgstr ""
 
-#: ../src/gajim-remote.py:540
-#, fuzzy
-msgid "Wrong uri"
-msgstr "Frase de acesso"
-
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Tema"
@@ -8811,204 +9073,202 @@ msgstr "Não pode apagar o seu tema actual"
 msgid "Please first choose another for your current theme."
 msgstr "Por favor, escolha primeiro outro para o seu tema actual."
 
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:170
 msgid "Sending private message failed"
 msgstr "Falha ao enviar uma mensagem privada"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:171
+#: ../src/groupchat_control.py:172
 #, 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:450
+#: ../src/groupchat_control.py:455
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Muda Alcu_nha"
 
-#: ../src/groupchat_control.py:631
+#: ../src/groupchat_control.py:636
 #, fuzzy
 msgid "Conversation with "
 msgstr "Histórico das Conversas"
 
-#: ../src/groupchat_control.py:633
+#: ../src/groupchat_control.py:638
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Ligação"
 
-#. Can be a message (see handle_event_gc_config_change in
-#. gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1272 ../src/gui_interface.py:1080
+#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1286
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1288
 #, fuzzy
 msgid "A new room has been created"
 msgstr "A sua nova conta foi criada com sucesso"
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1291
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1287
+#: ../src/groupchat_control.py:1297
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi expulso: %(reason)s"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1300
 #, 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:1300
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s foi banido: %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1312
 #, 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:1314 ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
 #, python-format
 msgid "You are now known as %s"
 msgstr "É agora conhecido como %s"
 
-#: ../src/groupchat_control.py:1330 ../src/gui_interface.py:919
+#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s agora é conhecido como %s"
 
-#: ../src/groupchat_control.py:1372 ../src/groupchat_control.py:1377
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1392
 #, 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:1374
+#: ../src/groupchat_control.py:1383
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Filiação: "
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1388
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1394
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1470
+#: ../src/groupchat_control.py:1477
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1474
+#: ../src/groupchat_control.py:1481
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1489
+#: ../src/groupchat_control.py:1496
 #, 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:1493
+#: ../src/groupchat_control.py:1500
 #, 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:1522
+#: ../src/groupchat_control.py:1530
 #, python-format
 msgid "%s has left"
 msgstr "%s saiu da sala"
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1535
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Neste grupo"
 
-#: ../src/groupchat_control.py:1529 ../src/gui_interface.py:946
+#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
 #: ../src/history_window.py:447 ../src/notify.py:234
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s está agora %(status)s"
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1774
 #, 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:1761
+#: ../src/groupchat_control.py:1776
 #, 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:1765 ../src/gui_interface.py:1216
-#: ../src/gui_interface.py:1992 ../src/gui_interface.py:2029
-#: ../src/gui_interface.py:2064 ../src/message_window.py:224
-#: ../src/roster_window.py:2739 ../src/roster_window.py:3399
-#: ../src/roster_window.py:4123
+#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
+#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
+#: ../src/gui_interface.py:1853 ../src/message_window.py:224
+#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
+#: ../src/roster_window.py:4195
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Não voltar a perguntar"
 
-#: ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:1814
 msgid "Changing Subject"
 msgstr "Mudar Assunto"
 
-#: ../src/groupchat_control.py:1800
+#: ../src/groupchat_control.py:1815
 msgid "Please specify the new subject:"
 msgstr "Por favor, especifique o novo assunto:"
 
-#: ../src/groupchat_control.py:1807
+#: ../src/groupchat_control.py:1822
 msgid "Changing Nickname"
 msgstr "Mudar Alcunha"
 
-#: ../src/groupchat_control.py:1808
+#: ../src/groupchat_control.py:1823
 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:1839
+#: ../src/groupchat_control.py:1854
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Descrição: %s"
 
-#: ../src/groupchat_control.py:1840
+#: ../src/groupchat_control.py:1855
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1842
+#: ../src/groupchat_control.py:1857
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2028
+#: ../src/groupchat_control.py:2046
 #, python-format
 msgid "Kicking %s"
 msgstr "Expulsando %s"
 
-#: ../src/groupchat_control.py:2029 ../src/groupchat_control.py:2356
+#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
 msgid "You may specify a reason below:"
 msgstr "Pode especificar uma razão em baixo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2355
+#: ../src/groupchat_control.py:2373
 #, python-format
 msgid "Banning %s"
 msgstr "Banindo %s"
@@ -9034,56 +9294,66 @@ msgid "Details"
 msgstr "Detalhes"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
+#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Erro: impossível abrir %s para leitura"
 
-#: ../src/gtkgui_helpers.py:400
+#: ../src/gtkgui_helpers.py:404
 msgid "Error reading file:"
 msgstr "Erro na leitura do ficheiro:"
 
-#: ../src/gtkgui_helpers.py:403
+#: ../src/gtkgui_helpers.py:407
 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:444
+#: ../src/gtkgui_helpers.py:448
 #, 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:818
+#: ../src/gtkgui_helpers.py:822
 #, fuzzy
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim - Um cliente Jabber GTK+"
 
-#: ../src/gtkgui_helpers.py:819
+#: ../src/gtkgui_helpers.py:823
 #, fuzzy
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Deseja sobre-escrevê-lo?"
 
-#: ../src/gtkgui_helpers.py:820
+#: ../src/gtkgui_helpers.py:824
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:887
+#: ../src/gtkgui_helpers.py:891
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:888
+#: ../src/gtkgui_helpers.py:892
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:924
+#: ../src/gtkgui_helpers.py:928
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Guardar Ficheiro como..."
 
-#: ../src/gui_interface.py:140
+#. we are banned
+#. group chat does not exist
+#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
+#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
+#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
+#: ../src/gui_interface.py:348
+#, fuzzy
+msgid "Unable to join group chat"
+msgstr "Impossível entrar na sala"
+
+#: ../src/gui_interface.py:138
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9093,166 +9363,196 @@ msgstr ""
 "A alcunha que deseja encontra-se em uso ou registado por outro ocupante.\n"
 "Por favor, introduza outra alcunha em baixo:"
 
-#: ../src/gui_interface.py:143
+#: ../src/gui_interface.py:141
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:159
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Aceita este pedido?"
 
-#: ../src/gui_interface.py:161
+#: ../src/gui_interface.py:160
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Aceita este pedido?"
 
-#: ../src/gui_interface.py:164
+#: ../src/gui_interface.py:163
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) Autorização para %s (id: %s)"
 
-#: ../src/gui_interface.py:213 ../src/notify.py:493
+#: ../src/gui_interface.py:209 ../src/notify.py:493
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Ligação"
 
-#: ../src/gui_interface.py:606 ../src/gui_interface.py:610
+#: ../src/gui_interface.py:312
+#, 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/gui_interface.py:324
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/gui_interface.py:333
+#, fuzzy, python-format
+msgid "You are banned from group chat %s."
+msgstr "Está banido/a desta sala."
+
+#: ../src/gui_interface.py:338
+#, fuzzy, python-format
+msgid "Group chat %s does not exist."
+msgstr "Tal sala não existe."
+
+#: ../src/gui_interface.py:341
+#, fuzzy
+msgid "Group chat creation is restricted."
+msgstr "Criação de salas encontra-se restrita."
+
+#: ../src/gui_interface.py:344
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "A sua alcunha registada tem de ser usada."
+
+#: ../src/gui_interface.py:349
+#, fuzzy, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Não está na lista de membros."
+
+#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Introduza a sua mensagem :"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:621 ../src/gui_interface.py:636
+#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "erro ao enviar"
 
-#: ../src/gui_interface.py:663 ../src/notify.py:495
+#: ../src/gui_interface.py:540 ../src/notify.py:495
 #, fuzzy
 msgid "Subscription request"
 msgstr "Pedido de Subscrição"
 
-#: ../src/gui_interface.py:688
+#: ../src/gui_interface.py:565
 msgid "Authorization accepted"
 msgstr "Autorização aceite"
 
-#: ../src/gui_interface.py:689
+#: ../src/gui_interface.py:566
 #, 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/gui_interface.py:702
+#: ../src/gui_interface.py:579
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contacto \"%s\" removeu a sua subscrição para si"
 
-#: ../src/gui_interface.py:703
+#: ../src/gui_interface.py:580
 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/gui_interface.py:727 ../src/notify.py:497
+#: ../src/gui_interface.py:604 ../src/notify.py:497
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Subscrever"
 
-#: ../src/gui_interface.py:754
+#: ../src/gui_interface.py:631
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contacto com \"%s\" não pode ser estabelecido"
 
-#: ../src/gui_interface.py:1015
+#: ../src/gui_interface.py:859
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1083
+#: ../src/gui_interface.py:926
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gui_interface.py:1085
+#: ../src/gui_interface.py:928
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gui_interface.py:1087
+#: ../src/gui_interface.py:930
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:1091
+#: ../src/gui_interface.py:934
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1093
+#: ../src/gui_interface.py:936
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1095
+#: ../src/gui_interface.py:938
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1098
+#: ../src/gui_interface.py:941
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1101
+#: ../src/gui_interface.py:944
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1133
-#, 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/gui_interface.py:1180
+#: ../src/gui_interface.py:985
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gui_interface.py:1182 ../src/gui_interface.py:1189
+#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Está neste momento ligado sem a sua chave OpenPGP."
 
-#: ../src/gui_interface.py:1184
+#: ../src/gui_interface.py:989
 msgid "Your passphrase is incorrect"
 msgstr "A sua chave de acesso está incorrecta"
 
-#: ../src/gui_interface.py:1188
+#: ../src/gui_interface.py:993
 #, fuzzy
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "A sua chave de acesso está incorrecta"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid "GPG key not trusted"
 msgstr ""
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
 msgstr ""
 
-#: ../src/gui_interface.py:1226
+#: ../src/gui_interface.py:1031
 msgid ""
 "Gnome Keyring is installed but not                 correctly started "
 "(environment variable probably not                 correctly set)"
 msgstr ""
 
-#: ../src/gui_interface.py:1330
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1332
+#: ../src/gui_interface.py:1133
 #, 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/gui_interface.py:1345
+#: ../src/gui_interface.py:1146
 #, python-format
 msgid ""
 "\n"
@@ -9262,105 +9562,105 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1418
+#: ../src/gui_interface.py:1215
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quer enviar-lhe um ficheiro."
 
-#: ../src/gui_interface.py:1455 ../src/roster_window.py:1856
+#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Remove o contacto da lista"
 
-#: ../src/gui_interface.py:1458 ../src/roster_window.py:1858
+#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
 #, fuzzy
 msgid "Error opening file"
 msgstr "Erro na leitura do ficheiro:"
 
-#: ../src/gui_interface.py:1490
+#: ../src/gui_interface.py:1287
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Recebeu com sucesso %(filename)s de %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1494
+#: ../src/gui_interface.py:1291
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Transferência de %(filename)s de %(name)s interrompida."
 
-#: ../src/gui_interface.py:1507
+#: ../src/gui_interface.py:1304
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Enviou com sucesso %(filename)s para %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1511
+#: ../src/gui_interface.py:1308
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Transferência de %(filename)s para %(name)s interrompida."
 
-#: ../src/gui_interface.py:1623
+#: ../src/gui_interface.py:1426
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gui_interface.py:1630
+#: ../src/gui_interface.py:1433
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Em todas as _mensagens"
 
-#: ../src/gui_interface.py:1702
+#: ../src/gui_interface.py:1505
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:1703
+#: ../src/gui_interface.py:1506
 #, 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/gui_interface.py:1716
+#: ../src/gui_interface.py:1519
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gui_interface.py:1729
+#: ../src/gui_interface.py:1532
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gui_interface.py:1740
+#: ../src/gui_interface.py:1543
 #, fuzzy
 msgid "Error."
 msgstr "Erro:"
 
-#: ../src/gui_interface.py:1768
+#: ../src/gui_interface.py:1556
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Recurso: "
 
-#: ../src/gui_interface.py:1769
+#: ../src/gui_interface.py:1557
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1816
+#: ../src/gui_interface.py:1604
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s quer enviar-lhe um ficheiro."
 
-#: ../src/gui_interface.py:1819
+#: ../src/gui_interface.py:1607
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Pedido de Transferência de Ficheiro"
 
-#: ../src/gui_interface.py:1927
+#: ../src/gui_interface.py:1716
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1928
+#: ../src/gui_interface.py:1717
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9368,15 +9668,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1936
+#: ../src/gui_interface.py:1725
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1956
+#: ../src/gui_interface.py:1745
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gui_interface.py:1957
+#: ../src/gui_interface.py:1746
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9387,13 +9687,13 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gui_interface.py:1987 ../src/gui_interface.py:2024
-#: ../src/gui_interface.py:2060
+#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
+#: ../src/gui_interface.py:1849
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Ligação"
 
-#: ../src/gui_interface.py:1988
+#: ../src/gui_interface.py:1777
 #, fuzzy
 msgid ""
 "You are about to connect to the server with an insecure connection. This "
@@ -9401,18 +9701,18 @@ msgid ""
 "want to do that?"
 msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
 
-#: ../src/gui_interface.py:1991 ../src/gui_interface.py:2028
-#: ../src/gui_interface.py:2063
+#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
+#: ../src/gui_interface.py:1852
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gui_interface.py:2025
+#: ../src/gui_interface.py:1814
 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/gui_interface.py:2061
+#: ../src/gui_interface.py:1850
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9420,60 +9720,60 @@ msgid ""
 msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2624 ../src/gui_interface.py:2647
+#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Encriptação desactivada"
 
-#: ../src/gui_interface.py:2625
+#: ../src/gui_interface.py:2423
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2648
+#: ../src/gui_interface.py:2446
 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/gui_interface.py:2679 ../src/roster_window.py:3560
+#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
 #, 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/gui_interface.py:3058
+#: ../src/gui_interface.py:2871
 msgid "Could not save your settings and preferences"
 msgstr "Impossível salvar as suas definições e preferências"
 
-#: ../src/gui_interface.py:3592
+#: ../src/gui_interface.py:3411
 msgid "Passphrase Required"
 msgstr "Frase de acesso Necessária"
 
-#: ../src/gui_interface.py:3593
+#: ../src/gui_interface.py:3412
 #, 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/gui_interface.py:3607
+#: ../src/gui_interface.py:3426
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gui_interface.py:3608
+#: ../src/gui_interface.py:3427
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "O utilizador será ligado a %s sem OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3617
+#: ../src/gui_interface.py:3436
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Frase de acesso"
 
-#: ../src/gui_interface.py:3618
+#: ../src/gui_interface.py:3437
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
@@ -9515,6 +9815,12 @@ msgstr "Alcunha:"
 msgid "Message"
 msgstr "Mensagem"
 
+#. holds subject
+#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#, fuzzy
+msgid "Subject"
+msgstr "Assunto:"
+
 #: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -9609,22 +9915,22 @@ msgstr "Não está ligado ao servidor"
 msgid "Do you really want to close them all?"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/message_window.py:484
+#: ../src/message_window.py:485
 #, fuzzy
 msgid "Chats"
 msgstr "Conversa"
 
-#: ../src/message_window.py:486
+#: ../src/message_window.py:487
 #, fuzzy
 msgid "Group Chats"
 msgstr "Chat"
 
-#: ../src/message_window.py:488
+#: ../src/message_window.py:489
 #, fuzzy
 msgid "Private Chats"
 msgstr "Iniciar Conversa"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:495
 #, fuzzy
 msgid "Messages"
 msgstr "Mensagem"
@@ -9682,60 +9988,60 @@ msgstr "Nova Mensagem como %s"
 msgid "Ignore"
 msgstr "_Continuar"
 
-#: ../src/profile_window.py:57
+#: ../src/profile_window.py:58
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2935
+#: ../src/profile_window.py:111 ../src/roster_window.py:3001
 #, fuzzy
 msgid "File is empty"
 msgstr "Localização do ficheiro"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2938
+#: ../src/profile_window.py:114 ../src/roster_window.py:3004
 #, fuzzy
 msgid "File does not exist"
 msgstr "Tal sala não existe."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2940 ../src/roster_window.py:2951
+#: ../src/profile_window.py:128 ../src/profile_window.py:144
+#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/profile_window.py:214
+#: ../src/profile_window.py:215
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Informações do Contacto"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:216
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Formato: AAAA-MM-DD"
 
-#: ../src/profile_window.py:269
+#: ../src/profile_window.py:270
 #, fuzzy
 msgid "Information received"
 msgstr "Convite Recebido"
 
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:341
 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:353
+#: ../src/profile_window.py:354
 msgid "Sending profile..."
 msgstr ""
 
-#: ../src/profile_window.py:368
+#: ../src/profile_window.py:369
 msgid "Information NOT published"
 msgstr ""
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:376
 msgid "vCard publication failed"
 msgstr "Publicação vCard falhou"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:377
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9743,51 +10049,51 @@ msgstr ""
 "Ocorreu um erro na publicação das suas informações pessoais. Tenta novamente "
 "mais tarde."
 
-#: ../src/roster_window.py:256 ../src/roster_window.py:1012
+#: ../src/roster_window.py:262 ../src/roster_window.py:1026
 msgid "Merged accounts"
 msgstr "Contas fundidas"
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1942
 msgid "Authorization has been sent"
 msgstr "Autorização foi enviada"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1943
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Agora \"%s\" saberá o seu estado."
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1966
 msgid "Subscription request has been sent"
 msgstr "Pedido de subscrição foi enviado"
 
-#: ../src/roster_window.py:1944
+#: ../src/roster_window.py:1967
 #, 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:1958
+#: ../src/roster_window.py:1981
 msgid "Authorization has been removed"
 msgstr "Autorização foi removida"
 
-#: ../src/roster_window.py:1959
+#: ../src/roster_window.py:1982
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Doravante, \"%s\" vê-lo-á sempre como estando offline."
 
-#: ../src/roster_window.py:1986
+#: ../src/roster_window.py:2009
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:1987
+#: ../src/roster_window.py:2010
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "O utilizador será ligado a %s sem OpenPGP."
 
-#: ../src/roster_window.py:2199 ../src/roster_window.py:3496
+#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
 msgid "You are participating in one or more group chats"
 msgstr "Está a participar num ou mais chats"
 
-#: ../src/roster_window.py:2200 ../src/roster_window.py:3497
+#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9795,39 +10101,39 @@ 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:2226
+#: ../src/roster_window.py:2249
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2288
+#: ../src/roster_window.py:2311
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2289
+#: ../src/roster_window.py:2312
 #, 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:2290
+#: ../src/roster_window.py:2313
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2373
+#: ../src/roster_window.py:2396
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Cancelar transferência de ficheiro"
 
-#: ../src/roster_window.py:2374
+#: ../src/roster_window.py:2397
 msgid ""
-"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2405 ../src/roster_window.py:2653
+#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
 msgid "You have unread messages"
 msgstr "Tem mensagens não lidas"
 
-#: ../src/roster_window.py:2406
+#: ../src/roster_window.py:2429
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9835,16 +10141,16 @@ msgid ""
 msgstr ""
 "As mensagens só poderão ser lidas mais tarde caso tenha o histórico activado."
 
-#: ../src/roster_window.py:2654
+#: ../src/roster_window.py:2720
 msgid "You must read them before removing this transport."
 msgstr ""
 
-#: ../src/roster_window.py:2657
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2724
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -9853,12 +10159,12 @@ msgstr ""
 "Deixará de poder enviar e receber mensagens aos contactos desde este "
 "transport."
 
-#: ../src/roster_window.py:2661
+#: ../src/roster_window.py:2727
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: ../src/roster_window.py:2666
+#: ../src/roster_window.py:2732
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9867,72 +10173,72 @@ msgstr ""
 "Deixará de poder enviar e receber mensagens aos contactos desde este "
 "transport."
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2800
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
 
-#: ../src/roster_window.py:2736
+#: ../src/roster_window.py:2802
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2827
+#: ../src/roster_window.py:2893
 #, fuzzy
 msgid "Rename Contact"
 msgstr "Contacto:"
 
-#: ../src/roster_window.py:2828
+#: ../src/roster_window.py:2894
 #, fuzzy, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: ../src/roster_window.py:2835
+#: ../src/roster_window.py:2901
 #, fuzzy
 msgid "Rename Group"
 msgstr "_Renomear"
 
-#: ../src/roster_window.py:2836
+#: ../src/roster_window.py:2902
 #, fuzzy, python-format
 msgid "Enter a new name for group %s"
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: ../src/roster_window.py:2881
+#: ../src/roster_window.py:2947
 #, fuzzy
 msgid "Remove Group"
 msgstr "_Remover"
 
-#: ../src/roster_window.py:2882
+#: ../src/roster_window.py:2948
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: ../src/roster_window.py:2883
+#: ../src/roster_window.py:2949
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Remove o contacto da lista"
 
-#: ../src/roster_window.py:2922
+#: ../src/roster_window.py:2988
 msgid "Assign OpenPGP Key"
 msgstr "Atribuir chave OpenPGP"
 
-#: ../src/roster_window.py:2923
+#: ../src/roster_window.py:2989
 msgid "Select a key to apply to the contact"
 msgstr "Selecione uma chave para aplicar ao contacto"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3372
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contacto \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:3308
+#: ../src/roster_window.py:3374
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3313
+#: ../src/roster_window.py:3379
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -9942,12 +10248,12 @@ msgstr ""
 "sempre como offline."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3319
+#: ../src/roster_window.py:3385
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/roster_window.py:3323
+#: ../src/roster_window.py:3389
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9955,17 +10261,17 @@ msgstr ""
 "Ao remover este contacto, também remove a autorização. O contacto vê-lo-á "
 "sempre como offline."
 
-#: ../src/roster_window.py:3326
+#: ../src/roster_window.py:3392
 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:3330
+#: ../src/roster_window.py:3396
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Contacto \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:3335
+#: ../src/roster_window.py:3401
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9974,68 +10280,68 @@ msgstr ""
 "Ao remover este contacto, também remove a autorização. O contacto vê-lo-á "
 "sempre como offline."
 
-#: ../src/roster_window.py:3393
+#: ../src/roster_window.py:3459
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want  to continue?"
 msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
 
-#: ../src/roster_window.py:3395
+#: ../src/roster_window.py:3461
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he or she will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3414
+#: ../src/roster_window.py:3480
 msgid "No account available"
 msgstr "Nenhuma conta disponível"
 
-#: ../src/roster_window.py:3415
+#: ../src/roster_window.py:3481
 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:4023
+#: ../src/roster_window.py:4095
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: ../src/roster_window.py:4025
+#: ../src/roster_window.py:4097
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: ../src/roster_window.py:4117
+#: ../src/roster_window.py:4189
 #, 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:4119
+#: ../src/roster_window.py:4191
 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:4234
+#: ../src/roster_window.py:4306
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Ficheiro Inválido"
 
-#: ../src/roster_window.py:4246
+#: ../src/roster_window.py:4318
 #, 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:4361
+#: ../src/roster_window.py:4433
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Enviar %s"
 
-#: ../src/roster_window.py:4367
+#: ../src/roster_window.py:4439
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Envia um ficheiro a um contacto"
@@ -10045,156 +10351,156 @@ msgstr "Envia um ficheiro a um contacto"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4816 ../src/roster_window.py:4889
-#: ../src/roster_window.py:4898 ../src/statusicon.py:246
-#: ../src/statusicon.py:293 ../src/statusicon.py:299
+#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
+#: ../src/roster_window.py:4970 ../src/statusicon.py:263
+#: ../src/statusicon.py:310 ../src/statusicon.py:316
 #, python-format
 msgid "using account %s"
 msgstr "usando a conta %s"
 
 #. add
-#: ../src/roster_window.py:4905
+#: ../src/roster_window.py:4977
 #, python-format
 msgid "to %s account"
 msgstr "para conta %s"
 
 #. disco
-#: ../src/roster_window.py:4910
+#: ../src/roster_window.py:4982
 #, python-format
 msgid "using %s account"
 msgstr "usando conta %s"
 
-#: ../src/roster_window.py:4948 ../src/statusicon.py:309
+#: ../src/roster_window.py:5020 ../src/statusicon.py:326
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "Gerir Bookmarks..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4968
+#: ../src/roster_window.py:5040
 #, fuzzy, python-format
 msgid "of account %s"
 msgstr "para conta %s"
 
-#: ../src/roster_window.py:5009
+#: ../src/roster_window.py:5081
 #, python-format
 msgid "for account %s"
 msgstr "para conta %s"
 
-#: ../src/roster_window.py:5069 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
 msgid "_Change Status Message"
 msgstr "_Mudar Mensagem de Estado"
 
-#: ../src/roster_window.py:5102
+#: ../src/roster_window.py:5174
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publicar"
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5176
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Publicar"
 
-#: ../src/roster_window.py:5107
+#: ../src/roster_window.py:5179
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Descobrir Recursos..."
 
-#: ../src/roster_window.py:5252
+#: ../src/roster_window.py:5324
 msgid "_Maximize All"
 msgstr ""
 
-#: ../src/roster_window.py:5262 ../src/roster_window.py:5436
+#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "Nova Mensagem"
 
-#: ../src/roster_window.py:5270
+#: ../src/roster_window.py:5342
 msgid "To all users"
 msgstr ""
 
-#: ../src/roster_window.py:5274
+#: ../src/roster_window.py:5346
 #, fuzzy
 msgid "To all online users"
 msgstr "Utilizadores _Online"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5456
+#: ../src/roster_window.py:5528
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Contacto:"
 
 #. Edit Groups
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5537
 msgid "Edit _Groups"
 msgstr "Editar _Grupos"
 
 #. Send single message
-#: ../src/roster_window.py:5520
+#: ../src/roster_window.py:5592
 #, fuzzy
 msgid "Send Single Message"
 msgstr "E_nviar Mensagem Simples"
 
 #. Execute Command
-#: ../src/roster_window.py:5567
+#: ../src/roster_window.py:5639
 msgid "Execute Command..."
 msgstr ""
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5577
+#: ../src/roster_window.py:5649
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transportes"
 
 #. Modify Transport
-#: ../src/roster_window.py:5586
+#: ../src/roster_window.py:5658
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Transportes"
 
 #. Rename
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5668
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: ../src/roster_window.py:5656
+#: ../src/roster_window.py:5728
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5665
+#: ../src/roster_window.py:5737
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Contacto Entrou"
 
-#: ../src/roster_window.py:5672
+#: ../src/roster_window.py:5744
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Contacto Entrou"
 
 #. History manager
-#: ../src/roster_window.py:5754
+#: ../src/roster_window.py:5833
 #, fuzzy
 msgid "History Manager"
 msgstr "_Histórico"
 
-#: ../src/roster_window.py:5765
+#: ../src/roster_window.py:5844
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "_Entrar num Chat"
 
-#: ../src/roster_window.py:5938
+#: ../src/roster_window.py:6019
 msgid "Change Status Message..."
 msgstr "Mudar Mensagem de Estado..."
 
-#: ../src/search_window.py:94
+#: ../src/search_window.py:105
 msgid "Waiting for results"
 msgstr ""
 
-#: ../src/search_window.py:132 ../src/search_window.py:210
+#: ../src/search_window.py:143 ../src/search_window.py:220
 msgid "Error in received dataform"
 msgstr ""
 
 #. No result
-#: ../src/search_window.py:166 ../src/search_window.py:202
+#: ../src/search_window.py:177 ../src/search_window.py:212
 msgid "No result"
 msgstr ""
 
@@ -10207,21 +10513,22 @@ msgstr ""
 msgid "Subject: %s"
 msgstr "Assunto: %s\n"
 
-#: ../src/session.py:433 ../src/session.py:468
+#: ../src/session.py:447 ../src/session.py:491
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:435
+#: ../src/session.py:448
 #, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
+"The remote client wants '\n"
+"                            'to negotiate an session with these features:\n"
 "\n"
 "%s\n"
 "\n"
 "Are these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:469
+#: ../src/session.py:492
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10231,16 +10538,16 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/statusicon.py:210
+#: ../src/statusicon.py:227
 msgid "_Change Status Message..."
 msgstr "_Mudar Mensagem de Estado..."
 
-#: ../src/statusicon.py:322
+#: ../src/statusicon.py:339
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Fora da lista"
 
-#: ../src/statusicon.py:333
+#: ../src/statusicon.py:350
 msgid "Hide this menu"
 msgstr "Esconder este menú"
 
@@ -10382,34 +10689,34 @@ msgstr ""
 "Este serviço/recurso não pôde responder com informações detalhadas.\n"
 "Provavelmente está legacy ou broken"
 
-#: ../src/vcard.py:251
+#: ../src/vcard.py:265
 msgid "?Client:Unknown"
 msgstr "?Cliente:Desconhecido"
 
-#: ../src/vcard.py:253
+#: ../src/vcard.py:267
 msgid "?OS:Unknown"
 msgstr "?SO:Desconhecido"
 
-#: ../src/vcard.py:274
+#: ../src/vcard.py:288
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "?Cliente:Desconhecido"
 
-#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
+#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Versão %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:345
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:349
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Aplicações</b>"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:357
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10417,7 +10724,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:345
+#: ../src/vcard.py:359
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10425,30 +10732,71 @@ msgstr ""
 "Está interessado nas informações de presença do contacto, mas ele/ela não "
 "está na sua"
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:361
 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:349
+#: ../src/vcard.py:363
 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:356
+#: ../src/vcard.py:370
 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:358
+#: ../src/vcard.py:372
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
+#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
 msgid " resource with priority "
 msgstr " recurso com prioridade "
 
+#, fuzzy
+#~ msgid "_Show event in systray"
+#~ msgstr "Mostrar apenas na _lista"
+
+#, fuzzy
+#~ msgid "Autodetect on every Gajim startup"
+#~ msgstr "_Ligar ao arranque"
+
+#, fuzzy
+#~ msgid "Show systray:"
+#~ msgstr "Mostrar apenas na _lista"
+
+#, fuzzy
+#~ msgid "Nickname not allowed: %s"
+#~ msgstr "Alcunha não encontrada: %s"
+
+#, fuzzy
+#~ msgid "Room has been destroyed"
+#~ msgstr "Autorização foi removida"
+
+#~ msgid "I would like to add you to my roster."
+#~ msgstr "Eu gostaria de o adicionar à minha lista"
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "estamos agora subscritos a %s"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "pedido de remoção de subscrição por %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "já não estamos subscritos a %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "JID %s não é compatível com RFC. Não será adicionado à sua lista. Utilize "
+#~ "ferramentas de gestão de lista (roster) tais como http://jru.jabberstudio."
+#~ "org/ para o remover."
+
 #~ msgid "Account Modification"
 #~ msgstr "Modificação da Conta"
 
@@ -10510,34 +10858,6 @@ msgstr " recurso com prioridade "
 #~ msgid "gtk-delete"
 #~ msgstr "Apagar MOTD"
 
-#, fuzzy
-#~ msgid "Add this contact to roster (Ctrl+D)"
-#~ msgstr "Adiciona o contacto à lista"
-
-#, fuzzy
-#~ msgid "Bookmark this room (Ctrl+B)"
-#~ msgstr "Adicionar esta Sala aos _Bookmarks"
-
-#, fuzzy
-#~ msgid "Change your nickname (Ctrl+N)"
-#~ msgstr "Muda Alcu_nha"
-
-#, fuzzy
-#~ msgid "Invite contacts to the conversation (Ctrl+G)"
-#~ msgstr "está a prestar atenção à conversa"
-
-#, fuzzy
-#~ msgid "Show a list of emoticons (Alt+M)"
-#~ msgstr "Clique para inserir um emoticon (Alt+E)"
-
-#, fuzzy
-#~ msgid "Show a list of formattings"
-#~ msgstr "Clique para inserir um emoticon (Alt+E)"
-
-#, fuzzy
-#~ msgid "Show a menu of advanced functions (Alt+D)"
-#~ msgstr "Clique para inserir um emoticon (Alt+E)"
-
 #~ msgid ""
 #~ "All chat states\n"
 #~ "Composing only\n"
@@ -10564,9 +10884,6 @@ msgstr " recurso com prioridade "
 #~ msgid "gtk-cancel"
 #~ msgstr "Apagar MOTD"
 
-#~ msgid "_Preferences"
-#~ msgstr "_Preferências"
-
 #~ msgid "_Quit"
 #~ msgstr "_Sair"
 
@@ -10933,10 +11250,6 @@ msgstr " recurso com prioridade "
 #~ msgid "The auto not available status message"
 #~ msgstr "A mensagem de estado auto-indisponível"
 
-#, fuzzy
-#~ msgid "Use t_rayicon (aka. notification area icon)"
-#~ msgstr "_Ícone na bandeja (também conhecido por área de notificação)"
-
 #, fuzzy
 #~ msgid ""
 #~ "When a new event (message, file transfer request etc..) is received, the "
@@ -11055,14 +11368,6 @@ msgstr " recurso com prioridade "
 #~ msgid "Session Management support not available (missing gnome.ui module)"
 #~ msgstr "Session Management não é suportado (módulo gnome.ui em falta)"
 
-#, fuzzy
-#~ msgid ""
-#~ "Usage: %s %s %s \n"
-#~ "\t %s"
-#~ msgstr ""
-#~ "Uso: %s %s %s \n"
-#~ "\t"
-
 #, fuzzy
 #~ msgid "Private Chat"
 #~ msgstr "Iniciar Conversa"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4aee0fa2ad4ec42598296c9bba22f49c9062c42c..468b9421a11fc79dd0601ed0ba209cd66a51b92a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,11 +6,15 @@
 # Gajim <gajim-devel@gajim.org>, 2007.
 # Djavan Fagundes <djavan@comum.org>, 2009, 2010.
 #
+#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 11:28+0200\n"
+"POT-Creation-Date: 2010-10-01 20:39+0200\n"
 "PO-Revision-Date: 2009-12-31 23:22-0300\n"
 "Last-Translator: Djavan Fagundes <dnoway@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
@@ -31,7 +35,7 @@ msgstr "_Entrar em uma conferência..."
 msgid "_Add Contact..."
 msgstr "_Adicionar contato..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:17
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
 msgid "_Discover Services"
 msgstr "_Descubra serviços"
 
@@ -51,7 +55,7 @@ msgstr "_Abrir caixa de entrada do GMail"
 msgid "_Personal Events"
 msgstr "Eventos _pessoais"
 
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:23
+#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
 msgid "_Start Chat..."
 msgstr "_Iniciar conversa..."
 
@@ -83,10 +87,6 @@ msgid "<b>Please select a server</b>"
 msgstr "<b>Por favor, selecione um servidor</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid "@"
-msgstr "@"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
@@ -94,64 +94,64 @@ msgstr ""
 "Adicionar este certificado na lista de certificados confiáveis.\n"
 "SHA1 fingerprint do certificado:\n"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:10
 msgid "Anon_ymous authentication"
 msgstr "Autenticação anôn_ima"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Connect when I press Finish"
 msgstr "Conectar quando eu clicar em Concluir"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Assistente de configuração de conta"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "I already have an account I want to _use"
 msgstr "Eu já tenho uma conta e quero _usá-la"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I want to _register for a new account"
 msgstr "Eu quero _registrar uma nova conta"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:16
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 #: ../data/gui/accounts_window.ui.h:28
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Se marcado, o Gajim irá memorizar a senha para esta conta"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:17
+#: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Gerenciar..."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:18
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
 #: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2263 ../src/config.py:2342
-#: ../src/config.py:2355 ../src/config.py:3596 ../src/config.py:3671
-#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513
-#: ../src/dialogs.py:526 ../src/roster_window.py:2890
-#: ../src/roster_window.py:2896 ../src/roster_window.py:2901
+#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
+#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
+#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
+#: ../src/dialogs.py:527 ../src/roster_window.py:2956
+#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
 msgid "None"
 msgstr "Nenhum"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:19
+#: ../data/gui/account_creation_wizard_window.ui.h:18
 msgid "Prox_y:"
 msgstr "Prox_y:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #: ../data/gui/accounts_window.ui.h:48
 msgid "Save pass_word"
 msgstr "Salvar sen_ha"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:21
+#: ../data/gui/account_creation_wizard_window.ui.h:20
 msgid "Set my profile when I connect"
 msgstr "Configurar perfil quando eu conectar"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:22
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Use custom hostname/port"
 msgstr "Usa nome de máquina/porta customizados"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:23
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -159,34 +159,34 @@ msgstr ""
 "Você precisa ter uma conta para conectar na\n"
 "rede Jabber."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-#: ../data/gui/roster_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:16
 msgid "_Advanced"
 msgstr "_Avançado"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:25
 msgid "_Finish"
 msgstr "_Concluir"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:27
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Hostname:"
 msgstr "_Nome do computador:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #: ../data/gui/accounts_window.ui.h:62
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:28
 #: ../data/gui/accounts_window.ui.h:64
 msgid "_Password:"
 msgstr "_Senha:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:29
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:31
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Server:"
 msgstr "_Servidor:"
 
@@ -295,17 +295,17 @@ msgstr "Primeiro nome:"
 #. No configured account
 #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
 #: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592
-#: ../src/notify.py:608
+#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
+#: ../src/notify.py:616
 msgid "Gajim"
 msgstr "Gajim"
 
 #. FIXME: Ugly workaround.
 #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
 #. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:61
-#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121
-#: ../src/roster_window.py:2832 ../src/roster_window.py:5379
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
+#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
 msgid "General"
 msgstr "Geral"
 
@@ -363,7 +363,7 @@ msgstr "Informações sobre você são gravadas no servidor"
 
 #: ../data/gui/accounts_window.ui.h:35
 #: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:830
+#: ../src/dialogs.py:831
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -377,7 +377,7 @@ msgid "Mer_ge accounts"
 msgstr "Mes_clar contas"
 
 #: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2356
+#: ../src/config.py:2358
 msgid "No key selected"
 msgstr "Nenhuma chave selecionada"
 
@@ -404,7 +404,7 @@ msgid "Priority will change automatically according to your status."
 msgstr "A prioridade será alterada automaticamente de acordo com o seu status."
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5329
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
 msgid "Re_name"
 msgstr "Re_nomear"
 
@@ -630,39 +630,44 @@ msgid "Deletes Message of the Day"
 msgstr "Excluir mensagem do dia"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
+#, fuzzy
+msgid "Edit Archi_ving Preferences"
+msgstr "_Preferências"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Edit _Privacy Lists..."
 msgstr "Editar listas de _privacidade..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sends a message to users currently connected to this server"
 msgstr ""
 "Envia uma mensagem para os usuários atualmente conectados a este servidor"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Set MOTD..."
 msgstr "Definir MOTD..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Configurar mensagem do dia"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Show _XML Console"
 msgstr "Exibir console _XML"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "Update MOTD..."
 msgstr "Atualizar MOTD..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "Atualizar mensagem do dia"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:11
 msgid "_Administrator"
 msgstr "_Administrador"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:11
+#: ../data/gui/advanced_menuitem_menu.ui.h:12
 msgid "_Send Server Message..."
 msgstr "_Enviar mensagem de servidor..."
 
@@ -696,7 +701,7 @@ msgid "All statuses"
 msgstr "Totos os status"
 
 #: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:233
+#: ../src/common/commands.py:106 ../src/common/helpers.py:239
 #: ../src/tooltips.py:193
 msgid "Away"
 msgstr "Afastado"
@@ -749,7 +754,7 @@ msgid "Have "
 msgstr "Possui "
 
 #: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:249
 msgid "Invisible"
 msgstr "Invisível"
 
@@ -758,7 +763,7 @@ msgid "Launch a command"
 msgstr "Executar um comando"
 
 #: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:216 ../src/tooltips.py:197
+#: ../src/common/helpers.py:222 ../src/tooltips.py:197
 msgid "Not Available"
 msgstr "Não disponível"
 
@@ -803,12 +808,13 @@ msgid "_Disable existing sound for this event"
 msgstr "_Desativar sons existentes para este evento"
 
 #: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in roster"
+#, fuzzy
+msgid "_Disable showing event in notification area"
 msgstr "_Desativar exibição de eventos na lista"
 
 #: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in systray"
-msgstr "_Desativar a exibição de eventos na bandeja do sistema"
+msgid "_Disable showing event in roster"
+msgstr "_Desativar exibição de eventos na lista"
 
 #: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
@@ -819,12 +825,13 @@ msgid "_Open chat window with user"
 msgstr "_Abrir janela de conversa com o contato"
 
 #: ../data/gui/advanced_notifications_window.ui.h:35
-msgid "_Show event in roster"
+#, fuzzy
+msgid "_Show event in notification area"
 msgstr "Mo_strar somente na lista"
 
 #: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in systray"
-msgstr "_Exibir evento na bandeja do sistema"
+msgid "_Show event in roster"
+msgstr "Mo_strar somente na lista"
 
 #: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
@@ -852,6 +859,45 @@ msgstr "Grupos"
 msgid "when I'm in"
 msgstr "quando eu estiver em"
 
+#: ../data/gui/archiving_preferences_window.ui.h:1
+msgid "<i>Method Auto</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "<i>Method Local</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:3
+msgid "<i>Method Manual</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:4
+#, fuzzy
+msgid "Auto"
+msgstr "Ingresso automático"
+
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Concede"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "Forbid"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:7
+#, fuzzy
+msgid "No"
+msgstr "Nenhum"
+
+#: ../data/gui/archiving_preferences_window.ui.h:8
+#, fuzzy
+msgid "Prefer"
+msgstr "Preferências"
+
+#: ../data/gui/archiving_preferences_window.ui.h:9
+msgid "Yes"
+msgstr ""
+
 #: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Entrada:"
@@ -878,8 +924,8 @@ msgstr "Contatos bloqueados"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5348
-#: ../src/roster_window.py:5476 ../src/roster_window.py:5609
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
+#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
 msgid "_Unblock"
 msgstr "_Desbloquear"
 
@@ -967,7 +1013,7 @@ msgid "_Start Chat"
 msgstr "_Iniciar conversa"
 
 #. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4184
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
 msgid "#"
 msgstr "#"
 
@@ -1015,13 +1061,49 @@ msgstr ""
 msgid "9"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:13
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Adicionar este contato para a lista (Ctrl+D)"
+
 #: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Pesquisar o histórico de conversas (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:15
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Convidar contatos para a conversa (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Exibe uma lista de emoticons (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
+msgid "Show a list of formattings"
+msgstr "Exibe uma lista de formatações"
+
+#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Exibir um menu com funções avançadas (Alt+D)"
+
+#: ../data/gui/chat_control.ui.h:19
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr "Exibir o perfil do contato (Ctrl+I)"
+
+#: ../data/gui/chat_control.ui.h:20
+msgid "Toggle audio session"
+msgstr "Alternar sessão de áudio"
+
+#: ../data/gui/chat_control.ui.h:21
+msgid "Toggle video session"
+msgstr "Alternar sessão de vídeo"
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
 #: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../data/gui/chat_control.ui.h:15 ../data/gui/groupchat_control.ui.h:3
+#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
 msgid "label"
 msgstr ""
 
@@ -1071,8 +1153,8 @@ msgstr "Editar _grupos..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5284
-#: ../src/roster_window.py:5444
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
+#: ../src/roster_window.py:5516
 msgid "In_vite to"
 msgstr "Con_vidar para"
 
@@ -1084,8 +1166,8 @@ msgstr "Convidar _contatos"
 msgid "Remo_ve"
 msgstr "Remo_ver"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5294
-#: ../src/roster_window.py:5533
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
+#: ../src/roster_window.py:5605
 msgid "Send Cus_tom Status"
 msgstr "Enviar status perso_nalizado"
 
@@ -1118,8 +1200,8 @@ msgid "_Allow him/her to see my status"
 msgstr "_Permitir que ele/ela veja meu status"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5482 ../src/roster_window.py:5612
+#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
+#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
 msgid "_Block"
 msgstr "_Bloquear"
 
@@ -1129,8 +1211,8 @@ msgstr "_Proibir ele/ela de ver meu status"
 
 #: ../data/gui/contact_context_menu.ui.h:20
 #: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:21
-#: ../src/roster_window.py:5683
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
+#: ../src/roster_window.py:5755
 msgid "_History"
 msgstr "_Histórico"
 
@@ -1266,7 +1348,7 @@ msgstr "<b>Aba de cores do bate-papo</b>"
 msgid "Account row"
 msgstr "Conta"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:925
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
 msgid "Bold"
 msgstr "Negrito"
 
@@ -1304,7 +1386,7 @@ msgstr "Grupo"
 msgid "Inactive"
 msgstr "Inativo"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:926
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
 msgid "Italic"
 msgstr "Itálico"
 
@@ -1352,7 +1434,7 @@ msgstr "Alterar as_sunto..."
 msgid "Configure _Room..."
 msgstr "Configurar _sala..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1782
+#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
 msgid "_Bookmark"
 msgstr "Ma_rcadores"
 
@@ -1412,19 +1494,31 @@ msgstr "_Enviar mensagem privada"
 msgid "_Voice"
 msgstr "_Voz"
 
+#: ../data/gui/groupchat_control.ui.h:1
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Adicionar esta sala aos marcadores (Ctrl+B)"
+
+#: ../data/gui/groupchat_control.ui.h:3
+msgid "Change the room's subject (Alt+T)"
+msgstr "Alterar o assunto da sala (Alt+T)"
+
+#: ../data/gui/groupchat_control.ui.h:4
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Alterar o seu apelido (Ctrl+N)"
+
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Criar nova postagem"
 
-#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
-msgid "From"
-msgstr "De"
+#: ../data/gui/groups_post_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:2
+msgid "From:"
+msgstr "De:"
 
-#. holds subject
-#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
-#: ../src/history_manager.py:219
-msgid "Subject"
-msgstr "Assunto"
+#: ../data/gui/groups_post_window.ui.h:3
+#: ../data/gui/single_message_window.ui.h:7
+msgid "Subject:"
+msgstr "Assunto:"
 
 #: ../data/gui/history_manager.ui.h:1
 msgid ""
@@ -1442,8 +1536,8 @@ msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Gerenciador de histórico de conversas do Gajim</b></big>"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3208
-#: ../src/dialogs.py:3305
+#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
+#: ../src/dialogs.py:3321
 msgid "Delete"
 msgstr "Deletar"
 
@@ -1501,12 +1595,75 @@ msgstr "Pesquisar:"
 msgid "_Log conversation history"
 msgstr "_Histórico de conversação"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
+msgid "approve"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:2
+msgid "body"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:3
+msgid "concede"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:4
+msgid "expire"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:5
+msgid "false"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:6
+msgid "forbid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:7
+#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+msgid "jid"
+msgstr "JID"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:8
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
+#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
+msgid "message"
+msgstr "mensagem"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
+msgid "oppose"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
+#, fuzzy
+msgid "otr"
+msgstr "Quente"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:11
+msgid "prefer"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:12
+msgid "require"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:13
+msgid "save"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:14
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
 msgid "Bro_wse Rooms"
 msgstr "_Navegar"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2180
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
 msgid "Join Group Chat"
 msgstr "Ingressar numa conferência"
 
@@ -1544,8 +1701,8 @@ msgstr "Servidor:"
 msgid "_Bookmark this room"
 msgstr "Adicionar esta sala aos marcadores"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1341
-#: ../src/disco.py:1786
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../src/disco.py:1804
 msgid "_Join"
 msgstr "_Ingressar"
 
@@ -1650,6 +1807,75 @@ msgstr "Nome de _usuário:"
 msgid "Passphrase"
 msgstr "Frase de acesso"
 
+#: ../data/gui/plugins_window.ui.h:1
+msgid "&lt;empty&gt;"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:2
+msgid "<empty>"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:3
+#, fuzzy
+msgid "Authors:"
+msgstr "Au_torizar"
+
+#: ../data/gui/plugins_window.ui.h:4
+#, fuzzy
+msgid "Available"
+msgstr "Dis_ponível"
+
+#: ../data/gui/plugins_window.ui.h:5
+#, fuzzy
+msgid "Configure"
+msgstr "_Configurar"
+
+#: ../data/gui/plugins_window.ui.h:6
+#, fuzzy
+msgid "Descrition:"
+msgstr "Descrição: "
+
+#: ../data/gui/plugins_window.ui.h:7
+#, fuzzy
+msgid "Homepage:"
+msgstr "<b>Página pessoal:</b>"
+
+#: ../data/gui/plugins_window.ui.h:8
+msgid "Install"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:9
+#, fuzzy
+msgid "Installed"
+msgstr "Parado"
+
+#: ../data/gui/plugins_window.ui.h:10
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:11
+msgid "Plugins"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:12
+msgid "Uninstall"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:13
+#, fuzzy
+msgid "Version:"
+msgstr "Versão do GTK+:"
+
+#: ../data/gui/plugins_window.ui.h:14
+msgid "button"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:15
+msgid "homepage url"
+msgstr ""
+
 #: ../data/gui/popup_notification_window.ui.h:1
 #, fuzzy
 msgid "Event Type"
@@ -1777,121 +2003,101 @@ msgid "Always"
 msgstr "Afastado"
 
 #: ../data/gui/preferences_window.ui.h:31
-#, fuzzy
-msgid "Always use GNOME default applications"
-msgstr "Sempre usar as aplicações padrões do OS/X"
-
-#: ../data/gui/preferences_window.ui.h:32
-#, fuzzy
-msgid "Always use KDE default applications"
-msgstr "Sempre usar as aplicações padrões do OS/X"
-
-#: ../data/gui/preferences_window.ui.h:33
-#, fuzzy
-msgid "Always use Xfce default applications"
-msgstr "Sempre usar as aplicações padrões do OS/X"
-
-#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Solicite uma mensagem de status quanto eu:"
 
-#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
 msgid "Audio / Video"
 msgstr "Áudio / Vídeo"
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:33
 msgid "Audio input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Audio output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:38
-#, fuzzy
-msgid "Autodetect on every Gajim startup"
-msgstr "C_onectar na inicialização do Gajim"
-
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:35
 msgid "Chat message:"
 msgstr "Mensagem da conversa:"
 
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:36
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Sempre verificar ao iniciar se o Gajim é o cliente Jabber _padrão"
 
-#: ../data/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:37
 #, fuzzy
 msgid "Composing only"
 msgstr "Escrevendo"
 
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:38
 msgid "Configure color and font of the interface"
 msgstr "Configurar cores e fontes da interface"
 
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:39
 msgid "Contact's message:"
 msgstr "Mensagem do contato:"
 
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:40
 msgid "Contact's nickname:"
 msgstr "Apelido do contato:"
 
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:41
 msgid "Custom"
 msgstr "Personalizar"
 
-#: ../data/gui/preferences_window.ui.h:46
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Detached roster with chat grouped by account"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Detached roster with detached chats"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:45
 msgid "Detached roster with single chat"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
-#: ../src/config.py:671
+#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
+#: ../src/config.py:665
 msgid "Disabled"
 msgstr "Desabilitado"
 
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:47
 msgid "Display _activity of contacts in roster"
 msgstr "Exibir a_tividade dos contatos na lista"
 
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:48
 msgid "Display _extra email details"
 msgstr "Exibir detalhes _extras dos emails"
 
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:49
 #, fuzzy
 msgid "Display _location of contacts in roster"
 msgstr "Exibir hum_or dos contatos na lista"
 
-#: ../data/gui/preferences_window.ui.h:54
+#: ../data/gui/preferences_window.ui.h:50
 msgid "Display _tunes of contacts in roster"
 msgstr "Exibir sin_tonia dos contatos na lista"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display a_vatars of contacts in roster"
 msgstr "Exibir a_vatar dos contatos na lista"
 
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display m_ood of contacts in roster"
 msgstr "Exibir hum_or dos contatos na lista"
 
-#: ../data/gui/preferences_window.ui.h:57
+#: ../data/gui/preferences_window.ui.h:53
 msgid "Display status _messages of contacts in roster"
 msgstr "Exibir _mensagem de status da lista de contato"
 
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:54
 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 "
@@ -1901,7 +2107,7 @@ msgstr ""
 "que você pode ter com um contato. Aqui você pode especificar quais "
 "caracteres você quer para enviar a outra parte."
 
-#: ../data/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:55
 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 "
@@ -1911,7 +2117,7 @@ msgstr ""
 "você pode ter com um contato. Aqui você pode especificar quais caracteres "
 "você quer para enviar a outra parte."
 
-#: ../data/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:56
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1919,11 +2125,11 @@ msgstr ""
 "Gajim notificará você através de um alerta visual na parte inferior direita "
 "da tela sobre os contatos que se desconectaram"
 
-#: ../data/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:58
 msgid "Hide all buttons in chat windows"
 msgstr "Esconder todos os botões nas janelas de conversa"
 
-#: ../data/gui/preferences_window.ui.h:63
+#: ../data/gui/preferences_window.ui.h:59
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1931,7 +2137,7 @@ msgstr ""
 "Se marcado, o Gajim irá permitir que os outros detectem qual o sistema "
 "operacional está usando"
 
-#: ../data/gui/preferences_window.ui.h:64
+#: ../data/gui/preferences_window.ui.h:60
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1939,14 +2145,14 @@ msgstr ""
 "Se marcado, o Gajim também incluirá informação sobre o remetente de novos "
 "emails"
 
-#: ../data/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:61
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Se marcado, o Gajim irá alterar o status para Ausente quando o computador "
 "não estiver em uso."
 
-#: ../data/gui/preferences_window.ui.h:66
+#: ../data/gui/preferences_window.ui.h:62
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1954,7 +2160,7 @@ msgstr ""
 "Se marcado, o Gajim irá alterar o status para Não disponível quando o "
 "computador não estiver mais em uso"
 
-#: ../data/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1962,7 +2168,7 @@ msgstr ""
 "Se marcado, Gajim exibirá avatars dos contatos na janela da lista e na "
 "conferência"
 
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1970,30 +2176,30 @@ msgstr ""
 "Se marcado, Gajim indicará mensagens de status dos contatos sob o nome do "
 "contato na janela da lista e na conferência"
 
-#: ../data/gui/preferences_window.ui.h:69
+#: ../data/gui/preferences_window.ui.h:65
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "Se marcado, Gajim irá exibir a atividade dos contatos na janela da lista"
 
-#: ../data/gui/preferences_window.ui.h:70
+#: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the location of contacts in the roster window"
 msgstr "Se marcado, Gajim exibirá o humor dos contatos na janela da lista"
 
-#: ../data/gui/preferences_window.ui.h:71
+#: ../data/gui/preferences_window.ui.h:67
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr "Se marcado, Gajim exibirá o humor dos contatos na janela da lista"
 
-#: ../data/gui/preferences_window.ui.h:72
+#: ../data/gui/preferences_window.ui.h:68
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Se marcado, o Gajim irá exibir a sintonia dos contatos na janela da lista"
 
-#: ../data/gui/preferences_window.ui.h:73
+#: ../data/gui/preferences_window.ui.h:69
 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 "
@@ -2004,7 +2210,7 @@ msgstr ""
 "através de um clique com o botão direito no campo de entrada, a linguagem "
 "padrão será usada para este contato ou conferência."
 
-#: ../data/gui/preferences_window.ui.h:74
+#: ../data/gui/preferences_window.ui.h:70
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -2014,7 +2220,7 @@ msgstr ""
 "autorizados. Utilize com cuidado, porque isto bloqueia todas as mensagens de "
 "qualquer contato que você não possuir na sua lista"
 
-#: ../data/gui/preferences_window.ui.h:75
+#: ../data/gui/preferences_window.ui.h:71
 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 "
@@ -2024,7 +2230,7 @@ msgstr ""
 "favor, note que quando estiver usando criptografia E2E o remote party não "
 "concorda com o registro, então a mensagem não será gravada."
 
-#: ../data/gui/preferences_window.ui.h:76
+#: ../data/gui/preferences_window.ui.h:72
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -2032,7 +2238,7 @@ msgstr ""
 "Se marcado, o Gajim irá exibir uma notificação quando um novo email via "
 "GMail for recebido"
 
-#: ../data/gui/preferences_window.ui.h:77
+#: ../data/gui/preferences_window.ui.h:73
 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, "
@@ -2042,7 +2248,7 @@ msgstr ""
 "exemplo, um contato do MSN terá o ícone equivalente do MSN para o status "
 "conectado, ausente, ocupado, etc....)"
 
-#: ../data/gui/preferences_window.ui.h:78
+#: ../data/gui/preferences_window.ui.h:74
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -2050,7 +2256,7 @@ msgstr ""
 "Se habilitado, o Gajim não irá perguntar por mensagem de status. A mensagem "
 "padrão especificada será usada neste caso."
 
-#: ../data/gui/preferences_window.ui.h:79
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2058,45 +2264,45 @@ msgstr ""
 "Se habilitado, Gajim substituirá o ascii para smilies, como ':)' com a "
 "animação equivalente ou estático emoticons gráfico"
 
-#: ../data/gui/preferences_window.ui.h:80
+#: ../data/gui/preferences_window.ui.h:76
 msgid "Log _encrypted chat session"
 msgstr "Registrar sessão de conversa _criptografada"
 
-#: ../data/gui/preferences_window.ui.h:81
+#: ../data/gui/preferences_window.ui.h:77
 msgid "Ma_ke message windows compact"
 msgstr "T_ornar a janela de mensagem compacta"
 
-#: ../data/gui/preferences_window.ui.h:82
+#: ../data/gui/preferences_window.ui.h:78
 msgid "Ma_nage..."
 msgstr "Gere_nciar..."
 
-#: ../data/gui/preferences_window.ui.h:83
+#: ../data/gui/preferences_window.ui.h:79
 #, fuzzy
 msgid "Never"
 msgstr "_Nunca"
 
-#: ../data/gui/preferences_window.ui.h:84
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Notifications"
 msgstr "Notificações"
 
-#: ../data/gui/preferences_window.ui.h:85
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Notify me about contacts that sign _in"
 msgstr "Notifique-me sobre contatos ao _conectar"
 
-#: ../data/gui/preferences_window.ui.h:86
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Notify me about contacts that sign _out"
 msgstr "Notifique-me sobre contatos ao _desconectar"
 
-#: ../data/gui/preferences_window.ui.h:87
+#: ../data/gui/preferences_window.ui.h:83
 #, fuzzy
 msgid "Notify me about it"
 msgstr "_Notifique-me sobre isto"
 
-#: ../data/gui/preferences_window.ui.h:88
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notify on new _GMail email"
 msgstr "Notificar cada nova mensagem do _GMail"
 
-#: ../data/gui/preferences_window.ui.h:89
+#: ../data/gui/preferences_window.ui.h:85
 #, fuzzy
 msgid "Only when pending events"
 msgstr ""
@@ -2104,56 +2310,57 @@ msgstr ""
 "Somente quando houver eventos pendentes\n"
 "Sempre"
 
-#: ../data/gui/preferences_window.ui.h:90
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Personal Events"
 msgstr "Eventos pessoais"
 
-#: ../data/gui/preferences_window.ui.h:91
+#: ../data/gui/preferences_window.ui.h:87
 msgid "Play _sounds"
 msgstr "Tocar _sons"
 
-#: ../data/gui/preferences_window.ui.h:92
+#: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
 msgid "Pop it up"
 msgstr "_Alerta visual"
 
-#: ../data/gui/preferences_window.ui.h:93
+#: ../data/gui/preferences_window.ui.h:89
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../data/gui/preferences_window.ui.h:94
+#: ../data/gui/preferences_window.ui.h:90
 msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:96
+#: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
 msgid "STUN server:"
 msgstr "Servidor:"
 
-#: ../data/gui/preferences_window.ui.h:97
+#: ../data/gui/preferences_window.ui.h:93
+#, fuzzy
+msgid "Show notification area icon:"
+msgstr "Usar ícone na bandeja (também conhecido por área de notificação)"
+
+#: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
 msgid "Show only in roster"
 msgstr "Mostre somente na _lista"
 
-#: ../data/gui/preferences_window.ui.h:98
-msgid "Show systray:"
-msgstr "Exibir na bandeja do sistema:"
-
-#: ../data/gui/preferences_window.ui.h:99
+#: ../data/gui/preferences_window.ui.h:95
 msgid "Sign _in"
 msgstr "_Conectar"
 
-#: ../data/gui/preferences_window.ui.h:100
+#: ../data/gui/preferences_window.ui.h:96
 msgid "Sign _out"
 msgstr "_Desconectar"
 
-#: ../data/gui/preferences_window.ui.h:101
+#: ../data/gui/preferences_window.ui.h:97
 msgid "Single window for everything"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:102
+#: ../data/gui/preferences_window.ui.h:98
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2161,27 +2368,27 @@ msgstr ""
 "Algumas mensagens podem incluir conteúdo rico (formatação, cores etc). Se "
 "marcado, o Gajim apenas exibirá as mensagens em texto puro."
 
-#: ../data/gui/preferences_window.ui.h:103
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sort contacts by status"
 msgstr "Ordena contatos pelo status"
 
-#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
 msgid "Status"
 msgstr "Status"
 
-#: ../data/gui/preferences_window.ui.h:105
+#: ../data/gui/preferences_window.ui.h:101
 msgid "Status _iconset:"
 msgstr "_Conjunto de ícones de status:"
 
-#: ../data/gui/preferences_window.ui.h:106
+#: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Estilo"
 
-#: ../data/gui/preferences_window.ui.h:107
+#: ../data/gui/preferences_window.ui.h:103
 msgid "T_heme:"
 msgstr "_Tema:"
 
-#: ../data/gui/preferences_window.ui.h:108
+#: ../data/gui/preferences_window.ui.h:104
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2193,7 +2400,7 @@ msgstr ""
 "$S será substituída pela mensagem de status anterior\n"
 "$T será substituída pela mensagem automática de ausência"
 
-#: ../data/gui/preferences_window.ui.h:111
+#: ../data/gui/preferences_window.ui.h:107
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2205,119 +2412,124 @@ msgstr ""
 "$S irá ser substituída pela mensagem de status anterior\n"
 "$T irá ser substituída pela mensagem de ausência automática"
 
-#: ../data/gui/preferences_window.ui.h:114
+#: ../data/gui/preferences_window.ui.h:110
 msgid "Use _transports icons"
 msgstr "Usar ícones de _transportes"
 
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:111
+#, fuzzy
+msgid "Use default applications"
+msgstr "Sempre usar as aplicações padrões do OS/X"
+
+#: ../data/gui/preferences_window.ui.h:112
 msgid "Use system _default"
 msgstr "Usar o _padrão do sistema"
 
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:113
 msgid "Video framerate"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:117
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Video input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:118
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Video output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:119
+#: ../data/gui/preferences_window.ui.h:116
 msgid "Video size"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:120
+#: ../data/gui/preferences_window.ui.h:117
 msgid "When new event is received:"
 msgstr "Quando novo evento é recebido:"
 
-#: ../data/gui/preferences_window.ui.h:121
+#: ../data/gui/preferences_window.ui.h:118
 msgid "Your message:"
 msgstr "Sua mensagem:"
 
-#: ../data/gui/preferences_window.ui.h:122
+#: ../data/gui/preferences_window.ui.h:119
 msgid "Your nickname:"
 msgstr "Seu apelido:"
 
-#: ../data/gui/preferences_window.ui.h:123
+#: ../data/gui/preferences_window.ui.h:120
 msgid "_Away after:"
 msgstr "_Afastado depois:"
 
-#: ../data/gui/preferences_window.ui.h:124
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Navegar:"
 
-#: ../data/gui/preferences_window.ui.h:125
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Display chat state notifications:"
 msgstr "_Exibir notificações de status de conversa:"
 
-#: ../data/gui/preferences_window.ui.h:126
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Emoticons:"
 msgstr "_Emoticons:"
 
-#: ../data/gui/preferences_window.ui.h:127
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_File manager:"
 msgstr "_Gerenciamento de arquivos:"
 
-#: ../data/gui/preferences_window.ui.h:128
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_Highlight misspelled words"
 msgstr "_Destacar palavras mal escritas"
 
-#: ../data/gui/preferences_window.ui.h:129
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignore eventos de contatos que não estejam na minha lista"
 
-#: ../data/gui/preferences_window.ui.h:130
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignorar conteúdo formatado nas mensagens recebidas"
 
-#: ../data/gui/preferences_window.ui.h:131
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Log status changes of contacts"
 msgstr "_Log mudanças de status dos contatos"
 
-#: ../data/gui/preferences_window.ui.h:132
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Mail client:"
 msgstr "_Cliente de email:"
 
-#: ../data/gui/preferences_window.ui.h:133
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Not available after:"
 msgstr "_Não disponível depois:"
 
-#: ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Reset to Default Colors"
 msgstr "Voltar para as cores _padrões"
 
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Send chat state notifications:"
 msgstr "_Enviar notificações de status de conversa:"
 
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Status message:"
 msgstr "_Mensagem de status:"
 
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_URL highlight:"
 msgstr "Destaque de _URL:"
 
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_Window behavior:"
 msgstr "Comportamento da jan_ela:"
 
-#: ../data/gui/preferences_window.ui.h:140
+#: ../data/gui/preferences_window.ui.h:137
 msgid "in _group chats"
 msgstr "em uma c_onferência"
 
-#: ../data/gui/preferences_window.ui.h:141
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _roster"
 msgstr "na _lista"
 
-#: ../data/gui/preferences_window.ui.h:142
+#: ../data/gui/preferences_window.ui.h:139
 msgid "minutes"
 msgstr "minutos"
 
@@ -2369,7 +2581,7 @@ msgstr "Jabber ID"
 msgid "Order:"
 msgstr "Ordem:"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3436
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
 msgid "Privacy List"
 msgstr "Lista de privacidade"
 
@@ -2580,8 +2792,8 @@ msgstr "Remover conta do Gajim e do _servidor"
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5492 ../src/roster_window.py:5622
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
+#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
 msgid "_Remove"
 msgstr "_Remover"
 
@@ -2628,56 +2840,60 @@ msgid "Help online"
 msgstr "Ajuda online"
 
 #: ../data/gui/roster_window.ui.h:8
+msgid "P_lugins"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:9
 msgid "Profile, A_vatar"
 msgstr "Perfil, A_vatar"
 
-#: ../data/gui/roster_window.ui.h:9
+#: ../data/gui/roster_window.ui.h:10
 msgid "Show Only _Active Contacts"
 msgstr "Exibir somente _ativos"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
 msgid "Show Trans_ports"
 msgstr "Exibir trans_portes"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
 msgid "Show _Offline Contacts"
 msgstr "Exibir desc_onectados"
 
-#: ../data/gui/roster_window.ui.h:12 ../src/statusicon.py:326
+#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
 msgid "Show _Roster"
 msgstr "Exibir _lista"
 
-#: ../data/gui/roster_window.ui.h:13
+#: ../data/gui/roster_window.ui.h:14
 msgid "_Accounts"
 msgstr "Cont_as"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
 #: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Ações"
 
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
 msgid "_Contents"
 msgstr "Índi_ces"
 
-#: ../data/gui/roster_window.ui.h:18 ../src/disco.py:1502
+#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../data/gui/roster_window.ui.h:19
+#: ../data/gui/roster_window.ui.h:20
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../data/gui/roster_window.ui.h:22
+#: ../data/gui/roster_window.ui.h:23
 msgid "_Send Single Message..."
 msgstr "_Enviar mensagem simples..."
 
-#: ../data/gui/roster_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:25
 msgid "_View"
 msgstr "_Ver"
 
@@ -2695,11 +2911,11 @@ msgid "_Add contact"
 msgstr "_Adicionar contato"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5634
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
 msgid "_Information"
 msgstr "_Informações"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1353
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
 msgid "_Search"
 msgstr "_Buscar"
 
@@ -2719,10 +2935,6 @@ msgstr "Registrar para"
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../data/gui/single_message_window.ui.h:2
-msgid "From:"
-msgstr "De:"
-
 #: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Resposta para esta mensagem"
@@ -2739,10 +2951,6 @@ msgstr "Enviar mensagem"
 msgid "Send message and close window"
 msgstr "Enviar mensagem e fechar a janela"
 
-#: ../data/gui/single_message_window.ui.h:7
-msgid "Subject:"
-msgstr "Assunto:"
-
 #: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Para:"
@@ -2953,25 +3161,35 @@ msgstr "Mensageiro Instantâneo Gajim"
 msgid "Jabber IM Client"
 msgstr "Um cliente de IM Jabber"
 
-#: ../src/adhoc_commands.py:314
+#: ../src/adhoc_commands.py:323
 msgid "Cancel confirmation"
 msgstr "Cancelar confirmação"
 
-#: ../src/adhoc_commands.py:315
+#: ../src/adhoc_commands.py:324
 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:351 ../src/adhoc_commands.py:374
+#: ../src/adhoc_commands.py:370
+#, fuzzy
+msgid "Invalid Form"
+msgstr "Sala inválida"
+
+#: ../src/adhoc_commands.py:371
+#, fuzzy
+msgid "The form is not filled correctly."
+msgstr "O apelido possui caracteres não permitidos."
+
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
 msgid "Service sent malformed data"
 msgstr "O serviço enviou dados inválidos"
 
-#: ../src/adhoc_commands.py:360
+#: ../src/adhoc_commands.py:399
 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:471
+#: ../src/adhoc_commands.py:513
 msgid "Service returned an error."
 msgstr "O serviço retornou um erro."
 
@@ -2996,7 +3214,7 @@ msgstr "Inteiro"
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:945
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
 msgid "Color"
 msgstr "Cor"
 
@@ -3033,184 +3251,184 @@ msgstr[1] "Você recebeu novas entradas (e %d não exibidas):"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "English"
 msgstr "Inglês"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Belarusian"
 msgstr "Bielorusso"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Breton"
 msgstr "Bretão"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Czech"
 msgstr "Tcheco"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "German"
 msgstr "Alemão"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Greek"
 msgstr "Grego"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "British"
 msgstr "Inglês britânico"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Spanish"
 msgstr "Espanhol"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Basque"
 msgstr "Basco"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "French"
 msgstr "Francês"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Croatian"
 msgstr "Croata"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian (b)"
 msgstr "Norueguês (b)"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Dutch"
 msgstr "Holandês"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian"
 msgstr "Norueguês"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Polish"
 msgstr "Polonês"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Portuguese"
 msgstr "Português"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Brazilian Portuguese"
 msgstr "Português Brasileiro"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Russian"
 msgstr "Russo"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Serbian"
 msgstr "Sérvio"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Chinese (Ch)"
 msgstr "Chinês (Ch)"
 
-#: ../src/chat_control.py:479
+#: ../src/chat_control.py:496
 msgid "Spelling language"
 msgstr "Idioma do corretor ortográfico"
 
 #. we are not connected
-#: ../src/chat_control.py:511 ../src/chat_control.py:720
+#: ../src/chat_control.py:528 ../src/chat_control.py:737
 msgid "A connection is not available"
 msgstr "Uma conexão não está disponível"
 
-#: ../src/chat_control.py:512 ../src/chat_control.py:721
+#: ../src/chat_control.py:529 ../src/chat_control.py:738
 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:927
+#: ../src/chat_control.py:944
 msgid "Underline"
 msgstr "Sublinhado"
 
-#: ../src/chat_control.py:928
+#: ../src/chat_control.py:945
 msgid "Strike"
 msgstr "Tachado"
 
-#: ../src/chat_control.py:951
+#: ../src/chat_control.py:968
 msgid "Font"
 msgstr "Fonte"
 
-#: ../src/chat_control.py:960
+#: ../src/chat_control.py:977
 msgid "Clear formating"
 msgstr "Limpar formatação"
 
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1055
 msgid "Really send file?"
 msgstr "Realmente enviar o arquivo?"
 
-#: ../src/chat_control.py:1039
+#: ../src/chat_control.py:1056
 #, 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:1503 ../src/chat_control.py:1987
+#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
 msgid "GPG encryption enabled"
 msgstr "Criptografia GPG habilitada"
 
 #. Add to roster
-#: ../src/chat_control.py:1528 ../src/common/contacts.py:158
+#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
 #: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:245 ../src/dialogs.py:1064 ../src/dialogs.py:2078
-#: ../src/dialogs.py:2107 ../src/gui_interface.py:674
+#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
+#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
 #: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1610 ../src/roster_window.py:1612
-#: ../src/roster_window.py:1942 ../src/roster_window.py:3289
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
+#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
+#: ../src/roster_window.py:3382
 msgid "Not in Roster"
 msgstr "Fora da lista"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1575
 msgid "This contact does not support file transfer."
 msgstr "Este contato não suporta transferência de arquivo."
 
-#: ../src/chat_control.py:1561
+#: ../src/chat_control.py:1578
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr "Você precisa saber o JID real do usuário para lhe enviar um arquivo."
 
-#: ../src/chat_control.py:1656
+#: ../src/chat_control.py:1677
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s estado: %(state)s, razão: %(reason)s"
 
-#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:1869
 #, 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:1967 ../src/dialogs.py:4866
+#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
 msgid "No GPG key assigned"
 msgstr "Nenhuma chave GPG atribuída"
 
-#: ../src/chat_control.py:1968
+#: ../src/chat_control.py:1991
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3218,50 +3436,50 @@ msgstr ""
 "Nenhuma chave GPG está atribuída para este contato. Você não poderá "
 "criptografar mensagem com GPG."
 
-#: ../src/chat_control.py:1977
+#: ../src/chat_control.py:2000
 msgid "GPG encryption disabled"
 msgstr "Criptografia GPG desabilitada"
 
-#: ../src/chat_control.py:2003
+#: ../src/chat_control.py:2026
 msgid "Session WILL be logged"
 msgstr "A sessão SERÁ gravada"
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:2028
 msgid "Session WILL NOT be logged"
 msgstr "A sessão NÃO SERÁ gravada"
 
 #. encryption %s active
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is"
 msgstr "está"
 
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is NOT"
 msgstr "NÃO está"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will"
 msgstr "será"
 
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will NOT"
 msgstr "NÃO será"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2051
 msgid "and authenticated"
 msgstr "e autenticada"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2032
+#: ../src/chat_control.py:2055
 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:2039
+#: ../src/chat_control.py:2062
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3270,23 +3488,32 @@ msgstr ""
 "Criptografia%(type)s %(status)s ativa %(authenticated)s.\n"
 "Sua conversa %(logged)s está sendo gravada."
 
-#: ../src/chat_control.py:2182
+#: ../src/chat_control.py:2205
 msgid "Session negotiation cancelled"
 msgstr "Negociação da sessão cancelada"
 
-#: ../src/chat_control.py:2191
+#: ../src/chat_control.py:2215
+msgid "This session WILL be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2217
+#, fuzzy
+msgid "This session WILL NOT be archived on server"
+msgstr "A sessão NÃO SERÁ gravada"
+
+#: ../src/chat_control.py:2226
 msgid "This session is encrypted"
 msgstr "Esta sessão está criptografada"
 
-#: ../src/chat_control.py:2194
+#: ../src/chat_control.py:2229
 msgid " and WILL be logged"
 msgstr " e SERÁ gravada"
 
-#: ../src/chat_control.py:2196
+#: ../src/chat_control.py:2231
 msgid " and WILL NOT be logged"
 msgstr " e NÃO SERÁ gravada"
 
-#: ../src/chat_control.py:2201
+#: ../src/chat_control.py:2236
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3294,25 +3521,25 @@ msgstr ""
 "Identidade do contato remoto não verificada. Clique no botão de proteção "
 "para mais detalhes."
 
-#: ../src/chat_control.py:2203
+#: ../src/chat_control.py:2238
 msgid "E2E encryption disabled"
 msgstr "Criptografia E2E desabilitada"
 
-#: ../src/chat_control.py:2241 ../src/chat_control.py:2254
+#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
 msgid "The following message was NOT encrypted"
 msgstr "A seguinte mensagem NÃO estava criptografada"
 
-#: ../src/chat_control.py:2247
+#: ../src/chat_control.py:2288
 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:2519
+#: ../src/chat_control.py:2566
 #, 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:2520
+#: ../src/chat_control.py:2567
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3320,15 +3547,13 @@ msgstr ""
 "Se você fechar esta aba e o histórico estiver desabilitado, esta mensagem "
 "será perdida."
 
-#: ../src/chat_control.py:2663 ../src/common/connection_handlers.py:1635
-#: ../src/common/connection_handlers.py:1758
-#: ../src/common/connection_handlers.py:1960
-#: ../src/common/connection_handlers.py:2110 ../src/common/connection.py:452
+#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
 #: ../src/gajim.py:159 ../src/session.py:138
 msgid "Database Error"
 msgstr "Erro na base de dados"
 
-#: ../src/chat_control.py:2664
+#: ../src/chat_control.py:2714
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3337,7 +3562,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:2906
+#: ../src/chat_control.py:2962
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s agora está %(status)s"
@@ -3351,28 +3576,28 @@ msgstr "criando banco de dados de logs"
 msgid "creating cache database"
 msgstr "criando banco de dados de logs"
 
-#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
-#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
-#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
-#: ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
 #, 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:275 ../src/common/check_paths.py:282
-#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
-#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
-#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:333
+#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
+#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
+#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
 msgid "Gajim will now exit"
 msgstr "Gajim sairá agora"
 
-#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
+#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
 #, 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:342
+#: ../src/common/check_paths.py:351
 #, python-format
 msgid "creating %s directory"
 msgstr "criando diretório %s"
@@ -3436,9 +3661,9 @@ msgstr "Selecione as salas das quais você quer sair"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:801
-#: ../src/roster_window.py:1614 ../src/roster_window.py:1616
-#: ../src/roster_window.py:5251
+#: ../src/common/helpers.py:57 ../src/roster_window.py:815
+#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
+#: ../src/roster_window.py:5323
 msgid "Groupchats"
 msgstr "Salas"
 
@@ -3500,7 +3725,9 @@ msgstr ""
 "indisponibilidade automática."
 
 #: ../src/common/config.py:88
-msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+#, fuzzy
+msgid ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 "Quando exibir um ícone na área de notificação. Pode ser \"nunca\", com "
 "\"eventos\" e \"sempre\"."
@@ -3552,9 +3779,9 @@ 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:501
-#: ../src/common/optparser.py:290 ../src/common/optparser.py:486
-#: ../src/common/optparser.py:520 ../src/gui_interface.py:3370
+#: ../src/common/config.py:106 ../src/common/config.py:505
+#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
+#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
 msgid "default"
 msgstr "padrão"
 
@@ -3783,7 +4010,8 @@ 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:197
-msgid "Notify of events in the system trayicon."
+#, fuzzy
+msgid "Notify of events in the notification area."
 msgstr "Notificar os eventos no ícone da bandeja do sistema."
 
 #: ../src/common/config.py:203
@@ -3822,9 +4050,10 @@ msgstr ""
 "conferências."
 
 #: ../src/common/config.py:221
+#, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
+"setting is taken into account only if notification icon is used."
 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."
@@ -4102,9 +4331,10 @@ msgstr ""
 "antigas são apagadas."
 
 #: ../src/common/config.py:270
+#, fuzzy
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
-"systray icon."
+"notification icon."
 msgstr ""
 "Se marcado como Verdadeiro as janelas de notificação do notification-daemon "
 "serão anexadas ao ícone da bandeja do sistema."
@@ -4307,11 +4537,15 @@ msgstr ""
 msgid "Message that is sent to contacts you want to add"
 msgstr "Por favor preencha os dados do contato que você quer adicionar"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:374
+msgid "Last time we syncronized with logs from server."
+msgstr ""
+
+#: ../src/common/config.py:436
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "O OpenPGP está ativado para este contato?"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4319,101 +4553,108 @@ msgstr ""
 "O Gajim deve iniciar automaticamente uma sessão criptografada com este "
 "contato quando possível?"
 
-#: ../src/common/config.py:437 ../src/common/config.py:440
+#: ../src/common/config.py:438 ../src/common/config.py:441
 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:446
+#: ../src/common/config.py:447
 msgid "all or space separated status"
 msgstr "todos ou lista de status separados por espaço"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:448
 msgid "'yes', 'no', or 'both'"
 msgstr "'sim', 'não' ou 'ambos'"
 
-#: ../src/common/config.py:448 ../src/common/config.py:450
-#: ../src/common/config.py:451 ../src/common/config.py:454
-#: ../src/common/config.py:455
+#: ../src/common/config.py:449 ../src/common/config.py:451
+#: ../src/common/config.py:452 ../src/common/config.py:455
+#: ../src/common/config.py:456
 msgid "'yes', 'no' or ''"
 msgstr "'sim', 'não', ou ''"
 
-#: ../src/common/config.py:461 ../src/common/pep.py:157
+#: ../src/common/config.py:460
+msgid ""
+"State whether plugins should be activated on exit (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
+msgstr ""
+
+#: ../src/common/config.py:465 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Dormindo"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back soon"
 msgstr "Volto logo"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back in some minutes."
 msgstr "Volto em alguns minutos."
 
-#: ../src/common/config.py:463 ../src/common/pep.py:127
+#: ../src/common/config.py:467 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Comendo"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:467
 msgid "I'm eating, so leave me a message."
 msgstr "Eu estou comendo, então deixe-me uma mensagem."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "Movie"
 msgstr "Filme"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "I'm watching a movie."
 msgstr "Estou assistindo um filme."
 
-#: ../src/common/config.py:465 ../src/common/pep.py:186
+#: ../src/common/config.py:469 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Trabalhando"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:469
 msgid "I'm working."
 msgstr "Estou trabalhando."
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "Phone"
 msgstr "Telefone"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "I'm on the phone."
 msgstr "Estou no telefone."
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "Out"
 msgstr "Estou fora"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "I'm out enjoying life."
 msgstr "Estou fora curtindo a vida."
 
-#: ../src/common/config.py:478
+#: ../src/common/config.py:482
 msgid "I'm available."
 msgstr "Estou disponível."
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:483
 msgid "I'm free for chat."
 msgstr "Estou livre para conversar."
 
-#: ../src/common/config.py:480 ../src/config.py:1600
+#: ../src/common/config.py:484 ../src/config.py:1600
 msgid "Be right back."
 msgstr "Estou de volta."
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:485
 msgid "I'm not available."
 msgstr "Não estou disponível."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:486
 msgid "Do not disturb."
 msgstr "Não perturbe."
 
-#: ../src/common/config.py:483 ../src/common/config.py:484
+#: ../src/common/config.py:487 ../src/common/config.py:488
 msgid "Bye!"
 msgstr "Tchau!"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:498
 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."
@@ -4421,88 +4662,84 @@ 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:495
+#: ../src/common/config.py:499
 msgid "Sound to play when any MUC message arrives."
 msgstr "Som a ser tocado quando qualquer mensagem MUC chegar."
 
-#: ../src/common/config.py:504 ../src/common/optparser.py:304
+#: ../src/common/config.py:508 ../src/common/optparser.py:308
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:290
+#: ../src/common/config.py:512 ../src/common/optparser.py:294
 msgid "grocery"
 msgstr "mantimento"
 
-#: ../src/common/config.py:512
+#: ../src/common/config.py:516
 msgid "human"
 msgstr "humano"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:520
 msgid "marine"
 msgstr "marinho"
 
-#: ../src/common/connection_handlers.py:84
+#: ../src/common/connection_handlers.py:94
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Incapaz de carregar o módulo inativo"
 
-#: ../src/common/connection_handlers.py:117
+#: ../src/common/connection_handlers.py:127
 #, 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:124
+#: ../src/common/connection_handlers.py:134
 msgid "Registration succeeded"
 msgstr "Registro realizado com sucesso"
 
-#: ../src/common/connection_handlers.py:125
+#: ../src/common/connection_handlers.py:135
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registro com o agente %s completado com sucesso"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 msgid "Registration failed"
 msgstr "Falha ao registrar"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 "Registro com o agente %(agent)s falhou com erro %(error)s: %(error_msg)s"
 
-#: ../src/common/connection_handlers.py:445
-#: ../src/common/connection_handlers.py:1633
-#: ../src/common/connection_handlers.py:1756
-#: ../src/common/connection_handlers.py:1957
-#: ../src/common/connection_handlers.py:2108 ../src/common/connection.py:449
+#: ../src/common/connection_handlers.py:466
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
 #: ../src/gajim.py:341
 msgid "Disk Write Error"
 msgstr "Erro de escrita em disco"
 
-#: ../src/common/connection_handlers.py:678 ../src/common/connection.py:1472
+#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
 msgid "Invisibility not supported"
 msgstr "Sem suporte a invisibilidade"
 
-#: ../src/common/connection_handlers.py:679 ../src/common/connection.py:1473
+#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "A conta %s não suporta invisibilidade."
 
-#: ../src/common/connection_handlers.py:1446 ../src/common/connection.py:253
-#: ../src/config.py:2091 ../src/config.py:2100 ../src/config.py:2168
-#: ../src/config.py:3560 ../src/dataforms_widget.py:597 ../src/dialogs.py:2931
+#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
+#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
+#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID inválido:"
 
-#: ../src/common/connection_handlers.py:1447
+#: ../src/common/connection_handlers.py:1405
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr "Uma mensagem de um JID não-valido recebida, ela foi ignorada."
 
-#: ../src/common/connection_handlers.py:1636
-#: ../src/common/connection_handlers.py:1759
-#: ../src/common/connection_handlers.py:1961
-#: ../src/common/connection_handlers.py:2111 ../src/common/connection.py:453
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
 #: ../src/gajim.py:160 ../src/session.py:139
 #, python-format
 msgid ""
@@ -4513,90 +4750,6 @@ msgstr ""
 "http://trac.gajim.org/wiki/DatabaseBackup) ou removê-lo (todo o histórico "
 "será perdido)."
 
-#: ../src/common/connection_handlers.py:1805
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Apelido não permitido: %s"
-
-#: ../src/common/connection_handlers.py:1902
-#: ../src/common/connection_handlers.py:1911
-#: ../src/common/connection_handlers.py:1918
-#: ../src/common/connection_handlers.py:1922
-#: ../src/common/connection_handlers.py:1926
-#: ../src/common/connection_handlers.py:1931 ../src/gui_interface.py:139
-msgid "Unable to join group chat"
-msgstr "Impossível ingressar na sala"
-
-#: ../src/common/connection_handlers.py:1903
-#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr "Número máximo de usuários para %s foi atingido"
-
-#: ../src/common/connection_handlers.py:1912
-#, python-format
-msgid "You are banned from group chat %s."
-msgstr "Você está banido da sala %s."
-
-#: ../src/common/connection_handlers.py:1919
-#, python-format
-msgid "Group chat %s does not exist."
-msgstr "A sala %s não existe."
-
-#: ../src/common/connection_handlers.py:1923
-msgid "Group chat creation is restricted."
-msgstr "A criação de sala é restrita."
-
-#: ../src/common/connection_handlers.py:1927
-#, 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:1932
-#, 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:1976
-msgid "Room has been destroyed"
-msgstr "A sala foi excluída"
-
-#: ../src/common/connection_handlers.py:1984
-#, 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:2020
-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:2041
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "nós estamos agora inscritos para %s"
-
-#: ../src/common/connection_handlers.py:2043
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "remoção de inscrição solicitada por %s"
-
-#: ../src/common/connection_handlers.py:2045
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "nós estamos agora sem inscrição para %s"
-
-#: ../src/common/connection_handlers.py:2240
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"O JID %s não é uma compilação da RFC. Não se adicionará a sua lista. Use "
-"ferramentas de gerência da lista como http://jru.jabberstudio.org/ para "
-"removê-lo"
-
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr "Não foi possível obter o certificado do emissor"
@@ -4725,27 +4878,27 @@ 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:254 ../src/dialogs.py:2932
+#: ../src/common/connection.py:256 ../src/dialogs.py:2948
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Não é possível enviar uma mensagem para %s, este não é um JID válido."
 
-#: ../src/common/connection.py:276
+#: ../src/common/connection.py:278
 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:279
+#: ../src/common/connection.py:281
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 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:331
+#: ../src/common/connection.py:333
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Esta mensagem está *criptografada* (Veja :XEP:`27`)]"
 
-#: ../src/common/connection.py:439
+#: ../src/common/connection.py:441
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4754,80 +4907,80 @@ msgstr ""
 "Assunto: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:807
+#: ../src/common/connection.py:809
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Conexão com a conta \"%s\" foi perdida"
 
-#: ../src/common/connection.py:808
+#: ../src/common/connection.py:810
 msgid "Reconnect manually."
 msgstr "Reconecte manualmente."
 
-#: ../src/common/connection.py:820
+#: ../src/common/connection.py:822
 #, 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:854
+#: ../src/common/connection.py:856
 #, 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:867
+#: ../src/common/connection.py:869
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Erro de SSL desconhecido: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:882
+#: ../src/common/connection.py:884
 msgid "Invalid answer"
 msgstr "Resposta inválida"
 
-#: ../src/common/connection.py:883
+#: ../src/common/connection.py:885
 #, 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:1165 ../src/common/connection.py:1294
-#: ../src/common/connection.py:1784
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
+#: ../src/common/connection.py:1792
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Impossível conectar a \"%s\""
 
-#: ../src/common/connection.py:1166 ../src/gui_interface.py:755
+#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
 msgid "Check your connection or try again later."
 msgstr "Verifique sua conexão ou tente novamente mais tarde."
 
-#: ../src/common/connection.py:1171
+#: ../src/common/connection.py:1173
 #, python-format
 msgid "Server replied: %s"
 msgstr "O servidor respondeu: %s"
 
-#: ../src/common/connection.py:1184
+#: ../src/common/connection.py:1186
 msgid "Connection to proxy failed"
 msgstr "Falha na conexão com o proxy"
 
-#: ../src/common/connection.py:1215 ../src/common/connection.py:1274
+#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Não foi possível conectar a conta %s"
 
-#: ../src/common/connection.py:1216 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
 #, 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:1241
+#: ../src/common/connection.py:1243
 #, 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:1244
+#: ../src/common/connection.py:1246
 #, python-format
 msgid ""
 "\n"
@@ -4836,7 +4989,7 @@ msgstr ""
 "\n"
 "Erro de SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1248
 #, python-format
 msgid ""
 "\n"
@@ -4845,24 +4998,24 @@ msgstr ""
 "\n"
 "Erro de SSL desconhecido: %d"
 
-#: ../src/common/connection.py:1295
+#: ../src/common/connection.py:1297
 msgid "Check your connection or try again later"
 msgstr "Verifique sua conexão ou tente novamente mais tarde"
 
-#: ../src/common/connection.py:1324
+#: ../src/common/connection.py:1329
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falha na autenticação com \"%s\""
 
-#: ../src/common/connection.py:1326
+#: ../src/common/connection.py:1331
 msgid "Please check your login and password for correctness."
 msgstr "Por favor, verifique se seu login e senha estão corretos."
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1400
 msgid "Error while removing privacy list"
 msgstr "Erro ao remover lista de privacidade"
 
-#: ../src/common/connection.py:1396
+#: ../src/common/connection.py:1401
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4871,39 +5024,39 @@ 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:1650
+#: ../src/common/connection.py:1658
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Enviar contato: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1653
+#: ../src/common/connection.py:1661
 msgid "Sent contacts:"
 msgstr "Enviar contatos:"
 
-#: ../src/common/connection.py:1799 ../src/common/connection.py:1822
+#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
 msgid "Not fetched because of invisible status"
 msgstr "Não baixado por causa do status invisível"
 
-#: ../src/common/connection.py:2254
+#: ../src/common/connection.py:2262
 msgid "Unregister failed"
 msgstr "Falha ao cancelar registro"
 
-#: ../src/common/connection.py:2255
+#: ../src/common/connection.py:2263
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr "Cancelamento de registro com o servidor %(server)s falhou: %(error)s:"
 
 #: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:674
+#: ../src/gui_interface.py:551
 msgid "Observers"
 msgstr "Observadores"
 
 #: ../src/common/contacts.py:139 ../src/common/contacts.py:366
 #: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1499 ../src/gui_interface.py:424
-#: ../src/roster_window.py:840 ../src/roster_window.py:1525
-#: ../src/roster_window.py:1606 ../src/roster_window.py:1608
-#: ../src/roster_window.py:1769
+#: ../src/disco.py:1517 ../src/roster_window.py:854
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
+#: ../src/roster_window.py:2466
 msgid "Transports"
 msgstr "Transportes"
 
@@ -5131,203 +5284,219 @@ msgstr "Fim da semana"
 msgid "Weekend!"
 msgstr "Final de semana!"
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:148
+msgid "Username must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:153
 msgid "Invalid character in username."
 msgstr "Caracter inválido no nome do usuário."
 
-#: ../src/common/helpers.py:156
-msgid "Server address required."
-msgstr "Endereço do servidor é requerido."
+#: ../src/common/helpers.py:159
+msgid "Server must be between 1 and 1023 chars"
+msgstr ""
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 msgid "Invalid character in hostname."
 msgstr "Caracter inválido no nome do host."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:166
+msgid "Server address required."
+msgstr "Endereço do servidor é requerido."
+
+#: ../src/common/helpers.py:170
+msgid "Resource must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:175
 msgid "Invalid character in resource."
 msgstr "Caracter inválido no recurso."
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:215
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: ../src/common/helpers.py:211 ../src/tooltips.py:195
+#: ../src/common/helpers.py:217 ../src/tooltips.py:195
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:220
 msgid "_Not Available"
 msgstr "_Não disponível"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:225
 msgid "_Free for Chat"
 msgstr "Livre para _conversa"
 
-#: ../src/common/helpers.py:221 ../src/tooltips.py:191
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Free for Chat"
 msgstr "Livre para conversa"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:230
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?status da transferência:Parado"
 
-#: ../src/common/helpers.py:226 ../src/tooltips.py:189
+#: ../src/common/helpers.py:232 ../src/tooltips.py:189
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?status da transferência:Parado"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:234
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:237
 msgid "A_way"
 msgstr "_Afastado"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:242
 msgid "_Offline"
 msgstr "_Desconectado"
 
-#: ../src/common/helpers.py:238 ../src/tooltips.py:199
+#: ../src/common/helpers.py:244 ../src/tooltips.py:199
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:247
 msgid "_Invisible"
 msgstr "_Invisível"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:253
 msgid "?contact has status:Unknown"
 msgstr "?contato tem status:Desconhecido"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:255
 msgid "?contact has status:Has errors"
 msgstr "?contato tem status:Com erros"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:260
 msgid "?Subscription we already have:None"
 msgstr "?Inscrição existente:Nenhuma"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:262
 msgid "To"
 msgstr "Para"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
+msgid "From"
+msgstr "De"
+
+#: ../src/common/helpers.py:266
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:274
 msgid "?Ask (for Subscription):None"
 msgstr "?Pergunta (para inscrição):Nenhuma"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:276
 msgid "Subscribe"
 msgstr "Inscrever"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:285
 msgid "?Group Chat Contact Role:None"
 msgstr "?Regra do contato para conversa em grupo:Nenhuma"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:288
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:290
 msgid "Moderator"
 msgstr "Moderador"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:293
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:295
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:298
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:300
 msgid "Visitor"
 msgstr "Visitante"
 
-#: ../src/common/helpers.py:300 ../src/tooltips.py:210
+#: ../src/common/helpers.py:306 ../src/tooltips.py:210
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Filiação do contato de conferência:Nenhuma"
 
-#: ../src/common/helpers.py:302 ../src/tooltips.py:216
+#: ../src/common/helpers.py:308 ../src/tooltips.py:216
 msgid "Owner"
 msgstr "Dono"
 
-#: ../src/common/helpers.py:304 ../src/tooltips.py:214
+#: ../src/common/helpers.py:310 ../src/tooltips.py:214
 msgid "Administrator"
 msgstr "Administrador"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:212
+#: ../src/common/helpers.py:312 ../src/tooltips.py:212
 msgid "Member"
 msgstr "Membro"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:351
 msgid "is paying attention to the conversation"
 msgstr "está prestando a atenção na conversa"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:353
 msgid "is doing something else"
 msgstr "está fazendo outra coisa"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:355
 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:352
+#: ../src/common/helpers.py:358
 msgid "paused composing a message"
 msgstr "parou de digitar"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:360
 msgid "has closed the chat window or tab"
 msgstr "fechou a janela de conversa ou aba"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:619
+#: ../src/common/helpers.py:625
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:622
+#: ../src/common/helpers.py:628
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:626
+#: ../src/common/helpers.py:632
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:629
+#: ../src/common/helpers.py:635
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:633
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:636
+#: ../src/common/helpers.py:642
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:645
 #, python-format
 msgid "%s B"
 msgstr "%s B"
@@ -5370,12 +5539,12 @@ msgstr "Gajim - %s"
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:111
+#: ../src/common/jingle_rtp.py:107
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Configuração da sala"
 
-#: ../src/common/jingle_rtp.py:112
+#: ../src/common/jingle_rtp.py:108
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5387,30 +5556,30 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:209
+#: ../src/common/jingle_rtp.py:205
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:210
+#: ../src/common/jingle_rtp.py:206
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Mensagem de erro: %s"
 
-#: ../src/common/jingle_rtp.py:336
+#: ../src/common/jingle_rtp.py:335
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:339
+#: ../src/common/jingle_rtp.py:338
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:382
+#: ../src/common/jingle_rtp.py:381
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:390
+#: ../src/common/jingle_rtp.py:389
 msgid "video output"
 msgstr ""
 
@@ -5488,11 +5657,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "erro: impossível abrir %s para leitura"
 
-#: ../src/common/optparser.py:299 ../src/common/optparser.py:300
+#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
 msgid "cyan"
 msgstr "azul celeste"
 
-#: ../src/common/optparser.py:379
+#: ../src/common/optparser.py:383
 msgid "migrating logs database to indices"
 msgstr "migrando base de dados de registros para índices"
 
@@ -6165,7 +6334,7 @@ msgstr ""
 "arquivos será cancelada."
 
 #. we're not english
-#: ../src/common/stanza_session.py:303
+#: ../src/common/stanza_session.py:423
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6173,11 +6342,11 @@ msgstr ""
 "[Isto é parte de uma sessão criptografada. Se você estiver vendo esta "
 "mensagem, alguma coisa vai errada.]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:178
+#: ../src/common/zeroconf/connection_zeroconf.py:181
 msgid "Avahi error"
 msgstr "Erro do Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:179
+#: ../src/common/zeroconf/connection_zeroconf.py:182
 #, python-format
 msgid ""
 "%s\n"
@@ -6186,44 +6355,44 @@ msgstr ""
 "%s\n"
 "Mensagens link-local podem não funcionar adequadamente."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:190
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Por favor verifique se o Avahi ou o Bonjour estão instalados."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:199
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Could not start local service"
 msgstr "Impossível iniciar o serviço local"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Impossível conectar-se à porta %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-#: ../src/common/zeroconf/connection_zeroconf.py:283
-#: ../src/common/zeroconf/connection_zeroconf.py:294
-#: ../src/common/zeroconf/connection_zeroconf.py:308
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:286
+#: ../src/common/zeroconf/connection_zeroconf.py:297
+#: ../src/common/zeroconf/connection_zeroconf.py:311
 msgid "Please check if avahi-daemon is running."
 msgstr "Por favor verifique se o serviço avahi-daemon está rodando."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:282
-#: ../src/common/zeroconf/connection_zeroconf.py:293
-#: ../src/common/zeroconf/connection_zeroconf.py:307
+#: ../src/common/zeroconf/connection_zeroconf.py:285
+#: ../src/common/zeroconf/connection_zeroconf.py:296
+#: ../src/common/zeroconf/connection_zeroconf.py:310
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Impossível alterar status da conta \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:325
+#: ../src/common/zeroconf/connection_zeroconf.py:328
 msgid "Your message could not be sent."
 msgstr "Sua mensagem não pode ser enviada."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:335
+#: ../src/common/zeroconf/connection_zeroconf.py:338
 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:360
+#: ../src/common/zeroconf/connection_zeroconf.py:363
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6244,16 +6413,16 @@ msgstr "Mensagem padrão"
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3078
+#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
 msgid "Default"
 msgstr "Padrão"
 
-#: ../src/config.py:739 ../src/dialogs.py:1395
+#: ../src/config.py:733 ../src/dialogs.py:1409
 #, 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:740
+#: ../src/config.py:734
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6271,9 +6440,9 @@ msgid "status message text"
 msgstr "texto da mensagem de status"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2383 ../src/dialogs.py:2449
-#: ../src/dialogs.py:3215 ../src/disco.py:866 ../src/disco.py:1726
-#: ../src/disco.py:2030 ../src/history_window.py:90
+#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
+#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
+#: ../src/disco.py:2048 ../src/history_window.py:90
 msgid "Name"
 msgstr "Nome"
 
@@ -6306,7 +6475,7 @@ msgstr "Você iniciou uma conversa usando a conta %s"
 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:1976 ../src/config.py:2509 ../src/config.py:2545
+#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
 msgid "You are currently connected to the server"
 msgstr "Você está atualmente conectado ao servidor"
 
@@ -6342,134 +6511,134 @@ msgstr "Nome da conta não pode ser vazio."
 msgid "Account name cannot contain spaces."
 msgstr "Nome da conta não pode conter espaços."
 
-#: ../src/config.py:2072
+#: ../src/config.py:2074
 msgid "Rename Account"
 msgstr "Renomear conta"
 
-#: ../src/config.py:2073
+#: ../src/config.py:2075
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Entre com um novo nome para a conta %s"
 
-#: ../src/config.py:2101
+#: ../src/config.py:2103
 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:2318 ../src/config.py:3606
+#: ../src/config.py:2320 ../src/config.py:3623
 msgid "Invalid entry"
 msgstr "Entrada inválida"
 
-#: ../src/config.py:2319 ../src/config.py:3607
+#: ../src/config.py:2321 ../src/config.py:3624
 msgid "Custom port must be a port number."
 msgstr "A porta do proxy deve ser um número de porta."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2342
 msgid "Failed to get secret keys"
 msgstr "Falha enquanto recebia as chaves secretas"
 
-#: ../src/config.py:2341
+#: ../src/config.py:2343
 msgid "There is no OpenPGP secret key available."
 msgstr "Não há chave secreta OpenPGP disponível."
 
-#: ../src/config.py:2375
+#: ../src/config.py:2377
 msgid "OpenPGP Key Selection"
 msgstr "Seleção de chave OpenPGP"
 
-#: ../src/config.py:2376
+#: ../src/config.py:2378
 msgid "Choose your OpenPGP key"
 msgstr "Escolha sua chave OpenPGP"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2385
 msgid "No such account available"
 msgstr "Conta não disponível"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2386
 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:2391 ../src/dialogs.py:2136 ../src/dialogs.py:2371
-#: ../src/dialogs.py:2557 ../src/disco.py:511 ../src/profile_window.py:339
+#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
+#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
 msgid "You are not connected to the server"
 msgstr "Você não está conectado ao servidor"
 
-#: ../src/config.py:2392
+#: ../src/config.py:2394
 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:2396
+#: ../src/config.py:2398
 msgid "Your server doesn't support Vcard"
 msgstr "Seu servidor não suporta Vcard"
 
-#: ../src/config.py:2397
+#: ../src/config.py:2399
 msgid "Your server can't save your personal information."
 msgstr "Seu servidor não pode salvar suas informações pessoais."
 
-#: ../src/config.py:2510 ../src/config.py:2546
+#: ../src/config.py:2512 ../src/config.py:2548
 msgid "To disable the account, you must be disconnected."
 msgstr "Para desativar esta conta, você deve estar desconectado."
 
-#: ../src/config.py:2515
+#: ../src/config.py:2517
 msgid "Account Local already exists."
 msgstr "Conta local já existe."
 
-#: ../src/config.py:2516
+#: ../src/config.py:2518
 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:2673
+#: ../src/config.py:2675
 #, python-format
 msgid "Edit %s"
 msgstr "Editar %s"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2677
 #, python-format
 msgid "Register to %s"
 msgstr "Registro para %s"
 
 #. list at the beginning
-#: ../src/config.py:2711
+#: ../src/config.py:2713
 msgid "Ban List"
 msgstr "Lista de banidos"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2714
 msgid "Member List"
 msgstr "Lista de membros"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2714
 msgid "Owner List"
 msgstr "Lista de proprietários"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2715
 msgid "Administrator List"
 msgstr "Lista de administradores"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2763 ../src/disco.py:873 ../src/history_manager.py:201
+#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2773
+#: ../src/config.py:2789
 msgid "Reason"
 msgstr "Razão"
 
-#: ../src/config.py:2780
+#: ../src/config.py:2796
 msgid "Nick"
 msgstr "Apelido"
 
-#: ../src/config.py:2786
+#: ../src/config.py:2802
 msgid "Role"
 msgstr "Cargo"
 
-#: ../src/config.py:2813
+#: ../src/config.py:2829
 msgid "Banning..."
 msgstr "Banindo..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2815
+#: ../src/config.py:2831
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6477,11 +6646,11 @@ msgstr ""
 "<b>Quem você quer banir?</b>\n"
 "\n"
 
-#: ../src/config.py:2817
+#: ../src/config.py:2833
 msgid "Adding Member..."
 msgstr "Adicionando membro..."
 
-#: ../src/config.py:2818
+#: ../src/config.py:2834
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6489,11 +6658,11 @@ msgstr ""
 "<b>Quem você quer fazer como membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2836
 msgid "Adding Owner..."
 msgstr "Adicionando proprietário..."
 
-#: ../src/config.py:2821
+#: ../src/config.py:2837
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6501,11 +6670,11 @@ msgstr ""
 "<b>Quem você quer tornar um proprietário?</b>\n"
 "\n"
 
-#: ../src/config.py:2823
+#: ../src/config.py:2839
 msgid "Adding Administrator..."
 msgstr "Adicionando administrador..."
 
-#: ../src/config.py:2824
+#: ../src/config.py:2840
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6513,7 +6682,7 @@ msgstr ""
 "<b>Quem você quer tornar um administrador?</b>\n"
 "\n"
 
-#: ../src/config.py:2825
+#: ../src/config.py:2841
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6529,83 +6698,83 @@ 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:2926
+#: ../src/config.py:2943
 #, python-format
 msgid "Removing %s account"
 msgstr "Removendo %s conta"
 
-#: ../src/config.py:2941
+#: ../src/config.py:2958
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Emoticons desabilitados"
 
-#: ../src/config.py:2942
+#: ../src/config.py:2959
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2955 ../src/gui_interface.py:1132
-#: ../src/gui_interface.py:1243
+#: ../src/config.py:2972 ../src/gui_interface.py:311
+#: ../src/gui_interface.py:1048
 msgid "Password Required"
 msgstr "Senha é obrigatória"
 
-#: ../src/config.py:2956 ../src/gui_interface.py:1223
+#: ../src/config.py:2973 ../src/gui_interface.py:1028
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entre com a senha para conta %s"
 
-#: ../src/config.py:2957 ../src/gui_interface.py:1243
+#: ../src/config.py:2974 ../src/gui_interface.py:1048
 msgid "Save password"
 msgstr "Salvar senha"
 
-#: ../src/config.py:2967
+#: ../src/config.py:2984
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Conta \"%s\" está conectada ao servidor"
 
-#: ../src/config.py:2968
+#: ../src/config.py:2985
 msgid "If you remove it, the connection will be lost."
 msgstr "Se você remover-lo, a conexão será perdida."
 
-#: ../src/config.py:2982
+#: ../src/config.py:2999
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Falha na conexão com o proxy"
 
-#: ../src/config.py:2983
+#: ../src/config.py:3000
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "O que você quer fazer?"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3001
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Remover conta _somente do Gajim"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3002
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3078
+#: ../src/config.py:3095
 msgid "?print_status:All"
 msgstr "?exibir_status:Todos"
 
-#: ../src/config.py:3079
+#: ../src/config.py:3096
 msgid "Enter and leave only"
 msgstr "Apenas entre e saia"
 
-#: ../src/config.py:3080
+#: ../src/config.py:3097
 msgid "?print_status:None"
 msgstr "?exibir_status:Nenhum"
 
-#: ../src/config.py:3150
+#: ../src/config.py:3167
 msgid "New Group Chat"
 msgstr "Nova conferência"
 
-#: ../src/config.py:3183
+#: ../src/config.py:3200
 msgid "This bookmark has invalid data"
 msgstr "Este marcador tem dados inválidos"
 
-#: ../src/config.py:3184
+#: ../src/config.py:3201
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6613,27 +6782,27 @@ msgstr ""
 "este marcador."
 
 #. invalid char
-#: ../src/config.py:3302 ../src/dialogs.py:1934
+#: ../src/config.py:3319 ../src/dialogs.py:1950
 msgid "Invalid nickname"
 msgstr "Apelido inválido"
 
-#: ../src/config.py:3303 ../src/config.py:3317 ../src/config.py:3331
+#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
 msgid "Character not allowed"
 msgstr "Caractere não permitido"
 
-#: ../src/config.py:3316 ../src/config.py:3582
+#: ../src/config.py:3333 ../src/config.py:3599
 msgid "Invalid server"
 msgstr "Servidor inválido"
 
-#: ../src/config.py:3330
+#: ../src/config.py:3347
 msgid "Invalid room"
 msgstr "Sala inválida"
 
-#: ../src/config.py:3498
+#: ../src/config.py:3515
 msgid "Account has been added successfully"
 msgstr "Conta foi adicionada com sucesso"
 
-#: ../src/config.py:3499 ../src/config.py:3505
+#: ../src/config.py:3516 ../src/config.py:3522
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menu item under the Edit menu from the main "
@@ -6643,34 +6812,34 @@ msgstr ""
 "avançado, ou mais tarde clicando em contas no menu editar da janela "
 "principal."
 
-#: ../src/config.py:3504
+#: ../src/config.py:3521
 msgid "Your new account has been created successfully"
 msgstr "Sua nova conta foi criada com sucesso"
 
-#: ../src/config.py:3543
+#: ../src/config.py:3560
 msgid "Invalid username"
 msgstr "Nome de usuário inválido"
 
-#: ../src/config.py:3545
+#: ../src/config.py:3562
 msgid "You must provide a username to configure this account."
 msgstr "Você deve entrar com um nome para configurar esta conta."
 
-#: ../src/config.py:3583
+#: ../src/config.py:3600
 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:3639 ../src/gui_interface.py:1904
+#: ../src/config.py:3656 ../src/gui_interface.py:1693
 msgid "Certificate Already in File"
 msgstr "Certificado já está no arquivo"
 
-#: ../src/config.py:3640 ../src/gui_interface.py:1905
+#: ../src/config.py:3657 ../src/gui_interface.py:1694
 #, 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:3717
+#: ../src/config.py:3734
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6685,7 +6854,7 @@ msgstr ""
 "Erro do SSL: %(error)s\n"
 "Você ainda quer conectar com este servidor?"
 
-#: ../src/config.py:3723 ../src/gui_interface.py:1932
+#: ../src/config.py:3740 ../src/gui_interface.py:1721
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6696,63 +6865,72 @@ msgstr ""
 "SHA1 fingerprint do certificado:\n"
 "%s"
 
-#: ../src/config.py:3755 ../src/config.py:3789
+#: ../src/config.py:3772 ../src/config.py:3806
 msgid "An error occurred during account creation"
 msgstr "Um erro ocorreu durante a criação da conta"
 
-#: ../src/config.py:3854
+#: ../src/config.py:3871
 msgid "Account name is in use"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:3855
+#: ../src/config.py:3872
 msgid "You already have an account using this name."
 msgstr "Você já tem uma conta usando este nome."
 
-#: ../src/config.py:4009
+#: ../src/config.py:3991
+msgid "PEP node was not removed"
+msgstr "O nó PEP não foi removido"
+
+#: ../src/config.py:3992
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr "O nó PEP %(node)s não foi removido: %(message)s"
+
+#: ../src/config.py:4036
 msgid "Active"
 msgstr "Ativo"
 
-#: ../src/config.py:4017
+#: ../src/config.py:4044
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:4052
+#: ../src/config.py:4079
 msgid "First Message Received"
 msgstr "Primeira mensagem recebida"
 
-#: ../src/config.py:4053
+#: ../src/config.py:4080
 msgid "Next Message Received Focused"
 msgstr "Nova mensagem recebida com foco"
 
-#: ../src/config.py:4055
+#: ../src/config.py:4082
 msgid "Next Message Received Unfocused"
 msgstr "Nova mensagem recebida sem foco"
 
-#: ../src/config.py:4056
+#: ../src/config.py:4083
 msgid "Contact Connected"
 msgstr "Contato conectado"
 
-#: ../src/config.py:4057
+#: ../src/config.py:4084
 msgid "Contact Disconnected"
 msgstr "Contato desconectou"
 
-#: ../src/config.py:4058
+#: ../src/config.py:4085
 msgid "Message Sent"
 msgstr "Mensagem enviada"
 
-#: ../src/config.py:4059
+#: ../src/config.py:4086
 msgid "Group Chat Message Highlight"
 msgstr "Mensagem destacada de conferência"
 
-#: ../src/config.py:4060
+#: ../src/config.py:4087
 msgid "Group Chat Message Received"
 msgstr "Mensagem de conferência recebida"
 
-#: ../src/config.py:4061
+#: ../src/config.py:4088
 msgid "GMail Email Received"
 msgstr "Email do GMail recebido"
 
-#: ../src/conversation_textview.py:600
+#: ../src/conversation_textview.py:601
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6762,7 +6940,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:619
+#: ../src/conversation_textview.py:620
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6770,44 +6948,44 @@ 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:739
+#: ../src/conversation_textview.py:740
 msgid "_Quote"
 msgstr "_Frase"
 
-#: ../src/conversation_textview.py:746
+#: ../src/conversation_textview.py:747
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Ações para \"%s\""
 
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Read _Wikipedia Article"
 msgstr "Ler artigo da _Wikipedia"
 
-#: ../src/conversation_textview.py:763
+#: ../src/conversation_textview.py:765
 msgid "Look it up in _Dictionary"
 msgstr "Procurar no _dicionário"
 
-#: ../src/conversation_textview.py:780
+#: ../src/conversation_textview.py:782
 #, 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:793
+#: ../src/conversation_textview.py:795
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL de procura na web não existe \"%s\""
 
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 msgid "Web _Search for it"
 msgstr "_Procura na web por isto"
 
-#: ../src/conversation_textview.py:802
+#: ../src/conversation_textview.py:804
 msgid "Open as _Link"
 msgstr "Abrir como _link"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1296
+#: ../src/conversation_textview.py:1298
 #, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6815,183 +6993,188 @@ msgstr[0] "Ontem"
 msgstr[1] "Há %i dias"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1344 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Assunto: %s\n"
 
-#: ../src/dataforms_widget.py:544
+#: ../src/dataforms_widget.py:545
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Incapaz de carregar o módulo inativo"
 
-#: ../src/dataforms_widget.py:546
+#: ../src/dataforms_widget.py:547
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Sem suporte a invisibilidade"
 
-#: ../src/dataforms_widget.py:601
+#: ../src/dataforms_widget.py:562
+msgid "This field is required"
+msgstr ""
+
+#: ../src/dataforms_widget.py:607
 msgid "Jabber ID already in list"
 msgstr "Jabber ID já existente na lista"
 
-#: ../src/dataforms_widget.py:602
+#: ../src/dataforms_widget.py:608
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "O Jabber ID que você forneceu já está na lista. Escolha outro."
 
 #. Default jid
-#: ../src/dataforms_widget.py:613
+#: ../src/dataforms_widget.py:619
 msgid "new@jabber.id"
 msgstr "novo@jabber.id"
 
-#: ../src/dataforms_widget.py:616 ../src/dataforms_widget.py:618
+#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "novo%d@jabber.id"
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nome do contato: <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:195
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:201
+#: ../src/dialogs.py:202
 msgid "In the group"
 msgstr "Neste grupo"
 
-#: ../src/dialogs.py:292
+#: ../src/dialogs.py:293
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:297
+#: ../src/dialogs.py:298
 msgid "Contact name"
 msgstr "Nome do contato"
 
-#: ../src/dialogs.py:469
+#: ../src/dialogs.py:470
 msgid "Set Mood"
 msgstr "Definir humor"
 
-#: ../src/dialogs.py:589
+#: ../src/dialogs.py:590
 #, python-format
 msgid "%s Status Message"
 msgstr "%s mensagem de status"
 
-#: ../src/dialogs.py:603
+#: ../src/dialogs.py:604
 msgid "Status Message"
 msgstr "Mensagem de status"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:794
 msgid "Overwrite Status Message?"
 msgstr "Sobrescrever mensagem de status?"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:795
 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:802
+#: ../src/dialogs.py:803
 msgid "Save as Preset Status Message"
 msgstr "Salvar como a mensagem de status pré-configurada"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:804
 msgid "Please type a name for this status message"
 msgstr "Por favor, escreva um nome para esta mensagem de status"
 
-#: ../src/dialogs.py:831
+#: ../src/dialogs.py:832
 msgid "AIM Address:"
 msgstr "Endereço AIM:"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:833
 msgid "GG Number:"
 msgstr "Número de GG:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:834
 msgid "ICQ Number:"
 msgstr "Número de ICQ:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:835
 msgid "MSN Address:"
 msgstr "Endereço MSN:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:836
 msgid "Yahoo! Address:"
 msgstr "Endereço Yahoo!:"
 
-#: ../src/dialogs.py:872
+#: ../src/dialogs.py:873
 #, 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:875
+#: ../src/dialogs.py:876
 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:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
+#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
+#: ../src/dialogs.py:3464
 msgid "Invalid User ID"
 msgstr "Inválido ID do usuário"
 
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1052
 msgid "The user ID must not contain a resource."
 msgstr "O ID do usuário não contém um recurso."
 
-#: ../src/dialogs.py:1051
+#: ../src/dialogs.py:1057
 msgid "You cannot add yourself to your roster."
 msgstr "Você não pode adicionar você mesmo na sua lista."
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1071
 msgid "Contact already in roster"
 msgstr "Contato já foi adicionado à lista"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1072
 msgid "This contact is already listed in your roster."
 msgstr "Este contato já encontra-se em sua lista."
 
-#: ../src/dialogs.py:1112
+#: ../src/dialogs.py:1118
 msgid "User ID:"
 msgstr "ID do usuário:"
 
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1189
 msgid "A GTK+ jabber client"
 msgstr "Um cliente jabber GTK+"
 
-#: ../src/dialogs.py:1176
+#: ../src/dialogs.py:1190
 msgid "GTK+ Version:"
 msgstr "Versão do GTK+:"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1191
 msgid "PyGTK Version:"
 msgstr "Versão do PyGTK:"
 
-#: ../src/dialogs.py:1187
+#: ../src/dialogs.py:1201
 msgid "Current Developers:"
 msgstr "Desenvolvedores atuais:"
 
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1203
 msgid "Past Developers:"
 msgstr "Desenvolvedores passados:"
 
-#: ../src/dialogs.py:1195
+#: ../src/dialogs.py:1209
 msgid "THANKS:"
 msgstr "AGRADECIMENTOS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1215
 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:1213
+#: ../src/dialogs.py:1227
 msgid "translator-credits"
 msgstr ""
 "Alfredo Jr. - Junix <junix@infolink.com.br>\n"
@@ -6999,7 +7182,7 @@ msgstr ""
 "Djavan Fagundes <djavan@comum.org>\n"
 "Og Maciel <og.maciel@gmail.com>"
 
-#: ../src/dialogs.py:1396
+#: ../src/dialogs.py:1410
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7012,100 +7195,100 @@ msgstr ""
 "\n"
 "O recurso de destacar palavras grafadas incorretamente não será usado"
 
-#: ../src/dialogs.py:1935 ../src/dialogs.py:2322
+#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
 msgid "The nickname has not allowed characters."
 msgstr "O apelido possui caracteres não permitidos."
 
-#: ../src/dialogs.py:2053
+#: ../src/dialogs.py:2069
 #, 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:2056
+#: ../src/dialogs.py:2072
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Solicitação de inscrição de %s"
 
-#: ../src/dialogs.py:2131 ../src/gui_interface.py:2672
+#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Você já está na conferência %s"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2153
 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:2178
+#: ../src/dialogs.py:2194
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Ingressar numa conferência com a conta %s"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2325
 msgid "Invalid Account"
 msgstr "Conta inválida"
 
-#: ../src/dialogs.py:2310
+#: ../src/dialogs.py:2326
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Selecione a conta que você quer usar para para entrar na sala."
 
-#: ../src/dialogs.py:2321
+#: ../src/dialogs.py:2337
 msgid "Invalid Nickname"
 msgstr "Apelido inválido"
 
-#: ../src/dialogs.py:2326 ../src/dialogs.py:2332
-#: ../src/groupchat_control.py:1832
+#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
+#: ../src/groupchat_control.py:1847
 msgid "Invalid group chat Jabber ID"
 msgstr "Jabber ID da conferência inválido:"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2343
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "Por favor, digite o Jabber ID da conferência como sala@servidor."
 
-#: ../src/dialogs.py:2333 ../src/groupchat_control.py:1833
+#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
 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:2340
+#: ../src/dialogs.py:2356
 msgid "This is not a group chat"
 msgstr "Isto não é uma conferência"
 
-#: ../src/dialogs.py:2341
+#: ../src/dialogs.py:2357
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s não é o nome da conferência."
 
-#: ../src/dialogs.py:2372
+#: ../src/dialogs.py:2388
 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:2386
+#: ../src/dialogs.py:2402
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/dialogs.py:2421
+#: ../src/dialogs.py:2437
 msgid "This account is not connected to the server"
 msgstr "Esta conta não está conectada ao servidor"
 
-#: ../src/dialogs.py:2422
+#: ../src/dialogs.py:2438
 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:2446
+#: ../src/dialogs.py:2462
 msgid "Synchronise"
 msgstr "Sincronizar"
 
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2523
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar uma conferência com a conta %s"
 
-#: ../src/dialogs.py:2509
+#: ../src/dialogs.py:2525
 msgid "Start Chat"
 msgstr "Iniciar conversa"
 
-#: ../src/dialogs.py:2510
+#: ../src/dialogs.py:2526
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7114,165 +7297,165 @@ msgstr ""
 "você quer enviar uma mensagem:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2536 ../src/dialogs.py:2917 ../src/dialogs.py:3129
+#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
 msgid "Connection not available"
 msgstr "Conexão não disponível"
 
-#: ../src/dialogs.py:2537 ../src/dialogs.py:2918 ../src/dialogs.py:3130
+#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
 #, 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:2546 ../src/dialogs.py:2549
+#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
 msgid "Invalid JID"
 msgstr "JID inválido:"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2565
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossível gravar o arquivo em \"%s\"."
 
-#: ../src/dialogs.py:2558
+#: ../src/dialogs.py:2574
 msgid "Without a connection, you can not change your password."
 msgstr "Você deve estar conectado para mudar sua senha."
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "Invalid password"
 msgstr "Senha inválida"
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "You must enter a password."
 msgstr "Você deve entrar com uma senha."
 
-#: ../src/dialogs.py:2581
+#: ../src/dialogs.py:2597
 msgid "Passwords do not match"
 msgstr "Senhas não conferem"
 
-#: ../src/dialogs.py:2582
+#: ../src/dialogs.py:2598
 msgid "The passwords typed in both fields must be identical."
 msgstr "As senhas digitadas em ambos os campos devem ser idênticas."
 
 #. default value
-#: ../src/dialogs.py:2619 ../src/notify.py:247 ../src/notify.py:473
+#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
 msgid "Contact Signed In"
 msgstr "Contato conectou"
 
-#: ../src/dialogs.py:2621 ../src/notify.py:255 ../src/notify.py:475
+#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
 msgid "Contact Signed Out"
 msgstr "Contato desconectou"
 
 #. chat message
-#: ../src/dialogs.py:2623 ../src/notify.py:277 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
 msgid "New Message"
 msgstr "Nova mensagem"
 
 #. single message
-#: ../src/dialogs.py:2623 ../src/notify.py:259 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
 msgid "New Single Message"
 msgstr "Nova mensagem"
 
 #. private message
-#: ../src/dialogs.py:2624 ../src/notify.py:265 ../src/notify.py:478
+#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
 msgid "New Private Message"
 msgstr "Enviar mensagem privada"
 
-#: ../src/dialogs.py:2624 ../src/gui_interface.py:1358 ../src/notify.py:487
+#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
 msgid "New E-mail"
 msgstr "Novo e-mail"
 
-#: ../src/dialogs.py:2626 ../src/gui_interface.py:1420 ../src/notify.py:480
+#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
 msgid "File Transfer Request"
 msgstr "Solicitação de transferência de arquivos"
 
-#: ../src/dialogs.py:2628 ../src/gui_interface.py:1320
-#: ../src/gui_interface.py:1389 ../src/notify.py:482
+#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
+#: ../src/gui_interface.py:1186 ../src/notify.py:482
 msgid "File Transfer Error"
 msgstr "Erro na transferência de arquivos"
 
-#: ../src/dialogs.py:2630 ../src/gui_interface.py:1466
-#: ../src/gui_interface.py:1489 ../src/gui_interface.py:1506
+#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
+#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
 #: ../src/notify.py:484
 msgid "File Transfer Completed"
 msgstr "Transferência do arquivo completa"
 
-#: ../src/dialogs.py:2631 ../src/gui_interface.py:1469 ../src/notify.py:485
+#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
 msgid "File Transfer Stopped"
 msgstr "Transferência do arquivo parada"
 
-#: ../src/dialogs.py:2633 ../src/gui_interface.py:1152 ../src/notify.py:489
+#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
 msgid "Groupchat Invitation"
 msgstr "Convite para conferência"
 
-#: ../src/dialogs.py:2635 ../src/notify.py:239 ../src/notify.py:491
+#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
 msgid "Contact Changed Status"
 msgstr "O contato alterou seu status"
 
-#: ../src/dialogs.py:2836
+#: ../src/dialogs.py:2852
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Mensagem simples usando conta %s"
 
-#: ../src/dialogs.py:2838
+#: ../src/dialogs.py:2854
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Mensagem simples na conta %s"
 
-#: ../src/dialogs.py:2840
+#: ../src/dialogs.py:2856
 msgid "Single Message"
 msgstr "Mensagem simples"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2843
+#: ../src/dialogs.py:2859
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:2882
 #, python-format
 msgid "Received %s"
 msgstr "Recebido %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2889
+#: ../src/dialogs.py:2905
 #, 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:2968
+#: ../src/dialogs.py:2984
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:2985
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escreveu:\n"
 
-#: ../src/dialogs.py:3028
+#: ../src/dialogs.py:3044
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML para %s"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3046
 msgid "XML Console"
 msgstr "Console XML"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 msgid "add"
 msgstr "adicionar"
 
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 msgid "modify"
 msgstr "modificar"
 
-#: ../src/dialogs.py:3160
+#: ../src/dialogs.py:3176
 msgid "remove"
 msgstr "remover"
 
-#: ../src/dialogs.py:3188
+#: ../src/dialogs.py:3204
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7282,154 +7465,188 @@ msgstr ""
 "lista."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3204 ../src/dialogs.py:3250
+#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
 msgid "Add"
 msgstr "Adicionar"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3206 ../src/dialogs.py:3281
+#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../src/dialogs.py:3212
+#: ../src/dialogs.py:3228
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3218
+#: ../src/dialogs.py:3234
 msgid "Groups"
 msgstr "Grupos"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3342
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s me sugeriu adicionar você à minha lista."
 
-#: ../src/dialogs.py:3340
+#: ../src/dialogs.py:3356
 #, python-format
 msgid "Added  %s contacts"
 msgstr "Adicionados %s contatos"
 
-#: ../src/dialogs.py:3377
+#: ../src/dialogs.py:3393
 #, python-format
 msgid "Removed  %s contacts"
 msgstr "Removidos %s contatos"
 
-#: ../src/dialogs.py:3430
+#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#, python-format
+msgid "Archiving Preferences for %s"
+msgstr ""
+
+#: ../src/dialogs.py:3473
+#, fuzzy
+msgid "Invalid expire value"
+msgstr "Nome do servidor inválido"
+
+#: ../src/dialogs.py:3474
+msgid "Expire must be a valid positive integer."
+msgstr ""
+
+#: ../src/dialogs.py:3521
+msgid "There is an error with the form"
+msgstr ""
+
+#: ../src/dialogs.py:3732
+#, fuzzy
+msgid "There is an error"
+msgstr "O serviço retornou um erro."
+
+#: ../src/dialogs.py:3796
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista de privacidade <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3434
+#: ../src/dialogs.py:3800
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista de privacidade para %s"
 
-#: ../src/dialogs.py:3490
+#: ../src/dialogs.py:3856
 #, 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:3495
+#: ../src/dialogs.py:3861
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordem: %(order)s, ação: %(action)s"
 
-#: ../src/dialogs.py:3539
+#: ../src/dialogs.py:3905
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Editar uma regra</b>"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:4016
 msgid "<b>Add a rule</b>"
 msgstr "<b>Adicionar uma regra</b>"
 
-#: ../src/dialogs.py:3750
+#: ../src/dialogs.py:4116
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Lista de privacidade para %s"
 
-#: ../src/dialogs.py:3752
+#: ../src/dialogs.py:4118
 msgid "Privacy Lists"
 msgstr "Listas de privacidade"
 
-#: ../src/dialogs.py:3822
+#: ../src/dialogs.py:4188
 msgid "Invalid List Name"
 msgstr "Nome de lista inválido"
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4189
 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:3855
+#: ../src/dialogs.py:4221
 msgid "You are invited to a groupchat"
 msgstr "Você foi convidado para uma conferência"
 
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4224
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact convidou você para ingressar em uma discussão"
 
-#: ../src/dialogs.py:3860
+#: ../src/dialogs.py:4226
 #, 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:3868
+#: ../src/dialogs.py:4234
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4236
 msgid "Do you want to accept the invitation?"
 msgstr "Você quer aceitar este convite?"
 
-#: ../src/dialogs.py:3932
+#: ../src/dialogs.py:4298
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:3942 ../src/dialogs.py:3985 ../src/dialogs.py:4041
+#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
+#: ../src/dialogs.py:4495
 msgid "All files"
 msgstr "Todos os arquivos"
 
-#: ../src/dialogs.py:3947
+#: ../src/dialogs.py:4313
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:3975
+#: ../src/dialogs.py:4341
 msgid "Choose Sound"
 msgstr "Escolher som"
 
-#: ../src/dialogs.py:3990
+#: ../src/dialogs.py:4356
 msgid "Wav Sounds"
 msgstr "Sons wav"
 
-#: ../src/dialogs.py:4028
+#: ../src/dialogs.py:4394
 msgid "Choose Image"
 msgstr "Escolha imagem"
 
-#: ../src/dialogs.py:4046
+#: ../src/dialogs.py:4412
 msgid "Images"
 msgstr "Imagens"
 
-#: ../src/dialogs.py:4113
+#: ../src/dialogs.py:4482
+#, fuzzy
+msgid "Choose Archive"
+msgstr "Escolha imagem"
+
+#: ../src/dialogs.py:4500
+#, fuzzy
+msgid "Zip files"
+msgstr "Todos os arquivos"
+
+#: ../src/dialogs.py:4525
 #, python-format
 msgid "When %s becomes:"
 msgstr "Quando %s chega:"
 
-#: ../src/dialogs.py:4115
+#: ../src/dialogs.py:4527
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Adicionando notificação especial para %s"
 
-#: ../src/dialogs.py:4190
+#: ../src/dialogs.py:4602
 msgid "Condition"
 msgstr "Condição"
 
-#: ../src/dialogs.py:4310
+#: ../src/dialogs.py:4722
 msgid "when I am "
 msgstr "quando eu estiver "
 
-#: ../src/dialogs.py:4786
+#: ../src/dialogs.py:5198
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7440,19 +7657,19 @@ msgstr ""
 "\n"
 "A String Curta de Autenticação (SAS) da sessão é <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4789
+#: ../src/dialogs.py:5201
 msgid "You have already verified this contact's identity."
 msgstr "Você já verificou a identidade deste contato."
 
-#: ../src/dialogs.py:4795 ../src/dialogs.py:4879
+#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
 msgid "Contact's identity verified"
 msgstr "Identidade do contato verificada"
 
-#: ../src/dialogs.py:4801
+#: ../src/dialogs.py:5213
 msgid "Verify again..."
 msgstr "Verificar novamente..."
 
-#: ../src/dialogs.py:4806
+#: ../src/dialogs.py:5218
 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 "
@@ -7462,19 +7679,19 @@ msgstr ""
 "mensagens e enviar mensagens, você precisa verificar a identidade dela "
 "clicando no botão abaixo."
 
-#: ../src/dialogs.py:4809 ../src/dialogs.py:4860 ../src/dialogs.py:4873
+#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
 msgid "Contact's identity NOT verified"
 msgstr "A identidade do contato NÃO foi verificada"
 
-#: ../src/dialogs.py:4814
+#: ../src/dialogs.py:5226
 msgid "Verify..."
 msgstr "Verificar..."
 
-#: ../src/dialogs.py:4825
+#: ../src/dialogs.py:5237
 msgid "Have you verified the contact's identity?"
 msgstr "Você verificou a identidade deste contato?"
 
-#: ../src/dialogs.py:4826
+#: ../src/dialogs.py:5238
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7489,24 +7706,24 @@ msgstr ""
 "\n"
 "Esta String de  Autenticação Curta é <b>%(sas)s</ b>."
 
-#: ../src/dialogs.py:4827
+#: ../src/dialogs.py:5239
 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:4861
+#: ../src/dialogs.py:5273
 #, 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:4867
+#: ../src/dialogs.py:5279
 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:4874
+#: ../src/dialogs.py:5286
 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."
@@ -7515,7 +7732,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:4880
+#: ../src/dialogs.py:5292
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7523,19 +7740,19 @@ msgstr ""
 "A chave GPG está atribuída para este contato, e você validou esta chave, "
 "então as mensagens serão criptografadas."
 
-#: ../src/dialogs.py:4945
+#: ../src/dialogs.py:5357
 msgid "an audio and video"
 msgstr "um áudio e vídeo"
 
-#: ../src/dialogs.py:4947
+#: ../src/dialogs.py:5359
 msgid "an audio"
 msgstr "um áudio"
 
-#: ../src/dialogs.py:4949
+#: ../src/dialogs.py:5361
 msgid "a video"
 msgstr "um video"
 
-#: ../src/dialogs.py:4953
+#: ../src/dialogs.py:5365
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7553,24 +7770,24 @@ msgstr "Outros"
 msgid "Conference"
 msgstr "Conferência"
 
-#: ../src/disco.py:512
+#: ../src/disco.py:513
 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:589
+#: ../src/disco.py:600
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Buscar serviços usando conta %s"
 
-#: ../src/disco.py:591
+#: ../src/disco.py:602
 msgid "Service Discovery"
 msgstr "Buscar serviços"
 
-#: ../src/disco.py:741
+#: ../src/disco.py:758
 msgid "The service could not be found"
 msgstr "O serviço não pode ser encontrado"
 
-#: ../src/disco.py:742
+#: ../src/disco.py:759
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7578,94 +7795,94 @@ 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:746 ../src/disco.py:1082
+#: ../src/disco.py:763 ../src/disco.py:1100
 msgid "The service is not browsable"
 msgstr "Serviço não navegável"
 
-#: ../src/disco.py:747
+#: ../src/disco.py:764
 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:786 ../src/disco.py:796
+#: ../src/disco.py:804 ../src/disco.py:814
 msgid "Invalid Server Name"
 msgstr "Nome do servidor inválido"
 
-#: ../src/disco.py:850
+#: ../src/disco.py:868
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Explorando %(address)s usando conta %(account)s"
 
-#: ../src/disco.py:894
+#: ../src/disco.py:912
 msgid "_Browse"
 msgstr "_Navegar"
 
-#: ../src/disco.py:1083
+#: ../src/disco.py:1101
 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:1323
+#: ../src/disco.py:1341
 msgid "_Execute Command"
 msgstr "_Executar comando"
 
-#: ../src/disco.py:1333 ../src/disco.py:1504
+#: ../src/disco.py:1351 ../src/disco.py:1522
 msgid "Re_gister"
 msgstr "Re_gistrar"
 
-#: ../src/disco.py:1545
+#: ../src/disco.py:1563
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Varrendo %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1736
+#: ../src/disco.py:1754
 msgid "Users"
 msgstr "Usuários"
 
 #. Description column
-#: ../src/disco.py:1744
+#: ../src/disco.py:1762
 msgid "Description"
 msgstr "Descrição"
 
 #. Id column
-#: ../src/disco.py:1752
+#: ../src/disco.py:1770
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1817 ../src/gui_interface.py:3182
+#: ../src/disco.py:1835 ../src/gui_interface.py:2995
 msgid "Bookmark already set"
 msgstr "Marcador já configurado"
 
-#: ../src/disco.py:1818 ../src/gui_interface.py:3183
+#: ../src/disco.py:1836 ../src/gui_interface.py:2996
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "A sala \"%s\" já existe nos marcadores."
 
-#: ../src/disco.py:1827 ../src/gui_interface.py:3197
+#: ../src/disco.py:1845 ../src/gui_interface.py:3010
 msgid "Bookmark has been added successfully"
 msgstr "Marcador foi adicionado com sucesso"
 
-#: ../src/disco.py:1828 ../src/gui_interface.py:3198
+#: ../src/disco.py:1846 ../src/gui_interface.py:3011
 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:2039
+#: ../src/disco.py:2057
 msgid "Subscribed"
 msgstr "Inscrito"
 
-#: ../src/disco.py:2047
+#: ../src/disco.py:2065
 msgid "Node"
 msgstr "Nó"
 
-#: ../src/disco.py:2111
+#: ../src/disco.py:2129
 msgid "New post"
 msgstr "Nova postagem"
 
-#: ../src/disco.py:2117
+#: ../src/disco.py:2135
 msgid "_Subscribe"
 msgstr "_Inscrever"
 
-#: ../src/disco.py:2123
+#: ../src/disco.py:2141
 msgid "_Unsubscribe"
 msgstr "_Desinscrever"
 
@@ -7841,17 +8058,19 @@ msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Transforma expressões LaTeX entre $$ $$."
 
 #: ../src/features_window.py:95
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
-"in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
 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
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
+"You have to set 'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 "Requer textlive-latex-base, e dvpng (todos estão em MikTeX). Você tem que "
 "definir a opção 'use_latex' para verdadeiro no Editor de configurações "
@@ -8008,12 +8227,12 @@ msgstr "Descrição: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s quer te enviar um arquivo:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Não é possível sobrescrever o arquivo \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -8021,22 +8240,22 @@ msgstr ""
 "Um arquivo com este nome já existe e você não tem permissão para sobrescrevê-"
 "lo."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 msgid "This file already exists"
 msgstr "Este arquivo já existe"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 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:369 ../src/gtkgui_helpers.py:914
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "O diretório \"%s\" não é gravável"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
 msgid "You do not have permission to create files in this directory."
 msgstr "Você não tem permissão para criar este diretório."
 
@@ -8139,28 +8358,28 @@ msgstr ""
 "Outra instância do Gajim parece estar rodando\n"
 "Executar de qualquer forma?"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
 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:80
+#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
 msgid "command"
 msgstr "comando"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "exibir ajuda no comando"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "exibe ou esconder a janela principal"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
 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:93
+#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8168,6 +8387,13 @@ msgstr ""
 "Exibir uma lista de todos os contatos na lista. Cada contato aparecerá em "
 "uma linha separada"
 
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
+#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
+#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
+#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
 #: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
 #: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
 #: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
@@ -8179,42 +8405,34 @@ msgstr ""
 msgid "account"
 msgstr "conta"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "exibir somente os contatos desta conta"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Imprimir uma lista das contas registradas"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
 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:109
+#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106
 #, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"accoun't previous status"
+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:110 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
-msgid "message"
-msgstr "mensagem"
-
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "mensagem de status"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8223,44 +8441,21 @@ msgstr ""
 "status de todas as contas existentes com a opção \"sincronizar com status "
 "global\" marcada"
 
-#: ../src/gajim-remote.py:117
-msgid "Changes the priority of account or accounts"
-msgstr "Mudar a prioridade da conta ou das contas"
-
-#: ../src/gajim-remote.py:119
-msgid "priority"
-msgstr "prioridade:"
-
-#: ../src/gajim-remote.py:119
-msgid "priority you want to give to the account"
-msgstr "prioridade que deseja dar para a conta"
-
-#: ../src/gajim-remote.py:121
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-msgstr ""
-"mudar status da conta. Se não especificado, tentará mudar o status de todas "
-"as contas existentes com a opção \"sincronizar com status global\" marcada"
-
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Exibe o diálogo do bate-papo onde você pode enviar mensagens para um contato"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID do contato que você quer conversar"
 
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
 #: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 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:134
-msgid "message content. The account must be specified or \"\""
-msgstr "conteúdo da mensagem. A conta deve estar especificada ou \"\""
-
-#: ../src/gajim-remote.py:139
+#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
 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 "
@@ -8270,30 +8465,35 @@ msgstr ""
 "são opcionais. Se você quer configurar somente a 'conta', sem a 'chave "
 "OpenPGP', apenas configure a 'chave para ''."
 
+#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
 #: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID do contato que irá receber a mensagem"
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
+#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "conteúdos da mensagem"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "chave pgp"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "se especificada, a mensagem será criptografada usando esta chave pública"
 
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
+#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "se especificada, a mensagem será enviada usando esta conta"
 
-#: ../src/gajim-remote.py:152
+#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
 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 "
@@ -8303,142 +8503,284 @@ msgstr ""
 "conta são opcionais. Se você quer configurar somente a 'conta', sem a 'chave "
 "OpenPGP, apenas configure a 'chave OpenPGP' para ''."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "assunto"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "assunto da mensagem"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 "Envia uma nova messagem para uma conferência em que você tiver ingressado."
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "O JID do contato que receberá a mensagem"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Informações detalhadas do contato"
 
+#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
+#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
 #: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
 #: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID do contato"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Informações detalhadas do contato"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Nome da conta"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Enviar arquivo para um contato"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "file"
 msgstr "arquivo"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Caminho do arquivo"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "se especificada, arquivo irá ser enviado usando esta conta"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Lista todas as preferências e seus valores"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Ajusta o valor da 'chave' ao 'valor '."
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "chave=valor"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'chave' é o nome de preferência, 'valor' é o valor para ajustá-la"
 
-#: ../src/gajim-remote.py:207
-msgid "Deletes a preference item"
-msgstr "Deleta um item de preferência"
+#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
+msgid "Deletes a preference item"
+msgstr "Deleta um item de preferência"
+
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "key"
+msgstr "chave"
+
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "name of the preference to be deleted"
+msgstr "nome da preferência a ser deletada"
+
+#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+msgid "Writes the current state of Gajim preferences to the .config file"
+msgstr "Escreve o estado atual das preferências do Gajim em um arquivo .config"
+
+#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
+msgid "Removes contact from roster"
+msgstr "Remover contato da lista"
+
+#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+msgid "Adds contact to roster"
+msgstr "Adicionar contato para a lista"
+
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+msgid "Adds new contact to this account"
+msgstr "Adicionar novo contato para esta conta"
+
+#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+msgid "Returns current status (the global one unless account is specified)"
+msgstr "Retorna o status atual (global a menos que o cliente for especificado)"
+
+#: ../src/gajim-remote-plugin.py:226
+#, fuzzy
+msgid ""
+"Returns current status message(the global one unless account is specified)"
+msgstr ""
+"Retorna a mensagem de status atual (global a menos que a conta for "
+"especificada)"
+
+#: ../src/gajim-remote-plugin.py:233 ../src/gajim-remote.py:249
+msgid "Returns number of unread messages"
+msgstr "Retorna o número das mensagens não lidas"
+
+#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+msgid "Opens 'Start Chat' dialog"
+msgstr "Abrir o diálogo 'Iniciar Conversa'"
+
+#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+msgid "Starts chat, using this account"
+msgstr "Iniciar conversa, usando esta conta"
+
+#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+msgid "Sends custom XML"
+msgstr "Envia XML personalizado"
+
+#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+msgid "XML to send"
+msgstr "XML a enviar"
+
+#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+"A conta em que o XML será enviado; se não estiver especificado, será enviado "
+"para todas as contas"
+
+#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
+msgid "Handle a xmpp:/ uri"
+msgstr "Manipular uma URI xmpp:/"
+
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
+msgid "uri"
+msgstr "URI"
+
+#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+msgid "Join a MUC room"
+msgstr "Entrar em uma sala MUC"
+
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+msgid "room"
+msgstr "sala"
+
+#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+msgid "nick"
+msgstr "apelido"
+
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+msgid "password"
+msgstr "senha"
+
+#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+msgid "Check if Gajim is running"
+msgstr "Checar se o Gajim está rodando"
+
+#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
+#: ../src/gajim-remote.py:300
+msgid "Shows or hides the ipython window"
+msgstr "Exibe ou esconder a janela ipython"
+
+#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+msgid "Missing argument \"contact_jid\""
+msgstr "Argumento não informado \"contact_jid\""
+
+#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#, python-format
+msgid ""
+"'%s' is not in your roster.\n"
+"Please specify account for sending the message."
+msgstr ""
+"'%s' não está em sua lista.\n"
+"Por favor, especifique a conta para enviar a mensagem."
+
+#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+msgid "You have no active account"
+msgstr "Você não tem uma conta ativa"
 
-#: ../src/gajim-remote.py:209
-msgid "key"
-msgstr "chave"
+#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+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:209
-msgid "name of the preference to be deleted"
-msgstr "nome da preferência a ser deletada"
+#: ../src/gajim-remote-plugin.py:412
+#, python-format
+msgid ""
+"Usage: %s %s %s \n"
+"\t %s"
+msgstr ""
+"Uso: %s %s %s \n"
+"\t %s"
 
-#: ../src/gajim-remote.py:213
-msgid "Writes the current state of Gajim preferences to the .config file"
-msgstr "Escreve o estado atual das preferências do Gajim em um arquivo .config"
+#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+msgid "Arguments:"
+msgstr "Argumentos:"
 
-#: ../src/gajim-remote.py:218
-msgid "Removes contact from roster"
-msgstr "Remover contato da lista"
+#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#, python-format
+msgid "%s not found"
+msgstr "%s não encontrado"
 
-#: ../src/gajim-remote.py:227
-msgid "Adds contact to roster"
-msgstr "Adicionar contato para a lista"
+#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
+#, python-format
+msgid ""
+"Usage: %s command [arguments]\n"
+"Command is one of:\n"
+msgstr ""
+"Uso: %s comando [argumentos]\n"
+"Comando é um desses:\n"
 
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "JID"
+#: ../src/gajim-remote-plugin.py:496
+#, fuzzy, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Muitos argumentos. \n"
+"Digite \"%(basename)s help %(command)s\" para mais informações"
 
-#: ../src/gajim-remote.py:230
-msgid "Adds new contact to this account"
-msgstr "Adicionar novo contato para esta conta"
+#: ../src/gajim-remote-plugin.py:500
+#, fuzzy, python-format
+msgid ""
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Argumento \"%(arg)s\" não está especificado. \n"
+"Digite\"%(basename)s help %(command)s\" para maiores informações"
 
-#: ../src/gajim-remote.py:235
-msgid "Returns current status (the global one unless account is specified)"
-msgstr "Retorna o status atual (global a menos que o cliente for especificado)"
+#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
+msgid "Wrong uri"
+msgstr "URI incorreta"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:109
+#, fuzzy
 msgid ""
-"Returns current status message (the global one unless account is specified)"
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
 msgstr ""
-"Retorna a mensagem de status atual (global a menos que a conta for "
-"especificada)"
+"um desses: desconectado, conectado, bate-papo, inativo, fora, np, invisível "
 
-#: ../src/gajim-remote.py:249
-msgid "Returns number of unread messages"
-msgstr "Retorna o número das mensagens não lidas"
+#: ../src/gajim-remote.py:117
+msgid "Changes the priority of account or accounts"
+msgstr "Mudar a prioridade da conta ou das contas"
 
-#: ../src/gajim-remote.py:253
-msgid "Opens 'Start Chat' dialog"
-msgstr "Abrir o diálogo 'Iniciar Conversa'"
+#: ../src/gajim-remote.py:119
+msgid "priority"
+msgstr "prioridade:"
 
-#: ../src/gajim-remote.py:255
-msgid "Starts chat, using this account"
-msgstr "Iniciar conversa, usando esta conta"
+#: ../src/gajim-remote.py:119
+msgid "priority you want to give to the account"
+msgstr "prioridade que deseja dar para a conta"
 
-#: ../src/gajim-remote.py:259
-msgid "Sends custom XML"
-msgstr "Envia XML personalizado"
+#: ../src/gajim-remote.py:121
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"mudar status da conta. Se não especificado, tentará mudar o status de todas "
+"as contas existentes com a opção \"sincronizar com status global\" marcada"
 
-#: ../src/gajim-remote.py:261
-msgid "XML to send"
-msgstr "XML a enviar"
+#: ../src/gajim-remote.py:134
+msgid "message content. The account must be specified or \"\""
+msgstr "conteúdo da mensagem. A conta deve estar especificada ou \"\""
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:242
 msgid ""
-"Account in which the xml will be sent; if not specified, xml will be sent to "
-"all accounts"
+"Returns current status message (the global one unless account is specified)"
 msgstr ""
-"A conta em que o XML será enviado; se não estiver especificado, será enviado "
-"para todas as contas"
+"Retorna a mensagem de status atual (global a menos que a conta for "
+"especificada)"
 
 #: ../src/gajim-remote.py:268
 #, fuzzy
@@ -8459,14 +8801,6 @@ msgstr ""
 "A conta em que o XML será enviado; se não estiver especificado, será enviado "
 "para todas as contas"
 
-#: ../src/gajim-remote.py:277
-msgid "Handle a xmpp:/ uri"
-msgstr "Manipular uma URI xmpp:/"
-
-#: ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "URI"
-
 #: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr "URI a manipular"
@@ -8479,30 +8813,14 @@ msgstr "Selecione a conta na qual você quer manipular isto"
 msgid "Message content"
 msgstr "Conteúdo da mensagem"
 
-#: ../src/gajim-remote.py:286
-msgid "Join a MUC room"
-msgstr "Entrar em uma sala MUC"
-
-#: ../src/gajim-remote.py:288
-msgid "room"
-msgstr "sala"
-
 #: ../src/gajim-remote.py:288
 msgid "Room JID"
 msgstr "Sala JID"
 
-#: ../src/gajim-remote.py:289
-msgid "nick"
-msgstr "apelido"
-
 #: ../src/gajim-remote.py:289
 msgid "Nickname to use"
 msgstr "Apelido a ser usado"
 
-#: ../src/gajim-remote.py:290
-msgid "password"
-msgstr "senha"
-
 #: ../src/gajim-remote.py:290
 msgid "Password to enter the room"
 msgstr "Senhas para entrar na sala"
@@ -8511,36 +8829,6 @@ msgstr "Senhas para entrar na sala"
 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:296
-msgid "Check if Gajim is running"
-msgstr "Checar se o Gajim está rodando"
-
-#: ../src/gajim-remote.py:300
-msgid "Shows or hides the ipython window"
-msgstr "Exibe ou esconder a janela ipython"
-
-#: ../src/gajim-remote.py:327
-msgid "Missing argument \"contact_jid\""
-msgstr "Argumento não informado \"contact_jid\""
-
-#: ../src/gajim-remote.py:348
-#, python-format
-msgid ""
-"'%s' is not in your roster.\n"
-"Please specify account for sending the message."
-msgstr ""
-"'%s' não está em sua lista.\n"
-"Por favor, especifique a conta para enviar a mensagem."
-
-#: ../src/gajim-remote.py:351
-msgid "You have no active account"
-msgstr "Você não tem uma conta ativa"
-
-#: ../src/gajim-remote.py:404
-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:431
 #, python-format
 msgid ""
@@ -8550,24 +8838,6 @@ msgstr ""
 "Uso: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:435
-msgid "Arguments:"
-msgstr "Argumentos:"
-
-#: ../src/gajim-remote.py:439
-#, python-format
-msgid "%s not found"
-msgstr "%s não encontrado"
-
-#: ../src/gajim-remote.py:445
-#, python-format
-msgid ""
-"Usage: %s command [arguments]\n"
-"Command is one of:\n"
-msgstr ""
-"Uso: %s comando [argumentos]\n"
-"Comando é um desses:\n"
-
 #: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
@@ -8590,10 +8860,6 @@ msgstr ""
 msgid "No uri given"
 msgstr ""
 
-#: ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "URI incorreta"
-
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Tema"
@@ -8619,179 +8885,177 @@ msgstr "Você não pode apagar o seu tema corrente"
 msgid "Please first choose another for your current theme."
 msgstr "Por favor escolha outro para seu tema corrente."
 
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:170
 msgid "Sending private message failed"
 msgstr "Falha ao enviar uma mensagem privada"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:171
+#: ../src/groupchat_control.py:172
 #, python-format
 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:450
+#: ../src/groupchat_control.py:455
 msgid "Insert Nickname"
 msgstr "Inserir apelido"
 
-#: ../src/groupchat_control.py:631
+#: ../src/groupchat_control.py:636
 msgid "Conversation with "
 msgstr "Conversação com "
 
-#: ../src/groupchat_control.py:633
+#: ../src/groupchat_control.py:638
 msgid "Continued conversation"
 msgstr "Conversação continuada"
 
-#. Can be a message (see handle_event_gc_config_change in
-#. gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1272 ../src/gui_interface.py:1080
+#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Algum ocupante tem permissão de ver o seu JID inteiro"
 
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1286
 msgid "Room logging is enabled"
 msgstr "A gravação das conversas da sala está ligado"
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1288
 msgid "A new room has been created"
 msgstr "Uma nova sala foi criada"
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1291
 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:1287
+#: ../src/groupchat_control.py:1297
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi chutado: %(reason)s"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1300
 #, 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:1300
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s foi banido: %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1312
 #, 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:1314 ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
 #, python-format
 msgid "You are now known as %s"
 msgstr "Você agora é conhecido como %s"
 
-#: ../src/groupchat_control.py:1330 ../src/gui_interface.py:919
+#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s agora é conhecido como %(new_nick)s"
 
-#: ../src/groupchat_control.py:1372 ../src/groupchat_control.py:1377
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1392
 #, 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:1374
+#: ../src/groupchat_control.py:1383
 msgid "affiliation changed"
 msgstr "filiação alterada"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1388
 msgid "room configuration changed to members-only"
 msgstr "a configuração da sala mudou para aceitar apenas membros"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1394
 msgid "system shutdown"
 msgstr "desligamento do sistema"
 
-#: ../src/groupchat_control.py:1470
+#: ../src/groupchat_control.py:1477
 #, 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:1474
+#: ../src/groupchat_control.py:1481
 #, 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:1489
+#: ../src/groupchat_control.py:1496
 #, 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:1493
+#: ../src/groupchat_control.py:1500
 #, 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:1522
+#: ../src/groupchat_control.py:1530
 #, python-format
 msgid "%s has left"
 msgstr "%s saiu da sala"
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1535
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s entrou na conferência"
 
-#: ../src/groupchat_control.py:1529 ../src/gui_interface.py:946
+#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
 #: ../src/history_window.py:447 ../src/notify.py:234
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s agora está %(status)s"
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1774
 #, 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:1761
+#: ../src/groupchat_control.py:1776
 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:1765 ../src/gui_interface.py:1216
-#: ../src/gui_interface.py:1992 ../src/gui_interface.py:2029
-#: ../src/gui_interface.py:2064 ../src/message_window.py:224
-#: ../src/roster_window.py:2739 ../src/roster_window.py:3399
-#: ../src/roster_window.py:4123
+#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
+#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
+#: ../src/gui_interface.py:1853 ../src/message_window.py:224
+#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
+#: ../src/roster_window.py:4195
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Não me pergunte novamente"
 
-#: ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:1814
 msgid "Changing Subject"
 msgstr "Mudando assunto"
 
-#: ../src/groupchat_control.py:1800
+#: ../src/groupchat_control.py:1815
 msgid "Please specify the new subject:"
 msgstr "Por favor, especifique o novo assunto:"
 
-#: ../src/groupchat_control.py:1807
+#: ../src/groupchat_control.py:1822
 msgid "Changing Nickname"
 msgstr "Mudando apelido"
 
-#: ../src/groupchat_control.py:1808
+#: ../src/groupchat_control.py:1823
 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:1839
+#: ../src/groupchat_control.py:1854
 #, python-format
 msgid "Destroying %s"
 msgstr "Excluindo %s"
 
-#: ../src/groupchat_control.py:1840
+#: ../src/groupchat_control.py:1855
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8799,22 +9063,22 @@ msgstr ""
 "Você está prestes a excluir definitivamente esta sala.\n"
 "Você deve especificar uma justificativa abaixo:"
 
-#: ../src/groupchat_control.py:1842
+#: ../src/groupchat_control.py:1857
 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:2028
+#: ../src/groupchat_control.py:2046
 #, python-format
 msgid "Kicking %s"
 msgstr "Chutando %s"
 
-#: ../src/groupchat_control.py:2029 ../src/groupchat_control.py:2356
+#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
 msgid "You may specify a reason below:"
 msgstr "Você deve especificar uma razão abaixo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2355
+#: ../src/groupchat_control.py:2373
 #, python-format
 msgid "Banning %s"
 msgstr "Banindo %s"
@@ -8838,56 +9102,65 @@ msgid "Details"
 msgstr "Detalhes"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
+#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Erro: impossível abrir %s para leitura"
 
-#: ../src/gtkgui_helpers.py:400
+#: ../src/gtkgui_helpers.py:404
 msgid "Error reading file:"
 msgstr "Erro lendo arquivo:"
 
-#: ../src/gtkgui_helpers.py:403
+#: ../src/gtkgui_helpers.py:407
 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:444
+#: ../src/gtkgui_helpers.py:448
 #, 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:818
+#: ../src/gtkgui_helpers.py:822
 msgid "Gajim is not the default Jabber client"
 msgstr "O Gajim não é o cliente Jabber padrão"
 
-#: ../src/gtkgui_helpers.py:819
+#: ../src/gtkgui_helpers.py:823
 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:820
+#: ../src/gtkgui_helpers.py:824
 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:887
+#: ../src/gtkgui_helpers.py:891
 msgid "Extension not supported"
 msgstr "Extensão não suportada"
 
-#: ../src/gtkgui_helpers.py:888
+#: ../src/gtkgui_helpers.py:892
 #, 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:924
+#: ../src/gtkgui_helpers.py:928
 msgid "Save Image as..."
 msgstr "Salvar imagem como..."
 
-#: ../src/gui_interface.py:140
+#. we are banned
+#. group chat does not exist
+#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
+#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
+#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
+#: ../src/gui_interface.py:348
+msgid "Unable to join group chat"
+msgstr "Impossível ingressar na sala"
+
+#: ../src/gui_interface.py:138
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8898,58 +9171,92 @@ msgstr ""
 "outro ocupante.\n"
 "Por favor, especifique um outro apelido abaixo:"
 
-#: ../src/gui_interface.py:143
+#: ../src/gui_interface.py:141
 msgid "Always use this nickname when there is a conflict"
 msgstr "Sempre usar este apelido quando houver um conflito"
 
-#: ../src/gui_interface.py:159
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Você aceita a solicitação?"
 
-#: ../src/gui_interface.py:161
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Você aceita essa requisição na conta %s?"
 
-#: ../src/gui_interface.py:164
+#: ../src/gui_interface.py:163
 #, 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/gui_interface.py:213 ../src/notify.py:493
+#: ../src/gui_interface.py:209 ../src/notify.py:493
 msgid "Connection Failed"
 msgstr "Falha na conexão"
 
-#: ../src/gui_interface.py:606 ../src/gui_interface.py:610
+#: ../src/gui_interface.py:312
+#, 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/gui_interface.py:324
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr "Número máximo de usuários para %s foi atingido"
+
+#: ../src/gui_interface.py:333
+#, python-format
+msgid "You are banned from group chat %s."
+msgstr "Você está banido da sala %s."
+
+#: ../src/gui_interface.py:338
+#, python-format
+msgid "Group chat %s does not exist."
+msgstr "A sala %s não existe."
+
+#: ../src/gui_interface.py:341
+msgid "Group chat creation is restricted."
+msgstr "A criação de sala é restrita."
+
+#: ../src/gui_interface.py:344
+#, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Seu nickname registado deve ser usado na sala %s."
+
+#: ../src/gui_interface.py:349
+#, 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."
+
+#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Erro %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:621 ../src/gui_interface.py:636
+#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "erro ao enviar %(message)s ( %(error)s )"
 
-#: ../src/gui_interface.py:663 ../src/notify.py:495
+#: ../src/gui_interface.py:540 ../src/notify.py:495
 msgid "Subscription request"
 msgstr "Solicitação de inscrição"
 
-#: ../src/gui_interface.py:688
+#: ../src/gui_interface.py:565
 msgid "Authorization accepted"
 msgstr "Autorização aceita"
 
-#: ../src/gui_interface.py:689
+#: ../src/gui_interface.py:566
 #, 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/gui_interface.py:702
+#: ../src/gui_interface.py:579
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contato \"%s\" removeu sua inscrição"
 
-#: ../src/gui_interface.py:703
+#: ../src/gui_interface.py:580
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8957,61 +9264,56 @@ msgstr ""
 "Você irá sempre ver ele ou ela como desconectado.\n"
 "Você quer removê-lo ou removê-la da sua lista de contatos?"
 
-#: ../src/gui_interface.py:727 ../src/notify.py:497
+#: ../src/gui_interface.py:604 ../src/notify.py:497
 msgid "Unsubscribed"
 msgstr "Desinscrever"
 
-#: ../src/gui_interface.py:754
+#: ../src/gui_interface.py:631
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contato com \"%s\" não pode ser estabelecido"
 
-#: ../src/gui_interface.py:1015
+#: ../src/gui_interface.py:859
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s alterou o assunto para %(subject)s"
 
-#: ../src/gui_interface.py:1083
+#: ../src/gui_interface.py:926
 msgid "Room now shows unavailable member"
 msgstr "A sala agora exibe membros indisponíveis"
 
-#: ../src/gui_interface.py:1085
+#: ../src/gui_interface.py:928
 msgid "room now does not show unavailable members"
 msgstr "a sala agora não mostra membros indisponíveis"
 
-#: ../src/gui_interface.py:1087
+#: ../src/gui_interface.py:930
 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/gui_interface.py:1091
+#: ../src/gui_interface.py:934
 msgid "Room logging is now enabled"
 msgstr "A gravação das conversas da sala está ativo agora"
 
-#: ../src/gui_interface.py:1093
+#: ../src/gui_interface.py:936
 msgid "Room logging is now disabled"
 msgstr "A gravação das conversas da sala está desligado agora"
 
-#: ../src/gui_interface.py:1095
+#: ../src/gui_interface.py:938
 msgid "Room is now non-anonymous"
 msgstr "Agora a sala é não-anônima"
 
-#: ../src/gui_interface.py:1098
+#: ../src/gui_interface.py:941
 msgid "Room is now semi-anonymous"
 msgstr "Agora a sala é semi-anônima"
 
-#: ../src/gui_interface.py:1101
+#: ../src/gui_interface.py:944
 msgid "Room is now fully-anonymous"
 msgstr "Agora a sala é totalmente anônima"
 
-#: ../src/gui_interface.py:1133
-#, 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/gui_interface.py:1180
+#: ../src/gui_interface.py:985
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -9019,23 +9321,23 @@ 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/gui_interface.py:1182 ../src/gui_interface.py:1189
+#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Você está atualmente conectado sem sua chave OpenPGP."
 
-#: ../src/gui_interface.py:1184
+#: ../src/gui_interface.py:989
 msgid "Your passphrase is incorrect"
 msgstr "Sua frase de acesso está incorreta"
 
-#: ../src/gui_interface.py:1188
+#: ../src/gui_interface.py:993
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Frase de acesso OpenGPG incorreta"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid "GPG key not trusted"
 msgstr "Chave GPG não confiável"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
@@ -9043,7 +9345,7 @@ msgstr ""
 "A chave GPG usada para criptografar esta conversa não é confiável. Você "
 "realmente deseja criptografar esta mensagem?"
 
-#: ../src/gui_interface.py:1226
+#: ../src/gui_interface.py:1031
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not                 correctly started "
@@ -9052,19 +9354,19 @@ msgstr ""
 "O Gnome Keyring está instalado mas não \t\t\t\tiniciou corretamente "
 "(provavelmente a variável de ambiente não \t\t\t\testá corretamente definida)"
 
-#: ../src/gui_interface.py:1330
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Novo email em %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1332
+#: ../src/gui_interface.py:1133
 #, 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/gui_interface.py:1345
+#: ../src/gui_interface.py:1146
 #, python-format
 msgid ""
 "\n"
@@ -9079,42 +9381,42 @@ msgstr ""
 "Assunto: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1418
+#: ../src/gui_interface.py:1215
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quer te enviar um arquivo."
 
-#: ../src/gui_interface.py:1455 ../src/roster_window.py:1856
+#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
 msgid "Remote contact stopped transfer"
 msgstr "O contato remoto parou a transferência"
 
-#: ../src/gui_interface.py:1458 ../src/roster_window.py:1858
+#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
 msgid "Error opening file"
 msgstr "Erro abrindo arquivo"
 
-#: ../src/gui_interface.py:1490
+#: ../src/gui_interface.py:1287
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Você recebeu com sucesso %(filename)s de %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1494
+#: ../src/gui_interface.py:1291
 #, 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/gui_interface.py:1507
+#: ../src/gui_interface.py:1304
 #, 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/gui_interface.py:1511
+#: ../src/gui_interface.py:1308
 #, 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/gui_interface.py:1623
+#: ../src/gui_interface.py:1426
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -9123,36 +9425,36 @@ msgstr ""
 "Não foi possível descriptografar a mensagem de %s\n"
 "Ela pode ter sido adulterada."
 
-#: ../src/gui_interface.py:1630
+#: ../src/gui_interface.py:1433
 msgid "Unable to decrypt message"
 msgstr "Não foi possível descriptografar a mensagem"
 
-#: ../src/gui_interface.py:1702
+#: ../src/gui_interface.py:1505
 msgid "Username Conflict"
 msgstr "Conflito de nome de usuário"
 
-#: ../src/gui_interface.py:1703
+#: ../src/gui_interface.py:1506
 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/gui_interface.py:1716
+#: ../src/gui_interface.py:1519
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gui_interface.py:1729
+#: ../src/gui_interface.py:1532
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gui_interface.py:1740
+#: ../src/gui_interface.py:1543
 msgid "Error."
 msgstr "Erro."
 
-#: ../src/gui_interface.py:1768
+#: ../src/gui_interface.py:1556
 msgid "Resource Conflict"
 msgstr "Conflito de recurso"
 
-#: ../src/gui_interface.py:1769
+#: ../src/gui_interface.py:1557
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -9161,20 +9463,20 @@ msgstr ""
 "novo"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1816
+#: ../src/gui_interface.py:1604
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s quer iniciar uma conversa com voz."
 
-#: ../src/gui_interface.py:1819
+#: ../src/gui_interface.py:1607
 msgid "Voice Chat Request"
 msgstr "Solicitação de conversa com voz"
 
-#: ../src/gui_interface.py:1927
+#: ../src/gui_interface.py:1716
 msgid "Error verifying SSL certificate"
 msgstr "Erro ao verificar o certificado SSL"
 
-#: ../src/gui_interface.py:1928
+#: ../src/gui_interface.py:1717
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9185,15 +9487,15 @@ msgstr ""
 "%(error)s\n"
 "Você ainda deseja conectar-se a este servidor?"
 
-#: ../src/gui_interface.py:1936
+#: ../src/gui_interface.py:1725
 msgid "Ignore this error for this certificate."
 msgstr "Ignorar este erro para este certificado."
 
-#: ../src/gui_interface.py:1956
+#: ../src/gui_interface.py:1745
 msgid "SSL certificate error"
 msgstr "Erro de certificado SSL"
 
-#: ../src/gui_interface.py:1957
+#: ../src/gui_interface.py:1746
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9210,12 +9512,12 @@ msgstr ""
 "\n"
 "Você ainda quer conectar e atualizar o fingerprint do certificado?"
 
-#: ../src/gui_interface.py:1987 ../src/gui_interface.py:2024
-#: ../src/gui_interface.py:2060
+#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
+#: ../src/gui_interface.py:1849
 msgid "Insecure connection"
 msgstr "Conexão não-segura"
 
-#: ../src/gui_interface.py:1988
+#: ../src/gui_interface.py:1777
 #, fuzzy
 msgid ""
 "You are about to connect to the server with an insecure connection. This "
@@ -9225,12 +9527,12 @@ 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/gui_interface.py:1991 ../src/gui_interface.py:2028
-#: ../src/gui_interface.py:2063
+#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
+#: ../src/gui_interface.py:1852
 msgid "Yes, I really want to connect insecurely"
 msgstr "Sim, eu realmente quero me conectar de modo não-seguro"
 
-#: ../src/gui_interface.py:2025
+#: ../src/gui_interface.py:1814
 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?"
@@ -9238,7 +9540,7 @@ 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/gui_interface.py:2061
+#: ../src/gui_interface.py:1850
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9248,11 +9550,11 @@ msgstr ""
 "certeza que quer fazer isto?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2624 ../src/gui_interface.py:2647
+#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
 msgid "Emoticons disabled"
 msgstr "Emoticons desabilitados"
 
-#: ../src/gui_interface.py:2625
+#: ../src/gui_interface.py:2423
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -9260,7 +9562,7 @@ msgstr ""
 "Você configurou um tema de emoticons que não foi encontrado, então os "
 "emoticons estão desativados."
 
-#: ../src/gui_interface.py:2648
+#: ../src/gui_interface.py:2446
 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 "
@@ -9270,42 +9572,42 @@ msgstr ""
 "precisar atualizar o formato do arquivo emoticons.py. Veja http://trac.gajim."
 "org/wiki/Emoticons para mais detalhes."
 
-#: ../src/gui_interface.py:2679 ../src/roster_window.py:3560
+#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
 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/gui_interface.py:3058
+#: ../src/gui_interface.py:2871
 msgid "Could not save your settings and preferences"
 msgstr "Impossível salvar suas preferências"
 
-#: ../src/gui_interface.py:3592
+#: ../src/gui_interface.py:3411
 msgid "Passphrase Required"
 msgstr "Frase de acesso é obrigatória"
 
-#: ../src/gui_interface.py:3593
+#: ../src/gui_interface.py:3412
 #, 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/gui_interface.py:3607
+#: ../src/gui_interface.py:3426
 msgid "GPG key expired"
 msgstr "A chave GPG expirou"
 
-#: ../src/gui_interface.py:3608
+#: ../src/gui_interface.py:3427
 #, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Sua chave GPG expirou, você será conectado ao %s sem OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3617
+#: ../src/gui_interface.py:3436
 msgid "Wrong Passphrase"
 msgstr "Frase de acesso errada"
 
-#: ../src/gui_interface.py:3618
+#: ../src/gui_interface.py:3437
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Por favor, reescreva sua frase secreta de GPG ou pressione Cancelar."
 
@@ -9343,6 +9645,11 @@ msgstr "Apelido"
 msgid "Message"
 msgstr "Mensagem"
 
+#. holds subject
+#: ../src/history_manager.py:188 ../src/history_manager.py:219
+msgid "Subject"
+msgstr "Assunto"
+
 #: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -9439,19 +9746,19 @@ msgstr "Você está prestes a fechar todas as abas"
 msgid "Do you really want to close them all?"
 msgstr "Você realmente deseja fechar todas?"
 
-#: ../src/message_window.py:484
+#: ../src/message_window.py:485
 msgid "Chats"
 msgstr "Conversas"
 
-#: ../src/message_window.py:486
+#: ../src/message_window.py:487
 msgid "Group Chats"
 msgstr "Conferências"
 
-#: ../src/message_window.py:488
+#: ../src/message_window.py:489
 msgid "Private Chats"
 msgstr "Conversas privadas"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:495
 msgid "Messages"
 msgstr "Mensagens"
 
@@ -9507,107 +9814,107 @@ msgstr "Nova mensagem de %(nickname)s"
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../src/profile_window.py:57
+#: ../src/profile_window.py:58
 msgid "Retrieving profile..."
 msgstr "Recuperando perfil..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2935
+#: ../src/profile_window.py:111 ../src/roster_window.py:3001
 msgid "File is empty"
 msgstr "O arquivo está vazio"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2938
+#: ../src/profile_window.py:114 ../src/roster_window.py:3004
 msgid "File does not exist"
 msgstr "O arquivo não existe"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2940 ../src/roster_window.py:2951
+#: ../src/profile_window.py:128 ../src/profile_window.py:144
+#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
 msgid "Could not load image"
 msgstr "A imagem não pode ser carregada"
 
-#: ../src/profile_window.py:214
+#: ../src/profile_window.py:215
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Informações do contato"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:216
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Formato: YYYY-MM-DD"
 
-#: ../src/profile_window.py:269
+#: ../src/profile_window.py:270
 msgid "Information received"
 msgstr "Informação recebida"
 
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:341
 msgid "Without a connection you can not publish your contact information."
 msgstr "Você deve estar conectado para publicar suas informações de contato."
 
-#: ../src/profile_window.py:353
+#: ../src/profile_window.py:354
 msgid "Sending profile..."
 msgstr "Enviando perfil..."
 
-#: ../src/profile_window.py:368
+#: ../src/profile_window.py:369
 msgid "Information NOT published"
 msgstr "Informação NÃO publicada"
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:376
 msgid "vCard publication failed"
 msgstr "Publicação do vCard falhou"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:377
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
 msgstr ""
 "Houve um erro ao publicar sua informação pessoal, tente outra vez mais tarde."
 
-#: ../src/roster_window.py:256 ../src/roster_window.py:1012
+#: ../src/roster_window.py:262 ../src/roster_window.py:1026
 msgid "Merged accounts"
 msgstr "Juntar contas"
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1942
 msgid "Authorization has been sent"
 msgstr "Autorização foi enviada"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1943
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Agora \"%s\" saberá seu status."
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1966
 msgid "Subscription request has been sent"
 msgstr "Solicitação de inscrição foi enviada"
 
-#: ../src/roster_window.py:1944
+#: ../src/roster_window.py:1967
 #, 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:1958
+#: ../src/roster_window.py:1981
 msgid "Authorization has been removed"
 msgstr "Autorização foi removida"
 
-#: ../src/roster_window.py:1959
+#: ../src/roster_window.py:1982
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Agora \"%s\" você sempre o verá como offline."
 
-#: ../src/roster_window.py:1986
+#: ../src/roster_window.py:2009
 msgid "GPG is not usable"
 msgstr "GPG não é usável"
 
-#: ../src/roster_window.py:1987
+#: ../src/roster_window.py:2010
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Você será conectado ao %s sem OpenPGP."
 
-#: ../src/roster_window.py:2199 ../src/roster_window.py:3496
+#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
 msgid "You are participating in one or more group chats"
 msgstr "Você está participando em uma ou mais conferências"
 
-#: ../src/roster_window.py:2200 ../src/roster_window.py:3497
+#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9615,38 +9922,38 @@ 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:2226
+#: ../src/roster_window.py:2249
 msgid "desync'ed"
 msgstr "não sincronizado"
 
-#: ../src/roster_window.py:2288
+#: ../src/roster_window.py:2311
 msgid "Really quit Gajim?"
 msgstr "Realmente sair do Gajim?"
 
-#: ../src/roster_window.py:2289
+#: ../src/roster_window.py:2312
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Você tem certeza que deseja sair?"
 
-#: ../src/roster_window.py:2290
+#: ../src/roster_window.py:2313
 msgid "Always close Gajim"
 msgstr "Sempre fechar o Gajim"
 
-#: ../src/roster_window.py:2373
+#: ../src/roster_window.py:2396
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Cancelar transferência de arquivo"
 
-#: ../src/roster_window.py:2374
+#: ../src/roster_window.py:2397
 msgid ""
-"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2405 ../src/roster_window.py:2653
+#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
 msgid "You have unread messages"
 msgstr "Você tem mensagens não lidas"
 
-#: ../src/roster_window.py:2406
+#: ../src/roster_window.py:2429
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9654,16 +9961,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:2654
+#: ../src/roster_window.py:2720
 msgid "You must read them before removing this transport."
 msgstr "Você precisa lê-los antes de remover este transporte."
 
-#: ../src/roster_window.py:2657
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2724
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9671,11 +9978,11 @@ msgstr ""
 "Você não poderá mais enviar e receber mensagens dos contatos usando este "
 "transporte."
 
-#: ../src/roster_window.py:2661
+#: ../src/roster_window.py:2727
 msgid "Transports will be removed"
 msgstr "Os transportes serão removidos"
 
-#: ../src/roster_window.py:2666
+#: ../src/roster_window.py:2732
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9684,12 +9991,12 @@ msgstr ""
 "Você não poderá mais enviar e receber mensagens para contatos destes "
 "transportes: %s"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2800
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "Você está prestes a bloquear um contato. Tem certeza que quer continuar?"
 
-#: ../src/roster_window.py:2736
+#: ../src/roster_window.py:2802
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -9698,56 +10005,56 @@ msgstr ""
 "ele enviar para você."
 
 #. it's jid
-#: ../src/roster_window.py:2827
+#: ../src/roster_window.py:2893
 msgid "Rename Contact"
 msgstr "Renomear contato"
 
-#: ../src/roster_window.py:2828
+#: ../src/roster_window.py:2894
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Entre com um novo apelido para o contato %s"
 
-#: ../src/roster_window.py:2835
+#: ../src/roster_window.py:2901
 msgid "Rename Group"
 msgstr "Renomear grupo"
 
-#: ../src/roster_window.py:2836
+#: ../src/roster_window.py:2902
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Entre com um novo nome para o grupo %s"
 
-#: ../src/roster_window.py:2881
+#: ../src/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Remover grupo"
 
-#: ../src/roster_window.py:2882
+#: ../src/roster_window.py:2948
 #, 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:2883
+#: ../src/roster_window.py:2949
 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:2922
+#: ../src/roster_window.py:2988
 msgid "Assign OpenPGP Key"
 msgstr "Atribuir chave OpenPGP"
 
-#: ../src/roster_window.py:2923
+#: ../src/roster_window.py:2989
 msgid "Select a key to apply to the contact"
 msgstr "Selecione uma chave para atribuir ao contato"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3372
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contato \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:3308
+#: ../src/roster_window.py:3374
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr "Você realmente deseja remover \"%(name)s\" (%(jid)s) da sua lista.\n"
 
-#: ../src/roster_window.py:3313
+#: ../src/roster_window.py:3379
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9756,11 +10063,11 @@ msgstr ""
 "ele ou ela sempre o verá offiline."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3319
+#: ../src/roster_window.py:3385
 msgid "Do you want to continue?"
 msgstr "Você quer continuar?"
 
-#: ../src/roster_window.py:3323
+#: ../src/roster_window.py:3389
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9768,16 +10075,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:3326
+#: ../src/roster_window.py:3392
 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:3330
+#: ../src/roster_window.py:3396
 msgid "Contacts will be removed from your roster"
 msgstr "Os contatos serão removidos da sua lista"
 
-#: ../src/roster_window.py:3335
+#: ../src/roster_window.py:3401
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9787,7 +10094,7 @@ msgstr ""
 "você também remove a autorização fazendo com que eles sempre vejam você "
 "offline."
 
-#: ../src/roster_window.py:3393
+#: ../src/roster_window.py:3459
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want  to continue?"
@@ -9795,7 +10102,7 @@ msgstr ""
 "Você está prestes a enviar um status customizado. Tem certeza que quer "
 "continuar?"
 
-#: ../src/roster_window.py:3395
+#: ../src/roster_window.py:3461
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -9804,20 +10111,20 @@ msgstr ""
 "Este contato irá temporariamente ver você como %(status)s, mas somente até "
 "você alterar o seu status. Então ele irá ver o seu status global."
 
-#: ../src/roster_window.py:3414
+#: ../src/roster_window.py:3480
 msgid "No account available"
 msgstr "Conta não disponível"
 
-#: ../src/roster_window.py:3415
+#: ../src/roster_window.py:3481
 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:4023
+#: ../src/roster_window.py:4095
 msgid "Metacontacts storage not supported by your server"
 msgstr "O armazenamento de metacontatos não é suportado pelo seu servidor"
 
-#: ../src/roster_window.py:4025
+#: ../src/roster_window.py:4097
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9825,13 +10132,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:4117
+#: ../src/roster_window.py:4189
 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:4119
+#: ../src/roster_window.py:4191
 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 "
@@ -9841,23 +10148,23 @@ msgstr ""
 "Geralmente isso é usado quando a mesma pessoa possui muitas contas de Jabber "
 "ou transportes."
 
-#: ../src/roster_window.py:4234
+#: ../src/roster_window.py:4306
 msgid "Invalid file URI:"
 msgstr "Arquivo URI inválido:"
 
-#: ../src/roster_window.py:4246
+#: ../src/roster_window.py:4318
 #, 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:4361
+#: ../src/roster_window.py:4433
 #, python-format
 msgid "Send %s to %s"
 msgstr "Enviar %s para %s"
 
-#: ../src/roster_window.py:4367
+#: ../src/roster_window.py:4439
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Fazer %s e %s metacontatos"
@@ -9867,143 +10174,143 @@ msgstr "Fazer %s e %s metacontatos"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4816 ../src/roster_window.py:4889
-#: ../src/roster_window.py:4898 ../src/statusicon.py:246
-#: ../src/statusicon.py:293 ../src/statusicon.py:299
+#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
+#: ../src/roster_window.py:4970 ../src/statusicon.py:263
+#: ../src/statusicon.py:310 ../src/statusicon.py:316
 #, python-format
 msgid "using account %s"
 msgstr "usando conta %s"
 
 #. add
-#: ../src/roster_window.py:4905
+#: ../src/roster_window.py:4977
 #, python-format
 msgid "to %s account"
 msgstr "para %s conta"
 
 #. disco
-#: ../src/roster_window.py:4910
+#: ../src/roster_window.py:4982
 #, python-format
 msgid "using %s account"
 msgstr "usando %s conta"
 
-#: ../src/roster_window.py:4948 ../src/statusicon.py:309
+#: ../src/roster_window.py:5020 ../src/statusicon.py:326
 msgid "_Manage Bookmarks..."
 msgstr "_Gerenciar marcadores..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4968
+#: ../src/roster_window.py:5040
 #, python-format
 msgid "of account %s"
 msgstr "da conta %s"
 
-#: ../src/roster_window.py:5009
+#: ../src/roster_window.py:5081
 #, python-format
 msgid "for account %s"
 msgstr "para conta %s"
 
-#: ../src/roster_window.py:5069 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
 msgid "_Change Status Message"
 msgstr "_Mudar mensagem de status"
 
-#: ../src/roster_window.py:5102
+#: ../src/roster_window.py:5174
 msgid "Publish Tune"
 msgstr "Publicar sintonia"
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5176
 #, fuzzy
 msgid "Publish Location"
 msgstr "Publicar sintonia"
 
-#: ../src/roster_window.py:5107
+#: ../src/roster_window.py:5179
 msgid "Configure Services..."
 msgstr "Configurar serviços..."
 
-#: ../src/roster_window.py:5252
+#: ../src/roster_window.py:5324
 msgid "_Maximize All"
 msgstr "_Maximizar tudo"
 
-#: ../src/roster_window.py:5262 ../src/roster_window.py:5436
+#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
 msgid "Send Group M_essage"
 msgstr "Enviar m_ensagem de grupo"
 
-#: ../src/roster_window.py:5270
+#: ../src/roster_window.py:5342
 msgid "To all users"
 msgstr "Para todos os usuários"
 
-#: ../src/roster_window.py:5274
+#: ../src/roster_window.py:5346
 msgid "To all online users"
 msgstr "Para todos os usuários conectados"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5456
+#: ../src/roster_window.py:5528
 msgid "_Manage Contacts"
 msgstr "_Gerenciar contatos"
 
 #. Edit Groups
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5537
 msgid "Edit _Groups"
 msgstr "Editar _grupos"
 
 #. Send single message
-#: ../src/roster_window.py:5520
+#: ../src/roster_window.py:5592
 msgid "Send Single Message"
 msgstr "Enviar mensagem simples"
 
 #. Execute Command
-#: ../src/roster_window.py:5567
+#: ../src/roster_window.py:5639
 msgid "Execute Command..."
 msgstr "Executar comando..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5577
+#: ../src/roster_window.py:5649
 msgid "_Manage Transport"
 msgstr "_Gerenciar transporte"
 
 #. Modify Transport
-#: ../src/roster_window.py:5586
+#: ../src/roster_window.py:5658
 msgid "_Modify Transport"
 msgstr "_Modificar transporte"
 
 #. Rename
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5668
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: ../src/roster_window.py:5656
+#: ../src/roster_window.py:5728
 msgid "_Maximize"
 msgstr "_Maximizar"
 
-#: ../src/roster_window.py:5665
+#: ../src/roster_window.py:5737
 msgid "_Reconnect"
 msgstr "_Reconectar"
 
-#: ../src/roster_window.py:5672
+#: ../src/roster_window.py:5744
 msgid "_Disconnect"
 msgstr "_Desconectar"
 
 #. History manager
-#: ../src/roster_window.py:5754
+#: ../src/roster_window.py:5833
 msgid "History Manager"
 msgstr "Gerenciador de histórico"
 
-#: ../src/roster_window.py:5765
+#: ../src/roster_window.py:5844
 msgid "_Join New Group Chat"
 msgstr "_Ingressar em uma nova Conferência"
 
-#: ../src/roster_window.py:5938
+#: ../src/roster_window.py:6019
 msgid "Change Status Message..."
 msgstr "Mudar mensagem de status..."
 
-#: ../src/search_window.py:94
+#: ../src/search_window.py:105
 msgid "Waiting for results"
 msgstr "Esperando resultados"
 
-#: ../src/search_window.py:132 ../src/search_window.py:210
+#: ../src/search_window.py:143 ../src/search_window.py:220
 msgid "Error in received dataform"
 msgstr "Erro no formulário de dados recebido"
 
 #. No result
-#: ../src/search_window.py:166 ../src/search_window.py:202
+#: ../src/search_window.py:177 ../src/search_window.py:212
 msgid "No result"
 msgstr "Sem resultados"
 
@@ -10016,14 +10323,15 @@ msgstr "Erro ao escrever em disco"
 msgid "Subject: %s"
 msgstr "Assunto: %s"
 
-#: ../src/session.py:433 ../src/session.py:468
+#: ../src/session.py:447 ../src/session.py:491
 msgid "Confirm these session options"
 msgstr "Confirme essas opções de sessão"
 
-#: ../src/session.py:435
+#: ../src/session.py:448
 #, fuzzy, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
+"The remote client wants '\n"
+"                            'to negotiate an session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -10035,7 +10343,7 @@ msgstr ""
 "\n"
 "\tEssas opções são aceitáveis?"
 
-#: ../src/session.py:469
+#: ../src/session.py:492
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10050,16 +10358,16 @@ msgstr ""
 "\n"
 "Continuar com a sessão?"
 
-#: ../src/statusicon.py:210
+#: ../src/statusicon.py:227
 msgid "_Change Status Message..."
 msgstr "_Mudar mensagem de status..."
 
-#: ../src/statusicon.py:322
+#: ../src/statusicon.py:339
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "na _lista"
 
-#: ../src/statusicon.py:333
+#: ../src/statusicon.py:350
 msgid "Hide this menu"
 msgstr "Esconder este menu"
 
@@ -10198,32 +10506,32 @@ msgstr ""
 "Este serviço não pode responder com informações detalhadas.\n"
 "É provável que esteja quebrado"
 
-#: ../src/vcard.py:251
+#: ../src/vcard.py:265
 msgid "?Client:Unknown"
 msgstr "?Cliente:Desconhecido"
 
-#: ../src/vcard.py:253
+#: ../src/vcard.py:267
 msgid "?OS:Unknown"
 msgstr "?SO:Desconhecido"
 
-#: ../src/vcard.py:274
+#: ../src/vcard.py:288
 msgid "?Time:Unknown"
 msgstr "?Tempo:Desconhecido"
 
-#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
+#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
 #, python-format
 msgid "since %s"
 msgstr "desde %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:345
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:349
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Afiliação:</b>"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:357
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10231,7 +10539,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:345
+#: ../src/vcard.py:359
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10239,13 +10547,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:347
+#: ../src/vcard.py:361
 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:349
+#: ../src/vcard.py:363
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10253,27 +10561,71 @@ msgstr ""
 "Você não está interessado na presença do contato, e nenhum outro está "
 "interessado no seu"
 
-#: ../src/vcard.py:356
+#: ../src/vcard.py:370
 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:358
+#: ../src/vcard.py:372
 msgid "There is no pending subscription request."
 msgstr "Não há requisições de inscrições pendentes."
 
-#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
+#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
 msgid " resource with priority "
 msgstr " recurso com prioridade "
 
-#~ msgid "_Available"
-#~ msgstr "Dis_ponível"
+#~ msgid "@"
+#~ msgstr "@"
+
+#~ msgid "_Disable showing event in systray"
+#~ msgstr "_Desativar a exibição de eventos na bandeja do sistema"
+
+#~ msgid "_Show event in systray"
+#~ msgstr "_Exibir evento na bandeja do sistema"
 
-#~ msgid "PEP node was not removed"
-#~ msgstr "O nó PEP não foi removido"
+#, fuzzy
+#~ msgid "Always use GNOME default applications"
+#~ msgstr "Sempre usar as aplicações padrões do OS/X"
+
+#, fuzzy
+#~ msgid "Always use Xfce default applications"
+#~ msgstr "Sempre usar as aplicações padrões do OS/X"
+
+#, fuzzy
+#~ msgid "Autodetect on every Gajim startup"
+#~ msgstr "C_onectar na inicialização do Gajim"
+
+#~ msgid "Show systray:"
+#~ msgstr "Exibir na bandeja do sistema:"
+
+#~ msgid "Nickname not allowed: %s"
+#~ msgstr "Apelido não permitido: %s"
+
+#~ msgid "Room has been destroyed"
+#~ msgstr "A sala foi excluída"
 
-#~ msgid "PEP node %(node)s was not removed: %(message)s"
-#~ msgstr "O nó PEP %(node)s não foi removido: %(message)s"
+#~ msgid "You can join this room instead: %s"
+#~ msgstr "Você pode entrar nessa sala ao invés: %s"
+
+#~ msgid "I would like to add you to my roster."
+#~ msgstr "Eu gostaria de adiciona-lo à minha lista."
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "nós estamos agora inscritos para %s"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "remoção de inscrição solicitada por %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "nós estamos agora sem inscrição para %s"
+
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "O JID %s não é uma compilação da RFC. Não se adicionará a sua lista. Use "
+#~ "ferramentas de gerência da lista como http://jru.jabberstudio.org/ para "
+#~ "removê-lo"
 
 #~ msgid "Account Modification"
 #~ msgstr "Alteração da conta"
@@ -10383,45 +10735,9 @@ msgstr " recurso com prioridade "
 #~ msgid "gtk-delete"
 #~ msgstr "gtk-delete"
 
-#~ msgid "Add this contact to roster (Ctrl+D)"
-#~ msgstr "Adicionar este contato para a lista (Ctrl+D)"
-
-#~ msgid "Bookmark this room (Ctrl+B)"
-#~ msgstr "Adicionar esta sala aos marcadores (Ctrl+B)"
-
-#~ msgid "Browse the chat history (Ctrl+H)"
-#~ msgstr "Pesquisar o histórico de conversas (Ctrl+H)"
-
-#~ msgid "Change the room's subject (Alt+T)"
-#~ msgstr "Alterar o assunto da sala (Alt+T)"
-
-#~ msgid "Change your nickname (Ctrl+N)"
-#~ msgstr "Alterar o seu apelido (Ctrl+N)"
-
-#~ msgid "Invite contacts to the conversation (Ctrl+G)"
-#~ msgstr "Convidar contatos para a conversa (Ctrl+G)"
-
 #~ msgid "Send a file (Ctrl+F)"
 #~ msgstr "Enviar um arquivo (Ctrl+F)"
 
-#~ msgid "Show a list of emoticons (Alt+M)"
-#~ msgstr "Exibe uma lista de emoticons (Alt+M)"
-
-#~ msgid "Show a list of formattings"
-#~ msgstr "Exibe uma lista de formatações"
-
-#~ msgid "Show a menu of advanced functions (Alt+D)"
-#~ msgstr "Exibir um menu com funções avançadas (Alt+D)"
-
-#~ msgid "Show the contact's profile (Ctrl+I)"
-#~ msgstr "Exibir o perfil do contato (Ctrl+I)"
-
-#~ msgid "Toggle audio session"
-#~ msgstr "Alternar sessão de áudio"
-
-#~ msgid "Toggle video session"
-#~ msgstr "Alternar sessão de vídeo"
-
 #~ msgid ""
 #~ "All chat states\n"
 #~ "Composing only\n"
@@ -10480,9 +10796,6 @@ msgstr " recurso com prioridade "
 #~ msgid "gtk-cancel"
 #~ msgstr "gtk-cancel"
 
-#~ msgid "_Preferences"
-#~ msgstr "_Preferências"
-
 #~ msgid "_Quit"
 #~ msgstr "_Sair"
 
@@ -10973,13 +11286,6 @@ msgstr " recurso com prioridade "
 #~ "Suporte de gerenciamento da sessão não disponível (faltando o módulo "
 #~ "gnome.ui)"
 
-#~ msgid ""
-#~ "Usage: %s %s %s \n"
-#~ "\t %s"
-#~ msgstr ""
-#~ "Uso: %s %s %s \n"
-#~ "\t %s"
-
 #~ msgid "%s - Gajim"
 #~ msgstr "%s - Gajim"
 
@@ -11171,9 +11477,6 @@ msgstr " recurso com prioridade "
 #~ msgstr ""
 #~ "Salvar _posição e tamanho das janelas de conversa e lista de contatos"
 
-#~ msgid "Use t_rayicon (aka. notification area icon)"
-#~ msgstr "Usar ícone na bandeja (também conhecido por área de notificação)"
-
 #~ msgid ""
 #~ "When a new event (message, file transfer request etc..) is received, the "
 #~ "following methods may be used to inform you about it. Please note that "
diff --git a/po/ru.po b/po/ru.po
index 8967a73df3f751bcbe1934f970b037a53dff9a83..8d9c481b31d20fbf103b4d19427cec9c48b45727 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,11 +8,15 @@
 # Yakov Bezrukov <nebulam51@gmail.com>, 2005, 2006, 2007.
 # Yakov Bezrukov <bezrukov@isp.nsc.ru>, 2005.
 # Dmitry Korzhevin <dkorzhevin@lsupport.net>, 2010.
+#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-05 02:23+0400\n"
+"POT-Creation-Date: 2010-10-01 20:39+0200\n"
 "PO-Revision-Date: 2010-09-05 02:43+0300\n"
 "Last-Translator: Fomin Denis <fominde@mail.ru>\n"
 "Language-Team: Linux Support LLC\n"
@@ -20,12 +24,12 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Virtaal 0.6.1\n"
 "X-Poedit-Basepath: /home/test/gajim\n"
 
-#: ../data/gui/account_context_menu.ui.h:1
-#: ../data/gui/roster_window.ui.h:7
+#: ../data/gui/account_context_menu.ui.h:1 ../data/gui/roster_window.ui.h:7
 msgid "Join _Group Chat..."
 msgstr "Войти в _комнату"
 
@@ -33,8 +37,7 @@ msgstr "Войти в _комнату"
 msgid "_Add Contact..."
 msgstr "_Добавить контакт..."
 
-#: ../data/gui/account_context_menu.ui.h:3
-#: ../data/gui/roster_window.ui.h:18
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
 msgid "_Discover Services"
 msgstr "_Просмотреть сервисы"
 
@@ -54,8 +57,7 @@ msgstr "_Открыть Gmail"
 msgid "_Personal Events"
 msgstr "_Расширенный статус"
 
-#: ../data/gui/account_context_menu.ui.h:8
-#: ../data/gui/roster_window.ui.h:24
+#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
 msgid "_Start Chat..."
 msgstr "_Начать беседу"
 
@@ -124,24 +126,13 @@ msgid "Manage..."
 msgstr "Управление..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:17
-#: ../data/gui/accounts_window.ui.h:39
-#: ../data/gui/change_mood_dialog.ui.h:3
-#: ../src/config.py:1295
-#: ../src/config.py:1398
-#: ../src/config.py:1709
-#: ../src/config.py:1714
-#: ../src/config.py:2278
-#: ../src/config.py:2357
-#: ../src/config.py:2370
-#: ../src/config.py:3614
-#: ../src/config.py:3689
-#: ../src/dialogs.py:308
-#: ../src/dialogs.py:310
-#: ../src/dialogs.py:513
-#: ../src/dialogs.py:526
-#: ../src/roster_window.py:2918
-#: ../src/roster_window.py:2924
-#: ../src/roster_window.py:2929
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
+#: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
+#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
+#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
+#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
+#: ../src/dialogs.py:527 ../src/roster_window.py:2956
+#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
 msgid "None"
 msgstr "Нет"
 
@@ -201,8 +192,7 @@ msgstr "_Порт:"
 msgid "_Server:"
 msgstr "_Сервер:"
 
-#: ../data/gui/accounts_window.ui.h:1
-#: ../data/gui/preferences_window.ui.h:13
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Прочее</b>"
 
@@ -222,8 +212,7 @@ msgstr "<b>Прокси</b>"
 msgid "A_djust to status"
 msgstr "В _зависимости от статуса"
 
-#: ../data/gui/accounts_window.ui.h:6
-#: ../data/gui/join_groupchat_window.ui.h:1
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
 msgid "Account"
 msgstr "Учетные записи"
 
@@ -256,8 +245,12 @@ msgid "Chan_ge Password"
 msgstr "И_зменить пароль"
 
 #: ../data/gui/accounts_window.ui.h:14
-msgid "Check this so Gajim will ask you before sending your password over an insecure connection."
-msgstr "Если отмечено, то Gajim будет будет спрашивать вас перед отправкой пароля через незащищенное соединение."
+msgid ""
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
+msgstr ""
+"Если отмечено, то Gajim будет будет спрашивать вас перед отправкой пароля "
+"через незащищенное соединение."
 
 #: ../data/gui/accounts_window.ui.h:15
 msgid "Choose Client Cert"
@@ -273,7 +266,8 @@ msgstr "Щелкните для изменения пароля"
 
 #: ../data/gui/accounts_window.ui.h:18
 msgid "Click to request authorization to all contacts of another account"
-msgstr "Щелкните, чтобы запросить авторизацию у всех контактов другой учетной записи"
+msgstr ""
+"Щелкните, чтобы запросить авторизацию у всех контактов другой учетной записи"
 
 #: ../data/gui/accounts_window.ui.h:19
 msgid "Client certificate"
@@ -298,56 +292,68 @@ msgid "First Name:"
 msgstr "Имя:"
 
 #. No configured account
-#: ../data/gui/accounts_window.ui.h:24
-#: ../data/gui/roster_window.ui.h:5
-#: ../src/common/helpers.py:1165
-#: ../src/common/helpers.py:1177
-#: ../src/notify.py:528
-#: ../src/notify.py:551
-#: ../src/notify.py:592
-#: ../src/notify.py:608
+#: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
+#: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
+#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
+#: ../src/notify.py:616
 msgid "Gajim"
 msgstr "Gajim"
 
 #. FIXME: Ugly workaround.
 #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
 #. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25
-#: ../data/gui/preferences_window.ui.h:61
-#: ../src/common/contacts.py:141
-#: ../src/dialogs.py:111
-#: ../src/dialogs.py:121
-#: ../src/roster_window.py:2860
-#: ../src/roster_window.py:5413
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
+#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
 msgid "General"
 msgstr "Общие"
 
 #: ../data/gui/accounts_window.ui.h:26
-msgid "If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working."
-msgstr "Если отмечено, Gajim будет передавать еще несколько IP адресов в дополнение к вашему, так что передача файла имеет больше шансов на успех."
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Если отмечено, Gajim будет передавать еще несколько IP адресов в дополнение "
+"к вашему, так что передача файла имеет больше шансов на успех."
 
 #: ../data/gui/accounts_window.ui.h:27
 msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
 msgstr "Если отмечено, то Gajim запомнит пароль учетной записи"
 
 #: ../data/gui/accounts_window.ui.h:29
-msgid "If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection"
-msgstr "Если отмечено, то Gajim будет пинговать сервер, чтобы избежать разрыва соединения по таймауту"
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"Если отмечено, то Gajim будет пинговать сервер, чтобы избежать разрыва "
+"соединения по таймауту"
 
 #: ../data/gui/accounts_window.ui.h:30
-msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account"
-msgstr "Если отмечено, Gajim после запуска будет автоматически подсоединяться к jabber серверу с использованием этой учетной записи"
+msgid ""
+"If checked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
+msgstr ""
+"Если отмечено, Gajim после запуска будет автоматически подсоединяться к "
+"jabber серверу с использованием этой учетной записи"
 
 #: ../data/gui/accounts_window.ui.h:31
-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 accordingly"
-msgstr "Если отмечено, то любые изменения глобального статуса (управляемого из выпадающего списка внизу окна ростера) повлекут за собой изменение статуса этой учетной записи"
+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 "
+"accordingly"
+msgstr ""
+"Если отмечено, то любые изменения глобального статуса (управляемого из "
+"выпадающего списка внизу окна ростера) повлекут за собой изменение статуса "
+"этой учетной записи"
 
 #: ../data/gui/accounts_window.ui.h:32
 msgid ""
-"If the default port that is used for incoming messages is unfitting for your setup you can select another one here.\n"
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
 "You might consider to change possible firewall settings."
 msgstr ""
-"Если порт по умолчанию, который используется для входящих сообщения вас не устраивает, вы можете выбрать другой.\n"
+"Если порт по умолчанию, который используется для входящих сообщения вас не "
+"устраивает, вы можете выбрать другой.\n"
 "Также, возможно, придется изменить некоторые настройки брандмауэра."
 
 #: ../data/gui/accounts_window.ui.h:34
@@ -355,9 +361,8 @@ msgid "Information about you, as stored in the server"
 msgstr "Информация о вас, сохраненная на сервере"
 
 #: ../data/gui/accounts_window.ui.h:35
-#: ../data/gui/zeroconf_information_window.ui.h:4
-#: ../src/config.py:1832
-#: ../src/dialogs.py:830
+#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
+#: ../src/dialogs.py:831
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -370,14 +375,12 @@ msgstr "Фамилия:"
 msgid "Mer_ge accounts"
 msgstr "_Объединить учетные записи"
 
-#: ../data/gui/accounts_window.ui.h:38
-#: ../src/config.py:1805
-#: ../src/config.py:2371
+#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
+#: ../src/config.py:2358
 msgid "No key selected"
 msgstr "Не выбран ключ"
 
-#: ../data/gui/accounts_window.ui.h:40
-#: ../data/gui/profile_window.ui.h:35
+#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35
 msgid "Personal Information"
 msgstr "Личная информация"
 
@@ -386,16 +389,22 @@ msgid "Priori_ty:"
 msgstr "Приори_тет:"
 
 #: ../data/gui/accounts_window.ui.h:42
-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 client with the highest priority gets the events"
-msgstr "Приоритет используется в Jabber для определения того, кто будет получать события от jabber сервера когда подсоединены два и более клиента с одной и той же учетной записью. Клиент с наибольшим приоритетом будет получать события"
+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 "
+"client with the highest priority gets the events"
+msgstr ""
+"Приоритет используется в Jabber для определения того, кто будет получать "
+"события от jabber сервера когда подсоединены два и более клиента с одной и "
+"той же учетной записью. Клиент с наибольшим приоритетом будет получать "
+"события"
 
 #: ../data/gui/accounts_window.ui.h:43
 msgid "Priority will change automatically according to your status."
 msgstr "Изменять приоритет автоматически в соответствии со статусом."
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:44
-#: ../src/roster_window.py:5363
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
 msgid "Re_name"
 msgstr "П_ереименовать"
 
@@ -404,8 +413,18 @@ msgid "Resour_ce:"
 msgstr "Ресу_рс: "
 
 #: ../data/gui/accounts_window.ui.h:46
-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 same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)"
-msgstr "Ресурс отправляется Jabber серверу для того, чтобы различать два и более клиентов с одинаковой учетной записью, подключенных к одному и тому же серверу. Таким образом, вы можете одновременно подключиться к одному серверу с ресурсов 'Дом' или 'Работа'. Ресурс, обладающий большим приоритетом, будет получать все события. (См. ниже)"
+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 "
+"same server with the same account. So you might be connected in the same "
+"account with resource 'Home' and 'Work' at the same time. The resource which "
+"has the highest priority will get the events. (see below)"
+msgstr ""
+"Ресурс отправляется Jabber серверу для того, чтобы различать два и более "
+"клиентов с одинаковой учетной записью, подключенных к одному и тому же "
+"серверу. Таким образом, вы можете одновременно подключиться к одному серверу "
+"с ресурсов 'Дом' или 'Работа'. Ресурс, обладающий большим приоритетом, будет "
+"получать все события. (См. ниже)"
 
 #: ../data/gui/accounts_window.ui.h:47
 msgid "Save conversation _logs for all contacts"
@@ -457,8 +476,7 @@ msgid "_Edit Personal Information..."
 msgstr "Редактировать личную информацию..."
 
 #. XML Console enable checkbutton
-#: ../data/gui/accounts_window.ui.h:60
-#: ../data/gui/xml_console_window.ui.h:11
+#: ../data/gui/accounts_window.ui.h:60 ../data/gui/xml_console_window.ui.h:11
 msgid "_Enable"
 msgstr "_Включить"
 
@@ -495,8 +513,7 @@ msgstr "Позволить ему или ей видеть мой ст_атус"
 msgid "Add New Contact"
 msgstr "Добавить новый контакт"
 
-#: ../data/gui/add_new_contact_window.ui.h:4
-#: ../src/common/helpers.py:1345
+#: ../data/gui/add_new_contact_window.ui.h:4 ../src/common/helpers.py:1339
 msgid "I would like to add you to my contact list."
 msgstr "Вы не возражаете, если я добавлю Вас в контакт лист?"
 
@@ -591,7 +608,9 @@ msgstr "<b>Описание</b>"
 
 #: ../data/gui/advanced_configuration_window.ui.h:2
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
-msgstr "<b>ПРИМЕЧАНИЕ:</b> Необходимо перезапустить Gajim, чтобы некоторые настройки вступили в силу"
+msgstr ""
+"<b>ПРИМЕЧАНИЕ:</b> Необходимо перезапустить Gajim, чтобы некоторые настройки "
+"вступили в силу"
 
 #: ../data/gui/advanced_configuration_window.ui.h:3
 msgid "Advanced Configuration Editor"
@@ -619,7 +638,8 @@ msgstr "Редактировать _списки доступа..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sends a message to users currently connected to this server"
-msgstr "Отправляет сообщение пользователям подсоединенным к серверу в данный момент"
+msgstr ""
+"Отправляет сообщение пользователям подсоединенным к серверу в данный момент"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Set MOTD..."
@@ -679,8 +699,7 @@ msgid "All statuses"
 msgstr "Все статусы"
 
 #: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106
-#: ../src/common/helpers.py:239
+#: ../src/common/commands.py:106 ../src/common/helpers.py:239
 #: ../src/tooltips.py:193
 msgid "Away"
 msgstr "Ушел"
@@ -735,8 +754,7 @@ msgid "Launch a command"
 msgstr "Выполнить команду"
 
 #: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222
-#: ../src/tooltips.py:197
+#: ../src/common/helpers.py:222 ../src/tooltips.py:197
 msgid "Not Available"
 msgstr "Недоступен"
 
@@ -761,8 +779,11 @@ msgid "When "
 msgstr "Когда "
 
 #: ../data/gui/advanced_notifications_window.ui.h:27
-msgid "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr "_Активировать функцию оконного менеджера «UrgencyHint», чтобы окно чата мигало на панели"
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
+msgstr ""
+"_Активировать функцию оконного менеджера «UrgencyHint», чтобы окно чата "
+"мигало на панели"
 
 #: ../data/gui/advanced_notifications_window.ui.h:28
 msgid "_Disable auto opening chat window"
@@ -879,8 +900,7 @@ msgstr "Последнее изменение:"
 msgid "New entry received"
 msgstr "Получена новая запись"
 
-#: ../data/gui/atom_entry_window.ui.h:5
-#: ../src/atom_window.py:128
+#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
 msgid "You have received new entry:"
 msgstr "Получена новая запись:"
 
@@ -890,10 +910,8 @@ msgstr "Заблокированные контакты"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13
-#: ../src/roster_window.py:5382
-#: ../src/roster_window.py:5510
-#: ../src/roster_window.py:5643
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
+#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
 msgid "_Unblock"
 msgstr "_Разблокировать"
 
@@ -981,8 +999,7 @@ msgid "_Start Chat"
 msgstr "_Начать беседу"
 
 #. # means number
-#: ../data/gui/chat_control.ui.h:1
-#: ../src/dialogs.py:4534
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
 msgid "#"
 msgstr "â„–"
 
@@ -990,8 +1007,7 @@ msgstr "â„–"
 msgid "*"
 msgstr "*"
 
-#: ../data/gui/chat_control.ui.h:3
-#: ../data/gui/single_message_window.ui.h:1
+#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
 msgid "0"
 msgstr "0"
 
@@ -1031,16 +1047,49 @@ msgstr "8"
 msgid "9"
 msgstr "9"
 
+#: ../data/gui/chat_control.ui.h:13
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Добавить контакт в ростер (Ctrl+D)"
+
+#: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Открыть историю чата (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:15
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Пригласить к беседе (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Показать набор смайлов (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
+msgid "Show a list of formattings"
+msgstr "Показать список форматирования"
+
+#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Показать меню дополнительных функций (Alt+D)"
+
+#: ../data/gui/chat_control.ui.h:19
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr "Показать информацию о контакте (Ctrl+I)"
+
+#: ../data/gui/chat_control.ui.h:20
+msgid "Toggle audio session"
+msgstr "Переключить аудио сеанс"
+
+#: ../data/gui/chat_control.ui.h:21
+msgid "Toggle video session"
+msgstr "Переключить видео сеанс"
+
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/gui/chat_control.ui.h:14
-#: ../data/gui/groupchat_control.ui.h:2
-#: ../data/gui/xml_console_window.ui.h:16
-#: ../src/filetransfers_window.py:266
+#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
+#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Отправить"
 
-#: ../data/gui/chat_control.ui.h:15
-#: ../data/gui/groupchat_control.ui.h:3
+#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
 msgid "label"
 msgstr "статусное сообщение"
 
@@ -1090,9 +1139,8 @@ msgstr "Редактировать _группы"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6
-#: ../src/roster_window.py:5318
-#: ../src/roster_window.py:5478
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
+#: ../src/roster_window.py:5516
 msgid "In_vite to"
 msgstr "_Пригласить в"
 
@@ -1104,9 +1152,8 @@ msgstr "Пригласить _участников"
 msgid "Remo_ve"
 msgstr "_Удалить"
 
-#: ../data/gui/contact_context_menu.ui.h:9
-#: ../src/roster_window.py:5328
-#: ../src/roster_window.py:5567
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
+#: ../src/roster_window.py:5605
 msgid "Send Cus_tom Status"
 msgstr "Установи_ть статус"
 
@@ -1139,10 +1186,8 @@ msgid "_Allow him/her to see my status"
 msgstr "_Позволить ему или ей видеть мой статус"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7
-#: ../src/roster_window.py:5390
-#: ../src/roster_window.py:5516
-#: ../src/roster_window.py:5646
+#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
+#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
 msgid "_Block"
 msgstr "_Блокировать"
 
@@ -1152,9 +1197,8 @@ msgstr "_Запретить ему или ей видеть мой статус"
 
 #: ../data/gui/contact_context_menu.ui.h:20
 #: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8
-#: ../data/gui/roster_window.ui.h:22
-#: ../src/roster_window.py:5717
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
+#: ../src/roster_window.py:5755
 msgid "_History"
 msgstr "_История"
 
@@ -1247,15 +1291,18 @@ msgid "Shows a list of file transfers between you and others"
 msgstr "Показывает список передач между вами и остальными"
 
 #: ../data/gui/filetransfers.ui.h:11
-msgid "This action removes single file transfer from the list. If the transfer is active, it is first stopped and then removed"
-msgstr "Это действие удаляет единичную передачу из списка. Если передача еще активна, она сначала останавливается, а затем удаляется"
+msgid ""
+"This action removes single file transfer from the list. If the transfer is "
+"active, it is first stopped and then removed"
+msgstr ""
+"Это действие удаляет единичную передачу из списка. Если передача еще "
+"активна, она сначала останавливается, а затем удаляется"
 
 #: ../data/gui/filetransfers.ui.h:12
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Показать уведомление по окончании загрузки"
 
-#: ../data/gui/filetransfers.ui.h:13
-#: ../src/filetransfers_window.py:788
+#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
 msgid "_Continue"
 msgstr "_Продолжить"
 
@@ -1263,8 +1310,7 @@ msgstr "_Продолжить"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Уведомить меня, когда передача файлов закончится"
 
-#: ../data/gui/filetransfers.ui.h:15
-#: ../src/filetransfers_window.py:205
+#: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
 msgid "_Open Containing Folder"
 msgstr "_Открыть папку с принятым файлом"
 
@@ -1284,8 +1330,7 @@ msgstr "<b>Цвета вкладок с чатами</b>"
 msgid "Account row"
 msgstr "Учетная запись"
 
-#: ../data/gui/gajim_themes_window.ui.h:3
-#: ../src/chat_control.py:942
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
 msgid "Bold"
 msgstr "Полужирный"
 
@@ -1317,13 +1362,11 @@ msgstr "Ушел"
 msgid "Group row"
 msgstr "Группа"
 
-#: ../data/gui/gajim_themes_window.ui.h:11
-#: ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Неактивен"
 
-#: ../data/gui/gajim_themes_window.ui.h:12
-#: ../src/chat_control.py:943
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
 msgid "Italic"
 msgstr "Курсив"
 
@@ -1369,8 +1412,7 @@ msgstr "Изменить _тему"
 msgid "Configure _Room..."
 msgstr "Настроить _комнату"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4
-#: ../src/disco.py:1782
+#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
 msgid "_Bookmark"
 msgstr "Добавить эту комнату в _закладки"
 
@@ -1430,6 +1472,18 @@ msgstr "_Отправить личное сообщение"
 msgid "_Voice"
 msgstr "_Право говорить"
 
+#: ../data/gui/groupchat_control.ui.h:1
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Добавить комнату в закладки (Ctrl+B)"
+
+#: ../data/gui/groupchat_control.ui.h:3
+msgid "Change the room's subject (Alt+T)"
+msgstr "Изменить тему (Alt+T)"
+
+#: ../data/gui/groupchat_control.ui.h:4
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Изменить ник (Ctrl+N)"
+
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Создать новое сообщение"
@@ -1447,19 +1501,21 @@ msgstr "Тема:"
 #: ../data/gui/history_manager.ui.h:1
 msgid ""
 "<b>WARNING:</b>\n"
-"If you plan to do massive deletions, please make sure Gajim is not running. Generally avoid deletions with contacts you currently chat with."
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
 msgstr ""
 "<b>ВНИМАНИЕ:</b>\n"
-"Если вы собираетесь устроить массовую чистку, удостоверьтесь, что Gajim не запущен. Избегайте удалений из логов контактов, с которыми вы разговариваете в этот момент."
+"Если вы собираетесь устроить массовую чистку, удостоверьтесь, что Gajim не "
+"запущен. Избегайте удалений из логов контактов, с которыми вы разговариваете "
+"в этот момент."
 
 #: ../data/gui/history_manager.ui.h:3
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Добро пожаловать в менеджер истории Gajim'а</b></big>"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4
-#: ../src/dialogs.py:3208
-#: ../src/dialogs.py:3305
+#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
+#: ../src/dialogs.py:3321
 msgid "Delete"
 msgstr "Удалить"
 
@@ -1473,13 +1529,18 @@ msgstr "Менеджер истории Gajim'а"
 
 #: ../data/gui/history_manager.ui.h:7
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for such functionality, use the history window instead.\n"
+"This log manager is not intended for log viewing. If you are looking for "
+"such functionality, use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left and/or search database from below."
+"Use this program to delete or export logs. You can select logs from the left "
+"and/or search database from below."
 msgstr ""
-"Этот менеджер истории не предназначен для просмотра. Если вы хотите просматривать историю с большим количеством функций, используйте окно истории.\n"
+"Этот менеджер истории не предназначен для просмотра. Если вы хотите "
+"просматривать историю с большим количеством функций, используйте окно "
+"истории.\n"
 "\n"
-"Используйте эту программу для удаления или экспорта истории. Вы можете выбрать лог слева или воспользоваться поиском в базе."
+"Используйте эту программу для удаления или экспорта истории. Вы можете "
+"выбрать лог слева или воспользоваться поиском в базе."
 
 #: ../data/gui/history_manager.ui.h:10
 msgid "_Search Database"
@@ -1489,8 +1550,7 @@ msgstr "_Поиск в базе данных"
 msgid "All Chat Histories"
 msgstr "Вся история"
 
-#: ../data/gui/history_window.ui.h:2
-#: ../src/history_window.py:323
+#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
 msgid "Conversation History"
 msgstr "История"
 
@@ -1537,22 +1597,16 @@ msgid "forbid"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:7
-#: ../src/gajim-remote-plugin.py:213
-#: ../src/gajim-remote.py:229
+#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
 msgid "jid"
 msgstr "JID"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:8
-#: ../src/gajim-remote-plugin.py:107
-#: ../src/gajim-remote-plugin.py:128
-#: ../src/gajim-remote-plugin.py:142
-#: ../src/gajim-remote-plugin.py:153
-#: ../src/gajim-remote.py:110
-#: ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144
-#: ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
+#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
 msgid "message"
 msgstr "сообщение"
 
@@ -1585,8 +1639,7 @@ msgstr ""
 msgid "Bro_wse Rooms"
 msgstr "Просмотр конферен_ций"
 
-#: ../data/gui/join_groupchat_window.ui.h:3
-#: ../src/dialogs.py:2180
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
 msgid "Join Group Chat"
 msgstr "Войти в комнату"
 
@@ -1614,8 +1667,7 @@ msgid "Room:"
 msgstr "Комната:"
 
 #: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9
-#: ../src/config.py:1822
+#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
 msgid "Server:"
 msgstr "Сервер:"
 
@@ -1623,9 +1675,8 @@ msgstr "Сервер:"
 msgid "_Bookmark this room"
 msgstr "Добавить комнату в закладк_и"
 
-#: ../data/gui/join_groupchat_window.ui.h:11
-#: ../src/disco.py:1341
-#: ../src/disco.py:1786
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../src/disco.py:1804
 msgid "_Join"
 msgstr "_Присоединиться"
 
@@ -1754,30 +1805,37 @@ msgid "Homepage:"
 msgstr "Домашняя страница:"
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Installed"
+#, fuzzy
+msgid "Install"
 msgstr "Установленные"
 
 #: ../data/gui/plugins_window.ui.h:9
-msgid "Plug-in decription should be displayed here. This text will be erased during PluginsWindow initialization."
-msgstr ""
+msgid "Installed"
+msgstr "Установленные"
 
 #: ../data/gui/plugins_window.ui.h:10
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:11
 msgid "Plugins"
 msgstr "Плагины"
 
-#: ../data/gui/plugins_window.ui.h:11
+#: ../data/gui/plugins_window.ui.h:12
 msgid "Uninstall"
 msgstr ""
 
-#: ../data/gui/plugins_window.ui.h:12
+#: ../data/gui/plugins_window.ui.h:13
 msgid "Version:"
 msgstr "Версия:"
 
-#: ../data/gui/plugins_window.ui.h:13
+#: ../data/gui/plugins_window.ui.h:14
 msgid "button"
 msgstr ""
 
-#: ../data/gui/plugins_window.ui.h:14
+#: ../data/gui/plugins_window.ui.h:15
 msgid "homepage url"
 msgstr "домашняя страница"
 
@@ -1899,257 +1957,322 @@ msgid "Always"
 msgstr "Всегда"
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Always use GNOME default applications"
-msgstr "Всегда использовать приложения GNOME по умолчанию"
-
-#: ../data/gui/preferences_window.ui.h:32
-msgid "Always use KDE default applications"
-msgstr "Всегда использовать приложения KDE по умолчанию"
-
-#: ../data/gui/preferences_window.ui.h:33
-msgid "Always use Xfce default applications"
-msgstr "Всегда использовать приложения Xfce по умолчанию"
-
-#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Запрашивать сообщение о статусе, когда я: "
 
-#: ../data/gui/preferences_window.ui.h:35
-#: ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
 msgid "Audio / Video"
 msgstr "Звук / Изображение"
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:33
 msgid "Audio input device"
 msgstr "Устройство захвата звука"
 
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Audio output device"
 msgstr "Устройство вывода звука"
 
-#: ../data/gui/preferences_window.ui.h:38
-msgid "Autodetect on every Gajim startup"
-msgstr "Определять при каждом запуске Gajim"
-
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:35
 msgid "Chat message:"
 msgstr "Сообщение чата:"
 
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:36
 msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr "_Всегда проверять при запуске, является ли Gajim jabber-клиентом по умолчанию"
+msgstr ""
+"_Всегда проверять при запуске, является ли Gajim jabber-клиентом по умолчанию"
 
-#: ../data/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:37
 msgid "Composing only"
 msgstr "Только печатает"
 
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:38
 msgid "Configure color and font of the interface"
 msgstr "Настроить цвет и шрифт интерфейса"
 
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:39
 msgid "Contact's message:"
 msgstr "Сообщение собеседника:"
 
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:40
 msgid "Contact's nickname:"
 msgstr "Ник собеседника:"
 
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:41
 msgid "Custom"
 msgstr "Другое"
 
-#: ../data/gui/preferences_window.ui.h:46
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Detached roster with chat grouped by account"
 msgstr "Окно контактов и окна с беседами сгруппированными по учетным записям"
 
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Detached roster with chat grouped by type"
 msgstr "Окно контактов и окна с беседами сгруппированными по типу"
 
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Detached roster with detached chats"
 msgstr "Окно контактов и окно с беседами"
 
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:45
 msgid "Detached roster with single chat"
 msgstr "Окно контактов и окно для каждой беседы"
 
-#: ../data/gui/preferences_window.ui.h:50
-#: ../src/config.py:170
-#: ../src/config.py:671
+#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
+#: ../src/config.py:665
 msgid "Disabled"
 msgstr "Отключены"
 
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:47
 msgid "Display _activity of contacts in roster"
 msgstr "Показывать _занятия контактов в ростере"
 
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:48
 msgid "Display _extra email details"
 msgstr "Отображать _дополнительные данные о почте"
 
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:49
 msgid "Display _location of contacts in roster"
 msgstr "Показывать местоположение контактов в ростере"
 
-#: ../data/gui/preferences_window.ui.h:54
+#: ../data/gui/preferences_window.ui.h:50
 msgid "Display _tunes of contacts in roster"
 msgstr "Отмечать контакты, слушающие музыку (tunes)"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display a_vatars of contacts in roster"
 msgstr "Показывать а_ватары для контактов в ростере"
 
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display m_ood of contacts in roster"
 msgstr "Показывать на_строения для контактов в ростере"
 
-#: ../data/gui/preferences_window.ui.h:57
+#: ../data/gui/preferences_window.ui.h:53
 msgid "Display status _messages of contacts in roster"
 msgstr "Показывать _сообщения о статусе контакта в ростере"
 
+#: ../data/gui/preferences_window.ui.h:54
+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 "
+"display in chat windows."
+msgstr ""
+"Gajim может отсылать и получать метаданные относящиеся к беседе с контактом. "
+"Здесь вы можете указать, какие состояние чата вы хотели бы видеть в окне "
+"чата."
+
+#: ../data/gui/preferences_window.ui.h:55
+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 "
+"send to the other party."
+msgstr ""
+"Gajim может отсылать и получать метаданные, относящиеся к беседе с "
+"контактом. Здесь вы можете указать, какие состояния чата Gajim будет "
+"отсылать вашему респонденту."
+
+#: ../data/gui/preferences_window.ui.h:56
+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/gui/preferences_window.ui.h:58
-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 display in chat windows."
-msgstr "Gajim может отсылать и получать метаданные относящиеся к беседе с контактом. Здесь вы можете указать, какие состояние чата вы хотели бы видеть в окне чата."
+msgid "Hide all buttons in chat windows"
+msgstr "Не показывать кнопки в окнах чата"
 
 #: ../data/gui/preferences_window.ui.h:59
-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 send to the other party."
-msgstr "Gajim может отсылать и получать метаданные, относящиеся к беседе с контактом. Здесь вы можете указать, какие состояния чата Gajim будет отсылать вашему респонденту."
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr ""
+"Если отмечено, то Gajim будет разрешать определять операционную систему, "
+"которую вы используете"
 
 #: ../data/gui/preferences_window.ui.h:60
-msgid "Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed out"
-msgstr "Gajim будет уведомлять вас об отсоединившемся контакте с помощью сообщения в правом нижнем углу экрана"
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+"Если отмечено, то Gajim будет включать информацию об отправителе новых писем."
+
+#: ../data/gui/preferences_window.ui.h:61
+msgid ""
+"If checked, Gajim will change status to Away when the computer is unused."
+msgstr ""
+"Если отмечено, то Gajim изменит статус на Away, если компьютер не "
+"используется."
 
 #: ../data/gui/preferences_window.ui.h:62
-msgid "Hide all buttons in chat windows"
-msgstr "Не показывать кнопки в окнах чата"
+msgid ""
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
+msgstr ""
+"Если отмечено, Gajim будет менять статус на Недоступен, если компьютер долго "
+"не используется"
 
 #: ../data/gui/preferences_window.ui.h:63
-msgid "If checked, Gajim will allow others to detect the operation system you are using"
-msgstr "Если отмечено, то Gajim будет разрешать определять операционную систему, которую вы используете"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Если отмечено, то Gajim будет показывать аватары контактов в окне ростера и "
+"в окнах комнат"
 
 #: ../data/gui/preferences_window.ui.h:64
-msgid "If checked, Gajim will also include information about the sender of the new emails"
-msgstr "Если отмечено, то Gajim будет включать информацию об отправителе новых писем."
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
+msgstr ""
+"Если отмечено, то Gajim будет отображать сообщение о статусе контакта под "
+"его именем в окне ростера и в окнах комнат"
 
 #: ../data/gui/preferences_window.ui.h:65
-msgid "If checked, Gajim will change status to Away when the computer is unused."
-msgstr "Если отмечено, то Gajim изменит статус на Away, если компьютер не используется."
+msgid ""
+"If checked, Gajim will display the activity of contacts in the roster window"
+msgstr ""
+"Если отмечено, то Gajim будет показывать занятия контактов в окне ростера"
 
 #: ../data/gui/preferences_window.ui.h:66
-msgid "If checked, Gajim will change status to Not Available when the computer has not been used even longer"
-msgstr "Если отмечено, Gajim будет менять статус на Недоступен, если компьютер долго не используется"
+msgid ""
+"If checked, Gajim will display the location of contacts in the roster window"
+msgstr ""
+"Если отмечено, то Gajim будет показывать местоположение контактов в окне "
+"ростера"
 
 #: ../data/gui/preferences_window.ui.h:67
-msgid "If checked, Gajim will display avatars of contacts in roster window and in group chats"
-msgstr "Если отмечено, то Gajim будет показывать аватары контактов в окне ростера и в окнах комнат"
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr ""
+"Если отмечено, то Gajim будет показывать настроения контактов в окне ростера"
 
 #: ../data/gui/preferences_window.ui.h:68
-msgid "If checked, Gajim will display status messages of contacts under the contact name in roster window and in group chats"
-msgstr "Если отмечено, то Gajim будет отображать сообщение о статусе контакта под его именем в окне ростера и в окнах комнат"
+msgid ""
+"If checked, Gajim will display the tunes of contacts in the roster window"
+msgstr ""
+"Если отмечено, то Gajim будет показывать tunes контактов в окне ростера"
 
 #: ../data/gui/preferences_window.ui.h:69
-msgid "If checked, Gajim will display the activity of contacts in the roster window"
-msgstr "Если отмечено, то Gajim будет показывать занятия контактов в окне ростера"
+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 ""
+"Если отмечено, Gajim будет выделять орфографические ошибки в полях ввода "
+"окон чата. Если язык проверки явно не задан, будет использован язык по "
+"умолчанию для данного контакта или комнаты."
 
 #: ../data/gui/preferences_window.ui.h:70
-msgid "If checked, Gajim will display the location of contacts in the roster window"
-msgstr "Если отмечено, то Gajim будет показывать местоположение контактов в окне ростера"
+msgid ""
+"If checked, Gajim will ignore incoming events from unauthorized contacts. "
+"Use with caution, because it blocks all messages from any contact that is "
+"not in the roster"
+msgstr ""
+"Отметьте эту опцию, только если кто-то не из вашего ростера спамит/достает "
+"вас. Используйте с осторожностью, потому что это заблокирует все сообщения "
+"от контактов не из вашего ростера."
 
 #: ../data/gui/preferences_window.ui.h:71
-msgid "If checked, Gajim will display the mood of contacts in the roster window"
-msgstr "Если отмечено, то Gajim будет показывать настроения контактов в окне ростера"
+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 ""
+"Если отмечено, Gajim будет сохранять историю зашифрованных сообщений. "
+"Помните, что при использовании E2E шифрования удаленная сторона должна дать "
+"согласие на ведение истории, иначе сообщения не будут сохраняться."
 
 #: ../data/gui/preferences_window.ui.h:72
-msgid "If checked, Gajim will display the tunes of contacts in the roster window"
-msgstr "Если отмечено, то Gajim будет показывать tunes контактов в окне ростера"
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"Если отмечено, то Gajim будет сообщать о новых письмах, полученных в GMail"
 
 #: ../data/gui/preferences_window.ui.h:73
-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 "Если отмечено, Gajim будет выделять орфографические ошибки в полях ввода окон чата. Если язык проверки явно не задан, будет использован язык по умолчанию для данного контакта или комнаты."
+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, "
+"etc...)"
+msgstr ""
+"Если отмечено, то Gajim будет использовать для каждого протокола свои иконки "
+"(например, контакты из MSN будут иметь соответствующие иконки msn для "
+"статусов «в сети», «ушёл», «занят» и т.д.)"
 
 #: ../data/gui/preferences_window.ui.h:74
-msgid "If checked, Gajim will ignore incoming events from unauthorized contacts. Use with caution, because it blocks all messages from any contact that is not in the roster"
-msgstr "Отметьте эту опцию, только если кто-то не из вашего ростера спамит/достает вас. Используйте с осторожностью, потому что это заблокирует все сообщения от контактов не из вашего ростера."
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+msgstr ""
+"Если включено, Gajim не будет запрашивать сообщение о статусе. Вместо него "
+"будет использовано соответствующее сообщение по умолчанию."
 
 #: ../data/gui/preferences_window.ui.h:75
-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 "Если отмечено, Gajim будет сохранять историю зашифрованных сообщений. Помните, что при использовании E2E шифрования удаленная сторона должна дать согласие на ведение истории, иначе сообщения не будут сохраняться."
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Gajim заменяет текстовые смайлики, например ':)', их графическим или "
+"анимированным эквивалентом. Выберите «Отключены», чтобы этого не происходило."
 
 #: ../data/gui/preferences_window.ui.h:76
-msgid "If checked, Gajim will show a notification when a new e-mail is received via GMail"
-msgstr "Если отмечено, то Gajim будет сообщать о новых письмах, полученных в GMail"
-
-#: ../data/gui/preferences_window.ui.h:77
-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, etc...)"
-msgstr "Если отмечено, то Gajim будет использовать для каждого протокола свои иконки (например, контакты из MSN будут иметь соответствующие иконки msn для статусов «в сети», «ушёл», «занят» и т.д.)"
-
-#: ../data/gui/preferences_window.ui.h:78
-msgid "If enabled, Gajim will not ask for a status message. The specified default message will be used instead."
-msgstr "Если включено, Gajim не будет запрашивать сообщение о статусе. Вместо него будет использовано соответствующее сообщение по умолчанию."
-
-#: ../data/gui/preferences_window.ui.h:79
-msgid "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons"
-msgstr "Gajim заменяет текстовые смайлики, например ':)', их графическим или анимированным эквивалентом. Выберите «Отключены», чтобы этого не происходило."
-
-#: ../data/gui/preferences_window.ui.h:80
 msgid "Log _encrypted chat session"
 msgstr "Записывать в лог _шифрованные сообщения"
 
-#: ../data/gui/preferences_window.ui.h:81
+#: ../data/gui/preferences_window.ui.h:77
 msgid "Ma_ke message windows compact"
 msgstr "_Компактное окно сообщений"
 
-#: ../data/gui/preferences_window.ui.h:82
+#: ../data/gui/preferences_window.ui.h:78
 msgid "Ma_nage..."
 msgstr "_Управление..."
 
-#: ../data/gui/preferences_window.ui.h:83
+#: ../data/gui/preferences_window.ui.h:79
 msgid "Never"
 msgstr "Никогда"
 
-#: ../data/gui/preferences_window.ui.h:84
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Notifications"
 msgstr "Уведомления"
 
-#: ../data/gui/preferences_window.ui.h:85
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Notify me about contacts that sign _in"
 msgstr "Уведомлять о контактах, которые _вошли: "
 
-#: ../data/gui/preferences_window.ui.h:86
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Notify me about contacts that sign _out"
 msgstr "Уведомлять о контактах, которые _вышли: "
 
-#: ../data/gui/preferences_window.ui.h:87
+#: ../data/gui/preferences_window.ui.h:83
 msgid "Notify me about it"
 msgstr "Уведомлять об этом"
 
-#: ../data/gui/preferences_window.ui.h:88
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notify on new _GMail email"
 msgstr "Сообщать о новых письмах в _Gmail"
 
-#: ../data/gui/preferences_window.ui.h:89
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Only when pending events"
 msgstr "Только при пропущенных событиях"
 
-#: ../data/gui/preferences_window.ui.h:90
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Personal Events"
 msgstr "Расширенные статусы"
 
-#: ../data/gui/preferences_window.ui.h:91
+#: ../data/gui/preferences_window.ui.h:87
 msgid "Play _sounds"
 msgstr "Проигрывать _звук"
 
-#: ../data/gui/preferences_window.ui.h:92
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Pop it up"
 msgstr "Показать"
 
-#: ../data/gui/preferences_window.ui.h:93
+#: ../data/gui/preferences_window.ui.h:89
 msgid "Preferences"
 msgstr "Настройки"
 
-#: ../data/gui/preferences_window.ui.h:94
+#: ../data/gui/preferences_window.ui.h:90
 msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
@@ -2157,188 +2280,203 @@ msgstr ""
 "Адрес сервера STUN. Если не указано, Gajim попробует\n"
 "получить адрес с сервера."
 
-#: ../data/gui/preferences_window.ui.h:96
+#: ../data/gui/preferences_window.ui.h:92
 msgid "STUN server:"
 msgstr "STUN сервер:"
 
-#: ../data/gui/preferences_window.ui.h:97
-msgid "Show notification area:"
+#: ../data/gui/preferences_window.ui.h:93
+#, fuzzy
+msgid "Show notification area icon:"
 msgstr "Отображать значек в области уведомлений:"
 
-#: ../data/gui/preferences_window.ui.h:98
+#: ../data/gui/preferences_window.ui.h:94
 msgid "Show only in roster"
 msgstr "Показывать только в ростере"
 
-#: ../data/gui/preferences_window.ui.h:99
+#: ../data/gui/preferences_window.ui.h:95
 msgid "Sign _in"
 msgstr "В_ошел"
 
-#: ../data/gui/preferences_window.ui.h:100
+#: ../data/gui/preferences_window.ui.h:96
 msgid "Sign _out"
 msgstr "В_ышел"
 
-#: ../data/gui/preferences_window.ui.h:101
+#: ../data/gui/preferences_window.ui.h:97
 msgid "Single window for everything"
 msgstr "Всё в одном окне"
 
-#: ../data/gui/preferences_window.ui.h:102
-msgid "Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text."
-msgstr "Некоторые сообщения могут содержать форматирование (цвет, шрифт и т.д.). Если отмечено, Gajim будет отображать только их текст, без форматирования."
+#: ../data/gui/preferences_window.ui.h:98
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"Некоторые сообщения могут содержать форматирование (цвет, шрифт и т.д.). "
+"Если отмечено, Gajim будет отображать только их текст, без форматирования."
 
-#: ../data/gui/preferences_window.ui.h:103
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sort contacts by status"
 msgstr "Сортировать контакты по статусу"
 
-#: ../data/gui/preferences_window.ui.h:104
-#: ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
 msgid "Status"
 msgstr "Статус"
 
-#: ../data/gui/preferences_window.ui.h:105
+#: ../data/gui/preferences_window.ui.h:101
 msgid "Status _iconset:"
 msgstr "Тема статусных _иконок:"
 
-#: ../data/gui/preferences_window.ui.h:106
+#: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Стиль"
 
-#: ../data/gui/preferences_window.ui.h:107
+#: ../data/gui/preferences_window.ui.h:103
 msgid "T_heme:"
 msgstr "_Тема:"
 
-#: ../data/gui/preferences_window.ui.h:108
+#: ../data/gui/preferences_window.ui.h:104
 msgid ""
-"The auto away status message. If empty, Gajim will not change the current status message\n"
+"The auto away status message. If empty, Gajim will not change the current "
+"status message\n"
 "$S will be replaced by previous status message\n"
 "$T will be replaced by auto-away timeout"
 msgstr ""
-"Автоматическое сообщение о статусе «Ушел». Если не указано, Gajim не будет изменять сообщение о статусе\n"
+"Автоматическое сообщение о статусе «Ушел». Если не указано, Gajim не будет "
+"изменять сообщение о статусе\n"
 "$S заменяется на предыдущее сообщение о статусе\n"
-"$T заменяется на время срабатывания автоматического сообщения о статусе «Ушел»"
+"$T заменяется на время срабатывания автоматического сообщения о статусе "
+"«Ушел»"
 
-#: ../data/gui/preferences_window.ui.h:111
+#: ../data/gui/preferences_window.ui.h:107
 msgid ""
-"The auto not available status message. If empty, Gajim will not change the current status message\n"
+"The auto not available status message. If empty, Gajim will not change the "
+"current status message\n"
 "$S will be replaced by previous status message\n"
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
-"Автоматическое сообщение о статусе «Недоступен». Если не указано, Gajim не будет изменять сообщение о статусе\n"
+"Автоматическое сообщение о статусе «Недоступен». Если не указано, Gajim не "
+"будет изменять сообщение о статусе\n"
 "$S заменяется на предыдущее сообщение о статусе\n"
-"$T заменяется на время срабатывания автоматического сообщения о статусе «Недоступен»"
+"$T заменяется на время срабатывания автоматического сообщения о статусе "
+"«Недоступен»"
 
-#: ../data/gui/preferences_window.ui.h:114
+#: ../data/gui/preferences_window.ui.h:110
 msgid "Use _transports icons"
 msgstr "Использовать иконки _транспортов"
 
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:111
+#, fuzzy
+msgid "Use default applications"
+msgstr "Всегда использовать приложения KDE по умолчанию"
+
+#: ../data/gui/preferences_window.ui.h:112
 msgid "Use system _default"
 msgstr "Использовать _системный шрифт"
 
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:113
 msgid "Video framerate"
 msgstr "Частота кадров видео"
 
-#: ../data/gui/preferences_window.ui.h:117
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Video input device"
 msgstr "Устройство захвата изображения"
 
-#: ../data/gui/preferences_window.ui.h:118
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Video output device"
 msgstr "Устройство вывода изображения"
 
-#: ../data/gui/preferences_window.ui.h:119
+#: ../data/gui/preferences_window.ui.h:116
 msgid "Video size"
 msgstr "Разрешение видео"
 
-#: ../data/gui/preferences_window.ui.h:120
+#: ../data/gui/preferences_window.ui.h:117
 msgid "When new event is received:"
 msgstr "Когда получено новое сообытие:"
 
-#: ../data/gui/preferences_window.ui.h:121
+#: ../data/gui/preferences_window.ui.h:118
 msgid "Your message:"
 msgstr "Ваше сообщение:"
 
-#: ../data/gui/preferences_window.ui.h:122
+#: ../data/gui/preferences_window.ui.h:119
 msgid "Your nickname:"
 msgstr "Ваш ник:"
 
-#: ../data/gui/preferences_window.ui.h:123
+#: ../data/gui/preferences_window.ui.h:120
 msgid "_Away after:"
 msgstr "Авто-_отошел после:"
 
-#: ../data/gui/preferences_window.ui.h:124
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Браузер:"
 
-#: ../data/gui/preferences_window.ui.h:125
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Display chat state notifications:"
 msgstr "_Отображать уведомления о состоянии чата:"
 
-#: ../data/gui/preferences_window.ui.h:126
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Emoticons:"
 msgstr "_Смайлики:"
 
-#: ../data/gui/preferences_window.ui.h:127
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_File manager:"
 msgstr "_Менеджер файлов:"
 
-#: ../data/gui/preferences_window.ui.h:128
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_Highlight misspelled words"
 msgstr "Выделять _слова с опечатками"
 
-#: ../data/gui/preferences_window.ui.h:129
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Игнорировать события от контактов не из ростера"
 
-#: ../data/gui/preferences_window.ui.h:130
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Игнорировать форматирование во входящих сообщениях"
 
-#: ../data/gui/preferences_window.ui.h:131
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Log status changes of contacts"
 msgstr "_Записывать в лог изменения статусов контактов"
 
-#: ../data/gui/preferences_window.ui.h:132
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Mail client:"
 msgstr "_Почтовый клиент:"
 
-#: ../data/gui/preferences_window.ui.h:133
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Not available after:"
 msgstr "Авто-_недоступен после:"
 
-#: ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Open..."
 msgstr "_Открыть..."
 
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Reset to Default Colors"
 msgstr "_Вернуться к цветам по умолчанию"
 
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Send chat state notifications:"
 msgstr "_Отправлять уведомления о состоянии чата:"
 
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Status message:"
 msgstr "_Сообщение о статусе:"
 
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_URL highlight:"
 msgstr "_Цвет ссылок:"
 
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_Window behavior:"
 msgstr "Поведение _окна:"
 
-#: ../data/gui/preferences_window.ui.h:140
+#: ../data/gui/preferences_window.ui.h:137
 msgid "in _group chats"
 msgstr "в _комнатах"
 
-#: ../data/gui/preferences_window.ui.h:141
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _roster"
 msgstr "в _ростере"
 
-#: ../data/gui/preferences_window.ui.h:142
+#: ../data/gui/preferences_window.ui.h:139
 msgid "minutes"
 msgstr "минут"
 
@@ -2390,8 +2528,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Номер:"
 
-#: ../data/gui/privacy_list_window.ui.h:12
-#: ../src/dialogs.py:3786
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
 msgid "Privacy List"
 msgstr "Список доступа"
 
@@ -2598,20 +2735,24 @@ msgstr "Удалить учетную запись из Gajim и с _серве
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4
-#: ../src/roster_window.py:5400
-#: ../src/roster_window.py:5526
-#: ../src/roster_window.py:5656
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
+#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
 msgid "_Remove"
 msgstr "_Удалить"
 
 #: ../data/gui/roster_item_exchange_window.ui.h:1
-msgid "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in your roster."
-msgstr "<b>someone@somewhere.com</b> хочет <b>добавить</b> несколько контактов в ваш список контактов."
+msgid ""
+"<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
+"your roster."
+msgstr ""
+"<b>someone@somewhere.com</b> хочет <b>добавить</b> несколько контактов в ваш "
+"список контактов."
 
 #: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
-msgstr "Тело сообщения <в данное время не используется, поэтому по умолчанию не отображается>"
+msgstr ""
+"Тело сообщения <в данное время не используется, поэтому по умолчанию не "
+"отображается>"
 
 #: ../data/gui/roster_item_exchange_window.ui.h:3
 msgid "Roster Item Exchange"
@@ -2662,8 +2803,7 @@ msgstr "Показать транс_порты"
 msgid "Show _Offline Contacts"
 msgstr "Показать _отключенных"
 
-#: ../data/gui/roster_window.ui.h:13
-#: ../src/statusicon.py:326
+#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
 msgid "Show _Roster"
 msgstr "Показать _ростер"
 
@@ -2681,8 +2821,7 @@ msgstr "_Действия"
 msgid "_Contents"
 msgstr "_Содержание"
 
-#: ../data/gui/roster_window.ui.h:19
-#: ../src/disco.py:1502
+#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
 msgid "_Edit"
 msgstr "_Правка"
 
@@ -2715,13 +2854,11 @@ msgid "_Add contact"
 msgstr "Добавить _контакт"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4
-#: ../src/roster_window.py:5668
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
 msgid "_Information"
 msgstr "_Информация о контакте"
 
-#: ../data/gui/search_window.ui.h:5
-#: ../src/disco.py:1353
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
 msgid "_Search"
 msgstr "_Поиск"
 
@@ -2778,7 +2915,9 @@ msgid "Authorize contact so he or she can know when you're connected"
 msgstr "Авторизовать контакт (он будет видеть ваш статус)"
 
 #: ../data/gui/subscription_request_window.ui.h:3
-msgid "Deny authorization from contact so he or she cannot know when you're connected"
+msgid ""
+"Deny authorization from contact so he or she cannot know when you're "
+"connected"
 msgstr "Отклонить авторизацию от контакта (Он не сможет видеть ваш статус)"
 
 #: ../data/gui/subscription_request_window.ui.h:4
@@ -2966,8 +3105,10 @@ msgid "Cancel confirmation"
 msgstr "Отменить подтверждение"
 
 #: ../src/adhoc_commands.py:324
-msgid "You are in process of executing command. Do you really want to cancel it?"
-msgstr "Команда находится в процессе выполнения. Вы уверены, что хотите её отменить?"
+msgid ""
+"You are in process of executing command. Do you really want to cancel it?"
+msgstr ""
+"Команда находится в процессе выполнения. Вы уверены, что хотите её отменить?"
 
 #: ../src/adhoc_commands.py:370
 #, fuzzy
@@ -2979,8 +3120,7 @@ msgstr "Неверная комната"
 msgid "The form is not filled correctly."
 msgstr "В Jabber ID комнаты или сервера содержатся недопустимые символы."
 
-#: ../src/adhoc_commands.py:390
-#: ../src/adhoc_commands.py:413
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
 msgid "Service sent malformed data"
 msgstr "Сервис отправил недопустимые данные"
 
@@ -3014,8 +3154,7 @@ msgstr "Целое"
 msgid "Text"
 msgstr "Текст"
 
-#: ../src/advanced_configuration_window.py:96
-#: ../src/chat_control.py:962
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
 msgid "Color"
 msgstr "Цвет"
 
@@ -3158,13 +3297,11 @@ msgid "Spelling language"
 msgstr "Язык проверки орфографии"
 
 #. we are not connected
-#: ../src/chat_control.py:528
-#: ../src/chat_control.py:737
+#: ../src/chat_control.py:528 ../src/chat_control.py:737
 msgid "A connection is not available"
 msgstr "Подключение недоступно"
 
-#: ../src/chat_control.py:529
-#: ../src/chat_control.py:738
+#: ../src/chat_control.py:529 ../src/chat_control.py:738
 msgid "Your message can not be sent until you are connected."
 msgstr "Ваше сообщение не может быть отправлено, пока вы не подключитесь."
 
@@ -3193,28 +3330,19 @@ msgstr "Отправить файл?"
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr "Если вы пошлете файл %s, он/она узнает ваш настоящий Jabber ID."
 
-#: ../src/chat_control.py:1520
-#: ../src/chat_control.py:2010
+#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
 msgid "GPG encryption enabled"
 msgstr "GPG шифрование включено"
 
 #. Add to roster
-#: ../src/chat_control.py:1545
-#: ../src/common/contacts.py:158
-#: ../src/common/contacts.py:277
-#: ../src/common/helpers.py:57
-#: ../src/common/helpers.py:251
-#: ../src/dialogs.py:1064
-#: ../src/dialogs.py:2078
-#: ../src/dialogs.py:2107
-#: ../src/gui_interface.py:675
-#: ../src/gui_menu_builder.py:252
-#: ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1627
-#: ../src/roster_window.py:1629
-#: ../src/roster_window.py:1962
-#: ../src/roster_window.py:3317
-#: ../src/roster_window.py:3344
+#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
+#: ../src/common/contacts.py:277 ../src/common/helpers.py:57
+#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
+#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
+#: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
+#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
+#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
+#: ../src/roster_window.py:3382
 msgid "Not in Roster"
 msgstr "Не в ростере"
 
@@ -3224,7 +3352,9 @@ msgstr "Этот контакт не поддерживает передачу 
 
 #: ../src/chat_control.py:1578
 msgid "You need to know the real JID of the contact to send him or her a file."
-msgstr "Необходимо знать настоящий JID контакта для того, чтобы отправить ему или ей файл."
+msgstr ""
+"Необходимо знать настоящий JID контакта для того, чтобы отправить ему или ей "
+"файл."
 
 #: ../src/chat_control.py:1677
 #, python-format
@@ -3237,14 +3367,17 @@ 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:1990
-#: ../src/dialogs.py:5216
+#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
 msgid "No GPG key assigned"
 msgstr "Ключ GPG не присвоен"
 
 #: ../src/chat_control.py:1991
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages with GPG."
-msgstr "Этому контакту не присвоен ключ GPG, поэтому вы не можете зашифровать сообщения с помощью GPG."
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+msgstr ""
+"Этому контакту не присвоен ключ GPG, поэтому вы не можете зашифровать "
+"сообщения с помощью GPG."
 
 #: ../src/chat_control.py:2000
 msgid "GPG encryption disabled"
@@ -3323,15 +3456,18 @@ msgid " and WILL NOT be logged"
 msgstr " и НЕ БУДЕТ сохранена история сообщений"
 
 #: ../src/chat_control.py:2236
-msgid "Remote contact's identity not verified. Click the shield button for more details."
-msgstr "Личность удаленного контакта не подтверждена. Нажмите на кнопке со щитом для подробностей."
+msgid ""
+"Remote contact's identity not verified. Click the shield button for more "
+"details."
+msgstr ""
+"Личность удаленного контакта не подтверждена. Нажмите на кнопке со щитом для "
+"подробностей."
 
 #: ../src/chat_control.py:2238
 msgid "E2E encryption disabled"
 msgstr "E2E шифрование выключено"
 
-#: ../src/chat_control.py:2282
-#: ../src/chat_control.py:2295
+#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
 msgid "The following message was NOT encrypted"
 msgstr "Последнее сообщение НЕ БЫЛО зашифровано"
 
@@ -3346,24 +3482,27 @@ msgid "You just received a new message from \"%s\""
 msgstr "Получено новое сообщение от «%s»"
 
 #: ../src/chat_control.py:2567
-msgid "If you close this tab and you have history disabled, this message will be lost."
-msgstr "Если вы закроете эту вкладку и у вас отключена функция ведения истории сообщений, то это сообщение будет утеряно."
-
-#: ../src/chat_control.py:2713
-#: ../src/common/connection_handlers.py:1577
-#: ../src/common/connection_handlers.py:1700
-#: ../src/common/connection_handlers.py:1904
-#: ../src/common/connection_handlers.py:2054
-#: ../src/common/connection.py:454
-#: ../src/gajim.py:159
-#: ../src/session.py:138
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Если вы закроете эту вкладку и у вас отключена функция ведения истории "
+"сообщений, то это сообщение будет утеряно."
+
+#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
+#: ../src/gajim.py:159 ../src/session.py:138
 msgid "Database Error"
 msgstr "Ошибка базы данных"
 
 #: ../src/chat_control.py:2714
 #, python-format
-msgid "The database file (%s) cannot be read. Try to repair it or remove it (all history will be lost)."
-msgstr "Файл базы данных (%s) не может быть прочитан. Попробуйте восстановить его или удалить (вся история будет утеряна)."
+msgid ""
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
+"history will be lost)."
+msgstr ""
+"Файл базы данных (%s) не может быть прочитан. Попробуйте восстановить его "
+"или удалить (вся история будет утеряна)."
 
 #: ../src/chat_control.py:2962
 #, python-format
@@ -3378,33 +3517,23 @@ msgstr "создается БД истории"
 msgid "creating cache database"
 msgstr "создается БД истории"
 
-#: ../src/common/check_paths.py:276
-#: ../src/common/check_paths.py:283
-#: ../src/common/check_paths.py:290
-#: ../src/common/check_paths.py:297
-#: ../src/common/check_paths.py:304
-#: ../src/common/check_paths.py:311
-#: ../src/common/check_paths.py:326
-#: ../src/common/check_paths.py:341
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s должен быть директорией, а не файлом"
 
-#: ../src/common/check_paths.py:277
-#: ../src/common/check_paths.py:284
-#: ../src/common/check_paths.py:291
-#: ../src/common/check_paths.py:298
-#: ../src/common/check_paths.py:305
-#: ../src/common/check_paths.py:312
-#: ../src/common/check_paths.py:320
-#: ../src/common/check_paths.py:327
-#: ../src/common/check_paths.py:335
-#: ../src/common/check_paths.py:342
+#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
+#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
+#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
 msgid "Gajim will now exit"
 msgstr "Закончить работу"
 
-#: ../src/common/check_paths.py:319
-#: ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s должен быть файлом, а не директорией"
@@ -3450,13 +3579,11 @@ msgstr "Не в сети — отключен"
 msgid "Presence description:"
 msgstr "Описание присутствия:"
 
-#: ../src/common/commands.py:149
-#: ../src/common/commands.py:317
+#: ../src/common/commands.py:149 ../src/common/commands.py:317
 msgid "The status has been changed."
 msgstr "Статус изменён."
 
-#: ../src/common/commands.py:181
-#: ../src/common/commands.py:207
+#: ../src/common/commands.py:181 ../src/common/commands.py:207
 msgid "Leave Groupchats"
 msgstr "Покинуть конференции"
 
@@ -3474,13 +3601,10 @@ msgid "Choose the groupchats you want to leave"
 msgstr "Выберите конференции, которые вы хотите покинуть"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:212
-#: ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57
-#: ../src/roster_window.py:814
-#: ../src/roster_window.py:1631
-#: ../src/roster_window.py:1633
-#: ../src/roster_window.py:5285
+#: ../src/common/commands.py:212 ../src/common/contacts.py:137
+#: ../src/common/helpers.py:57 ../src/roster_window.py:815
+#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
+#: ../src/roster_window.py:5323
 msgid "Groupchats"
 msgstr "Комнаты"
 
@@ -3510,7 +3634,9 @@ msgstr "Использовать DBus и Notification Daemon для показа
 
 #: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
-msgstr "Показывать в ростере только контакты со статусами «Доступен» и «Готов поболтать»."
+msgstr ""
+"Показывать в ростере только контакты со статусами «Доступен» и «Готов "
+"поболтать»."
 
 #: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
@@ -3537,8 +3663,11 @@ msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr "$S будет замещено текущим сообщением о статусе, $T — временем простоя."
 
 #: ../src/common/config.py:88
-msgid "When to show notification area icon. Can be 'never', 'on_event', 'always'."
-msgstr "Когда показывать иконку в области уведомлений. Возможные значения 'never', 'on_event', 'always'."
+msgid ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+msgstr ""
+"Когда показывать иконку в области уведомлений. Возможные значения 'never', "
+"'on_event', 'always'."
 
 #: ../src/common/config.py:93
 msgid "Incoming nickname color."
@@ -3581,16 +3710,15 @@ msgid "Status message text font."
 msgstr "Шрифт сообщения о статусе"
 
 #: ../src/common/config.py:105
-msgid "List (space separated) of rows (accounts and groups) that are collapsed."
-msgstr "Список (через пробел) строк (учётных записей и групп), которые свёрнуты."
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+"Список (через пробел) строк (учётных записей и групп), которые свёрнуты."
 
 #. sorted alphanum
-#: ../src/common/config.py:106
-#: ../src/common/config.py:505
-#: ../src/common/optparser.py:292
-#: ../src/common/optparser.py:488
-#: ../src/common/optparser.py:522
-#: ../src/gui_interface.py:3338
+#: ../src/common/config.py:106 ../src/common/config.py:505
+#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
+#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
 msgid "default"
 msgstr "По_умолчанию"
 
@@ -3609,32 +3737,63 @@ msgstr ""
 "«never» — не печатать время."
 
 #: ../src/common/config.py:114
-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 "Печатать время в беседе как в неточных часах. Степень неточности может быть от 1 до 4, 0 отключает эту функцию. 1 самые точные часы, 4 самые неточные. Используется только если режим печати времени установлен на «sometimes» (иногда)."
+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 ""
+"Печатать время в беседе как в неточных часах. Степень неточности может быть "
+"от 1 до 4, 0 отключает эту функцию. 1 самые точные часы, 4 самые неточные. "
+"Используется только если режим печати времени установлен на "
+"«sometimes» (иногда)."
 
 #: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Обрабатывать пары * / _ как возможные форматирующие символы."
 
 #: ../src/common/config.py:118
-msgid "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr "Если активно, то не будут удаляться */_. Так что *фыва* будет написано полужирным шрифтом, но * * удалены не будут"
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"Если активно, то не будут удаляться */_. Так что *фыва* будет написано "
+"полужирным шрифтом, но * * удалены не будут"
 
 #: ../src/common/config.py:121
-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 "Использовать разметку ReStructuredText для отправки HTML, плюс ascii форматирование, если оно выбрано. Синтаксис описан на http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.htm (Если вы хотите воспользоваться этой опцией, установите docutils)"
+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 ""
+"Использовать разметку ReStructuredText для отправки HTML, плюс ascii "
+"форматирование, если оно выбрано. Синтаксис описан на http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.htm (Если вы хотите "
+"воспользоваться этой опцией, установите docutils)"
 
 #: ../src/common/config.py:130
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr "Символ, который нужно добавлять к нику, когда используется дополнение (tab) в комнате."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Символ, который нужно добавлять к нику, когда используется дополнение (tab) "
+"в комнате."
 
 #: ../src/common/config.py:131
-msgid "Character to propose to add after desired nickname when desired nickname is used by someone else in group chat."
-msgstr "Символ, который будет добавляться после ника, когда желаемый ник уже занят кем-нибудь в комнате."
+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:159
-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 "Эта опция позволяет настроить отпечаток времени, который печатается в чатах. К примеру «[%H:%M]» будет показано как «[чч:мм]». Смотрите дополнительно документацию python к strftime (http://docs.python.org/lib/module-time.html)"
+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 ""
+"Эта опция позволяет настроить отпечаток времени, который печатается в чатах. "
+"К примеру «[%H:%M]» будет показано как «[чч:мм]». Смотрите дополнительно "
+"документацию python к strftime (http://docs.python.org/lib/module-time.html)"
 
 #: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
@@ -3645,16 +3804,23 @@ msgid "Characters that are printed after the nickname in conversations"
 msgstr "Символы, которые будут отображаться после ников в чате"
 
 #: ../src/common/config.py:164
-msgid "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
-msgstr "Определение команды для запуска при получении нового письма, например: /usr/bin/getmail -q"
+msgid ""
+"Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
+msgstr ""
+"Определение команды для запуска при получении нового письма, например: /usr/"
+"bin/getmail -q"
 
 #: ../src/common/config.py:166
 msgid "Add * and [n] in roster title?"
 msgstr "Добавлять * и [n] в окно ростера?"
 
 #: ../src/common/config.py:167
-msgid "How many lines to remember from previous conversation when a chat tab/window is reopened."
-msgstr "Сколько строк из предыдущей беседы выводить, когда вкладка/окно открываются вновь."
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr ""
+"Сколько строк из предыдущей беседы выводить, когда вкладка/окно открываются "
+"вновь."
 
 #: ../src/common/config.py:168
 msgid "How many minutes should last lines from previous conversation last."
@@ -3666,15 +3832,26 @@ msgstr "Количество строк истории сообщений, за
 
 #: ../src/common/config.py:170
 msgid "How many minutes back to request logs when a entering a groupchat."
-msgstr "За какой период (минут назад) запрашивать историю сообщений при входе в комнату."
+msgstr ""
+"За какой период (минут назад) запрашивать историю сообщений при входе в "
+"комнату."
 
 #: ../src/common/config.py:171
-msgid "How many seconds to wait before trying to autorejoin to a conference you are being disconnected from. Set to 0 to disable autorejoining."
-msgstr "Время ожидания в секундах перед попыткой снова автоматически войти в комнату, от которой вы были отключены. Чтобы отключить автоматический вход в этом случае, установите значение 0."
+msgid ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
+msgstr ""
+"Время ожидания в секундах перед попыткой снова автоматически войти в "
+"комнату, от которой вы были отключены. Чтобы отключить автоматический вход в "
+"этом случае, установите значение 0."
 
 #: ../src/common/config.py:173
-msgid "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour)."
-msgstr "Оправлять сообщения по Ctrl+Enter и Enter создает новую строку (как в Mirabilis ICQ)"
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Оправлять сообщения по Ctrl+Enter и Enter создает новую строку (как в "
+"Mirabilis ICQ)"
 
 #: ../src/common/config.py:175
 msgid "How many lines to store for Ctrl+KeyUP."
@@ -3682,48 +3859,92 @@ msgstr "Сколько строк хранить для Ctrl+Стрелка вв
 
 #: ../src/common/config.py:178
 #, python-format
-msgid "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary."
-msgstr "Введите свою ссылку с %s, в которой %s подменяет слово/фразу, или «WIKTIONARY», чтобы использовать Викисловарь."
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"Введите свою ссылку с %s, в которой %s подменяет слово/фразу, или "
+"«WIKTIONARY», чтобы использовать Викисловарь."
 
 #: ../src/common/config.py:181
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
-msgstr "Если отмечено, то Gajim'ом можно будет управлять удаленно с использованием gajim-remote."
+msgstr ""
+"Если отмечено, то Gajim'ом можно будет управлять удаленно с использованием "
+"gajim-remote."
 
 #: ../src/common/config.py:182
-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 False and they sync with global status) based upon the status of the network connection."
-msgstr "Если активно, тогда «слушать» сообщения от NetworkManager по D-Bus и изменять статус учетных записей в зависимости от состояния сетевого соединения (необходимо, чтобы учетные записи не имели установленной в «Неактивно» опции listen_to_network_manager и они должны синхронизировать свой статус с глобальным)"
+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 "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+"Если активно, тогда «слушать» сообщения от NetworkManager по D-Bus и "
+"изменять статус учетных записей в зависимости от состояния сетевого "
+"соединения (необходимо, чтобы учетные записи не имели установленной в "
+"«Неактивно» опции listen_to_network_manager и они должны синхронизировать "
+"свой статус с глобальным)"
 
 #: ../src/common/config.py:183
-msgid "Sent chat state notifications. Can be one of all, composing_only, disabled."
-msgstr "Отсылать уведомления о состоянии беседы. Варианты: all (все), composing_only (только печать), disabled (никаких уведомлений)."
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+"Отсылать уведомления о состоянии беседы. Варианты: all (все), composing_only "
+"(только печать), disabled (никаких уведомлений)."
 
 #: ../src/common/config.py:184
-msgid "Displayed chat state notifications in chat windows. Can be one of all, composing_only, disabled."
-msgstr "Отображать состояния беседы в окне беседы. Варианты: all (все), composing_only (только печать), disabled (никаких уведомлений)."
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+"Отображать состояния беседы в окне беседы. Варианты: all (все), "
+"composing_only (только печать), disabled (никаких уведомлений)."
 
 #: ../src/common/config.py:186
-msgid "When not printing time for every message (print_time==sometimes), print it every x minutes."
-msgstr "Если отключена печать времени для каждого сообщения, то печатать его каждые X минут."
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+"Если отключена печать времени для каждого сообщения, то печатать его каждые "
+"X минут."
 
 #: ../src/common/config.py:187
 msgid "Ask before closing a group chat tab/window."
 msgstr "Спрашивать перед закрытием окна/вкладки комнаты."
 
 #: ../src/common/config.py:188
-msgid "Always ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Всегда спрашивать перед закрытием окна/вкладки комнаты из этого списка. Комнаты в списке разделяются пробелом."
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Всегда спрашивать перед закрытием окна/вкладки комнаты из этого списка. "
+"Комнаты в списке разделяются пробелом."
 
 #: ../src/common/config.py:189
-msgid "Never ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Никогда не спрашивать перед закрытием окна/вкладки комнаты из этого списка. Комнаты в списке разделяются пробелом."
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Никогда не спрашивать перед закрытием окна/вкладки комнаты из этого списка. "
+"Комнаты в списке разделяются пробелом."
 
 #: ../src/common/config.py:190
-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 "Спрашивать перед закрытием окна разговора с вкладками, если существует элемент, который может потерять данные (разговор, личный разговор, разговор в комнате, которые не будут свёрнуты)"
+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:193
-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 "Разделенный запятыми список хостов, который мы отсылаем в дополнение к локальным интерфейсам при передаче файлов в случае, если мы за NAT или используется перенаправление портов."
+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 ""
+"Разделенный запятыми список хостов, который мы отсылаем в дополнение к "
+"локальным интерфейсам при передаче файлов в случае, если мы за NAT или "
+"используется перенаправление портов."
 
 #: ../src/common/config.py:195
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
@@ -3746,48 +3967,93 @@ msgid "Show close button in tab?"
 msgstr "Показывать кнопку закрытия на вкладке?"
 
 #: ../src/common/config.py:206
-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 numbers are more secure, but take longer to calculate when you start a session."
-msgstr "Список modp групп (через запятую) для использования в алгоритме Диффи-Хеллмана, начиная с наиболее предпочтительной. Допустимые группы: 1, 2, 5, 14, 15, 16, 17 и 18. Более высокие числа безопаснее, но требуют более длительных вычислений при начале сеанса."
+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 "
+"numbers are more secure, but take longer to calculate when you start a "
+"session."
+msgstr ""
+"Список modp групп (через запятую) для использования в алгоритме Диффи-"
+"Хеллмана, начиная с наиболее предпочтительной. Допустимые группы: 1, 2, 5, "
+"14, 15, 16, 17 и 18. Более высокие числа безопаснее, но требуют более "
+"длительных вычислений при начале сеанса."
 
 #: ../src/common/config.py:215
 msgid "Preview new messages in notification popup?"
 msgstr "Предпросмотр новых сообщений во всплывающем окне?"
 
 #: ../src/common/config.py:220
-msgid "A semicolon-separated list of words that will be highlighted in group chats."
-msgstr "Список слов (через точку с запятой), которые будут подсвечиваться в комнатах."
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+msgstr ""
+"Список слов (через точку с запятой), которые будут подсвечиваться в комнатах."
 
 #: ../src/common/config.py:221
-msgid "If True, quits Gajim when X button of Window Manager is clicked. This setting is taken into account only if notification icon is used."
-msgstr "Если активно, то Gajim будет завершаться при нажатии на кнопку закрытия окна. Эта опция учитывается, только если используется иконка в области уведомлений."
+msgid ""
+"If True, quits Gajim when X button of Window Manager is clicked. This "
+"setting is taken into account only if notification icon is used."
+msgstr ""
+"Если активно, то Gajim будет завершаться при нажатии на кнопку закрытия "
+"окна. Эта опция учитывается, только если используется иконка в области "
+"уведомлений."
 
 #: ../src/common/config.py:222
-msgid "If True, Gajim will check if it's the default jabber client on each startup."
-msgstr "Если активно, то Gajim будет проверять при запуске, является ли он jabber-клиентом по умолчанию."
+msgid ""
+"If True, Gajim will check if it's the default jabber client on each startup."
+msgstr ""
+"Если активно, то Gajim будет проверять при запуске, является ли он jabber-"
+"клиентом по умолчанию."
 
 #: ../src/common/config.py:223
-msgid "If True, Gajim will display an icon on each tab containing unread messages. Depending on the theme, this icon may be animated."
-msgstr "Если активно, то Gajim отображает иконку на каждой вкладке, которая содержит непрочитанные сообщения. В зависимости от темы, она может быть анимированной."
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"Если активно, то Gajim отображает иконку на каждой вкладке, которая содержит "
+"непрочитанные сообщения. В зависимости от темы, она может быть анимированной."
 
 #: ../src/common/config.py:224
-msgid "If True, Gajim will display the status message, if not empty, for every contact under the contact name in roster window."
-msgstr "Если активно то Gajim будет отображать сообщение о статусе, если оно не пустое, для каждого контакта под именем контакта в окне ростера"
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+msgstr ""
+"Если активно то Gajim будет отображать сообщение о статусе, если оно не "
+"пустое, для каждого контакта под именем контакта в окне ростера"
 
 #: ../src/common/config.py:230
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr "Определяет позицию аватар в ростере. Может быть left или right"
 
 #: ../src/common/config.py:231
-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 будет запрашивать аватару для каждого контакта, у которого её не было в последний раз или она уже слишком старая."
+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:232
-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 "Если неактивно, то Gajim больше не будет показывать строку статуса в окне беседы, когда контакт меняет его или её статус и/или сообщение о статусе."
+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 ""
+"Если неактивно, то Gajim больше не будет показывать строку статуса в окне "
+"беседы, когда контакт меняет его или её статус и/или сообщение о статусе."
 
 #: ../src/common/config.py:233
-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 status and/or his or her status message. If \"all\" Gajim will print all status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves group chat."
-msgstr "может быть «none», «all» или «in_and_out». Если установлено «none», то Gajim больше не будет выводить сообщения о статусе в комнатах, когда участник меняет свой статус или сообщение о статусе. Если установлено в «all», то Gajim будет выводить все сообщения о статусе. Если установлено в «in_and_out», то Gajim будет выводить сообщение только когда кто-то входит или выходит из комнаты."
+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 "
+"status and/or his or her status message. If \"all\" Gajim will print all "
+"status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
+"group chat."
+msgstr ""
+"может быть «none», «all» или «in_and_out». Если установлено «none», то Gajim "
+"больше не будет выводить сообщения о статусе в комнатах, когда участник "
+"меняет свой статус или сообщение о статусе. Если установлено в «all», то "
+"Gajim будет выводить все сообщения о статусе. Если установлено в "
+"«in_and_out», то Gajim будет выводить сообщение только когда кто-то входит "
+"или выходит из комнаты."
 
 #: ../src/common/config.py:235
 msgid "Background color of contacts when they just signed in."
@@ -3798,7 +4064,8 @@ msgid "Background color of contacts when they just signed out."
 msgstr "Фоновый цвет контакта, который только что вышел."
 
 #: ../src/common/config.py:238
-msgid "If True, restored messages will use a smaller font than the default one."
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
 msgstr "Если активно, то восстановленные сообщения будут иметь меньший шрифт."
 
 #: ../src/common/config.py:239
@@ -3810,29 +4077,45 @@ msgid "Don't show roster in the system taskbar."
 msgstr "Не показывать ростер в панели задач."
 
 #: ../src/common/config.py:241
-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 "Если активно и установлены GTK+ и PyGTK версий 2.8 и выше, то окно будет мигать (поведение по умолчанию для большинства менеджеров окон) когда присутствуют не просмотренные события."
+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 ""
+"Если активно и установлены GTK+ и PyGTK версий 2.8 и выше, то окно будет "
+"мигать (поведение по умолчанию для большинства менеджеров окон) когда "
+"присутствуют не просмотренные события."
 
 #: ../src/common/config.py:243
-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 presences."
-msgstr "Jabberd1.4 не понимает sha данные при входе в комнату, защищенную паролем. Установите эту опцию в «Неактивно» для того, чтобы запретить отсылку sha данных в информации для комнат"
+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 "
+"presences."
+msgstr ""
+"Jabberd1.4 не понимает sha данные при входе в комнату, защищенную паролем. "
+"Установите эту опцию в «Неактивно» для того, чтобы запретить отсылку sha "
+"данных в информации для комнат"
 
 #. always, never, peracct, pertype should not be translated
 #: ../src/common/config.py:246
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
-"'always_with_roster' - Like 'always' but the messages are in a single window along with the roster.\n"
+"'always_with_roster' - Like 'always' but the messages are in a single window "
+"along with the roster.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a specific window."
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"specific window."
 msgstr ""
 "Управляет окном, где помещаются новые сообщения.\n"
 "«always» — Все сообщения отправляются в одно окно.\n"
 "«always_with_roster» — Как «always» но сообщения в одном окне с ростером.\n"
 "«never» — Все сообщения приходят в свои отдельные окна.\n"
 "«peracct» — Сообщения для каждой учетной записи отсылаются в свои окна.\n"
-"«pertype» — Каждый тип сообщения (например, беседа или комната) отсылается в свое окно. Заметьте, что при изменении этого параметра требуется перезапуск Gajim, чтобы изменения вступили в силу."
+"«pertype» — Каждый тип сообщения (например, беседа или комната) отсылается в "
+"свое окно. Заметьте, что при изменении этого параметра требуется перезапуск "
+"Gajim, чтобы изменения вступили в силу."
 
 #: ../src/common/config.py:247
 msgid "If False, you will no longer see the avatar in the chat window."
@@ -3859,144 +4142,249 @@ msgid "Hides the group chat occupants list in group chat window."
 msgstr "Скрывает список посетителей в окне комнаты."
 
 #: ../src/common/config.py:253
-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 "Показывать ник в начале строки в чате только если предыдущее сообщение было написано другим участником."
+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:254
 msgid "Indentation when using merge consecutive nickname."
-msgstr "Разделитель, используемый при активированной настройке chat_merge_consecutive_nickname."
+msgstr ""
+"Разделитель, используемый при активированной настройке "
+"chat_merge_consecutive_nickname."
 
 #: ../src/common/config.py:255
 msgid "Smooth scroll message in conversation window"
 msgstr "Плавно прокручивать сообщения в окне чата"
 
 #: ../src/common/config.py:256
-msgid "List of colors, separated by \":\", that will be used to color nicknames in group chats."
-msgstr "Список цветов, разделенных «:», которые будут использоваться для раскраски ников в комнатах."
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
+msgstr ""
+"Список цветов, разделенных «:», которые будут использоваться для раскраски "
+"ников в комнатах."
 
 #: ../src/common/config.py:257
 msgid "Ctrl-Tab go to next composing tab when none is unread."
-msgstr "Использовать Ctrl-Tab, чтобы перейти к следующей вкладке с составляемым сообщением, когда нет непрочитанных сообщений."
+msgstr ""
+"Использовать Ctrl-Tab, чтобы перейти к следующей вкладке с составляемым "
+"сообщением, когда нет непрочитанных сообщений."
 
 #: ../src/common/config.py:258
-msgid "Should we show the confirm metacontacts creation dialog or not? Empty string means we never show the dialog."
-msgstr "Следует ли показывать диалог подтверждения о создании метаконтакта? Пустая строка означает, что сообщение не будет показываться вообще."
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+"Следует ли показывать диалог подтверждения о создании метаконтакта? Пустая "
+"строка означает, что сообщение не будет показываться вообще."
 
 #: ../src/common/config.py:259
-msgid "Should we show the confirm block contact dialog or not? Empty string means we never show the dialog."
-msgstr "Следует ли показывать диалог подтверждения блокировки контакта? Пустая строка означает, что сообщение не будет показываться вообще."
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Следует ли показывать диалог подтверждения блокировки контакта? Пустая "
+"строка означает, что сообщение не будет показываться вообще."
 
 #: ../src/common/config.py:260
-msgid "Should we show the confirm custom status dialog or not? Empty string means we never show the dialog."
-msgstr "Следует ли показывать диалог подтверждения блокировки контакта? Пустая строка означает, что сообщение не будет показываться вообще."
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Следует ли показывать диалог подтверждения блокировки контакта? Пустая "
+"строка означает, что сообщение не будет показываться вообще."
 
 #: ../src/common/config.py:261
-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 "Если активно, то у вас появится возможность назначить для учетной записи приоритет меньше нуля в окне настройки учетной записи. БУДЬТЕ ОСТОРОЖНЫ, если вы подключитесь с отрицательным приоритетом, то вы НЕ получите никаких сообщений от сервера."
+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:262
-msgid "If True, Gajim will use Gnome Keyring (if available) to store account passwords."
-msgstr "Если активно, Gajim будет использовать (если возможно) Gnome Keyring для хранения паролей учетных записей."
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+"Если активно, Gajim будет использовать (если возможно) Gnome Keyring для "
+"хранения паролей учетных записей."
 
 #: ../src/common/config.py:263
-msgid "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store account passwords."
-msgstr "Если активно, Gajim будет использовать (если возможно) KDE Wallet для хранения паролей учетных записей."
+msgid ""
+"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+"account passwords."
+msgstr ""
+"Если активно, Gajim будет использовать (если возможно) KDE Wallet для "
+"хранения паролей учетных записей."
 
 #: ../src/common/config.py:264
-msgid "If True, Gajim will show number of online and total contacts in account and group rows."
-msgstr "Если активно, Gajim будет показывать количество контактов онлайн/всего в строках с названием учетной записи и групп."
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+"Если активно, Gajim будет показывать количество контактов онлайн/всего в "
+"строках с названием учетной записи и групп."
 
 #: ../src/common/config.py:265
-msgid "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages as if they were of this type"
-msgstr "Может быть пусто, 'chat' или 'normal'. Если не пусто — обрабатывать все входящие сообщения так, как будто бы они были этого типа."
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+msgstr ""
+"Может быть пусто, 'chat' или 'normal'. Если не пусто — обрабатывать все "
+"входящие сообщения так, как будто бы они были этого типа."
 
 #: ../src/common/config.py:266
-msgid "If True, Gajim will scroll and select the contact who sent you the last message, if chat window is not already opened."
-msgstr "Если активно, Gajim прокрутит ростер и выделит контакт, который написал вам сообщение последним, если окно чата еще небыло открыто."
+msgid ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+"Если активно, Gajim прокрутит ростер и выделит контакт, который написал вам "
+"сообщение последним, если окно чата еще небыло открыто."
 
 #: ../src/common/config.py:267
-msgid "If True, Gajim will convert string between $$ and $$ to an image using dvips and convert before insterting it in chat window."
-msgstr "Если активно, Gajim будет конвертировать строку между $$ и $$ в изображение, используя dvips и конвертировать до вставки его в окно чата."
+msgid ""
+"If True, Gajim will convert string between $$ and $$ to an image using dvips "
+"and convert before insterting it in chat window."
+msgstr ""
+"Если активно, Gajim будет конвертировать строку между $$ и $$ в изображение, "
+"используя dvips и конвертировать до вставки его в окно чата."
 
 #: ../src/common/config.py:268
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Время не активности прежде чем окно изменения статуса закроется."
 
 #: ../src/common/config.py:269
-msgid "Maximum number of lines that are printed in conversations. Oldest lines are cleared."
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
 msgstr "Максимальное количество строк в окне. Старые строки будут удалены."
 
 #: ../src/common/config.py:270
-msgid "If True, notification windows from notification-daemon will be attached to notification icon."
-msgstr "Если активно, окно уведомления от notification-daemon будет прикреплено к области уведомлений."
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"notification icon."
+msgstr ""
+"Если активно, окно уведомления от notification-daemon будет прикреплено к "
+"области уведомлений."
 
 #: ../src/common/config.py:271
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Выберите интервал между 2 проверками на бездействие."
 
 #: ../src/common/config.py:272
-msgid "Change the value to change the size of latex formulas displayed. The higher is larger."
+msgid ""
+"Change the value to change the size of latex formulas displayed. The higher "
+"is larger."
 msgstr "Измените значение для изменения размера отображаемых формул LaTeX."
 
 #: ../src/common/config.py:273
-msgid "Valid uri schemes. Only schemes in this list will be accepted as \"real\" uri. (mailto and xmpp are handled separately)"
-msgstr "Допустимые uri схемы. Только схемы из этого списка будут приняты как «real» uri.(mailto и xmpp обрабатываются отдельно)"
+msgid ""
+"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
+"uri. (mailto and xmpp are handled separately)"
+msgstr ""
+"Допустимые uri схемы. Только схемы из этого списка будут приняты как «real» "
+"uri.(mailto и xmpp обрабатываются отдельно)"
 
 #: ../src/common/config.py:274
-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 "Запрашивать сообщение о статусе «отключен» у всех отключенных контактов при установлении соединения с учетной записью. ВНИМАНИЕ: Данная опция приводит к большому количеству посылаемых запросов!"
+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:275
 msgid "If True, completion in groupchats will be like a shell auto-completion"
-msgstr "Если Активно, автодополнение ников в конференциях будет работать как автодополнение в командной оболочке"
+msgstr ""
+"Если Активно, автодополнение ников в конференциях будет работать как "
+"автодополнение в командной оболочке"
 
 #: ../src/common/config.py:276
-msgid "When is self contact row displayed. Can be \"always\", \"when_other_resource\" or \"never\""
-msgstr "В каких случаях показывать список своих собственных контактов. Может принимать значения «always» (всегда), «when_other_resource» (если другой ресурс) и «never» (никогда)."
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+"В каких случаях показывать список своих собственных контактов. Может "
+"принимать значения «always» (всегда), «when_other_resource» (если другой "
+"ресурс) и «never» (никогда)."
 
 #: ../src/common/config.py:281
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
-msgstr "Опциональное изменение частоты кадров видео в jingle. Например: 10/1 или 25/2"
+msgstr ""
+"Опциональное изменение частоты кадров видео в jingle. Например: 10/1 или 25/2"
 
 #: ../src/common/config.py:282
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr "Опциональное изменение размера кадра видео в jingle. Например: 320x240"
 
 #: ../src/common/config.py:285
-msgid "If True, Gajim will try to use a STUN server when using jingle. The one in \"stun_server\" option, or the one given by the jabber server."
-msgstr "Если включено, Gajim попробует использовать STUN сервер с jingle. Либо указанный опцией \"stun_server\", либо предоставленный jabber сервером."
+msgid ""
+"If True, Gajim will try to use a STUN server when using jingle. The one in "
+"\"stun_server\" option, or the one given by the jabber server."
+msgstr ""
+"Если включено, Gajim попробует использовать STUN сервер с jingle. Либо "
+"указанный опцией \"stun_server\", либо предоставленный jabber сервером."
 
 #: ../src/common/config.py:286
 msgid "STUN server to use when using jingle"
 msgstr "Сервер STUN для использования с jingle"
 
 #: ../src/common/config.py:287
-msgid "If True, Gajim will show affiliation of groupchat occupants by adding a colored square to the status icon"
-msgstr "Если включено, Gajim покажет принадлежность пользователей группового чата, добавив цветные квадраты к значку статуса"
+msgid ""
+"If True, Gajim will show affiliation of groupchat occupants by adding a "
+"colored square to the status icon"
+msgstr ""
+"Если включено, Gajim покажет принадлежность пользователей группового чата, "
+"добавив цветные квадраты к значку статуса"
 
 #: ../src/common/config.py:300
-msgid "Priority will change automatically according to your status. Priorities are defined in autopriority_* options."
-msgstr "Приоритет будет изменяться автоматически согласно вашему статусу. Приоритеты для статусов задаются в пункте autopriority_* ."
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+"Приоритет будет изменяться автоматически согласно вашему статусу. Приоритеты "
+"для статусов задаются в пункте autopriority_* ."
 
 #: ../src/common/config.py:308
-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 "Статус, используемый при автоподключении. Варианты: отключен, в сети, готов поболтать, отошел, недоступен, не беспокоить, невидимка"
+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:309
 msgid "If enabled, restore the last status that was used."
 msgstr "Если включено, восстанавливать последний использованный статус."
 
 #: ../src/common/config.py:311
-msgid "If True, Contacts requesting authorization will be automatically accepted."
-msgstr "Если активно, контакты, запрашивающие авторизацию, будут автоматически её получать."
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
+msgstr ""
+"Если активно, контакты, запрашивающие авторизацию, будут автоматически её "
+"получать."
 
 #: ../src/common/config.py:312
-msgid "If False, this account will be disabled and will not appear in roster window."
-msgstr "Если неактивно, эта учетная запись будет отключена и не будет отображаться в окне ростера."
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr ""
+"Если неактивно, эта учетная запись будет отключена и не будет отображаться в "
+"окне ростера."
 
 #: ../src/common/config.py:315
-msgid "If disabled, don't sign presences with GPG key, even if GPG is configured."
-msgstr "Если отключено, не подписывать присутствие ключом GPG, даже если GPG настроен."
+msgid ""
+"If disabled, don't sign presences with GPG key, even if GPG is configured."
+msgstr ""
+"Если отключено, не подписывать присутствие ключом GPG, даже если GPG "
+"настроен."
 
 #: ../src/common/config.py:317
 msgid "Enable ESessions encryption for this account."
@@ -4004,23 +4392,34 @@ msgstr "Включить ESessions шифрование для данной уч
 
 #: ../src/common/config.py:318
 msgid "Should Gajim automatically start an encrypted session when possible?"
-msgstr "Должен ли Gajim по возможности автоматически начинать зашифрованный сеанс?"
+msgstr ""
+"Должен ли Gajim по возможности автоматически начинать зашифрованный сеанс?"
 
 #: ../src/common/config.py:319
-msgid "Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain"
-msgstr "Упорядоченный список (разделённый пробелами) типов подключения, которые будут перепробованы. Может включать tls, ssl или plain"
+msgid ""
+"Ordered list (space separated) of connection type to try. Can contain tls, "
+"ssl or plain"
+msgstr ""
+"Упорядоченный список (разделённый пробелами) типов подключения, которые "
+"будут перепробованы. Может включать tls, ssl или plain"
 
 #: ../src/common/config.py:320
-msgid "Show a warning dialog before sending password on an plaintext connection."
-msgstr "Если отмечено, то Gajim будет будет спрашивать вас перед отправкой пароля через незащищенное соединение."
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection."
+msgstr ""
+"Если отмечено, то Gajim будет будет спрашивать вас перед отправкой пароля "
+"через незащищенное соединение."
 
 #: ../src/common/config.py:321
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Предупреждать, прежде чем использовать стандартную библиотеку SSL."
 
 #: ../src/common/config.py:322
-msgid "Show a warning dialog before sending PLAIN password over a plain conenction."
-msgstr "Если отмечено, Gajim будет спрашивать вас перед отправкой пароля через незащищенное соединение."
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain conenction."
+msgstr ""
+"Если отмечено, Gajim будет спрашивать вас перед отправкой пароля через "
+"незащищенное соединение."
 
 #: ../src/common/config.py:324
 msgid "Space separated list of ssl errors to ignore."
@@ -4036,8 +4435,12 @@ msgid "XMPP ping sent after inactivity"
 msgstr "пинг XMPP, посылаемый после бездействия"
 
 #: ../src/common/config.py:338
-msgid "How many seconds to wait for the answer of ping alive packet before we try to reconnect."
-msgstr "Время ожидания (в секундах) ответа на пинг перед повторной попыткой соединения."
+msgid ""
+"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:342
@@ -4045,8 +4448,12 @@ msgid "Jabberd2 workaround"
 msgstr "Костыль для jabberd2"
 
 #: ../src/common/config.py:345
-msgid "If checked, Gajim will use your IP and proxies defined in file_transfer_proxies option for file transfer."
-msgstr "Если отмечено, Gajim будет использовать ваш IP и прокси, определенные в параметре file_transfer_proxies для передачи файлов"
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+"Если отмечено, Gajim будет использовать ваш IP и прокси, определенные в "
+"параметре file_transfer_proxies для передачи файлов"
 
 #: ../src/common/config.py:359
 msgid "Answer to receipt requests"
@@ -4057,8 +4464,12 @@ msgid "Sent receipt requests"
 msgstr "Посылать запросы уведомления"
 
 #: ../src/common/config.py:370
-msgid "When negotiating an encrypted session, should Gajim assume you want your messages to be logged?"
-msgstr "Когда устанавливается зашифрованный сеанс, должен ли Gajim предположить, что вы хотите сохранить историю сообщений?"
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+"Когда устанавливается зашифрованный сеанс, должен ли Gajim предположить, что "
+"вы хотите сохранить историю сообщений?"
 
 #: ../src/common/config.py:373
 msgid "Message that is sent to contacts you want to add"
@@ -4073,11 +4484,14 @@ msgid "Is OpenPGP enabled for this contact?"
 msgstr "Используется ли для этого контакта OpenPGP?"
 
 #: ../src/common/config.py:437
-msgid "Should Gajim automatically start an encrypted session with this contact when possible?"
-msgstr "Должен ли Gajim по возможности автоматически начинать для данного контакта зашифрованный сеанс?"
+msgid ""
+"Should Gajim automatically start an encrypted session with this contact when "
+"possible?"
+msgstr ""
+"Должен ли Gajim по возможности автоматически начинать для данного контакта "
+"зашифрованный сеанс?"
 
-#: ../src/common/config.py:438
-#: ../src/common/config.py:441
+#: ../src/common/config.py:438 ../src/common/config.py:441
 msgid "Language for which we want to check misspelled words"
 msgstr "Язык, который используется при проверке правописания"
 
@@ -4089,20 +4503,23 @@ msgstr "все или статусы, разделенные пробелом"
 msgid "'yes', 'no', or 'both'"
 msgstr "«yes» (да), «no» (нет) или «both» (оба)"
 
-#: ../src/common/config.py:449
-#: ../src/common/config.py:451
-#: ../src/common/config.py:452
-#: ../src/common/config.py:455
+#: ../src/common/config.py:449 ../src/common/config.py:451
+#: ../src/common/config.py:452 ../src/common/config.py:455
 #: ../src/common/config.py:456
 msgid "'yes', 'no' or ''"
 msgstr "«yes» (да), «no» (нет) или «» (пусто)"
 
 #: ../src/common/config.py:460
-msgid "State whether plugins should be activated on exit (this is saved on Gajim exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI instead."
-msgstr "Состояние плагинов при выходе(это сохраняется при выключении Gajim). Эта опция НЕ ДОЛЖНА использоваться для включения или выключения плагинов. Используйте графический интерфейс для этого."
+msgid ""
+"State whether plugins should be activated on exit (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
+msgstr ""
+"Состояние плагинов при выходе(это сохраняется при выключении Gajim). Эта "
+"опция НЕ ДОЛЖНА использоваться для включения или выключения плагинов. "
+"Используйте графический интерфейс для этого."
 
-#: ../src/common/config.py:465
-#: ../src/common/pep.py:157
+#: ../src/common/config.py:465 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Сплю"
 
@@ -4114,8 +4531,7 @@ msgstr "Скоро буду"
 msgid "Back in some minutes."
 msgstr "Вернусь через несколько минут"
 
-#: ../src/common/config.py:467
-#: ../src/common/pep.py:127
+#: ../src/common/config.py:467 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Ем"
 
@@ -4131,8 +4547,7 @@ msgstr "В кино"
 msgid "I'm watching a movie."
 msgstr "Смотрю кино"
 
-#: ../src/common/config.py:469
-#: ../src/common/pep.py:186
+#: ../src/common/config.py:469 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Работаю"
 
@@ -4164,8 +4579,7 @@ msgstr "Я здесь."
 msgid "I'm free for chat."
 msgstr "Я готов поболтать."
 
-#: ../src/common/config.py:484
-#: ../src/config.py:1615
+#: ../src/common/config.py:484 ../src/config.py:1600
 msgid "Be right back."
 msgstr "Скоро буду."
 
@@ -4177,26 +4591,28 @@ msgstr "Меня нет."
 msgid "Do not disturb."
 msgstr "Не беспокоить."
 
-#: ../src/common/config.py:487
-#: ../src/common/config.py:488
+#: ../src/common/config.py:487 ../src/common/config.py:488
 msgid "Bye!"
 msgstr "Пока!"
 
 #: ../src/common/config.py:498
-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 появляется сообщение, которое содержит слово из списка muc_highlight_words, или когда сообщение содержит ваш ник."
+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 появляется сообщение, которое "
+"содержит слово из списка muc_highlight_words, или когда сообщение содержит "
+"ваш ник."
 
 #: ../src/common/config.py:499
 msgid "Sound to play when any MUC message arrives."
 msgstr "Звук, который нужно проигрывать, когда приходит любое сообщение MUC."
 
-#: ../src/common/config.py:508
-#: ../src/common/optparser.py:306
+#: ../src/common/config.py:508 ../src/common/optparser.py:308
 msgid "green"
 msgstr "зеленый"
 
-#: ../src/common/config.py:512
-#: ../src/common/optparser.py:292
+#: ../src/common/config.py:512 ../src/common/optparser.py:294
 msgid "grocery"
 msgstr "овощной"
 
@@ -4208,155 +4624,73 @@ msgstr "телесный"
 msgid "marine"
 msgstr "морской"
 
-#: ../src/common/connection_handlers.py:95
+#: ../src/common/connection_handlers.py:94
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Не могу загрузить модуль «idle»"
 
-#: ../src/common/connection_handlers.py:128
+#: ../src/common/connection_handlers.py:127
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Данные о регистрации для транспорта %s не пришли вовремя."
 
-#: ../src/common/connection_handlers.py:135
+#: ../src/common/connection_handlers.py:134
 msgid "Registration succeeded"
 msgstr "Регистрация завершена"
 
-#: ../src/common/connection_handlers.py:136
+#: ../src/common/connection_handlers.py:135
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Регистрация сервиса %s завершена успешно"
 
-#: ../src/common/connection_handlers.py:144
+#: ../src/common/connection_handlers.py:143
 msgid "Registration failed"
 msgstr "Ошибка регистрации"
 
-#: ../src/common/connection_handlers.py:144
+#: ../src/common/connection_handlers.py:143
 #, python-format
-msgid "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
-msgstr "Регистрация сервиса %(agent)s завершилась ошибкой: %(error)s: %(error_msg)s"
+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:467
-#: ../src/common/connection_handlers.py:1575
-#: ../src/common/connection_handlers.py:1698
-#: ../src/common/connection_handlers.py:1901
-#: ../src/common/connection_handlers.py:2052
-#: ../src/common/connection.py:451
+#: ../src/common/connection_handlers.py:466
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
 #: ../src/gajim.py:341
 msgid "Disk Write Error"
 msgstr "Ошибка записи на диск"
 
-#: ../src/common/connection_handlers.py:703
-#: ../src/common/connection.py:1477
+#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
 msgid "Invisibility not supported"
 msgstr "Невидимость не поддерживается"
 
-#: ../src/common/connection_handlers.py:704
-#: ../src/common/connection.py:1478
+#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Учетная запись %s не поддерживает невидимость."
 
-#: ../src/common/connection_handlers.py:1388
-#: ../src/common/connection.py:255
-#: ../src/config.py:2106
-#: ../src/config.py:2115
-#: ../src/config.py:2183
-#: ../src/config.py:3578
-#: ../src/dataforms_widget.py:603
-#: ../src/dialogs.py:2931
+#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
+#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
+#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
 msgid "Invalid Jabber ID"
 msgstr "Неверный Jabber ID"
 
-#: ../src/common/connection_handlers.py:1389
+#: ../src/common/connection_handlers.py:1405
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr "Было получено сообщение от неверного JID, оно было проигнорировано."
 
-#: ../src/common/connection_handlers.py:1578
-#: ../src/common/connection_handlers.py:1701
-#: ../src/common/connection_handlers.py:1905
-#: ../src/common/connection_handlers.py:2055
-#: ../src/common/connection.py:455
-#: ../src/gajim.py:160
-#: ../src/session.py:139
-#, 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 "Файл базы данных (%s) не может быть прочитан. Попробуйте восстановить его(см. http://trac.gajim.org/wiki/DatabaseBackup) или удалить (вся история будет утеряна)."
-
-#: ../src/common/connection_handlers.py:1749
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Ник недопустим: %s"
-
-#: ../src/common/connection_handlers.py:1846
-#: ../src/common/connection_handlers.py:1855
-#: ../src/common/connection_handlers.py:1862
-#: ../src/common/connection_handlers.py:1866
-#: ../src/common/connection_handlers.py:1870
-#: ../src/common/connection_handlers.py:1875
-#: ../src/gui_interface.py:139
-msgid "Unable to join group chat"
-msgstr "Не получается войти в комнату"
-
-#: ../src/common/connection_handlers.py:1847
-#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr "Было достигнуто максимальное количество пользователей %s"
-
-#: ../src/common/connection_handlers.py:1856
-#, python-format
-msgid "You are banned from group chat %s."
-msgstr "Вам запрещено входить в комнату %s."
-
-#: ../src/common/connection_handlers.py:1863
-#, python-format
-msgid "Group chat %s does not exist."
-msgstr "Комнаты %s не существует."
-
-#: ../src/common/connection_handlers.py:1867
-msgid "Group chat creation is restricted."
-msgstr "Создание комнат запрещено."
-
-#: ../src/common/connection_handlers.py:1871
-#, python-format
-msgid "Your registered nickname must be used in group chat %s."
-msgstr "Необходимо использовать ваш зарегистрированный ник в комнате %s."
-
-#: ../src/common/connection_handlers.py:1876
-#, 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:1920
-msgid "Room has been destroyed"
-msgstr "Комната была удалена"
-
-#: ../src/common/connection_handlers.py:1928
-#, python-format
-msgid "You can join this room instead: %s"
-msgstr "Взамен, вы можете присоединиться к комнате: %s"
-
-#: ../src/common/connection_handlers.py:1964
-msgid "I would like to add you to my roster."
-msgstr "Вы не возражаете, если я добавлю Вас в свой ростер?"
-
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1985
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "теперь мы подписались на %s"
-
-#: ../src/common/connection_handlers.py:1987
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "%s хочет отменить подписку"
-
-#: ../src/common/connection_handlers.py:1989
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
+#: ../src/gajim.py:160 ../src/session.py:139
 #, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "теперь мы отписались от %s"
+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 ""
+"Файл базы данных (%s) не может быть прочитан. Попробуйте восстановить его"
+"(см. http://trac.gajim.org/wiki/DatabaseBackup) или удалить (вся история "
+"будет утеряна)."
 
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
@@ -4486,8 +4820,7 @@ msgstr "Назначение ключа не включает подписыва
 msgid "Application verification failure"
 msgstr "Ошибка при проверке приложения"
 
-#: ../src/common/connection.py:256
-#: ../src/dialogs.py:2932
+#: ../src/common/connection.py:256 ../src/dialogs.py:2948
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Не удалось передать сообщение %s — этот JID неверен."
@@ -4550,16 +4883,14 @@ msgstr "Неверный ответ"
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Транспорт %(name)s неверно ответил на запрос о регистрации: %(error)s"
 
-#: ../src/common/connection.py:1167
-#: ../src/common/connection.py:1296
+#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
 #: ../src/common/connection.py:1792
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Не могу соединиться с «%s»"
 
-#: ../src/common/connection.py:1168
-#: ../src/gui_interface.py:756
+#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
 msgid "Check your connection or try again later."
 msgstr "Проверьте настройки сети или попробуйте еще раз позже."
 
@@ -4572,14 +4903,12 @@ msgstr "Сервер ответил: %s"
 msgid "Connection to proxy failed"
 msgstr "Соединение с прокси разорвалось"
 
-#: ../src/common/connection.py:1217
-#: ../src/common/connection.py:1276
+#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Не могу соединиться с %s"
 
-#: ../src/common/connection.py:1218
-#: ../src/common/connection.py:1277
+#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Связь с учетной записью %s была потеряна.Попытка подключения."
@@ -4626,8 +4955,12 @@ msgstr "Ошибка при удалении списка доступа"
 
 #: ../src/common/connection.py:1401
 #, 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 "Список доступа %s не может быть удален. Возможно, он используется одним из ваших активных ресурсов. Отключите ресурс и попробуйте снова."
+msgid ""
+"Privacy list %s has not been removed. It is maybe active in one of your "
+"connected resources. Deactivate it and try again."
+msgstr ""
+"Список доступа %s не может быть удален. Возможно, он используется одним из "
+"ваших активных ресурсов. Отключите ресурс и попробуйте снова."
 
 #: ../src/common/connection.py:1658
 #, python-format
@@ -4638,8 +4971,7 @@ msgstr "Контакт для отправки: «%s» (%s)"
 msgid "Sent contacts:"
 msgstr "Контакты для отправки:"
 
-#: ../src/common/connection.py:1807
-#: ../src/common/connection.py:1830
+#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
 msgid "Not fetched because of invisible status"
 msgstr "Нельзя получить из-за невидимости"
 
@@ -4650,26 +4982,20 @@ msgstr "Ошибка отказа от регистрации"
 #: ../src/common/connection.py:2263
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
-msgstr "Отказ от регистрации на сервере %(server)s завершился ошибкой: %(error)s"
+msgstr ""
+"Отказ от регистрации на сервере %(server)s завершился ошибкой: %(error)s"
 
-#: ../src/common/contacts.py:135
-#: ../src/common/helpers.py:57
-#: ../src/gui_interface.py:675
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
+#: ../src/gui_interface.py:551
 msgid "Observers"
 msgstr "Наблюдатели"
 
-#: ../src/common/contacts.py:139
-#: ../src/common/contacts.py:366
-#: ../src/common/helpers.py:57
-#: ../src/disco.py:120
-#: ../src/disco.py:121
-#: ../src/disco.py:1499
-#: ../src/gui_interface.py:425
-#: ../src/roster_window.py:853
-#: ../src/roster_window.py:1542
-#: ../src/roster_window.py:1623
-#: ../src/roster_window.py:1625
-#: ../src/roster_window.py:1787
+#: ../src/common/contacts.py:139 ../src/common/contacts.py:366
+#: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
+#: ../src/disco.py:1517 ../src/roster_window.py:854
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
+#: ../src/roster_window.py:2466
 msgid "Transports"
 msgstr "Транспорты"
 
@@ -4682,8 +5008,7 @@ msgstr "Не в ростере"
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "На компьютере не установлена библиотека D-Bus для Python"
 
-#: ../src/common/dbus_support.py:41
-#: ../src/common/dbus_support.py:52
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Возможности работы Gajim с D-Bus не могут быть использованы"
 
@@ -4706,7 +5031,9 @@ msgstr "База данных не может быть загружена."
 
 #: ../src/common/exceptions.py:56
 msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr "Сервис недоступен: Gajim не запущен или отключена функция удаленного управления (настройка remote_control)"
+msgstr ""
+"Сервис недоступен: Gajim не запущен или отключена функция удаленного "
+"управления (настройка remote_control)"
 
 #: ../src/common/exceptions.py:67
 msgid "D-Bus is not present on this machine or python module is missing"
@@ -4845,8 +5172,7 @@ msgstr "без пяти %(1)s"
 msgid "%(1)s o'clock"
 msgstr "%(1)s"
 
-#: ../src/common/fuzzyclock.py:49
-#: ../src/common/fuzzyclock.py:51
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:51
 msgid "Night"
 msgstr "Ночь"
 
@@ -4882,8 +5208,7 @@ msgstr "Поздний вечер"
 msgid "Start of week"
 msgstr "Начало недели"
 
-#: ../src/common/fuzzyclock.py:53
-#: ../src/common/fuzzyclock.py:54
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
 msgid "Middle of week"
 msgstr "Середина недели"
 
@@ -4927,8 +5252,7 @@ msgstr "Неверный символ в ресурсе"
 msgid "_Busy"
 msgstr "_Занят"
 
-#: ../src/common/helpers.py:217
-#: ../src/tooltips.py:195
+#: ../src/common/helpers.py:217 ../src/tooltips.py:195
 msgid "Busy"
 msgstr "Занят"
 
@@ -4940,8 +5264,7 @@ msgstr "_Недоступен"
 msgid "_Free for Chat"
 msgstr "_Готов поболтать"
 
-#: ../src/common/helpers.py:227
-#: ../src/tooltips.py:191
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Free for Chat"
 msgstr "Готов поболтать"
 
@@ -4949,8 +5272,7 @@ msgstr "Готов поболтать"
 msgid "?user status:_Available"
 msgstr "Д_оступен"
 
-#: ../src/common/helpers.py:232
-#: ../src/tooltips.py:189
+#: ../src/common/helpers.py:232 ../src/tooltips.py:189
 msgid "?user status:Available"
 msgstr "Доступен"
 
@@ -4966,8 +5288,7 @@ msgstr "_Ушел"
 msgid "_Offline"
 msgstr "_Отключен"
 
-#: ../src/common/helpers.py:244
-#: ../src/tooltips.py:199
+#: ../src/common/helpers.py:244 ../src/tooltips.py:199
 msgid "Offline"
 msgstr "Отключен"
 
@@ -5035,23 +5356,19 @@ msgstr "Посетители"
 msgid "Visitor"
 msgstr "Посетитель"
 
-#: ../src/common/helpers.py:306
-#: ../src/tooltips.py:210
+#: ../src/common/helpers.py:306 ../src/tooltips.py:210
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Отсутствует"
 
-#: ../src/common/helpers.py:308
-#: ../src/tooltips.py:216
+#: ../src/common/helpers.py:308 ../src/tooltips.py:216
 msgid "Owner"
 msgstr "Владелец"
 
-#: ../src/common/helpers.py:310
-#: ../src/tooltips.py:214
+#: ../src/common/helpers.py:310 ../src/tooltips.py:214
 msgid "Administrator"
 msgstr "Администратор"
 
-#: ../src/common/helpers.py:312
-#: ../src/tooltips.py:212
+#: ../src/common/helpers.py:312 ../src/tooltips.py:212
 msgid "Member"
 msgstr "Участник"
 
@@ -5118,8 +5435,7 @@ msgstr "%s KB"
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1114
-#: ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5127,24 +5443,22 @@ msgstr[0] "%d пропущенное сообщение"
 msgstr[1] "%d пропущенных сообщения"
 msgstr[2] "%d пропущенных сообщений"
 
-#: ../src/common/helpers.py:1127
+#: ../src/common/helpers.py:1121
 #, python-format
 msgid " from room %s"
 msgstr " в комнате %s"
 
-#: ../src/common/helpers.py:1130
-#: ../src/common/helpers.py:1149
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
 #, python-format
 msgid " from user %s"
 msgstr " от пользователя %s"
 
-#: ../src/common/helpers.py:1132
+#: ../src/common/helpers.py:1126
 #, python-format
 msgid " from %s"
 msgstr " от %s"
 
-#: ../src/common/helpers.py:1139
-#: ../src/common/helpers.py:1146
+#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5152,12 +5466,12 @@ msgstr[0] "%d событие пропущено"
 msgstr[1] "%d события пропущено"
 msgstr[2] "%d событий пропущено"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1173
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim — %s"
 
-#: ../src/common/helpers.py:1347
+#: ../src/common/helpers.py:1341
 msgid "Hello, I am $name."
 msgstr "Привет, я $name."
 
@@ -5198,19 +5512,19 @@ msgstr ""
 "Ошибка: %s\n"
 "Отладка: %s"
 
-#: ../src/common/jingle_rtp.py:332
+#: ../src/common/jingle_rtp.py:335
 msgid "audio input"
 msgstr "звуковой вход"
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:338
 msgid "audio output"
 msgstr "звуковой выход"
 
-#: ../src/common/jingle_rtp.py:378
+#: ../src/common/jingle_rtp.py:381
 msgid "video input"
 msgstr "видео вход"
 
-#: ../src/common/jingle_rtp.py:386
+#: ../src/common/jingle_rtp.py:389
 msgid "video output"
 msgstr "видео выход"
 
@@ -5286,12 +5600,11 @@ msgstr "Система X Window (без Xv)"
 msgid "error: cannot open %s for reading"
 msgstr "ошибка: не могу открыть %s для чтения"
 
-#: ../src/common/optparser.py:301
-#: ../src/common/optparser.py:302
+#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
 msgid "cyan"
 msgstr "синий"
 
-#: ../src/common/optparser.py:381
+#: ../src/common/optparser.py:383
 msgid "migrating logs database to indices"
 msgstr "переносим журнал на индексы"
 
@@ -5712,8 +6025,7 @@ msgstr "Ланч"
 msgid "Exercising"
 msgstr "Занимаюсь спортом"
 
-#: ../src/common/pep.py:133
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:133 ../src/common/pep.py:178
 msgid "Cycling"
 msgstr "На велосипеде"
 
@@ -5957,21 +6269,28 @@ msgid "Unable to bind to port %s."
 msgstr "Не могу привязаться к порту %s."
 
 #: ../src/common/socks5.py:92
-msgid "Maybe you have another running instance of Gajim. File Transfer will be cancelled."
-msgstr "Возможно, запущен ещё один экземпляр Gajim. Передача файлов будет отменена."
+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:423
-msgid "[This is part of an encrypted session. If you see this message, something went wrong.]"
-msgstr "[Это часть зашифрованного сообщения. Если вы видите это сообщение, возможно, произошла ошибка.]"
+msgid ""
+"[This is part of an encrypted session. If you see this message, something "
+"went wrong.]"
+msgstr ""
+"[Это часть зашифрованного сообщения. Если вы видите это сообщение, возможно, "
+"произошла ошибка.]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:178
+#: ../src/common/zeroconf/connection_zeroconf.py:181
 msgid "Avahi error"
 msgstr "Ошибка Avahi"
 
 # link-local это вроде не просто локальный. http://en.wikipedia.org/wiki/Link-
 # local_address
-#: ../src/common/zeroconf/connection_zeroconf.py:179
+#: ../src/common/zeroconf/connection_zeroconf.py:182
 #, python-format
 msgid ""
 "%s\n"
@@ -5980,45 +6299,46 @@ msgstr ""
 "%s\n"
 "Возможно, обмен локальными сообщениями работает не верно."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:190
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Удостоверьтесь, что Avahi или Bonjour установлен."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:199
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Could not start local service"
 msgstr "Не могу запустить локальный сервис"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Не могу использовать порт %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-#: ../src/common/zeroconf/connection_zeroconf.py:283
-#: ../src/common/zeroconf/connection_zeroconf.py:294
-#: ../src/common/zeroconf/connection_zeroconf.py:308
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:286
+#: ../src/common/zeroconf/connection_zeroconf.py:297
+#: ../src/common/zeroconf/connection_zeroconf.py:311
 msgid "Please check if avahi-daemon is running."
 msgstr "Удостоверьтесь, что демон avahi запущен."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:282
-#: ../src/common/zeroconf/connection_zeroconf.py:293
-#: ../src/common/zeroconf/connection_zeroconf.py:307
+#: ../src/common/zeroconf/connection_zeroconf.py:285
+#: ../src/common/zeroconf/connection_zeroconf.py:296
+#: ../src/common/zeroconf/connection_zeroconf.py:310
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Не могу изменить статус учётной записи «%s»"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:325
+#: ../src/common/zeroconf/connection_zeroconf.py:328
 msgid "Your message could not be sent."
 msgstr "Ваше сообщение не может быть отправлено."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:335
+#: ../src/common/zeroconf/connection_zeroconf.py:338
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Контакт не в сети. Отправить сообщение не удалось."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
-msgid "Connection to host could not be established: Timeout while sending data."
+#: ../src/common/zeroconf/connection_zeroconf.py:363
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
 msgstr "Не удалось соединиться с хостом: истекло время ожидания."
 
 #: ../src/common/zeroconf/zeroconf_avahi.py:192
@@ -6035,243 +6355,234 @@ msgstr "Сообщение по умолчанию"
 msgid "Enabled"
 msgstr "Включено"
 
-#: ../src/config.py:459
-#: ../src/config.py:463
-#: ../src/config.py:3096
+#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
 msgid "Default"
 msgstr "По умолчанию"
 
-#: ../src/config.py:739
-#: ../src/dialogs.py:1395
+#: ../src/config.py:733 ../src/dialogs.py:1409
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Нет словаря для языка %s"
 
-#: ../src/config.py:740
+#: ../src/config.py:734
 #, python-format
-msgid "You have to install %s dictionary to use spellchecking, or choose another language by setting the speller_language option."
-msgstr "Чтобы воспользоваться проверкой правописания, установите словарь для языка %s или выберите другой язык, исправив настройку speller_language."
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+"Чтобы воспользоваться проверкой правописания, установите словарь для языка "
+"%s или выберите другой язык, исправив настройку speller_language."
 
-#: ../src/config.py:1229
+#: ../src/config.py:1214
 msgid "status message title"
 msgstr "заголовок сообщения о статусе"
 
-#: ../src/config.py:1229
+#: ../src/config.py:1214
 msgid "status message text"
 msgstr "текст сообщения о статусе"
 
 #. Name column
-#: ../src/config.py:1529
-#: ../src/dialogs.py:2383
-#: ../src/dialogs.py:2449
-#: ../src/dialogs.py:3215
-#: ../src/disco.py:866
-#: ../src/disco.py:1726
-#: ../src/disco.py:2030
-#: ../src/history_window.py:90
+#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
+#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
+#: ../src/disco.py:2048 ../src/history_window.py:90
 msgid "Name"
 msgstr "Имя"
 
-#: ../src/config.py:1624
+#: ../src/config.py:1609
 msgid "Relogin now?"
 msgstr "Переподключиться сейчас?"
 
-#: ../src/config.py:1625
+#: ../src/config.py:1610
 msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr "Если вы хотите, чтобы изменения были применены немедленно, вы должны переподключиться."
+msgstr ""
+"Если вы хотите, чтобы изменения были применены немедленно, вы должны "
+"переподключиться."
 
-#: ../src/config.py:1779
-#: ../src/config.py:1908
+#: ../src/config.py:1764 ../src/config.py:1893
 msgid "OpenPGP is not usable on this computer"
 msgstr "Невозможно использовать OpenPGP на этом компьютере"
 
-#: ../src/config.py:1948
-#: ../src/config.py:1995
+#: ../src/config.py:1933 ../src/config.py:1980
 msgid "Unread events"
 msgstr "Непросмотренные события"
 
-#: ../src/config.py:1949
+#: ../src/config.py:1934
 msgid "Read all pending events before removing this account."
 msgstr "Просмотрите все ожидающие события перед удалением учетной записи."
 
-#: ../src/config.py:1978
+#: ../src/config.py:1963
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "У вас есть окна чата под учётной записью %s"
 
-#: ../src/config.py:1979
+#: ../src/config.py:1964
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Все окна чатов и комнат будут закрыты. Продолжить?"
 
-#: ../src/config.py:1991
-#: ../src/config.py:2524
-#: ../src/config.py:2560
+#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
 msgid "You are currently connected to the server"
 msgstr "Вы сейчас подсоединены к серверу"
 
-#: ../src/config.py:1992
+#: ../src/config.py:1977
 msgid "To change the account name, you must be disconnected."
 msgstr "Для смены имени учетной записи необходимо отключиться."
 
-#: ../src/config.py:1996
+#: ../src/config.py:1981
 msgid "To change the account name, you must read all pending events."
-msgstr "Для смены имени учетной записи необходимо просмотреть ожидающие события."
+msgstr ""
+"Для смены имени учетной записи необходимо просмотреть ожидающие события."
 
-#: ../src/config.py:2002
+#: ../src/config.py:1987
 msgid "Account Name Already Used"
 msgstr "Такое имя учетной записи уже используется"
 
-#: ../src/config.py:2003
-msgid "This name is already used by another of your accounts. Please choose another name."
-msgstr "Это имя уже используется в другой вашей учетной записи. Выберите другое."
+#: ../src/config.py:1988
+msgid ""
+"This name is already used by another of your accounts. Please choose another "
+"name."
+msgstr ""
+"Это имя уже используется в другой вашей учетной записи. Выберите другое."
 
-#: ../src/config.py:2007
-#: ../src/config.py:2011
+#: ../src/config.py:1992 ../src/config.py:1996
 msgid "Invalid account name"
 msgstr "Неверное имя учетной записи"
 
-#: ../src/config.py:2008
+#: ../src/config.py:1993
 msgid "Account name cannot be empty."
 msgstr "Имя учетной записи не может быть пустым."
 
-#: ../src/config.py:2012
+#: ../src/config.py:1997
 msgid "Account name cannot contain spaces."
 msgstr "Имя учетной записи не может содержать пробелы."
 
-#: ../src/config.py:2087
+#: ../src/config.py:2074
 msgid "Rename Account"
 msgstr "Переименовать учетную запись"
 
-#: ../src/config.py:2088
+#: ../src/config.py:2075
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Введите новое название для учетной записи %s"
 
-#: ../src/config.py:2116
+#: ../src/config.py:2103
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID должен иметь формат «имя_пользователя@сервер»."
 
-#: ../src/config.py:2333
-#: ../src/config.py:3624
+#: ../src/config.py:2320 ../src/config.py:3623
 msgid "Invalid entry"
 msgstr "Неверная запись"
 
-#: ../src/config.py:2334
-#: ../src/config.py:3625
+#: ../src/config.py:2321 ../src/config.py:3624
 msgid "Custom port must be a port number."
 msgstr "В качестве номера порта должно выступать число"
 
-#: ../src/config.py:2355
+#: ../src/config.py:2342
 msgid "Failed to get secret keys"
 msgstr "Не удалось получить секретный ключ"
 
-#: ../src/config.py:2356
+#: ../src/config.py:2343
 msgid "There is no OpenPGP secret key available."
 msgstr "Нет секретного ключа OpenPGP."
 
-#: ../src/config.py:2390
+#: ../src/config.py:2377
 msgid "OpenPGP Key Selection"
 msgstr "Выбор ключа OpenPGP"
 
-#: ../src/config.py:2391
+#: ../src/config.py:2378
 msgid "Choose your OpenPGP key"
 msgstr "Выберите свой ключ OpenPGP"
 
-#: ../src/config.py:2398
+#: ../src/config.py:2385
 msgid "No such account available"
 msgstr "Такая учетная запись недоступна"
 
-#: ../src/config.py:2399
+#: ../src/config.py:2386
 msgid "You must create your account before editing your personal information."
-msgstr "Перед редактированием личных данных необходимо сначала создать учетную запись."
-
-#: ../src/config.py:2406
-#: ../src/dialogs.py:2136
-#: ../src/dialogs.py:2371
-#: ../src/dialogs.py:2557
-#: ../src/disco.py:511
-#: ../src/profile_window.py:340
+msgstr ""
+"Перед редактированием личных данных необходимо сначала создать учетную "
+"запись."
+
+#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
+#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
 msgid "You are not connected to the server"
 msgstr "Вы не подключены к серверу"
 
-#: ../src/config.py:2407
+#: ../src/config.py:2394
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Чтобы отредактировать личную информацию, нужно подключиться к серверу."
 
-#: ../src/config.py:2411
+#: ../src/config.py:2398
 msgid "Your server doesn't support Vcard"
 msgstr "Сервер не поддерживает Vcard"
 
-#: ../src/config.py:2412
+#: ../src/config.py:2399
 msgid "Your server can't save your personal information."
 msgstr "Ваш сервер не может хранить личную информацию."
 
-#: ../src/config.py:2525
-#: ../src/config.py:2561
+#: ../src/config.py:2512 ../src/config.py:2548
 msgid "To disable the account, you must be disconnected."
-msgstr "Чтобы отключить эту учетную запись, необходимо отсоединиться от сервера."
+msgstr ""
+"Чтобы отключить эту учетную запись, необходимо отсоединиться от сервера."
 
-#: ../src/config.py:2530
+#: ../src/config.py:2517
 msgid "Account Local already exists."
 msgstr "Учётная запись Local уже существует."
 
-#: ../src/config.py:2531
+#: ../src/config.py:2518
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Переименуйте или удалите её, прежде чем включать локальные сообщения."
 
-#: ../src/config.py:2688
+#: ../src/config.py:2675
 #, python-format
 msgid "Edit %s"
 msgstr "Править %s"
 
-#: ../src/config.py:2690
+#: ../src/config.py:2677
 #, python-format
 msgid "Register to %s"
 msgstr "Зарегистрировать %s"
 
 #. list at the beginning
-#: ../src/config.py:2726
+#: ../src/config.py:2713
 msgid "Ban List"
 msgstr "Черный список"
 
-#: ../src/config.py:2727
+#: ../src/config.py:2714
 msgid "Member List"
 msgstr "Список участников"
 
-#: ../src/config.py:2727
+#: ../src/config.py:2714
 msgid "Owner List"
 msgstr "Список владельцев"
 
-#: ../src/config.py:2728
+#: ../src/config.py:2715
 msgid "Administrator List"
 msgstr "Список администраторов"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2780
-#: ../src/disco.py:873
-#: ../src/history_manager.py:201
+#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2790
+#: ../src/config.py:2789
 msgid "Reason"
 msgstr "Причина"
 
-#: ../src/config.py:2797
+#: ../src/config.py:2796
 msgid "Nick"
 msgstr "Ник"
 
-#: ../src/config.py:2803
+#: ../src/config.py:2802
 msgid "Role"
 msgstr "Обязанность"
 
-#: ../src/config.py:2830
+#: ../src/config.py:2829
 msgid "Banning..."
 msgstr "Баню..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2832
+#: ../src/config.py:2831
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6279,11 +6590,11 @@ msgstr ""
 "<b>Кого вы хотите забанить?</b>\n"
 "\n"
 
-#: ../src/config.py:2834
+#: ../src/config.py:2833
 msgid "Adding Member..."
 msgstr "Добавляю участника..."
 
-#: ../src/config.py:2835
+#: ../src/config.py:2834
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6291,11 +6602,11 @@ msgstr ""
 "<b>Кого вы хотите сделать участником?</b>\n"
 "\n"
 
-#: ../src/config.py:2837
+#: ../src/config.py:2836
 msgid "Adding Owner..."
 msgstr "Добавляю владельца..."
 
-#: ../src/config.py:2838
+#: ../src/config.py:2837
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6303,11 +6614,11 @@ msgstr ""
 "<b>Кого вы хотите сделать владельцем?</b>\n"
 "\n"
 
-#: ../src/config.py:2840
+#: ../src/config.py:2839
 msgid "Adding Administrator..."
 msgstr "Добавляю администратора..."
 
-#: ../src/config.py:2841
+#: ../src/config.py:2840
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6315,7 +6626,7 @@ msgstr ""
 "<b>Кого вы хотите сделать администратором?</b>\n"
 "\n"
 
-#: ../src/config.py:2842
+#: ../src/config.py:2841
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6331,144 +6642,144 @@ msgstr ""
 "4. domain (сам домен, т.е. как любое сочетание user@domain,\n"
 "domain/resource, так и адрес, содержащий этот поддомен)"
 
-#: ../src/config.py:2944
+#: ../src/config.py:2943
 #, python-format
 msgid "Removing %s account"
 msgstr "Удаление учетной записи %s"
 
-#: ../src/config.py:2959
+#: ../src/config.py:2958
 msgid "Account is disabled"
 msgstr "Учетная запись отключена"
 
-#: ../src/config.py:2960
+#: ../src/config.py:2959
 msgid "To unregister from a server, account must be enabled."
-msgstr "Для удаления регистрации с сервера, учетная запись должна быть активна."
+msgstr ""
+"Для удаления регистрации с сервера, учетная запись должна быть активна."
 
-#: ../src/config.py:2973
-#: ../src/gui_interface.py:1099
-#: ../src/gui_interface.py:1210
+#: ../src/config.py:2972 ../src/gui_interface.py:311
+#: ../src/gui_interface.py:1048
 msgid "Password Required"
 msgstr "Требуется пароль"
 
-#: ../src/config.py:2974
-#: ../src/gui_interface.py:1190
+#: ../src/config.py:2973 ../src/gui_interface.py:1028
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Введите пароль для учетной записи %s"
 
-#: ../src/config.py:2975
-#: ../src/gui_interface.py:1210
+#: ../src/config.py:2974 ../src/gui_interface.py:1048
 msgid "Save password"
 msgstr "Сохранить пароль"
 
-#: ../src/config.py:2985
+#: ../src/config.py:2984
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Учетная запись «%s» подключена к серверу"
 
-#: ../src/config.py:2986
+#: ../src/config.py:2985
 msgid "If you remove it, the connection will be lost."
 msgstr "Если вы удалите его, произойдет отключение."
 
-#: ../src/config.py:3000
+#: ../src/config.py:2999
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "Не удалось соединиться с сервером %s"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3000
 msgid "What would you like to do?"
 msgstr "Что вы хотите сделать?"
 
-#: ../src/config.py:3002
+#: ../src/config.py:3001
 msgid "Remove only from Gajim"
 msgstr "Удалить только из Gajim"
 
-#: ../src/config.py:3003
+#: ../src/config.py:3002
 msgid "Don't remove anything. I'll try again later"
 msgstr "Ничего не удалять. Я попробую позже."
 
-#: ../src/config.py:3096
+#: ../src/config.py:3095
 msgid "?print_status:All"
 msgstr "?print_status:Все"
 
-#: ../src/config.py:3097
+#: ../src/config.py:3096
 msgid "Enter and leave only"
 msgstr "Только приход и уход"
 
-#: ../src/config.py:3098
+#: ../src/config.py:3097
 msgid "?print_status:None"
 msgstr "?print_status:Нет"
 
-#: ../src/config.py:3168
+#: ../src/config.py:3167
 msgid "New Group Chat"
 msgstr "Новая комната"
 
-#: ../src/config.py:3201
+#: ../src/config.py:3200
 msgid "This bookmark has invalid data"
 msgstr "Эта закладка содержит неверные данные"
 
-#: ../src/config.py:3202
-msgid "Please be sure to fill out server and room fields or remove this bookmark."
-msgstr "Удостоверьтесь, что заполнены поля с именем сервера и комнаты, либо удалите эту закладку."
+#: ../src/config.py:3201
+msgid ""
+"Please be sure to fill out server and room fields or remove this bookmark."
+msgstr ""
+"Удостоверьтесь, что заполнены поля с именем сервера и комнаты, либо удалите "
+"эту закладку."
 
 #. invalid char
-#: ../src/config.py:3320
-#: ../src/dialogs.py:1934
+#: ../src/config.py:3319 ../src/dialogs.py:1950
 msgid "Invalid nickname"
 msgstr "Неверное имя пользователя"
 
-#: ../src/config.py:3321
-#: ../src/config.py:3335
-#: ../src/config.py:3349
+#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
 msgid "Character not allowed"
 msgstr "Символ недопустим"
 
-#: ../src/config.py:3334
-#: ../src/config.py:3600
+#: ../src/config.py:3333 ../src/config.py:3599
 msgid "Invalid server"
 msgstr "Неверный сервер"
 
-#: ../src/config.py:3348
+#: ../src/config.py:3347
 msgid "Invalid room"
 msgstr "Неверная комната"
 
-#: ../src/config.py:3516
+#: ../src/config.py:3515
 msgid "Account has been added successfully"
 msgstr "Учетная запись успешно добавлена"
 
-#: ../src/config.py:3517
-#: ../src/config.py:3523
-msgid "You can set advanced account options by pressing the Advanced button, or later by choosing the Accounts menu item under the Edit menu from the main window."
-msgstr "Вы можете установить расширенные настройки учетной записи нажатием кнопки «Дополнительно», или сделать это позже посредством пункта «Учетные записи» меню «Правка» в главном окне программы."
+#: ../src/config.py:3516 ../src/config.py:3522
+msgid ""
+"You can set advanced account options by pressing the Advanced button, or "
+"later by choosing the Accounts menu item under the Edit menu from the main "
+"window."
+msgstr ""
+"Вы можете установить расширенные настройки учетной записи нажатием кнопки "
+"«Дополнительно», или сделать это позже посредством пункта «Учетные записи» "
+"меню «Правка» в главном окне программы."
 
-#: ../src/config.py:3522
+#: ../src/config.py:3521
 msgid "Your new account has been created successfully"
 msgstr "Ваша новая учетная запись успешно создана"
 
-#: ../src/config.py:3561
+#: ../src/config.py:3560
 msgid "Invalid username"
 msgstr "Неверное имя пользователя"
 
-#: ../src/config.py:3563
+#: ../src/config.py:3562
 msgid "You must provide a username to configure this account."
 msgstr "Для настройки учетной записи необходимо ввести имя пользователя."
 
-#: ../src/config.py:3601
+#: ../src/config.py:3600
 msgid "Please provide a server on which you want to register."
 msgstr "Укажите сервер, на котором вы хотите зарегистрироваться."
 
-#: ../src/config.py:3657
-#: ../src/gui_interface.py:1856
+#: ../src/config.py:3656 ../src/gui_interface.py:1693
 msgid "Certificate Already in File"
 msgstr "Сертификат уже находится в файле"
 
-#: ../src/config.py:3658
-#: ../src/gui_interface.py:1857
+#: ../src/config.py:3657 ../src/gui_interface.py:1694
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Этот сертификат уже есть в файле %s, поэтому он не был добавлен."
 
-#: ../src/config.py:3735
+#: ../src/config.py:3734
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6483,8 +6794,7 @@ msgstr ""
 "Ошибка SSL: %(error)s\n"
 "Соединиться с этим сервером?"
 
-#: ../src/config.py:3741
-#: ../src/gui_interface.py:1884
+#: ../src/config.py:3740 ../src/gui_interface.py:1721
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6495,69 +6805,68 @@ msgstr ""
 "Отпечаток SHA1 сертификата:\n"
 "%s"
 
-#: ../src/config.py:3773
-#: ../src/config.py:3807
+#: ../src/config.py:3772 ../src/config.py:3806
 msgid "An error occurred during account creation"
 msgstr "Произошла ошибка при создании учетной записи"
 
-#: ../src/config.py:3872
+#: ../src/config.py:3871
 msgid "Account name is in use"
 msgstr "Такое имя учетной записи уже используется"
 
-#: ../src/config.py:3873
+#: ../src/config.py:3872
 msgid "You already have an account using this name."
 msgstr "У вас уже есть учетная запись с таким именем."
 
-#: ../src/config.py:3992
+#: ../src/config.py:3991
 msgid "PEP node was not removed"
 msgstr "PEP узел не был удален"
 
-#: ../src/config.py:3993
+#: ../src/config.py:3992
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP узел %(node)s не был удален: %(message)s"
 
-#: ../src/config.py:4037
+#: ../src/config.py:4036
 msgid "Active"
 msgstr "Активен"
 
-#: ../src/config.py:4045
+#: ../src/config.py:4044
 msgid "Event"
 msgstr "Событие"
 
-#: ../src/config.py:4080
+#: ../src/config.py:4079
 msgid "First Message Received"
 msgstr "Получено первое сообщение"
 
-#: ../src/config.py:4081
+#: ../src/config.py:4080
 msgid "Next Message Received Focused"
 msgstr "Следующее сообщение получено в окне с фокусом"
 
-#: ../src/config.py:4083
+#: ../src/config.py:4082
 msgid "Next Message Received Unfocused"
 msgstr "Следующее сообщение получено в окне без фокуса"
 
-#: ../src/config.py:4084
+#: ../src/config.py:4083
 msgid "Contact Connected"
 msgstr "Контакт подключился"
 
-#: ../src/config.py:4085
+#: ../src/config.py:4084
 msgid "Contact Disconnected"
 msgstr "Контакт отключился"
 
-#: ../src/config.py:4086
+#: ../src/config.py:4085
 msgid "Message Sent"
 msgstr "Сообщение отправлено"
 
-#: ../src/config.py:4087
+#: ../src/config.py:4086
 msgid "Group Chat Message Highlight"
 msgstr "Вас упомянули в комнате"
 
-#: ../src/config.py:4088
+#: ../src/config.py:4087
 msgid "Group Chat Message Received"
 msgstr "Получено сообщение в комнате"
 
-#: ../src/config.py:4089
+#: ../src/config.py:4088
 msgid "GMail Email Received"
 msgstr "Получено письмо на Gmail"
 
@@ -6625,8 +6934,7 @@ msgstr[1] "%i дня назад"
 msgstr[2] "%i дней назад"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346
-#: ../src/history_window.py:480
+#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
@@ -6657,157 +6965,155 @@ msgstr "Jabber ID, который вы ввели, уже существует.
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:622
-#: ../src/dataforms_widget.py:624
+#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Имя контакта: <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:195
 msgid "Group"
 msgstr "Группа"
 
-#: ../src/dialogs.py:201
+#: ../src/dialogs.py:202
 msgid "In the group"
 msgstr "В группе"
 
-#: ../src/dialogs.py:292
+#: ../src/dialogs.py:293
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:297
+#: ../src/dialogs.py:298
 msgid "Contact name"
 msgstr "Имя контакта"
 
-#: ../src/dialogs.py:469
+#: ../src/dialogs.py:470
 msgid "Set Mood"
 msgstr "Установить настроение"
 
-#: ../src/dialogs.py:589
+#: ../src/dialogs.py:590
 #, python-format
 msgid "%s Status Message"
 msgstr "Сообщение о статусе %s"
 
-#: ../src/dialogs.py:603
+#: ../src/dialogs.py:604
 msgid "Status Message"
 msgstr "Сообщение о статусе"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:794
 msgid "Overwrite Status Message?"
 msgstr "Изменить сообщение о статусе?"
 
-#: ../src/dialogs.py:794
-msgid "This name is already used. Do you want to overwrite this status message?"
+#: ../src/dialogs.py:795
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
 msgstr "Это имя уже используется. Перезаписать это сообщение о статусе?"
 
-#: ../src/dialogs.py:802
+#: ../src/dialogs.py:803
 msgid "Save as Preset Status Message"
 msgstr "Сохранить установленное сообщение о статусе"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:804
 msgid "Please type a name for this status message"
 msgstr "Введите имя для этого сообщения о статусе"
 
-#: ../src/dialogs.py:831
+#: ../src/dialogs.py:832
 msgid "AIM Address:"
 msgstr "Адрес AIM:"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:833
 msgid "GG Number:"
 msgstr "Номер GaduGadu"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:834
 msgid "ICQ Number:"
 msgstr "Номер ICQ:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:835
 msgid "MSN Address:"
 msgstr "Адрес в MSN:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:836
 msgid "Yahoo! Address:"
 msgstr "Адрес Yahoo:"
 
-#: ../src/dialogs.py:872
+#: ../src/dialogs.py:873
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Заполните данные о контакте,\n"
 "который хотите добавить в ростер учетной записи %s"
 
-#: ../src/dialogs.py:875
+#: ../src/dialogs.py:876
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Заполните данные о контакте, который вы хотите добавить"
 
-#: ../src/dialogs.py:1039
-#: ../src/dialogs.py:1045
-#: ../src/dialogs.py:1050
-#: ../src/dialogs.py:3448
+#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
+#: ../src/dialogs.py:3464
 msgid "Invalid User ID"
 msgstr "Неверный ID пользователя"
 
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1052
 msgid "The user ID must not contain a resource."
 msgstr "ID пользователя не должен содержать ресурс."
 
-#: ../src/dialogs.py:1051
+#: ../src/dialogs.py:1057
 msgid "You cannot add yourself to your roster."
 msgstr "Вы не можете добавлять себя в свой ростер."
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1071
 msgid "Contact already in roster"
 msgstr "Контакт уже в ростере"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1072
 msgid "This contact is already listed in your roster."
 msgstr "Этот контакт уже содержится в вашем ростере."
 
-#: ../src/dialogs.py:1112
+#: ../src/dialogs.py:1118
 msgid "User ID:"
 msgstr "ID пользователя:"
 
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1189
 msgid "A GTK+ jabber client"
 msgstr "Jabber-клиент на GTK+"
 
-#: ../src/dialogs.py:1176
+#: ../src/dialogs.py:1190
 msgid "GTK+ Version:"
 msgstr "Версия GTK+:"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1191
 msgid "PyGTK Version:"
 msgstr "Версия PyGTK:"
 
-#: ../src/dialogs.py:1187
+#: ../src/dialogs.py:1201
 msgid "Current Developers:"
 msgstr "Разработчики:"
 
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1203
 msgid "Past Developers:"
 msgstr "Разработчики прошлых версий:"
 
-#: ../src/dialogs.py:1195
+#: ../src/dialogs.py:1209
 msgid "THANKS:"
 msgstr "БЛАГОДАРНОСТИ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1215
 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:1213
+#: ../src/dialogs.py:1227
 msgid "translator-credits"
 msgstr ""
 "Яков Безруков <nebulam51@gmail.com>\n"
@@ -6816,485 +7122,468 @@ msgstr ""
 "Денис Фомин <fominde@mail.ru>\n"
 "Григорий Сарницкий <sargrigory@ya.ru>"
 
-#: ../src/dialogs.py:1396
+#: ../src/dialogs.py:1410
 #, python-format
 msgid ""
-"You have to install %s dictionary to use spellchecking, or choose another language by setting the speller_language option.\n"
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option.\n"
 "\n"
 "Highlighting misspelled words feature will not be used"
-msgstr "Чтобы воспользоваться проверкой правописания, установите словарь для языка %s или выберите другой язык, исправив настройку speller_language."
+msgstr ""
+"Чтобы воспользоваться проверкой правописания, установите словарь для языка "
+"%s или выберите другой язык, исправив настройку speller_language."
 
-#: ../src/dialogs.py:1935
-#: ../src/dialogs.py:2322
+#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
 msgid "The nickname has not allowed characters."
 msgstr "В Jabber ID комнаты или сервера содержатся недопустимые символы."
 
-#: ../src/dialogs.py:2053
+#: ../src/dialogs.py:2069
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Запрос на подписку для учетной записи %(account)s от %(jid)s"
 
-#: ../src/dialogs.py:2056
+#: ../src/dialogs.py:2072
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Запрос на подписку от %s"
 
-#: ../src/dialogs.py:2131
-#: ../src/gui_interface.py:2635
+#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Вы уже в комнате %s"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2153
 msgid "You can not join a group chat unless you are connected."
 msgstr "Вы не можете зайти в комнату без подключения."
 
-#: ../src/dialogs.py:2178
+#: ../src/dialogs.py:2194
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Войти в комнату с учетной записи %s"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2325
 msgid "Invalid Account"
 msgstr "Неверное имя учетной записи"
 
-#: ../src/dialogs.py:2310
-msgid "You have to choose an account from which you want to join the groupchat."
+#: ../src/dialogs.py:2326
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
 msgstr "Выберите учетную запись, с которой вы хотите войти в комнату."
 
-#: ../src/dialogs.py:2321
+#: ../src/dialogs.py:2337
 msgid "Invalid Nickname"
 msgstr "Неверное имя пользователя"
 
-#: ../src/dialogs.py:2326
-#: ../src/dialogs.py:2332
-#: ../src/groupchat_control.py:1842
+#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
+#: ../src/groupchat_control.py:1847
 msgid "Invalid group chat Jabber ID"
 msgstr "Неверное имя комнаты"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2343
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "В Jabber ID комнаты или сервера содержатся недопустимые символы."
 
-#: ../src/dialogs.py:2333
-#: ../src/groupchat_control.py:1843
+#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "В Jabber ID комнаты или сервера содержатся недопустимые символы."
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2356
 msgid "This is not a group chat"
 msgstr "Это не комната"
 
-#: ../src/dialogs.py:2341
+#: ../src/dialogs.py:2357
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s не является именем комнаты."
 
-#: ../src/dialogs.py:2372
+#: ../src/dialogs.py:2388
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Чтобы объединить контакты, необходимо подключиться к серверу."
 
-#: ../src/dialogs.py:2386
+#: ../src/dialogs.py:2402
 msgid "Server"
 msgstr "Сервер"
 
-#: ../src/dialogs.py:2421
+#: ../src/dialogs.py:2437
 msgid "This account is not connected to the server"
 msgstr "Учётная запись не подключена к серверу"
 
-#: ../src/dialogs.py:2422
+#: ../src/dialogs.py:2438
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Вы не можете синхронизировать учетную запись если она не подключена."
 
-#: ../src/dialogs.py:2446
+#: ../src/dialogs.py:2462
 msgid "Synchronise"
 msgstr "Синхронизировать"
 
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2523
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Начать чат с учетной записью %s"
 
-#: ../src/dialogs.py:2509
+#: ../src/dialogs.py:2525
 msgid "Start Chat"
 msgstr "Начать чат"
 
-#: ../src/dialogs.py:2510
+#: ../src/dialogs.py:2526
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
-msgstr "Введите ник или ID пользователя, которому вы хотите отправить сообщение:"
+msgstr ""
+"Введите ник или ID пользователя, которому вы хотите отправить сообщение:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2536
-#: ../src/dialogs.py:2917
-#: ../src/dialogs.py:3129
+#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
 msgid "Connection not available"
 msgstr "Соединение недоступно"
 
-#: ../src/dialogs.py:2537
-#: ../src/dialogs.py:2918
-#: ../src/dialogs.py:3130
+#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Удостоверьтесь, что вы подключены к «%s»."
 
-#: ../src/dialogs.py:2546
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
 msgid "Invalid JID"
 msgstr "Неверный JID"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2565
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Не понимаю адреса «%s»."
 
-#: ../src/dialogs.py:2558
+#: ../src/dialogs.py:2574
 msgid "Without a connection, you can not change your password."
 msgstr "Чтобы изменить пароль, необходимо подключиться к серверу."
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "Invalid password"
 msgstr "Неверный пароль"
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "You must enter a password."
 msgstr "Необходимо ввести пароль."
 
-#: ../src/dialogs.py:2581
+#: ../src/dialogs.py:2597
 msgid "Passwords do not match"
 msgstr "Пароли не совпадают"
 
-#: ../src/dialogs.py:2582
+#: ../src/dialogs.py:2598
 msgid "The passwords typed in both fields must be identical."
 msgstr "Пароли, введенные в оба поля, должны быть одинаковыми."
 
 #. default value
-#: ../src/dialogs.py:2619
-#: ../src/notify.py:247
-#: ../src/notify.py:473
+#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
 msgid "Contact Signed In"
 msgstr "Контакт подключился"
 
-#: ../src/dialogs.py:2621
-#: ../src/notify.py:255
-#: ../src/notify.py:475
+#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
 msgid "Contact Signed Out"
 msgstr "Контакт отключился"
 
 #. chat message
-#: ../src/dialogs.py:2623
-#: ../src/notify.py:277
-#: ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
 msgid "New Message"
 msgstr "Новое сообщение"
 
 #. single message
-#: ../src/dialogs.py:2623
-#: ../src/notify.py:259
-#: ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
 msgid "New Single Message"
 msgstr "Новое одиночное сообщение"
 
 #. private message
-#: ../src/dialogs.py:2624
-#: ../src/notify.py:265
-#: ../src/notify.py:478
+#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
 msgid "New Private Message"
 msgstr "Новое личное сообщение"
 
-#: ../src/dialogs.py:2624
-#: ../src/gui_interface.py:1320
-#: ../src/notify.py:487
+#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
 msgid "New E-mail"
 msgstr "Новое письмо"
 
-#: ../src/dialogs.py:2626
-#: ../src/gui_interface.py:1379
-#: ../src/notify.py:480
+#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
 msgid "File Transfer Request"
 msgstr "Запрос передачи"
 
-#: ../src/dialogs.py:2628
-#: ../src/gui_interface.py:1282
-#: ../src/gui_interface.py:1348
-#: ../src/notify.py:482
+#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
+#: ../src/gui_interface.py:1186 ../src/notify.py:482
 msgid "File Transfer Error"
 msgstr "Ошибка передачи"
 
-#: ../src/dialogs.py:2630
-#: ../src/gui_interface.py:1425
-#: ../src/gui_interface.py:1448
-#: ../src/gui_interface.py:1465
+#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
+#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
 #: ../src/notify.py:484
 msgid "File Transfer Completed"
 msgstr "Передача файла завершена"
 
-#: ../src/dialogs.py:2631
-#: ../src/gui_interface.py:1428
-#: ../src/notify.py:485
+#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
 msgid "File Transfer Stopped"
 msgstr "Передача остановлена"
 
-#: ../src/dialogs.py:2633
-#: ../src/gui_interface.py:1119
-#: ../src/notify.py:489
+#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
 msgid "Groupchat Invitation"
 msgstr "Приглашение в комнату"
 
-#: ../src/dialogs.py:2635
-#: ../src/notify.py:239
-#: ../src/notify.py:491
+#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
 msgid "Contact Changed Status"
 msgstr "Контакт изменит статус"
 
-#: ../src/dialogs.py:2836
+#: ../src/dialogs.py:2852
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Новое сообщение с учетной записи %s"
 
-#: ../src/dialogs.py:2838
+#: ../src/dialogs.py:2854
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Новое сообщение для учетной записи %s"
 
-#: ../src/dialogs.py:2840
+#: ../src/dialogs.py:2856
 msgid "Single Message"
 msgstr "Сообщение"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2843
+#: ../src/dialogs.py:2859
 #, python-format
 msgid "Send %s"
 msgstr "Отправить %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:2882
 #, python-format
 msgid "Received %s"
 msgstr "Получено %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2889
+#: ../src/dialogs.py:2905
 #, 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:2968
+#: ../src/dialogs.py:2984
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:2985
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s написал:\n"
 
-#: ../src/dialogs.py:3028
+#: ../src/dialogs.py:3044
 #, python-format
 msgid "XML Console for %s"
 msgstr "Консоль XML для %s"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3046
 msgid "XML Console"
 msgstr "Консоль XML"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 msgid "add"
 msgstr "добавить"
 
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 msgid "modify"
 msgstr "изменить"
 
-#: ../src/dialogs.py:3160
+#: ../src/dialogs.py:3176
 msgid "remove"
 msgstr "удалить"
 
-#: ../src/dialogs.py:3188
+#: ../src/dialogs.py:3204
 #, python-format
-msgid "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your roster."
-msgstr "<b>%(jid)s</b> хочет <b>%(action)s</b> несколько контактов в ваш список контактов."
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
+msgstr ""
+"<b>%(jid)s</b> хочет <b>%(action)s</b> несколько контактов в ваш список "
+"контактов."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3204
-#: ../src/dialogs.py:3250
+#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
 msgid "Add"
 msgstr "Добавить"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3206
-#: ../src/dialogs.py:3281
+#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
 msgid "Modify"
 msgstr "Изменить"
 
-#: ../src/dialogs.py:3212
+#: ../src/dialogs.py:3228
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3218
+#: ../src/dialogs.py:3234
 msgid "Groups"
 msgstr "Группы"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3342
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s предложил мне добавить вас в мой список контактов."
 
-#: ../src/dialogs.py:3340
+#: ../src/dialogs.py:3356
 #, python-format
 msgid "Added  %s contacts"
 msgstr "Добавлены контакты %s"
 
-#: ../src/dialogs.py:3377
+#: ../src/dialogs.py:3393
 #, python-format
 msgid "Removed  %s contacts"
 msgstr "Удалены контакты %s"
 
-#: ../src/dialogs.py:3417
-#: ../src/dialogs.py:3594
+#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr "Настройки архивации для %s"
 
-#: ../src/dialogs.py:3457
+#: ../src/dialogs.py:3473
 #, fuzzy
 msgid "Invalid expire value"
 msgstr "Неверное имя сервера"
 
-#: ../src/dialogs.py:3458
+#: ../src/dialogs.py:3474
 msgid "Expire must be a valid positive integer."
 msgstr ""
 
-#: ../src/dialogs.py:3505
+#: ../src/dialogs.py:3521
 msgid "There is an error with the form"
 msgstr ""
 
-#: ../src/dialogs.py:3716
+#: ../src/dialogs.py:3732
 #, fuzzy
 msgid "There is an error"
 msgstr "Сервис ответил ошибкой."
 
-#: ../src/dialogs.py:3780
+#: ../src/dialogs.py:3796
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Список доступа <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3784
+#: ../src/dialogs.py:3800
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Список доступа для %s"
 
-#: ../src/dialogs.py:3840
+#: ../src/dialogs.py:3856
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
-msgstr "Номер: %(order)s, действие: %(action)s, тип: %(type)s, значение: %(value)s"
+msgstr ""
+"Номер: %(order)s, действие: %(action)s, тип: %(type)s, значение: %(value)s"
 
-#: ../src/dialogs.py:3845
+#: ../src/dialogs.py:3861
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Номер: %(order)s, действие: %(action)s"
 
-#: ../src/dialogs.py:3889
+#: ../src/dialogs.py:3905
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Изменить правило</b>"
 
-#: ../src/dialogs.py:4000
+#: ../src/dialogs.py:4016
 msgid "<b>Add a rule</b>"
 msgstr "<b>Добавить правило</b>"
 
-#: ../src/dialogs.py:4100
+#: ../src/dialogs.py:4116
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Списки доступа для %s"
 
-#: ../src/dialogs.py:4102
+#: ../src/dialogs.py:4118
 msgid "Privacy Lists"
 msgstr "Списки доступа"
 
-#: ../src/dialogs.py:4172
+#: ../src/dialogs.py:4188
 msgid "Invalid List Name"
 msgstr "Недопустимое имя списка"
 
-#: ../src/dialogs.py:4173
+#: ../src/dialogs.py:4189
 msgid "You must enter a name to create a privacy list."
 msgstr "Необходимо ввести имя для нового списка доступа."
 
-#: ../src/dialogs.py:4205
+#: ../src/dialogs.py:4221
 msgid "You are invited to a groupchat"
 msgstr "Вы приглашены в конференцию"
 
-#: ../src/dialogs.py:4208
+#: ../src/dialogs.py:4224
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact приглашает вас присоединиться к обсуждению."
 
-#: ../src/dialogs.py:4210
+#: ../src/dialogs.py:4226
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact приглашает вас в комнату %(room_jid)s."
 
-#: ../src/dialogs.py:4218
+#: ../src/dialogs.py:4234
 #, python-format
 msgid "Comment: %s"
 msgstr "Комментарий: %s"
 
-#: ../src/dialogs.py:4220
+#: ../src/dialogs.py:4236
 msgid "Do you want to accept the invitation?"
 msgstr "Вы принимаете приглашение?"
 
-#: ../src/dialogs.py:4282
+#: ../src/dialogs.py:4298
 msgid "Choose Client Cert #PCKS12"
 msgstr "Выберите сертификат владельца #PCKS12"
 
-#: ../src/dialogs.py:4292
-#: ../src/dialogs.py:4335
-#: ../src/dialogs.py:4391
+#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
+#: ../src/dialogs.py:4495
 msgid "All files"
 msgstr "Все файлы"
 
-#: ../src/dialogs.py:4297
+#: ../src/dialogs.py:4313
 msgid "PKCS12 Files"
 msgstr "Файлы PKCS12"
 
-#: ../src/dialogs.py:4325
+#: ../src/dialogs.py:4341
 msgid "Choose Sound"
 msgstr "Выберите звуковой файл"
 
-#: ../src/dialogs.py:4340
+#: ../src/dialogs.py:4356
 msgid "Wav Sounds"
 msgstr "В формате Wav"
 
-#: ../src/dialogs.py:4378
+#: ../src/dialogs.py:4394
 msgid "Choose Image"
 msgstr "Выбрать картинку"
 
-#: ../src/dialogs.py:4396
+#: ../src/dialogs.py:4412
 msgid "Images"
 msgstr "Картинки"
 
-#: ../src/dialogs.py:4463
+#: ../src/dialogs.py:4482
+#, fuzzy
+msgid "Choose Archive"
+msgstr "Выбрать картинку"
+
+#: ../src/dialogs.py:4500
+#, fuzzy
+msgid "Zip files"
+msgstr "Все файлы"
+
+#: ../src/dialogs.py:4525
 #, python-format
 msgid "When %s becomes:"
 msgstr "Когда %s происходит:"
 
-#: ../src/dialogs.py:4465
+#: ../src/dialogs.py:4527
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Добавление специального уведомления для %s"
 
-#: ../src/dialogs.py:4540
+#: ../src/dialogs.py:4602
 msgid "Condition"
 msgstr "Условие"
 
-#: ../src/dialogs.py:4660
+#: ../src/dialogs.py:4722
 msgid "when I am "
 msgstr "когда я "
 
-#: ../src/dialogs.py:5136
+#: ../src/dialogs.py:5198
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7305,84 +7594,105 @@ msgstr ""
 "\n"
 "Short Authentication String данного сеанса <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:5139
+#: ../src/dialogs.py:5201
 msgid "You have already verified this contact's identity."
 msgstr "Вы уже удостоверили личность этого контакта."
 
-#: ../src/dialogs.py:5145
-#: ../src/dialogs.py:5229
+#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
 msgid "Contact's identity verified"
 msgstr "Личность контакта удостоверена"
 
-#: ../src/dialogs.py:5151
+#: ../src/dialogs.py:5213
 msgid "Verify again..."
 msgstr "Удостоверить снова..."
 
-#: ../src/dialogs.py:5156
-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 "Чтобы быть уверенным, что <b>только</b> нужный человек может прочитать ваши сообщения или послать сообщения вам, вы должны удостоверить личность собеседника, нажав кнопку, расположенную ниже."
+#: ../src/dialogs.py:5218
+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 ""
+"Чтобы быть уверенным, что <b>только</b> нужный человек может прочитать ваши "
+"сообщения или послать сообщения вам, вы должны удостоверить личность "
+"собеседника, нажав кнопку, расположенную ниже."
 
-#: ../src/dialogs.py:5159
-#: ../src/dialogs.py:5210
-#: ../src/dialogs.py:5223
+#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
 msgid "Contact's identity NOT verified"
 msgstr "Личность контакта НЕ удостоверена"
 
-#: ../src/dialogs.py:5164
+#: ../src/dialogs.py:5226
 msgid "Verify..."
 msgstr "Удостоверить..."
 
-#: ../src/dialogs.py:5175
+#: ../src/dialogs.py:5237
 msgid "Have you verified the contact's identity?"
 msgstr "Вы удостоверили личность удаленного контакта?"
 
-#: ../src/dialogs.py:5176
+#: ../src/dialogs.py:5238
 #, python-format
 msgid ""
-"To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> directly (in person or on the phone) and verify that they see the same Short Authentication String (SAS) as you.\n"
+"To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
+"directly (in person or on the phone) and verify that they see the same Short "
+"Authentication String (SAS) as you.\n"
 "\n"
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
-"Для предотвращения атаки типа «человек посередине» вы должны переговорить с <b>%(jid)s</b> напрямую (лично или по телефону) и убедиться, что он видит ту же Short Authentication String (SAS), что и вы.\n"
+"Для предотвращения атаки типа «человек посередине» вы должны переговорить с "
+"<b>%(jid)s</b> напрямую (лично или по телефону) и убедиться, что он видит ту "
+"же Short Authentication String (SAS), что и вы.\n"
 "\n"
 "Short Authentication String этого сеанса <b>%(sas)s</b>"
 
-#: ../src/dialogs.py:5177
+#: ../src/dialogs.py:5239
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Вы переговорили с удаленным контактом и удостоверили SAS?"
 
-#: ../src/dialogs.py:5211
+#: ../src/dialogs.py:5273
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
-msgstr "Ключ (%s) контакта <b>не соответствует</b> ключу, присвоенному в Gajim."
+msgstr ""
+"Ключ (%s) контакта <b>не соответствует</b> ключу, присвоенному в Gajim."
 
-#: ../src/dialogs.py:5217
+#: ../src/dialogs.py:5279
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
-msgstr "Этому контакту не присвоен ключ GPG, поэтому вы не можете зашифровать сообщения."
+msgstr ""
+"Этому контакту не присвоен ключ GPG, поэтому вы не можете зашифровать "
+"сообщения."
 
-#: ../src/dialogs.py:5224
-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 "Этому контакту присвоен ключ GPG, но <b>вы не доверяете этому ключу</b>. Таким образом, сообщения <b>не могут быть</b> зашифрованы. Воспользуйтесь вашим GPG клиентом для того, чтобы выставить доверие данному ключу"
+#: ../src/dialogs.py:5286
+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 ""
+"Этому контакту присвоен ключ GPG, но <b>вы не доверяете этому ключу</b>. "
+"Таким образом, сообщения <b>не могут быть</b> зашифрованы. Воспользуйтесь "
+"вашим GPG клиентом для того, чтобы выставить доверие данному ключу"
 
-#: ../src/dialogs.py:5230
-msgid "GPG Key is assigned to this contact, and you trust his key, so messages will be encrypted."
-msgstr "Этому контакту присвоен ключ GPG, и вы доверяете этому ключу. Таким образом, сообщения будут зашифрованы."
+#: ../src/dialogs.py:5292
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
+msgstr ""
+"Этому контакту присвоен ключ GPG, и вы доверяете этому ключу. Таким образом, "
+"сообщения будут зашифрованы."
 
-#: ../src/dialogs.py:5295
+#: ../src/dialogs.py:5357
 msgid "an audio and video"
 msgstr "аудио и видео"
 
-#: ../src/dialogs.py:5297
+#: ../src/dialogs.py:5359
 msgid "an audio"
 msgstr "аудио"
 
-#: ../src/dialogs.py:5299
+#: ../src/dialogs.py:5361
 msgid "a video"
 msgstr "видео"
 
-#: ../src/dialogs.py:5303
+#: ../src/dialogs.py:5365
 #, python-format
-msgid "%(contact)s wants to start %(type)s session with you. Do you want to answer the call?"
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
 msgstr "%(contact)s хочет начать %(type)s сеанс с вами. Вы хотите ответить?"
 
 #: ../src/disco.py:119
@@ -7394,121 +7704,118 @@ msgstr "Другие"
 msgid "Conference"
 msgstr "Комнаты"
 
-#: ../src/disco.py:512
+#: ../src/disco.py:513
 msgid "Without a connection, you can not browse available services"
 msgstr "Для просмотра сервисов необходимо сначала подключиться к серверу"
 
-#: ../src/disco.py:589
+#: ../src/disco.py:600
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Обзор сервисов с учётной записи %s"
 
-#: ../src/disco.py:591
+#: ../src/disco.py:602
 msgid "Service Discovery"
 msgstr "Обзор сервисов (discovery)"
 
-#: ../src/disco.py:741
+#: ../src/disco.py:758
 msgid "The service could not be found"
 msgstr "Сервис не обнаружен"
 
-#: ../src/disco.py:742
-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:759
+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:746
-#: ../src/disco.py:1082
+#: ../src/disco.py:763 ../src/disco.py:1100
 msgid "The service is not browsable"
 msgstr "Сервис недоступен для просмотра"
 
-#: ../src/disco.py:747
+#: ../src/disco.py:764
 msgid "This type of service does not contain any items to browse."
 msgstr "Этот сервис не содержит ничего, что можно было бы просмотреть."
 
-#: ../src/disco.py:786
-#: ../src/disco.py:796
+#: ../src/disco.py:804 ../src/disco.py:814
 msgid "Invalid Server Name"
 msgstr "Неверное имя сервера"
 
-#: ../src/disco.py:850
+#: ../src/disco.py:868
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Просмотр %(address)s с учетной записью %(account)s"
 
-#: ../src/disco.py:894
+#: ../src/disco.py:912
 msgid "_Browse"
 msgstr "_Браузер"
 
-#: ../src/disco.py:1083
+#: ../src/disco.py:1101
 msgid "This service does not contain any items to browse."
 msgstr "Этот сервис не содержит ничего, что можно было бы просмотреть."
 
-#: ../src/disco.py:1323
+#: ../src/disco.py:1341
 msgid "_Execute Command"
 msgstr "В_ыполнить команду..."
 
-#: ../src/disco.py:1333
-#: ../src/disco.py:1504
+#: ../src/disco.py:1351 ../src/disco.py:1522
 msgid "Re_gister"
 msgstr "За_регистрироваться"
 
-#: ../src/disco.py:1545
+#: ../src/disco.py:1563
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Сканирую %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1736
+#: ../src/disco.py:1754
 msgid "Users"
 msgstr "Пользователи"
 
 #. Description column
-#: ../src/disco.py:1744
+#: ../src/disco.py:1762
 msgid "Description"
 msgstr "Описание"
 
 #. Id column
-#: ../src/disco.py:1752
+#: ../src/disco.py:1770
 msgid "Id"
 msgstr "ID"
 
-#: ../src/disco.py:1817
-#: ../src/gui_interface.py:3147
+#: ../src/disco.py:1835 ../src/gui_interface.py:2995
 msgid "Bookmark already set"
 msgstr "Закладка уже установлена"
 
-#: ../src/disco.py:1818
-#: ../src/gui_interface.py:3148
+#: ../src/disco.py:1836 ../src/gui_interface.py:2996
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Комната «%s» уже есть в ваших закладках."
 
-#: ../src/disco.py:1827
-#: ../src/gui_interface.py:3162
+#: ../src/disco.py:1845 ../src/gui_interface.py:3010
 msgid "Bookmark has been added successfully"
 msgstr "Закладка успешно добавлена"
 
-#: ../src/disco.py:1828
-#: ../src/gui_interface.py:3163
+#: ../src/disco.py:1846 ../src/gui_interface.py:3011
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Вы можете управлять закладками через меню «Действия» в ростере."
 
-#: ../src/disco.py:2039
+#: ../src/disco.py:2057
 msgid "Subscribed"
 msgstr "Подписка"
 
-#: ../src/disco.py:2047
+#: ../src/disco.py:2065
 msgid "Node"
 msgstr "Узел"
 
-#: ../src/disco.py:2111
+#: ../src/disco.py:2129
 msgid "New post"
 msgstr "Новое сообщение"
 
-#: ../src/disco.py:2117
+#: ../src/disco.py:2135
 msgid "_Subscribe"
 msgstr "_Подписаться"
 
-#: ../src/disco.py:2123
+#: ../src/disco.py:2141
 msgid "_Unsubscribe"
 msgstr "_Отписаться"
 
@@ -7517,11 +7824,13 @@ msgid "SSL certificat validation"
 msgstr "Подтверждение SSL сертификата"
 
 #: ../src/features_window.py:50
-msgid "A library used to validate server certificates to ensure a secure connection."
-msgstr "Библиотека используется для подтверждения действительности сертификатов сервера для того, чтобы удостовериться в защищенности соединения."
+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:51 ../src/features_window.py:52
 msgid "Requires python-pyopenssl."
 msgstr "Требует python-pyopenssl."
 
@@ -7531,7 +7840,9 @@ msgstr "Bonjour / Zeroconf"
 
 #: ../src/features_window.py:54
 msgid "Serverless chatting with autodetected clients in a local network."
-msgstr "Не требующее сервера общение между автоматически обнаруживаемыми клиентами в локальной сети."
+msgstr ""
+"Не требующее сервера общение между автоматически обнаруживаемыми клиентами в "
+"локальной сети."
 
 #: ../src/features_window.py:55
 msgid "Requires python-avahi."
@@ -7553,14 +7864,10 @@ msgstr "Скрипт для управления Gajim'ом через кома
 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:108
+#: ../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:108
 msgid "Feature not available under Windows."
 msgstr "Эта возможность отсутствует в Windows."
 
@@ -7594,7 +7901,9 @@ msgstr "Управление сеансами"
 
 #: ../src/features_window.py:70
 msgid "Gajim session is stored on logout and restored on login."
-msgstr "Сеанс Gajim сохраняется при выходе (logout) и восстанавливается при входе (login)."
+msgstr ""
+"Сеанс Gajim сохраняется при выходе (logout) и восстанавливается при входе "
+"(login)."
 
 #: ../src/features_window.py:71
 msgid "Requires python-gnome2."
@@ -7649,7 +7958,9 @@ msgid "Passive popups notifying for new events."
 msgstr "Пассивные всплывающие окна для уведомления о новых событиях."
 
 #: ../src/features_window.py:87
-msgid "Requires python-notify or instead python-dbus in conjunction with notification-daemon."
+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
@@ -7658,7 +7969,9 @@ msgstr "Авто статус"
 
 #: ../src/features_window.py:90
 msgid "Ability to measure idle time, in order to set auto status."
-msgstr "Возможность определения времени бездействия для того, чтобы установить автостатус."
+msgstr ""
+"Возможность определения времени бездействия для того, чтобы установить "
+"автостатус."
 
 #: ../src/features_window.py:91
 msgid "Requires libxss library."
@@ -7677,12 +7990,23 @@ msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Преобразовывать LaTeX выражения, заключенные в $$ $$"
 
 #: ../src/features_window.py:95
-msgid "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True in the Advanced Configuration Editor."
-msgstr "Требует texlive-latex-base и dvipng. Необходимо присвоить пункту 'use_latex' значение «Активно» в Расширенном редакторе настроек."
+#, fuzzy
+msgid ""
+"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
+msgstr ""
+"Требует texlive-latex-base и dvipng. Необходимо присвоить пункту 'use_latex' "
+"значение «Активно» в Расширенном редакторе настроек."
 
 #: ../src/features_window.py:96
-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 "Требует texlive-latex-base и dvipng (оба есть в MikTeX). Необходимо присвоить пункту 'use_latex' значение «Активно» в Расширенном редакторе настроек."
+#, fuzzy
+msgid ""
+"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
+"You have to set 'use_latex' to True in the Advanced Configuration Editor."
+msgstr ""
+"Требует texlive-latex-base и dvipng (оба есть в MikTeX). Необходимо "
+"присвоить пункту 'use_latex' значение «Активно» в Расширенном редакторе "
+"настроек."
 
 #: ../src/features_window.py:97
 msgid "End to End message encryption"
@@ -7692,8 +8016,7 @@ msgstr "End to end шифрование"
 msgid "Encrypting chat messages."
 msgstr "Шифрование сообщений чата."
 
-#: ../src/features_window.py:99
-#: ../src/features_window.py:100
+#: ../src/features_window.py:99 ../src/features_window.py:100
 msgid "Requires python-crypto."
 msgstr "Требует python-crypto."
 
@@ -7702,11 +8025,14 @@ msgid "RST Generator"
 msgstr "Генератор RST"
 
 #: ../src/features_window.py:102
-msgid "Generate XHTML output from RST code (see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html)."
-msgstr "Генерировать XHTML вывод из кода RST (см. http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html)."
+msgid ""
+"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
+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:103 ../src/features_window.py:104
 msgid "Requires python-docutils."
 msgstr "Требует python-docutils."
 
@@ -7738,22 +8064,19 @@ msgstr "Время"
 msgid "Progress"
 msgstr "Прогресс"
 
-#: ../src/filetransfers_window.py:178
-#: ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
 #, python-format
 msgid "Filename: %s"
 msgstr "Имя файла: %s"
 
-#: ../src/filetransfers_window.py:179
-#: ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "Размер: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:188
-#: ../src/filetransfers_window.py:198
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
 #: ../src/history_manager.py:522
 msgid "You"
 msgstr "Ð’Ñ‹"
@@ -7763,8 +8086,7 @@ msgstr "Ð’Ñ‹"
 msgid "Sender: %s"
 msgstr "Отправитель: %s"
 
-#: ../src/filetransfers_window.py:190
-#: ../src/filetransfers_window.py:617
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
 #: ../src/tooltips.py:742
 msgid "Recipient: "
 msgstr "Получатель:"
@@ -7778,13 +8100,11 @@ msgstr "Сохранено в: %s"
 msgid "File transfer completed"
 msgstr "Передача завершена"
 
-#: ../src/filetransfers_window.py:218
-#: ../src/filetransfers_window.py:225
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
 msgid "File transfer cancelled"
 msgstr "Передача отменена"
 
-#: ../src/filetransfers_window.py:218
-#: ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
 msgid "Connection with peer cannot be established."
 msgstr "Соединение не может быть установлено."
 
@@ -7806,8 +8126,7 @@ msgstr "Передача файла остановлена"
 msgid "Choose File to Send..."
 msgstr "Выбрать файл для отправки..."
 
-#: ../src/filetransfers_window.py:273
-#: ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
 msgid "Description: "
 msgstr "Описание: "
 
@@ -7839,37 +8158,33 @@ msgstr "Описание: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s хочет отправить вам файл:"
 
-#: ../src/filetransfers_window.py:342
-#: ../src/gtkgui_helpers.py:900
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Не могу заместить существующий файл «%s»"
 
-#: ../src/filetransfers_window.py:343
-#: ../src/gtkgui_helpers.py:901
-msgid "A file with this name already exists and you do not have permission to overwrite it."
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
+msgid ""
+"A file with this name already exists and you do not have permission to "
+"overwrite it."
 msgstr "Этот файл уже существует, и у вас нет права его перезаписать."
 
-#: ../src/filetransfers_window.py:359
-#: ../src/gtkgui_helpers.py:905
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 msgid "This file already exists"
 msgstr "Файл уже существует"
 
-#: ../src/filetransfers_window.py:359
-#: ../src/gtkgui_helpers.py:905
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 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:369
-#: ../src/gtkgui_helpers.py:912
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Папка «%s» не доступна для записи"
 
-#: ../src/filetransfers_window.py:369
-#: ../src/gtkgui_helpers.py:913
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
 msgid "You do not have permission to create files in this directory."
 msgstr "У вас нет права создавать файлы в этой директории."
 
@@ -7893,8 +8208,7 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:585
-#: ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
 msgid "Invalid File"
 msgstr "Неверный файл"
 
@@ -7906,13 +8220,11 @@ msgstr "Файл: "
 msgid "It is not possible to send empty files"
 msgstr "Нельзя отсылать пустые файлы"
 
-#: ../src/filetransfers_window.py:613
-#: ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
 msgid "Name: "
 msgstr "Имя: "
 
-#: ../src/filetransfers_window.py:615
-#: ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
 msgid "Sender: "
 msgstr "Отправитель:"
 
@@ -7951,8 +8263,12 @@ msgstr "Gajim для запуска требуется pywin32"
 
 #: ../src/gajim.py:200
 #, python-format
-msgid "Please make sure that Pywin32 is installed on your system. You can get it at %s"
-msgstr "Удостоверьтесь, что в вашей системе установлен Pywin32. Вы можете получить его на сайте: %s"
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+"Удостоверьтесь, что в вашей системе установлен Pywin32. Вы можете получить "
+"его на сайте: %s"
 
 #. set the icon to all newly opened wind
 #: ../src/gajim.py:316
@@ -7967,378 +8283,327 @@ msgstr ""
 "По-видимому, уже запущен другой экземпляр Gajim\n"
 "Запустить ещё один?"
 
-#: ../src/gajim-remote-plugin.py:74
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "Показывает помощь для конкретной команды"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77
-#: ../src/gajim-remote.py:80
+#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
 msgid "command"
 msgstr "команда"
 
-#: ../src/gajim-remote-plugin.py:78
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "показать помощь по команде"
 
-#: ../src/gajim-remote-plugin.py:82
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Скрывает или показывает окно ростера"
 
-#: ../src/gajim-remote-plugin.py:86
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Показывать окно со следующим непрочитанным сообщением"
 
-#: ../src/gajim-remote-plugin.py:90
-#: ../src/gajim-remote.py:93
-msgid "Prints a list of all contacts in the roster. Each contact appears on a separate line"
-msgstr "Выводит список всех контактов в ростере. Каждый контакт будет в отдельной строке"
-
-#: ../src/gajim-remote-plugin.py:93
-#: ../src/gajim-remote-plugin.py:108
-#: ../src/gajim-remote-plugin.py:118
-#: ../src/gajim-remote-plugin.py:131
-#: ../src/gajim-remote-plugin.py:145
-#: ../src/gajim-remote-plugin.py:154
-#: ../src/gajim-remote-plugin.py:175
-#: ../src/gajim-remote-plugin.py:205
-#: ../src/gajim-remote-plugin.py:214
-#: ../src/gajim-remote-plugin.py:221
-#: ../src/gajim-remote-plugin.py:228
-#: ../src/gajim-remote-plugin.py:239
-#: ../src/gajim-remote-plugin.py:255
-#: ../src/gajim-remote-plugin.py:264
-#: ../src/gajim-remote.py:96
-#: ../src/gajim-remote.py:111
-#: ../src/gajim-remote.py:121
-#: ../src/gajim-remote.py:131
-#: ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
-#: ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221
-#: ../src/gajim-remote.py:230
-#: ../src/gajim-remote.py:237
-#: ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:255
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
+msgid ""
+"Prints a list of all contacts in the roster. Each contact appears on a "
+"separate line"
+msgstr ""
+"Выводит список всех контактов в ростере. Каждый контакт будет в отдельной "
+"строке"
+
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
+#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
+#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
+#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
+#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:280
 #: ../src/gajim-remote.py:291
 msgid "account"
 msgstr "Учетные записи"
 
-#: ../src/gajim-remote-plugin.py:93
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "показывать контакты только для данной учетной записи"
 
-#: ../src/gajim-remote-plugin.py:99
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Показывает список зарегистрированных учетных записей"
 
-#: ../src/gajim-remote-plugin.py:103
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "Изменяет статус учетной записи или записей"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
 msgid "status"
 msgstr "статус"
 
 #: ../src/gajim-remote-plugin.py:106
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
-msgstr "один из: отключен, в сети, готов поболтать, отошел, недоступен, не беспокоить, невидимка."
+msgstr ""
+"один из: отключен, в сети, готов поболтать, отошел, недоступен, не "
+"беспокоить, невидимка."
 
-#: ../src/gajim-remote-plugin.py:107
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "сообщение о статусе"
 
-#: ../src/gajim-remote-plugin.py:108
-#: ../src/gajim-remote.py:111
-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-plugin.py:108 ../src/gajim-remote.py:111
+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-plugin.py:114
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Показывает окно беседы, чтобы вы могли отправлять сообщения контакту"
 
-#: ../src/gajim-remote-plugin.py:116
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID контакта, с которым вы хотели бы побеседовать"
 
-#: ../src/gajim-remote-plugin.py:118
-#: ../src/gajim-remote-plugin.py:205
-#: ../src/gajim-remote.py:131
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
+#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "если указано, контакт будет взят из контакт-листа этой учетной записи"
 
-#: ../src/gajim-remote-plugin.py:123
-#: ../src/gajim-remote.py:139
-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 key', just set 'OpenPGP key' to ''."
-msgstr "Отправить новое сообщение контакту в ростере. Как ключ OpenPGP, так и учетная запись опциональны. Если вы хотите настроить лишь 'учетную запись', без 'ключа OpenPGP', просто установите 'ключ OpenPGP' в ''."
+#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
+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 "
+"key', just set 'OpenPGP key' to ''."
+msgstr ""
+"Отправить новое сообщение контакту в ростере. Как ключ OpenPGP, так и "
+"учетная запись опциональны. Если вы хотите настроить лишь 'учетную запись', "
+"без 'ключа OpenPGP', просто установите 'ключ OpenPGP' в ''."
 
-#: ../src/gajim-remote-plugin.py:127
-#: ../src/gajim-remote-plugin.py:140
-#: ../src/gajim-remote.py:143
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
+#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID контакта, который получит сообщение"
 
-#: ../src/gajim-remote-plugin.py:128
-#: ../src/gajim-remote-plugin.py:142
-#: ../src/gajim-remote-plugin.py:153
-#: ../src/gajim-remote.py:144
-#: ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
+#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "содержимое сообщения"
 
-#: ../src/gajim-remote-plugin.py:129
-#: ../src/gajim-remote-plugin.py:143
-#: ../src/gajim-remote.py:145
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "PGP ключ"
 
-#: ../src/gajim-remote-plugin.py:129
-#: ../src/gajim-remote-plugin.py:143
-#: ../src/gajim-remote.py:145
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
-msgstr "если указано, сообщение будет зашифровано с использованием открытого ключа"
-
-#: ../src/gajim-remote-plugin.py:131
-#: ../src/gajim-remote-plugin.py:145
-#: ../src/gajim-remote-plugin.py:154
-#: ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
+msgstr ""
+"если указано, сообщение будет зашифровано с использованием открытого ключа"
+
+#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
+#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
-msgstr "если указано, сообщение будет отправлено с использованием этой учетной записи"
+msgstr ""
+"если указано, сообщение будет отправлено с использованием этой учетной записи"
 
-#: ../src/gajim-remote-plugin.py:136
-#: ../src/gajim-remote.py:152
-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 key', just set 'OpenPGP key' to ''."
-msgstr "Отправить новое сообщение контакту в ростере. Как ключ OpenPGP, так и учетная запись опциональны. Если вы хотите настроить лишь 'учетную запись', без 'ключа OpenPGP', просто установите 'ключ OpenPGP' в ''."
+#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
+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 "
+"key', just set 'OpenPGP key' to ''."
+msgstr ""
+"Отправить новое сообщение контакту в ростере. Как ключ OpenPGP, так и "
+"учетная запись опциональны. Если вы хотите настроить лишь 'учетную запись', "
+"без 'ключа OpenPGP', просто установите 'ключ OpenPGP' в ''."
 
-#: ../src/gajim-remote-plugin.py:141
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "тема"
 
-#: ../src/gajim-remote-plugin.py:141
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "тема сообщения"
 
-#: ../src/gajim-remote-plugin.py:150
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Отправляет новые сообщения в комнату, к которой вы присоединились."
 
-#: ../src/gajim-remote-plugin.py:152
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "JID контакта, который получит сообщение"
 
-#: ../src/gajim-remote-plugin.py:159
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Получает детальную информацию о контакте"
 
-#: ../src/gajim-remote-plugin.py:161
-#: ../src/gajim-remote-plugin.py:174
-#: ../src/gajim-remote-plugin.py:204
-#: ../src/gajim-remote-plugin.py:213
-#: ../src/gajim-remote.py:177
-#: ../src/gajim-remote.py:190
-#: ../src/gajim-remote.py:220
-#: ../src/gajim-remote.py:229
+#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
+#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
+#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID контакта"
 
-#: ../src/gajim-remote-plugin.py:165
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Получает детальную информацию о учетной записи"
 
-#: ../src/gajim-remote-plugin.py:167
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Имя учетной записи"
 
-#: ../src/gajim-remote-plugin.py:171
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Отправляет контакту файл"
 
-#: ../src/gajim-remote-plugin.py:173
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "file"
 msgstr "файл"
 
-#: ../src/gajim-remote-plugin.py:173
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Путь до файла"
 
-#: ../src/gajim-remote-plugin.py:175
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
-msgstr "если указано, файл будет отправлен с использованием этой учетной записи"
+msgstr ""
+"если указано, файл будет отправлен с использованием этой учетной записи"
 
-#: ../src/gajim-remote-plugin.py:180
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Показывает все параметры с их значениями"
 
-#: ../src/gajim-remote-plugin.py:184
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Присваивает 'ключу' в 'значение'"
 
-#: ../src/gajim-remote-plugin.py:186
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "ключ=значение"
 
-#: ../src/gajim-remote-plugin.py:186
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
-msgstr "'ключ' это название параметра, а 'значение' это то, что ему присваивают"
+msgstr ""
+"'ключ' это название параметра, а 'значение' это то, что ему присваивают"
 
-#: ../src/gajim-remote-plugin.py:191
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Удаляет параметр"
 
-#: ../src/gajim-remote-plugin.py:193
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
 msgid "key"
 msgstr "ключ"
 
-#: ../src/gajim-remote-plugin.py:193
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "имя параметра, который нужно удалить"
 
-#: ../src/gajim-remote-plugin.py:197
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Сохраняет текущее состояние настроек Gajim в файл .config"
 
-#: ../src/gajim-remote-plugin.py:202
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "Удаляет контакт из ростера"
 
-#: ../src/gajim-remote-plugin.py:211
-#: ../src/gajim-remote.py:227
+#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "Добавляет контакт в ростер"
 
-#: ../src/gajim-remote-plugin.py:214
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "Добавляет новый контакт для данной учетной записи"
 
-#: ../src/gajim-remote-plugin.py:219
-#: ../src/gajim-remote.py:235
+#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
-msgstr "Возвращает текущий статус (по умолчанию глобальный, если не указана учетная запись)"
+msgstr ""
+"Возвращает текущий статус (по умолчанию глобальный, если не указана учетная "
+"запись)"
 
 #: ../src/gajim-remote-plugin.py:226
-msgid "Returns current status message(the global one unless account is specified)"
-msgstr "Возвращает текущее сообщение о статусе (по умолчанию глобальное, если не указана учетная запись)"
+msgid ""
+"Returns current status message(the global one unless account is specified)"
+msgstr ""
+"Возвращает текущее сообщение о статусе (по умолчанию глобальное, если не "
+"указана учетная запись)"
 
-#: ../src/gajim-remote-plugin.py:233
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote-plugin.py:233 ../src/gajim-remote.py:249
 msgid "Returns number of unread messages"
 msgstr "Возвращает количество непрочитанных сообщений"
 
-#: ../src/gajim-remote-plugin.py:237
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr "Открыть диалог «Начать беседу»"
 
-#: ../src/gajim-remote-plugin.py:239
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "Начать беседу с этой учетной записи"
 
-#: ../src/gajim-remote-plugin.py:243
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr "Отправляет произвольный XML"
 
-#: ../src/gajim-remote-plugin.py:245
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr "Отправляемый XML"
 
-#: ../src/gajim-remote-plugin.py:246
-#: ../src/gajim-remote.py:262
-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-plugin.py:246 ../src/gajim-remote.py:262
+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-plugin.py:252
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
 msgid "Handle a xmpp:/ uri"
 msgstr "Обработать ссылку формата «xmpp:/»"
 
-#: ../src/gajim-remote-plugin.py:254
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote-plugin.py:259
-#: ../src/gajim-remote.py:286
+#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
 msgid "Join a MUC room"
 msgstr "Присоединиться к комнате MUC"
 
-#: ../src/gajim-remote-plugin.py:261
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
 msgid "room"
 msgstr "комната"
 
-#: ../src/gajim-remote-plugin.py:262
-#: ../src/gajim-remote.py:289
+#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
 msgid "nick"
 msgstr "Ник"
 
-#: ../src/gajim-remote-plugin.py:263
-#: ../src/gajim-remote.py:290
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
 msgid "password"
 msgstr "Пароль:"
 
-#: ../src/gajim-remote-plugin.py:268
-#: ../src/gajim-remote.py:296
+#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
 msgid "Check if Gajim is running"
 msgstr "Проверить, запущен ли Gajim"
 
-#: ../src/gajim-remote-plugin.py:272
-#: ../src/gajim-remote-plugin.py:282
+#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
 #: ../src/gajim-remote.py:300
 msgid "Shows or hides the ipython window"
 msgstr "Скрывает или показывает окно ipython"
 
-#: ../src/gajim-remote-plugin.py:306
-#: ../src/gajim-remote.py:327
+#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "Пропущен аргумент «JID контакта»"
 
-#: ../src/gajim-remote-plugin.py:325
-#: ../src/gajim-remote.py:348
+#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8347,13 +8612,11 @@ msgstr ""
 "'%s' не в вашем ростере.\n"
 "Укажите учетную запись для отправки сообщения."
 
-#: ../src/gajim-remote-plugin.py:328
-#: ../src/gajim-remote.py:351
+#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
 msgid "You have no active account"
 msgstr "У вас нет ни одной активной учетной записи"
 
-#: ../src/gajim-remote-plugin.py:383
-#: ../src/gajim-remote.py:404
+#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "По-видимому, Gajim не запущен. Вы не можете использовать gajim-remote."
 
@@ -8366,19 +8629,16 @@ msgstr ""
 "Использование: %s %s %s \n"
 "\t %s"
 
-#: ../src/gajim-remote-plugin.py:415
-#: ../src/gajim-remote.py:435
+#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
 msgid "Arguments:"
 msgstr "Аргументы:"
 
-#: ../src/gajim-remote-plugin.py:419
-#: ../src/gajim-remote.py:439
+#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
 #, python-format
 msgid "%s not found"
 msgstr "%s не найден"
 
-#: ../src/gajim-remote-plugin.py:423
-#: ../src/gajim-remote.py:445
+#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8405,14 +8665,17 @@ msgstr ""
 "Аргумент \"%s\" не задан. \n"
 "Наберите \"%s help %s\" для справки"
 
-#: ../src/gajim-remote-plugin.py:518
-#: ../src/gajim-remote.py:540
+#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
 msgid "Wrong uri"
 msgstr "Неверный хост"
 
 #: ../src/gajim-remote.py:109
-msgid "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use account's previous status"
-msgstr "один из: отключен, в сети, готов поболтать, отошел, недоступен, не беспокоить, невидимка. Если не указано, использовать предыдущий статус."
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
+msgstr ""
+"один из: отключен, в сети, готов поболтать, отошел, недоступен, не "
+"беспокоить, невидимка. Если не указано, использовать предыдущий статус."
 
 #: ../src/gajim-remote.py:117
 msgid "Changes the priority of account or accounts"
@@ -8427,16 +8690,24 @@ msgid "priority you want to give to the account"
 msgstr "приоритет, который вы хотите назначить для учетной записи"
 
 #: ../src/gajim-remote.py:121
-msgid "change the priority of the given account. If not specified, change status of all accounts that have \"sync with global status\" option set"
-msgstr "изменяет приоритет учетной записи. Если не указано, пытается изменить статус всех учетных записей, у которых установлена опция «синхронизировать с глобальным статусом»"
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"изменяет приоритет учетной записи. Если не указано, пытается изменить статус "
+"всех учетных записей, у которых установлена опция «синхронизировать с "
+"глобальным статусом»"
 
 #: ../src/gajim-remote.py:134
 msgid "message content. The account must be specified or \"\""
 msgstr "содержимое сообщения. Учетная запись должна быть указана или \"\""
 
 #: ../src/gajim-remote.py:242
-msgid "Returns current status message (the global one unless account is specified)"
-msgstr "Возвращает текущее сообщение о статусе (по умолчанию глобальное, если не указана учетная запись)"
+msgid ""
+"Returns current status message (the global one unless account is specified)"
+msgstr ""
+"Возвращает текущее сообщение о статусе (по умолчанию глобальное, если не "
+"указана учетная запись)"
 
 #: ../src/gajim-remote.py:268
 msgid "Change the avatar"
@@ -8447,8 +8718,12 @@ msgid "Picture to use"
 msgstr "Использовать картинку"
 
 #: ../src/gajim-remote.py:271
-msgid "Account in which the avatar will be set; if not specified, the avatar will be set for all accounts"
-msgstr "Учётная запись, для которой будет назначен аватар. Если не указано, аватар будет назначен всем учетным записям."
+msgid ""
+"Account in which the avatar will be set; if not specified, the avatar will "
+"be set for all accounts"
+msgstr ""
+"Учётная запись, для которой будет назначен аватар. Если не указано, аватар "
+"будет назначен всем учетным записям."
 
 #: ../src/gajim-remote.py:279
 msgid "URI to handle"
@@ -8534,186 +8809,175 @@ msgstr "Вы не можете удалить вашу текущую тему"
 msgid "Please first choose another for your current theme."
 msgstr "Выберите сначала другую тему."
 
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:170
 msgid "Sending private message failed"
 msgstr "Не удалось отправить личное сообщение"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:171
+#: ../src/groupchat_control.py:172
 #, 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:452
+#: ../src/groupchat_control.py:455
 msgid "Insert Nickname"
 msgstr "Вставить ник"
 
-#: ../src/groupchat_control.py:633
+#: ../src/groupchat_control.py:636
 msgid "Conversation with "
 msgstr "Беседа с "
 
-#: ../src/groupchat_control.py:635
+#: ../src/groupchat_control.py:638
 msgid "Continued conversation"
 msgstr "Возобновлённая беседа"
 
-#. Can be a message (see handle_event_gc_config_change in
-#. gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1278
-#: ../src/gui_interface.py:1047
+#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Любой участник может увидеть ваш настоящий JID"
 
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1282
+#: ../src/groupchat_control.py:1286
 msgid "Room logging is enabled"
 msgstr "Запись логов конференции включена"
 
-#: ../src/groupchat_control.py:1284
+#: ../src/groupchat_control.py:1288
 msgid "A new room has been created"
 msgstr "Новая комната была создана"
 
-#: ../src/groupchat_control.py:1287
+#: ../src/groupchat_control.py:1291
 msgid "The server has assigned or modified your roomnick"
 msgstr "Сервер присвоил или изменил ваш ник в комнате"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1297
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s выгнали из комнаты: %(reason)s"
 
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1300
 #, 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:1306
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s запретили заходить в комнату: %(reason)s"
 
-#: ../src/groupchat_control.py:1309
+#: ../src/groupchat_control.py:1312
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(who)s запретил(а) %(nick)s заходить в комнату: %(reason)s"
 
-#: ../src/groupchat_control.py:1320
-#: ../src/groupchat_control.py:1424
+#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вы теперь известны как %s"
 
-#: ../src/groupchat_control.py:1336
-#: ../src/gui_interface.py:887
+#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s теперь известен как %(new_nick)s"
 
-#: ../src/groupchat_control.py:1378
-#: ../src/groupchat_control.py:1383
-#: ../src/groupchat_control.py:1389
+#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1392
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s выгнали из комнаты (%(reason)s)"
 
-#: ../src/groupchat_control.py:1380
+#: ../src/groupchat_control.py:1383
 msgid "affiliation changed"
 msgstr "ранг изменен"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1388
 msgid "room configuration changed to members-only"
 msgstr "настройки комнаты были изменены на 'только для участников'"
 
-#: ../src/groupchat_control.py:1391
+#: ../src/groupchat_control.py:1394
 msgid "system shutdown"
 msgstr "выключение системы"
 
-#: ../src/groupchat_control.py:1476
+#: ../src/groupchat_control.py:1477
 #, 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:1480
+#: ../src/groupchat_control.py:1481
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Ранг %(nick)s был изменен на %(affiliation)s"
 
-#: ../src/groupchat_control.py:1495
+#: ../src/groupchat_control.py:1496
 #, 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:1499
+#: ../src/groupchat_control.py:1500
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Обязанности %(nick)s были изменены на %(role)s"
 
-#: ../src/groupchat_control.py:1528
+#: ../src/groupchat_control.py:1530
 #, python-format
 msgid "%s has left"
 msgstr "%s ушел"
 
-#: ../src/groupchat_control.py:1533
+#: ../src/groupchat_control.py:1535
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s зашёл в комнату"
 
-#: ../src/groupchat_control.py:1535
-#: ../src/gui_interface.py:914
-#: ../src/history_window.py:447
-#: ../src/notify.py:234
+#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
+#: ../src/history_window.py:447 ../src/notify.py:234
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s теперь %(status)s"
 
-#: ../src/groupchat_control.py:1769
+#: ../src/groupchat_control.py:1774
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Вы точно хотите выйти из комнаты «%s»?"
 
-#: ../src/groupchat_control.py:1771
-msgid "If you close this window, you will be disconnected from this group chat."
+#: ../src/groupchat_control.py:1776
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
 msgstr "Если вы закроете это окно, то вы выйдете из этой комнаты."
 
-#: ../src/groupchat_control.py:1775
-#: ../src/gui_interface.py:1183
-#: ../src/gui_interface.py:1944
-#: ../src/gui_interface.py:1981
-#: ../src/gui_interface.py:2016
-#: ../src/message_window.py:224
-#: ../src/roster_window.py:2767
-#: ../src/roster_window.py:3427
-#: ../src/roster_window.py:4157
+#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
+#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
+#: ../src/gui_interface.py:1853 ../src/message_window.py:224
+#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
+#: ../src/roster_window.py:4195
 msgid "_Do not ask me again"
 msgstr "Не _спрашивать меня снова"
 
-#: ../src/groupchat_control.py:1809
+#: ../src/groupchat_control.py:1814
 msgid "Changing Subject"
 msgstr "Смена темы"
 
-#: ../src/groupchat_control.py:1810
+#: ../src/groupchat_control.py:1815
 msgid "Please specify the new subject:"
 msgstr "Введите новую тему:"
 
-#: ../src/groupchat_control.py:1817
+#: ../src/groupchat_control.py:1822
 msgid "Changing Nickname"
 msgstr "Смена ника"
 
-#: ../src/groupchat_control.py:1818
+#: ../src/groupchat_control.py:1823
 msgid "Please specify the new nickname you want to use:"
 msgstr "Введите новый ник, который вы хотите использовать:"
 
 # смотря где вылазит меседж - нужно присмотреться
 #. Ask for a reason
-#: ../src/groupchat_control.py:1849
+#: ../src/groupchat_control.py:1854
 #, python-format
 msgid "Destroying %s"
 msgstr "Удаление %s"
 
-#: ../src/groupchat_control.py:1850
+#: ../src/groupchat_control.py:1855
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8721,23 +8985,22 @@ msgstr ""
 "Вы собираетесь полностью уничтожить эту комнату.\n"
 "Можете указать причину:"
 
-#: ../src/groupchat_control.py:1852
+#: ../src/groupchat_control.py:1857
 msgid "You may also enter an alternate venue:"
 msgstr "Можете указать альтернативную комнату:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2041
+#: ../src/groupchat_control.py:2046
 #, python-format
 msgid "Kicking %s"
 msgstr "Выгоняем %s"
 
-#: ../src/groupchat_control.py:2042
-#: ../src/groupchat_control.py:2369
+#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
 msgid "You may specify a reason below:"
 msgstr "Вы можете указать причину ниже:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2368
+#: ../src/groupchat_control.py:2373
 #, python-format
 msgid "Banning %s"
 msgstr "Забанить %s"
@@ -8747,8 +9010,12 @@ msgid "A programming error has been detected"
 msgstr "Обнаружена ошибка в программе"
 
 #: ../src/gtkexcepthook.py:47
-msgid "It probably is not fatal, but should be reported to the developers nonetheless."
-msgstr "Возможно это не так страшно, но все равно стоит сообщить об этом разработчикам."
+msgid ""
+"It probably is not fatal, but should be reported to the developers "
+"nonetheless."
+msgstr ""
+"Возможно это не так страшно, но все равно стоит сообщить об этом "
+"разработчикам."
 
 #: ../src/gtkexcepthook.py:54
 msgid "_Report Bug"
@@ -8759,118 +9026,161 @@ msgid "Details"
 msgstr "Детали"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:203
-#: ../src/gtkgui_helpers.py:219
+#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Ошибка: не могу открыть %s для чтения"
 
-#: ../src/gtkgui_helpers.py:398
+#: ../src/gtkgui_helpers.py:404
 msgid "Error reading file:"
 msgstr "Ошибка чтения файла:"
 
-#: ../src/gtkgui_helpers.py:401
+#: ../src/gtkgui_helpers.py:407
 msgid "Error parsing file:"
 msgstr "Ошибка обработки файла:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:442
+#: ../src/gtkgui_helpers.py:448
 #, 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:816
+#: ../src/gtkgui_helpers.py:822
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim не является основным jabber-клиентом"
 
-#: ../src/gtkgui_helpers.py:817
+#: ../src/gtkgui_helpers.py:823
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Вы хотите сделать Gajim основным jabber-клиентом?"
 
-#: ../src/gtkgui_helpers.py:818
+#: ../src/gtkgui_helpers.py:824
 msgid "Always check to see if Gajim is the default Jabber client on startup"
-msgstr "Всегда проверять при запуске является ли Gajim основным jabber-клиентом"
+msgstr ""
+"Всегда проверять при запуске является ли Gajim основным jabber-клиентом"
 
-#: ../src/gtkgui_helpers.py:885
+#: ../src/gtkgui_helpers.py:891
 msgid "Extension not supported"
 msgstr "Расширение не поддерживается"
 
-#: ../src/gtkgui_helpers.py:886
+#: ../src/gtkgui_helpers.py:892
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
-msgstr "Изображение нельзя сохранить в формате %(type)s. Сохранить как %(new_filename)s?"
+msgstr ""
+"Изображение нельзя сохранить в формате %(type)s. Сохранить как "
+"%(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:922
+#: ../src/gtkgui_helpers.py:928
 msgid "Save Image as..."
 msgstr "Сохранить изображение как..."
 
-#: ../src/gui_interface.py:140
+#. we are banned
+#. group chat does not exist
+#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
+#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
+#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
+#: ../src/gui_interface.py:348
+msgid "Unable to join group chat"
+msgstr "Не получается войти в комнату"
+
+#: ../src/gui_interface.py:138
 #, python-format
 msgid ""
-"Your desired nickname in group chat %s is in use or registered by another occupant.\n"
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
-"Тот ник, что вы ввели в комнате %s уже используется или зарегистрирован другим пользователем.\n"
+"Тот ник, что вы ввели в комнате %s уже используется или зарегистрирован "
+"другим пользователем.\n"
 "Укажите другой ник:"
 
-#: ../src/gui_interface.py:143
+#: ../src/gui_interface.py:141
 msgid "Always use this nickname when there is a conflict"
 msgstr "Всегда использовать этот ник в случае конфликта"
 
-#: ../src/gui_interface.py:160
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Вы принимаете этот запрос?"
 
-#: ../src/gui_interface.py:162
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Вы принимаете запрос %s?"
 
-#: ../src/gui_interface.py:165
+#: ../src/gui_interface.py:163
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Авторизация для %(url)s (id: %(id)s)"
 
-#: ../src/gui_interface.py:214
-#: ../src/notify.py:493
+#: ../src/gui_interface.py:209 ../src/notify.py:493
 msgid "Connection Failed"
 msgstr "Соединение разорвалось"
 
-#: ../src/gui_interface.py:607
-#: ../src/gui_interface.py:611
+#: ../src/gui_interface.py:312
+#, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Чтобы войти в комнату %s, нужен пароль."
+
+#: ../src/gui_interface.py:324
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr "Было достигнуто максимальное количество пользователей %s"
+
+#: ../src/gui_interface.py:333
+#, python-format
+msgid "You are banned from group chat %s."
+msgstr "Вам запрещено входить в комнату %s."
+
+#: ../src/gui_interface.py:338
+#, python-format
+msgid "Group chat %s does not exist."
+msgstr "Комнаты %s не существует."
+
+#: ../src/gui_interface.py:341
+msgid "Group chat creation is restricted."
+msgstr "Создание комнат запрещено."
+
+#: ../src/gui_interface.py:344
+#, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Необходимо использовать ваш зарегистрированный ник в комнате %s."
+
+#: ../src/gui_interface.py:349
+#, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Вас нет в списке членов комнаты %s."
+
+#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Ошибка %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:622
-#: ../src/gui_interface.py:637
+#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "ошибка при отправке %(message)s ( %(error)s )"
 
-#: ../src/gui_interface.py:664
-#: ../src/notify.py:495
+#: ../src/gui_interface.py:540 ../src/notify.py:495
 msgid "Subscription request"
 msgstr "Запрос подписки"
 
-#: ../src/gui_interface.py:689
+#: ../src/gui_interface.py:565
 msgid "Authorization accepted"
 msgstr "Авторизация принята"
 
-#: ../src/gui_interface.py:690
+#: ../src/gui_interface.py:566
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Контакт «%s» авторизовал вас, теперь вы можете видеть его статус."
 
-#: ../src/gui_interface.py:703
+#: ../src/gui_interface.py:579
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контакт «%s» отозвал подписку с вами"
 
-#: ../src/gui_interface.py:704
+#: ../src/gui_interface.py:580
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8878,94 +9188,100 @@ msgstr ""
 "Вы всегда будете видеть его или её как отключенными.\n"
 "Удалить его или её из контакт-листа?"
 
-#: ../src/gui_interface.py:728
-#: ../src/notify.py:497
+#: ../src/gui_interface.py:604 ../src/notify.py:497
 msgid "Unsubscribed"
 msgstr "От подписки отказался"
 
-#: ../src/gui_interface.py:755
+#: ../src/gui_interface.py:631
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Связь с «%s» не может быть установлена"
 
-#: ../src/gui_interface.py:983
+#: ../src/gui_interface.py:859
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s установил(а) тему: %(subject)s"
 
-#: ../src/gui_interface.py:1050
+#: ../src/gui_interface.py:926
 msgid "Room now shows unavailable member"
 msgstr "Теперь в комнате отображается недоступный участник"
 
-#: ../src/gui_interface.py:1052
+#: ../src/gui_interface.py:928
 msgid "room now does not show unavailable members"
 msgstr "теперь в комнате не отображаются недоступные участники"
 
-#: ../src/gui_interface.py:1054
+#: ../src/gui_interface.py:930
 msgid "A non-privacy-related room configuration change has occurred"
-msgstr "Произошло изменение настроек комнаты, не относящееся к настройкам приватности"
+msgstr ""
+"Произошло изменение настроек комнаты, не относящееся к настройкам приватности"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:1058
+#: ../src/gui_interface.py:934
 msgid "Room logging is now enabled"
 msgstr "Запись логов конференции включена"
 
-#: ../src/gui_interface.py:1060
+#: ../src/gui_interface.py:936
 msgid "Room logging is now disabled"
 msgstr "Запись логов конференции выключена"
 
-#: ../src/gui_interface.py:1062
+#: ../src/gui_interface.py:938
 msgid "Room is now non-anonymous"
 msgstr "Конференция не анонимна"
 
-#: ../src/gui_interface.py:1065
+#: ../src/gui_interface.py:941
 msgid "Room is now semi-anonymous"
 msgstr "Конференция частично анонимна"
 
-#: ../src/gui_interface.py:1068
+#: ../src/gui_interface.py:944
 msgid "Room is now fully-anonymous"
 msgstr "Конференция полностью анонимна"
 
-#: ../src/gui_interface.py:1100
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Чтобы войти в комнату %s, нужен пароль."
-
-#: ../src/gui_interface.py:1147
-msgid "You configured Gajim to use GPG agent, but there is no GPG agent running or it returned a wrong passphrase.\n"
-msgstr "Gajim настроен на использование GPG агента, но GPG агент не запущен или он возвратил неверный пароль.\n"
+#: ../src/gui_interface.py:985
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+"Gajim настроен на использование GPG агента, но GPG агент не запущен или он "
+"возвратил неверный пароль.\n"
 
-#: ../src/gui_interface.py:1149
-#: ../src/gui_interface.py:1156
+#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Вы сейчас соединены без ключа OpenPGP."
 
-#: ../src/gui_interface.py:1151
+#: ../src/gui_interface.py:989
 msgid "Your passphrase is incorrect"
 msgstr "Ваша парольная фраза неверна"
 
-#: ../src/gui_interface.py:1155
+#: ../src/gui_interface.py:993
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Парольная фраза OpenGPG неверна"
 
-#: ../src/gui_interface.py:1181
+#: ../src/gui_interface.py:1019
 msgid "GPG key not trusted"
 msgstr "Ключ GPG не является доверенным"
 
-#: ../src/gui_interface.py:1181
-msgid "The GPG key used to encrypt this chat is not trusted. Do you really want to encrypt this message?"
-msgstr "Ключ GPG используемый для шифрования не является доверенным. Вы действительно хотите зашифровать эти сообщения?"
+#: ../src/gui_interface.py:1019
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+"Ключ GPG используемый для шифрования не является доверенным. Вы "
+"действительно хотите зашифровать эти сообщения?"
 
-#: ../src/gui_interface.py:1193
-msgid "Gnome Keyring is installed but not                 correctly started (environment variable probably not                 correctly set)"
-msgstr "Gnome Keyring установлен, но некорректно запущен (возможно, неверно установлена переменная среды)"
+#: ../src/gui_interface.py:1031
+msgid ""
+"Gnome Keyring is installed but not                 correctly started "
+"(environment variable probably not                 correctly set)"
+msgstr ""
+"Gnome Keyring установлен, но некорректно запущен (возможно, неверно "
+"установлена переменная среды)"
 
-#: ../src/gui_interface.py:1293
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Новое письмо на %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1295
+#: ../src/gui_interface.py:1133
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -8973,7 +9289,7 @@ msgstr[0] "У вас есть %d непрочитанное письмо"
 msgstr[1] "У вас есть %d непрочитанных письма"
 msgstr[2] "У вас есть %d непрочитанных писем"
 
-#: ../src/gui_interface.py:1308
+#: ../src/gui_interface.py:1146
 #, python-format
 msgid ""
 "\n"
@@ -8988,44 +9304,42 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1377
+#: ../src/gui_interface.py:1215
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s хочет отправить вам файл."
 
-#: ../src/gui_interface.py:1414
-#: ../src/roster_window.py:1874
+#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
 msgid "Remote contact stopped transfer"
 msgstr "Удаленный контакт остановил передачу"
 
-#: ../src/gui_interface.py:1417
-#: ../src/roster_window.py:1876
+#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
 msgid "Error opening file"
 msgstr "Ошибка открытия файла"
 
-#: ../src/gui_interface.py:1449
+#: ../src/gui_interface.py:1287
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Успешно получен файл %(filename)s от %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1453
+#: ../src/gui_interface.py:1291
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Передача файла %(filename)s от %(name)s приостановлена."
 
-#: ../src/gui_interface.py:1466
+#: ../src/gui_interface.py:1304
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "%(name)s успешно получил(а) отправленный вами файл %(filename)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1470
+#: ../src/gui_interface.py:1308
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Передача файла %(filename)s к %(name)s приостановлена."
 
-#: ../src/gui_interface.py:1588
+#: ../src/gui_interface.py:1426
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -9034,157 +9348,181 @@ msgstr ""
 "Не удалось расшифровать сообщение от %s\n"
 "Возможно, оно было испорчено."
 
-#: ../src/gui_interface.py:1595
+#: ../src/gui_interface.py:1433
 msgid "Unable to decrypt message"
 msgstr "Сообщение не удалось расшифровать"
 
-#: ../src/gui_interface.py:1667
+#: ../src/gui_interface.py:1505
 msgid "Username Conflict"
 msgstr "Такое имя уже есть"
 
-#: ../src/gui_interface.py:1668
+#: ../src/gui_interface.py:1506
 msgid "Please type a new username for your local account"
 msgstr "Введите новое имя пользователя для локальной учетной записи"
 
-#: ../src/gui_interface.py:1681
+#: ../src/gui_interface.py:1519
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gui_interface.py:1694
+#: ../src/gui_interface.py:1532
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s сек.)"
 
-#: ../src/gui_interface.py:1705
+#: ../src/gui_interface.py:1543
 msgid "Error."
 msgstr "Ошибка."
 
-#: ../src/gui_interface.py:1719
+#: ../src/gui_interface.py:1556
 msgid "Resource Conflict"
 msgstr "Такое имя уже есть"
 
-#: ../src/gui_interface.py:1720
-msgid "You are already connected to this account with the same resource. Please type a new one"
-msgstr "Вы уже подсоединены к этой учетной записи с таким же ресурсом. Введите другой ресурс"
+#: ../src/gui_interface.py:1557
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+"Вы уже подсоединены к этой учетной записи с таким же ресурсом. Введите "
+"другой ресурс"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1767
+#: ../src/gui_interface.py:1604
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s хочет начать видео сеанс."
 
-#: ../src/gui_interface.py:1770
+#: ../src/gui_interface.py:1607
 msgid "Voice Chat Request"
 msgstr "Запрос аудио сеанса"
 
-#: ../src/gui_interface.py:1879
+#: ../src/gui_interface.py:1716
 msgid "Error verifying SSL certificate"
 msgstr "Ошибка при проверке SSL сертификата"
 
-#: ../src/gui_interface.py:1880
+#: ../src/gui_interface.py:1717
 #, python-format
 msgid ""
-"There was an error verifying the SSL certificate of your jabber server: %(error)s\n"
+"There was an error verifying the SSL certificate of your jabber server: "
+"%(error)s\n"
 "Do you still want to connect to this server?"
 msgstr ""
-"Произошла ошибка при проверке сертификата SSL вашего jabber сервера: %(error)s\n"
+"Произошла ошибка при проверке сертификата SSL вашего jabber сервера: "
+"%(error)s\n"
 "Вы всё ещё хотите подключиться к этому серверу?"
 
-#: ../src/gui_interface.py:1888
+#: ../src/gui_interface.py:1725
 msgid "Ignore this error for this certificate."
 msgstr "Игнорировать эту ошибку для данного сертификата."
 
-#: ../src/gui_interface.py:1908
+#: ../src/gui_interface.py:1745
 msgid "SSL certificate error"
 msgstr "Ошибка SSL сертификата"
 
-#: ../src/gui_interface.py:1909
+#: ../src/gui_interface.py:1746
 #, python-format
 msgid ""
-"It seems the SSL certificate of account %(account)s 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 ""
-"По видимому, сертификат SSL учетной записи %(account)s изменился или ваше соединение было взломано.\n"
+"По видимому, сертификат SSL учетной записи %(account)s изменился или ваше "
+"соединение было взломано.\n"
 "Старый отпечаток: %(old)s\n"
 "Новый отпечаток: %(new)s\n"
 "Вы всё ещё хотите соединиться и обновить отпечаток сертификата?"
 
-#: ../src/gui_interface.py:1939
-#: ../src/gui_interface.py:1976
-#: ../src/gui_interface.py:2012
+#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
+#: ../src/gui_interface.py:1849
 msgid "Insecure connection"
 msgstr "Небезопасное соединение"
 
-#: ../src/gui_interface.py:1940
-msgid "You are about to connect to the server with an insecure connection. This means all your conversations will be exchanged unencrypted. Are you sure you want to do that?"
-msgstr "Вы хотите отправить пароль через небезопасное соединение. Вы уверены? (Установите PyOpenSSL, чтобы этого не происходило)."
+#: ../src/gui_interface.py:1777
+msgid ""
+"You are about to connect to the server with an insecure connection. This "
+"means all your conversations will be exchanged unencrypted. Are you sure you "
+"want to do that?"
+msgstr ""
+"Вы хотите отправить пароль через небезопасное соединение. Вы уверены? "
+"(Установите PyOpenSSL, чтобы этого не происходило)."
 
-#: ../src/gui_interface.py:1943
-#: ../src/gui_interface.py:1980
-#: ../src/gui_interface.py:2015
+#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
+#: ../src/gui_interface.py:1852
 msgid "Yes, I really want to connect insecurely"
 msgstr "Да, я действительно хочу соединиться небезопасно"
 
-#: ../src/gui_interface.py:1977
-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 "Вы хотите отправить пароль через небезопасное соединение. Вы уверены? (Установите PyOpenSSL, чтобы этого не происходило.)"
+#: ../src/gui_interface.py:1814
+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 ""
+"Вы хотите отправить пароль через небезопасное соединение. Вы уверены? "
+"(Установите PyOpenSSL, чтобы этого не происходило.)"
 
-#: ../src/gui_interface.py:2013
-msgid "You are about to send your password unencrypted on an insecure connection. Are you sure you want to do that?"
+#: ../src/gui_interface.py:1850
+msgid ""
+"You are about to send your password unencrypted on an insecure connection. "
+"Are you sure you want to do that?"
 msgstr "Вы хотите отправить пароль через небезопасное соединение. Вы уверены?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2587
-#: ../src/gui_interface.py:2610
+#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
 msgid "Emoticons disabled"
 msgstr "Смайлики выключены"
 
-#: ../src/gui_interface.py:2588
-msgid "Your configured emoticons theme has not been found, so emoticons have been disabled."
+#: ../src/gui_interface.py:2423
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
 msgstr "Тема смайликов не найдена, они будут отключены."
 
-#: ../src/gui_interface.py:2611
-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 "Смайлики не могут быть загружены. Возможно, вам нужно обновить формат файла emoticons.py. Подробности на http://trac.gajim.org/wiki/Emoticons."
+#: ../src/gui_interface.py:2446
+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 ""
+"Смайлики не могут быть загружены. Возможно, вам нужно обновить формат файла "
+"emoticons.py. Подробности на http://trac.gajim.org/wiki/Emoticons."
 
-#: ../src/gui_interface.py:2642
-#: ../src/roster_window.py:3594
+#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
 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/gui_interface.py:3023
+#: ../src/gui_interface.py:2871
 msgid "Could not save your settings and preferences"
 msgstr "Не могу сохранить ваши установки и настройки"
 
-#: ../src/gui_interface.py:3563
+#: ../src/gui_interface.py:3411
 msgid "Passphrase Required"
 msgstr "Требуется парольная фраза"
 
-#: ../src/gui_interface.py:3564
+#: ../src/gui_interface.py:3412
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Введите пароль для ключа %(keyid)s (аккаунт %(account)s)."
 
-#: ../src/gui_interface.py:3578
+#: ../src/gui_interface.py:3426
 msgid "GPG key expired"
 msgstr "Срок действия ключа GPG истёк"
 
-#: ../src/gui_interface.py:3579
+#: ../src/gui_interface.py:3427
 #, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
-msgstr "Срок действия вашего ключа GPG истёк, вы будете подключены к %s без использования OpenPGP."
+msgstr ""
+"Срок действия вашего ключа GPG истёк, вы будете подключены к %s без "
+"использования OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3588
+#: ../src/gui_interface.py:3436
 msgid "Wrong Passphrase"
 msgstr "Неверная парольная фраза"
 
-#: ../src/gui_interface.py:3589
+#: ../src/gui_interface.py:3437
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Введите парольную фразу для GPG еще раз или нажмите «Отмена»."
 
@@ -9206,42 +9544,45 @@ msgid "Contacts"
 msgstr "Контакты"
 
 #. holds time
-#: ../src/history_manager.py:167
-#: ../src/history_manager.py:207
+#: ../src/history_manager.py:167 ../src/history_manager.py:207
 #: ../src/history_window.py:98
 msgid "Date"
 msgstr "Дата"
 
 #. holds nickname
-#: ../src/history_manager.py:173
-#: ../src/history_manager.py:225
+#: ../src/history_manager.py:173 ../src/history_manager.py:225
 msgid "Nickname"
 msgstr "Ник"
 
 #. holds message
-#: ../src/history_manager.py:181
-#: ../src/history_manager.py:213
+#: ../src/history_manager.py:181 ../src/history_manager.py:213
 #: ../src/history_window.py:106
 msgid "Message"
 msgstr "Сообщение"
 
 #. holds subject
-#: ../src/history_manager.py:188
-#: ../src/history_manager.py:219
+#: ../src/history_manager.py:188 ../src/history_manager.py:219
 msgid "Subject"
 msgstr "Тема"
 
 #: ../src/history_manager.py:241
-msgid "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING)"
-msgstr "Вы хотите очистить базу данных? (КРАЙНЕ НЕ РЕКОМЕНДУЕТСЯ, ЕСЛИ GAJIM ЗАПУЩЕН)"
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
+msgstr ""
+"Вы хотите очистить базу данных? (КРАЙНЕ НЕ РЕКОМЕНДУЕТСЯ, ЕСЛИ GAJIM ЗАПУЩЕН)"
 
 #: ../src/history_manager.py:243
 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 click NO.\n"
+"Normally allocated database size will not be freed, it will just become "
+"reusable. If you really want to reduce database filesize, click YES, else "
+"click NO.\n"
 "\n"
 "In case you click YES, please wait..."
 msgstr ""
-"Обычно размер файла базы данных не уменьшается при очистке, а используется заново. Если вы хотите действительно уменьшить размер файла, нажмите ДА, в противном случае нажмите НЕТ.\n"
+"Обычно размер файла базы данных не уменьшается при очистке, а используется "
+"заново. Если вы хотите действительно уменьшить размер файла, нажмите ДА, в "
+"противном случае нажмите НЕТ.\n"
 "\n"
 "Если вы нажали ДА, пожалуйста подождите..."
 
@@ -9261,8 +9602,7 @@ msgstr[0] "Вы точно хотите удалить логи выделенн
 msgstr[1] "Вы точно хотите удалить логи выделенных контактов?"
 msgstr[2] "Вы точно хотите удалить логи выделенных контактов?"
 
-#: ../src/history_manager.py:576
-#: ../src/history_manager.py:611
+#: ../src/history_manager.py:576 ../src/history_manager.py:611
 msgid "This is an irreversible operation."
 msgstr "Это необратимая операция"
 
@@ -9306,8 +9646,7 @@ msgstr "Статус установлен в: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Статус установлен в: %(status)s"
 
-#: ../src/htmltextview.py:515
-#: ../src/htmltextview.py:525
+#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
 msgid "Timeout loading image"
 msgstr "Не могу загрузить изображение"
 
@@ -9395,22 +9734,18 @@ msgstr "Игнорировать"
 msgid "Retrieving profile..."
 msgstr "Получаю данные..."
 
-#: ../src/profile_window.py:111
-#: ../src/roster_window.py:2963
+#: ../src/profile_window.py:111 ../src/roster_window.py:3001
 msgid "File is empty"
 msgstr "Пустой файл"
 
-#: ../src/profile_window.py:114
-#: ../src/roster_window.py:2966
+#: ../src/profile_window.py:114 ../src/roster_window.py:3004
 msgid "File does not exist"
 msgstr "Файл не существует"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:128
-#: ../src/profile_window.py:144
-#: ../src/roster_window.py:2968
-#: ../src/roster_window.py:2979
+#: ../src/profile_window.py:128 ../src/profile_window.py:144
+#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
 msgid "Could not load image"
 msgstr "Не могу загрузить изображение"
 
@@ -9443,242 +9778,291 @@ msgid "vCard publication failed"
 msgstr "Публикация vCard не удалась"
 
 #: ../src/profile_window.py:377
-msgid "There was an error while publishing your personal information, try again later."
-msgstr "При публикации вашей личной информации произошла ошибка, попробуйте позже."
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"При публикации вашей личной информации произошла ошибка, попробуйте позже."
 
-#: ../src/roster_window.py:261
-#: ../src/roster_window.py:1025
+#: ../src/roster_window.py:262 ../src/roster_window.py:1026
 msgid "Merged accounts"
 msgstr "Объединенные учетные записи"
 
-#: ../src/roster_window.py:1939
+#: ../src/roster_window.py:1942
 msgid "Authorization has been sent"
 msgstr "Была отправлена авторизация"
 
-#: ../src/roster_window.py:1940
+#: ../src/roster_window.py:1943
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Теперь «%s» будет знать о вашем статусе."
 
-#: ../src/roster_window.py:1963
+#: ../src/roster_window.py:1966
 msgid "Subscription request has been sent"
 msgstr "Был отправлен запрос на подписку "
 
-#: ../src/roster_window.py:1964
+#: ../src/roster_window.py:1967
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Если «%s» примет ваш запрос, вы будете знать его или её статус"
 
-#: ../src/roster_window.py:1978
+#: ../src/roster_window.py:1981
 msgid "Authorization has been removed"
 msgstr "Авторизация была удалена"
 
-#: ../src/roster_window.py:1979
+#: ../src/roster_window.py:1982
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Теперь «%s» всегда будет видеть вас в оффлайне."
 
-#: ../src/roster_window.py:2006
+#: ../src/roster_window.py:2009
 msgid "GPG is not usable"
 msgstr "GPG использовать невозможно"
 
-#: ../src/roster_window.py:2007
+#: ../src/roster_window.py:2010
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Вы будете подключены к %s без использования OpenPGP."
 
-#: ../src/roster_window.py:2219
-#: ../src/roster_window.py:3524
+#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
 msgid "You are participating in one or more group chats"
 msgstr "Вы находитесь в одной или более комнатах"
 
-#: ../src/roster_window.py:2220
-#: ../src/roster_window.py:3525
-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:2223 ../src/roster_window.py:3563
+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:2246
+#: ../src/roster_window.py:2249
 msgid "desync'ed"
 msgstr "не синхронизировано"
 
-#: ../src/roster_window.py:2308
+#: ../src/roster_window.py:2311
 msgid "Really quit Gajim?"
 msgstr "Закрыть Gajim?"
 
-#: ../src/roster_window.py:2309
+#: ../src/roster_window.py:2312
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Вы точно хотите закрыть Gajim?"
 
-#: ../src/roster_window.py:2310
+#: ../src/roster_window.py:2313
 msgid "Always close Gajim"
 msgstr "Всегда закрывать Gajim"
 
-#: ../src/roster_window.py:2393
+#: ../src/roster_window.py:2396
 msgid "You have running file transfers"
 msgstr "Идет передача файлов"
 
-#: ../src/roster_window.py:2394
-msgid "If you quit now, the file(s) being transferred will be stopped. Do you still want to quit?"
+#: ../src/roster_window.py:2397
+msgid ""
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
+"want to quit?"
 msgstr "Если выйти сейчас, передача файла остановится. Выйти?"
 
-#: ../src/roster_window.py:2425
-#: ../src/roster_window.py:2681
+#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
 msgid "You have unread messages"
 msgstr "У вас есть непрочитанные сообщения"
 
-#: ../src/roster_window.py:2426
-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:2429
+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:2682
+#: ../src/roster_window.py:2720
 msgid "You must read them before removing this transport."
 msgstr "Просмотрите все ожидающие события перед удалением транспорта."
 
-#: ../src/roster_window.py:2685
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспорт «%s» будет удален"
 
-#: ../src/roster_window.py:2686
-msgid "You will no longer be able to send and receive messages from contacts using this transport."
-msgstr "У вас теперь не будет возможности приема и отправки сообщения контактам через этот транспорт."
+#: ../src/roster_window.py:2724
+msgid ""
+"You will no longer be able to send and receive messages from contacts using "
+"this transport."
+msgstr ""
+"У вас теперь не будет возможности приема и отправки сообщения контактам "
+"через этот транспорт."
 
-#: ../src/roster_window.py:2689
+#: ../src/roster_window.py:2727
 msgid "Transports will be removed"
 msgstr "Транспорты будут удалены"
 
-#: ../src/roster_window.py:2694
+#: ../src/roster_window.py:2732
 #, python-format
-msgid "You will no longer be able to send and receive messages to contacts from these transports: %s"
-msgstr "У вас больше не будет возможности приема и отправки сообщений через эти транспорты:%s."
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports: %s"
+msgstr ""
+"У вас больше не будет возможности приема и отправки сообщений через эти "
+"транспорты:%s."
 
-#: ../src/roster_window.py:2762
+#: ../src/roster_window.py:2800
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Вы точно хотите заблокировать контакт?"
 
-#: ../src/roster_window.py:2764
-msgid "This contact will see you offline and you will not receive messages he will send you."
-msgstr "Этот контакт будет видеть вас как отключенного, а вы не будете получать от него сообщения."
+#: ../src/roster_window.py:2802
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+"Этот контакт будет видеть вас как отключенного, а вы не будете получать от "
+"него сообщения."
 
 #. it's jid
-#: ../src/roster_window.py:2855
+#: ../src/roster_window.py:2893
 msgid "Rename Contact"
 msgstr "Переименовать контакт"
 
-#: ../src/roster_window.py:2856
+#: ../src/roster_window.py:2894
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Введите новый ник для контакта %s"
 
-#: ../src/roster_window.py:2863
+#: ../src/roster_window.py:2901
 msgid "Rename Group"
 msgstr "Переименовать группу"
 
-#: ../src/roster_window.py:2864
+#: ../src/roster_window.py:2902
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Введите новое название для группы %s"
 
-#: ../src/roster_window.py:2909
+#: ../src/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Удалить группу"
 
-#: ../src/roster_window.py:2910
+#: ../src/roster_window.py:2948
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Вы точно хотите удалить группу %s из ростера?"
 
-#: ../src/roster_window.py:2911
+#: ../src/roster_window.py:2949
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Удалить из ростера все контакты в этой группе"
 
-#: ../src/roster_window.py:2950
+#: ../src/roster_window.py:2988
 msgid "Assign OpenPGP Key"
 msgstr "Назначить ключ OpenPGP"
 
-#: ../src/roster_window.py:2951
+#: ../src/roster_window.py:2989
 msgid "Select a key to apply to the contact"
 msgstr "Выберите ключ, который будет применен к контакту"
 
-#: ../src/roster_window.py:3334
+#: ../src/roster_window.py:3372
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контакт «%s» будет удален из вашего ростера"
 
-#: ../src/roster_window.py:3336
+#: ../src/roster_window.py:3374
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
-msgstr "Вы собираетесь удалить «%(name)s» (%(jid)s) из вашего списка контактов.\n"
+msgstr ""
+"Вы собираетесь удалить «%(name)s» (%(jid)s) из вашего списка контактов.\n"
 
-#: ../src/roster_window.py:3341
-msgid "By removing this contact you also remove authorization resulting in him or her always seeing you as offline."
-msgstr "Удаляя контакт, вы одновременно удалите авторизацию, и этот человек больше не сможет видеть ваш статус."
+#: ../src/roster_window.py:3379
+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:3347
+#: ../src/roster_window.py:3385
 msgid "Do you want to continue?"
 msgstr "Продолжить?"
 
-#: ../src/roster_window.py:3351
-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:3389
+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:3354
+#: ../src/roster_window.py:3392
 msgid "I want this contact to know my status after removal"
 msgstr "Я хочу, чтобы этот контакт видел мой статус после удаления"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3358
+#: ../src/roster_window.py:3396
 msgid "Contacts will be removed from your roster"
 msgstr "Контакты будут удалены из вашего ростера"
 
-#: ../src/roster_window.py:3363
+#: ../src/roster_window.py:3401
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
 "you also remove authorization resulting in them always seeing you as offline."
 msgstr ""
 "Вы удаляете эти контакты:%s.\n"
-"Одновременно вы удалите и авторизацию, то есть они всегда будут видеть вас в оффлайне."
+"Одновременно вы удалите и авторизацию, то есть они всегда будут видеть вас в "
+"оффлайне."
 
-#: ../src/roster_window.py:3421
-msgid "You are about to send a custom status. Are you sure you want  to continue?"
+#: ../src/roster_window.py:3459
+msgid ""
+"You are about to send a custom status. Are you sure you want  to continue?"
 msgstr "Вы точно хотите послать другой статус?"
 
-#: ../src/roster_window.py:3423
+#: ../src/roster_window.py:3461
 #, python-format
-msgid "This contact will temporarily see you as %(status)s, but only until you change your status. Then he or she will see your global status."
-msgstr "Этот контакт будет временно видеть ваш статус как %(status)s, но лишь пока вы не измените свой глобальный статус. Тогда этому контакту станет виден глобальный статус."
+msgid ""
+"This contact will temporarily see you as %(status)s, but only until you "
+"change your status. Then he or she will see your global status."
+msgstr ""
+"Этот контакт будет временно видеть ваш статус как %(status)s, но лишь пока "
+"вы не измените свой глобальный статус. Тогда этому контакту станет виден "
+"глобальный статус."
 
-#: ../src/roster_window.py:3442
+#: ../src/roster_window.py:3480
 msgid "No account available"
 msgstr "Нет доступной учетной записи"
 
-#: ../src/roster_window.py:3443
+#: ../src/roster_window.py:3481
 msgid "You must create an account before you can chat with other contacts."
-msgstr "Для начала беседы с другими людьми прежде необходимо создать учетную запись."
+msgstr ""
+"Для начала беседы с другими людьми прежде необходимо создать учетную запись."
 
-#: ../src/roster_window.py:4057
+#: ../src/roster_window.py:4095
 msgid "Metacontacts storage not supported by your server"
 msgstr "Сервер не умеет хранить метаконтакты"
 
-#: ../src/roster_window.py:4059
-msgid "Your server does not support storing metacontacts information. So those information will not be saved on next reconnection."
-msgstr "Ваш сервер не умеет хранить данные о метаконтактах. Они будут утеряны при следующем подключении."
+#: ../src/roster_window.py:4097
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be saved on next reconnection."
+msgstr ""
+"Ваш сервер не умеет хранить данные о метаконтактах. Они будут утеряны при "
+"следующем подключении."
 
-#: ../src/roster_window.py:4151
-msgid "You are about to create a metacontact. Are you sure you want to continue?"
+#: ../src/roster_window.py:4189
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Вы точно хотите создать метаконтакт?"
 
-#: ../src/roster_window.py:4153
-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 "Метаконтакты — это метод группировки нескольких контактов в одну запись. Обычно используется, когда один и тот же человек имеет несколько учетных записей в Jabber или на транспортах."
+#: ../src/roster_window.py:4191
+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 ""
+"Метаконтакты — это метод группировки нескольких контактов в одну запись. "
+"Обычно используется, когда один и тот же человек имеет несколько учетных "
+"записей в Jabber или на транспортах."
 
-#: ../src/roster_window.py:4268
+#: ../src/roster_window.py:4306
 msgid "Invalid file URI:"
 msgstr "Неверный файл:"
 
-#: ../src/roster_window.py:4280
+#: ../src/roster_window.py:4318
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9686,12 +10070,12 @@ msgstr[0] "Хотите отправить файл %s:"
 msgstr[1] "Хотите отправить файлы %s:"
 msgstr[2] "Хотите отправить файлы %s:"
 
-#: ../src/roster_window.py:4395
+#: ../src/roster_window.py:4433
 #, python-format
 msgid "Send %s to %s"
 msgstr "Отправить %s контакту %s"
 
-#: ../src/roster_window.py:4401
+#: ../src/roster_window.py:4439
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Обьединить %s и %s в метаконтакт"
@@ -9701,135 +10085,129 @@ msgstr "Обьединить %s и %s в метаконтакт"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4850
-#: ../src/roster_window.py:4923
-#: ../src/roster_window.py:4932
-#: ../src/statusicon.py:246
-#: ../src/statusicon.py:293
-#: ../src/statusicon.py:299
+#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
+#: ../src/roster_window.py:4970 ../src/statusicon.py:263
+#: ../src/statusicon.py:310 ../src/statusicon.py:316
 #, python-format
 msgid "using account %s"
 msgstr "используя учетную запись %s"
 
 #. add
-#: ../src/roster_window.py:4939
+#: ../src/roster_window.py:4977
 #, python-format
 msgid "to %s account"
 msgstr "для учетной записи %s"
 
 #. disco
-#: ../src/roster_window.py:4944
+#: ../src/roster_window.py:4982
 #, python-format
 msgid "using %s account"
 msgstr "учетной записи %s"
 
-#: ../src/roster_window.py:4982
-#: ../src/statusicon.py:309
+#: ../src/roster_window.py:5020 ../src/statusicon.py:326
 msgid "_Manage Bookmarks..."
 msgstr "Управление _закладками..."
 
 #. profile, avatar
-#: ../src/roster_window.py:5002
+#: ../src/roster_window.py:5040
 #, python-format
 msgid "of account %s"
 msgstr "для учетной записи %s"
 
-#: ../src/roster_window.py:5043
+#: ../src/roster_window.py:5081
 #, python-format
 msgid "for account %s"
 msgstr "для учетной записи %s"
 
-#: ../src/roster_window.py:5103
-#: ../src/roster_window.py:5208
+#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
 msgid "_Change Status Message"
 msgstr "_Изменить сообщение о статусе"
 
-#: ../src/roster_window.py:5136
+#: ../src/roster_window.py:5174
 msgid "Publish Tune"
 msgstr "Музыка"
 
-#: ../src/roster_window.py:5138
+#: ../src/roster_window.py:5176
 msgid "Publish Location"
 msgstr "Отправлять Местоположение"
 
-#: ../src/roster_window.py:5141
+#: ../src/roster_window.py:5179
 msgid "Configure Services..."
 msgstr "Настроить Сервисы..."
 
-#: ../src/roster_window.py:5286
+#: ../src/roster_window.py:5324
 msgid "_Maximize All"
 msgstr "_Развернуть все"
 
-#: ../src/roster_window.py:5296
-#: ../src/roster_window.py:5470
+#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
 msgid "Send Group M_essage"
 msgstr "_Отправить сообщение группе"
 
-#: ../src/roster_window.py:5304
+#: ../src/roster_window.py:5342
 msgid "To all users"
 msgstr "Всем пользователям"
 
-#: ../src/roster_window.py:5308
+#: ../src/roster_window.py:5346
 msgid "To all online users"
 msgstr "Всем, кто подключён"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5490
+#: ../src/roster_window.py:5528
 msgid "_Manage Contacts"
 msgstr "_Управление контактами"
 
 #. Edit Groups
-#: ../src/roster_window.py:5499
+#: ../src/roster_window.py:5537
 msgid "Edit _Groups"
 msgstr "Редактировать _группы"
 
 #. Send single message
-#: ../src/roster_window.py:5554
+#: ../src/roster_window.py:5592
 msgid "Send Single Message"
 msgstr "Отправить одиночное сообщение"
 
 #. Execute Command
-#: ../src/roster_window.py:5601
+#: ../src/roster_window.py:5639
 msgid "Execute Command..."
 msgstr "Выполнить команду..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5611
+#: ../src/roster_window.py:5649
 msgid "_Manage Transport"
 msgstr "_Управление транспортом"
 
 #. Modify Transport
-#: ../src/roster_window.py:5620
+#: ../src/roster_window.py:5658
 msgid "_Modify Transport"
 msgstr "_Изменить транспорт"
 
 #. Rename
-#: ../src/roster_window.py:5630
+#: ../src/roster_window.py:5668
 msgid "_Rename"
 msgstr "П_ереименовать"
 
-#: ../src/roster_window.py:5690
+#: ../src/roster_window.py:5728
 msgid "_Maximize"
 msgstr "Развернут_ь"
 
-#: ../src/roster_window.py:5699
+#: ../src/roster_window.py:5737
 msgid "_Reconnect"
 msgstr "_Переподсоеденится"
 
-#: ../src/roster_window.py:5706
+#: ../src/roster_window.py:5744
 msgid "_Disconnect"
 msgstr "_Выйти"
 
 #. History manager
-#: ../src/roster_window.py:5795
+#: ../src/roster_window.py:5833
 msgid "History Manager"
 msgstr "Менеджер истории"
 
-#: ../src/roster_window.py:5806
+#: ../src/roster_window.py:5844
 msgid "_Join New Group Chat"
 msgstr "_Войти в новую комнату"
 
-#: ../src/roster_window.py:5981
+#: ../src/roster_window.py:6019
 msgid "Change Status Message..."
 msgstr "Изменить сообщение о статусе..."
 
@@ -9837,14 +10215,12 @@ msgstr "Изменить сообщение о статусе..."
 msgid "Waiting for results"
 msgstr "Ожидание результатов"
 
-#: ../src/search_window.py:143
-#: ../src/search_window.py:220
+#: ../src/search_window.py:143 ../src/search_window.py:220
 msgid "Error in received dataform"
 msgstr "Ошибка в принятой форме данных"
 
 #. No result
-#: ../src/search_window.py:177
-#: ../src/search_window.py:212
+#: ../src/search_window.py:177 ../src/search_window.py:212
 msgid "No result"
 msgstr "Нет результата"
 
@@ -9857,8 +10233,7 @@ msgstr "Ошибка записи на диск"
 msgid "Subject: %s"
 msgstr "Тема: %s"
 
-#: ../src/session.py:447
-#: ../src/session.py:491
+#: ../src/session.py:447 ../src/session.py:491
 msgid "Confirm these session options"
 msgstr "Подтвердить данные настройки сеанса"
 
@@ -9894,25 +10269,23 @@ msgstr ""
 "\n"
 "Продолжить этот сеанс?"
 
-#: ../src/statusicon.py:210
+#: ../src/statusicon.py:227
 msgid "_Change Status Message..."
 msgstr "_Изменить сообщение о статусе..."
 
-#: ../src/statusicon.py:322
+#: ../src/statusicon.py:339
 msgid "Hide _Roster"
 msgstr "Скрыть _ростер"
 
-#: ../src/statusicon.py:333
+#: ../src/statusicon.py:350
 msgid "Hide this menu"
 msgstr "Скрыть это меню"
 
-#: ../src/tooltips.py:392
-#: ../src/tooltips.py:604
+#: ../src/tooltips.py:392 ../src/tooltips.py:604
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:395
-#: ../src/tooltips.py:608
+#: ../src/tooltips.py:395 ../src/tooltips.py:608
 msgid "Resource: "
 msgstr "Ресурс: "
 
@@ -9929,8 +10302,7 @@ msgstr "[заблокировано]"
 msgid " [minimized]"
 msgstr "[свернуто]"
 
-#: ../src/tooltips.py:521
-#: ../src/tooltips.py:777
+#: ../src/tooltips.py:521 ../src/tooltips.py:777
 msgid "Status: "
 msgstr "Статус: "
 
@@ -10007,8 +10379,7 @@ msgstr "Тип: "
 msgid "Transferred: "
 msgstr "Передано: "
 
-#: ../src/tooltips.py:755
-#: ../src/tooltips.py:776
+#: ../src/tooltips.py:755 ../src/tooltips.py:776
 msgid "Not started"
 msgstr "Не начато"
 
@@ -10016,8 +10387,7 @@ msgstr "Не начато"
 msgid "Stopped"
 msgstr "Остановлено"
 
-#: ../src/tooltips.py:761
-#: ../src/tooltips.py:764
+#: ../src/tooltips.py:761 ../src/tooltips.py:764
 msgid "Completed"
 msgstr "Завершено"
 
@@ -10058,9 +10428,7 @@ msgstr "Неизвестна"
 msgid "?Time:Unknown"
 msgstr "?Time:Неизвестно"
 
-#: ../src/vcard.py:312
-#: ../src/vcard.py:322
-#: ../src/vcard.py:530
+#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
 #, python-format
 msgid "since %s"
 msgstr "с %s"
@@ -10074,12 +10442,20 @@ msgid "<b>Affiliation:</b>"
 msgstr "<b>Ранг:</b>"
 
 #: ../src/vcard.py:357
-msgid "This contact is interested in your presence information, but you are not interested in his/her presence"
-msgstr "Этот контакт хочет знать о вашем присутствии, но вам информация о его или её присутствии не интересна"
+msgid ""
+"This contact is interested in your presence information, but you are not "
+"interested in his/her presence"
+msgstr ""
+"Этот контакт хочет знать о вашем присутствии, но вам информация о его или её "
+"присутствии не интересна"
 
 #: ../src/vcard.py:359
-msgid "You are interested in the contact's presence information, but he/she is not interested in yours"
-msgstr "Вам хочется получать информацию о присутствии контакта, но он или она не заинтересована в вашей."
+msgid ""
+"You are interested in the contact's presence information, but he/she is not "
+"interested in yours"
+msgstr ""
+"Вам хочется получать информацию о присутствии контакта, но он или она не "
+"заинтересована в вашей."
 
 #: ../src/vcard.py:361
 msgid "You and the contact are interested in each other's presence information"
@@ -10087,7 +10463,9 @@ msgstr "Вы и контакт оба желаете знать о присут
 
 #. None
 #: ../src/vcard.py:363
-msgid "You are not interested in the contact's presence, and neither he/she is interested in yours"
+msgid ""
+"You are not interested in the contact's presence, and neither he/she is "
+"interested in yours"
 msgstr "Ни вы, ни ваш контакт не желаете знать о присутствии друг друга"
 
 #: ../src/vcard.py:370
@@ -10098,20 +10476,52 @@ msgstr "Вы ожидаете ответа контакта на запрос н
 msgid "There is no pending subscription request."
 msgstr "Нет ожидающего запроса на подписку."
 
-#: ../src/vcard.py:377
-#: ../src/vcard.py:431
-#: ../src/vcard.py:553
+#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
 msgid " resource with priority "
 msgstr " ресурс с приоритетом "
 
+#~ msgid "Always use GNOME default applications"
+#~ msgstr "Всегда использовать приложения GNOME по умолчанию"
+
+#~ msgid "Always use Xfce default applications"
+#~ msgstr "Всегда использовать приложения Xfce по умолчанию"
+
+#~ msgid "Autodetect on every Gajim startup"
+#~ msgstr "Определять при каждом запуске Gajim"
+
+#~ msgid "Nickname not allowed: %s"
+#~ msgstr "Ник недопустим: %s"
+
+#~ msgid "Room has been destroyed"
+#~ msgstr "Комната была удалена"
+
+#~ msgid "You can join this room instead: %s"
+#~ msgstr "Взамен, вы можете присоединиться к комнате: %s"
+
+#~ msgid "I would like to add you to my roster."
+#~ msgstr "Вы не возражаете, если я добавлю Вас в свой ростер?"
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "теперь мы подписались на %s"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "%s хочет отменить подписку"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "теперь мы отписались от %s"
+
 #~ msgid "@"
 #~ msgstr "@"
+
 #~ msgid "_Disable showing event in systray"
 #~ msgstr "_Отключить показ события в системном лотке"
+
 #~ msgid "_Show event in systray"
 #~ msgstr "_Показывать событие в системном лотке"
+
 #~ msgid "Show systray:"
 #~ msgstr "Показывать иконку в системном лотке:"
+
 #~ msgid ""
 #~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
 #~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
@@ -10119,14 +10529,19 @@ msgstr " ресурс с приоритетом "
 #~ "JID %s не соответствует RFC. Он не будет добавлен в ваш ростер. "
 #~ "Используйте средство управления ростера, например http://jru.jabberstudio."
 #~ "org/, чтобы удалить его"
+
 #~ msgid "Mic volume:"
 #~ msgstr "Громкость микрофона:"
+
 #~ msgid "Sound volume:"
 #~ msgstr "Громкость звука:"
+
 #~ msgid "_Available"
 #~ msgstr "_Доступен"
+
 #~ msgid "Account Modification"
 #~ msgstr "Изменение учетной записи"
+
 #~ msgid ""
 #~ "Check this so Gajim will connect in port 5223 where legacy servers are "
 #~ "expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
@@ -10137,34 +10552,47 @@ msgstr " ресурс с приоритетом "
 #~ "старые сервера обычно ожидают подключения по SSL. Заметьте, что Gajim "
 #~ "использует TLS шифрование по умолчанию, если сервер предоставляет такую "
 #~ "возможность, с этой же опцией TLS отключается"
+
 #~ msgid "Edit Personal Information..."
 #~ msgstr "Редактировать личную информацию..."
+
 #~ msgid "Hostname: "
 #~ msgstr "Хост: "
+
 #~ msgid ""
 #~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 #~ "permission only for you"
 #~ msgstr ""
 #~ "Если отмечено, то Gajim сохранит пароль в ~/.gajim/config с доступом на "
 #~ "чтение только для вас"
+
 #~ msgid "Port: "
 #~ msgstr "Порт: "
+
 #~ msgid "Proxy:"
 #~ msgstr "Прокси:"
+
 #~ msgid "Save _passphrase (insecure)"
 #~ msgstr "Сохранить _парольную фразу (небезопасно)"
+
 #~ msgid "Send keep-alive packets"
 #~ msgstr "Отправить пинг"
+
 #~ msgid "Use _SSL (legacy)"
 #~ msgstr "Использовать _SSL (устарело)"
+
 #~ msgid "_Adjust to status"
 #~ msgstr "В _зависимости от статуса"
+
 #~ msgid "gtk-add"
 #~ msgstr "gtk-add"
+
 #~ msgid "gtk-close"
 #~ msgstr "gtk-close"
+
 #~ msgid "gtk-remove"
 #~ msgstr "gtk-remove"
+
 #~ msgid ""
 #~ "Receive a Message\n"
 #~ "Contact Disconnected \n"
@@ -10183,6 +10611,7 @@ msgstr " ресурс с приоритетом "
 #~ "Запрос на передачу файла\n"
 #~ "Начата передача файла\n"
 #~ "Завершена передача файла"
+
 #~ msgid ""
 #~ "contact(s)\n"
 #~ "group(s)\n"
@@ -10191,6 +10620,7 @@ msgstr " ресурс с приоритетом "
 #~ "контакт(ы)\n"
 #~ "группа(ы)\n"
 #~ "все"
+
 #~ msgid ""
 #~ "Account row\n"
 #~ "Group row\n"
@@ -10201,6 +10631,7 @@ msgstr " ресурс с приоритетом "
 #~ "Группа\n"
 #~ "Контакт\n"
 #~ "Баннер в окне чата"
+
 #~ msgid ""
 #~ "Enter JID or Contact name\n"
 #~ "Groupchat Histories\n"
@@ -10209,36 +10640,16 @@ msgstr " ресурс с приоритетом "
 #~ "Введите JID или имя контакта\n"
 #~ "История конференций\n"
 #~ "История всех чатов"
+
 #~ msgid "Manage Accounts"
 #~ msgstr "Управление учетными записями"
+
 #~ msgid "gtk-delete"
 #~ msgstr "gtk-delete"
-#~ msgid "Add this contact to roster (Ctrl+D)"
-#~ msgstr "Добавить контакт в ростер (Ctrl+D)"
-#~ msgid "Bookmark this room (Ctrl+B)"
-#~ msgstr "Добавить комнату в закладки (Ctrl+B)"
-#~ msgid "Browse the chat history (Ctrl+H)"
-#~ msgstr "Открыть историю чата (Ctrl+H)"
-#~ msgid "Change the room's subject (Alt+T)"
-#~ msgstr "Изменить тему (Alt+T)"
-#~ msgid "Change your nickname (Ctrl+N)"
-#~ msgstr "Изменить ник (Ctrl+N)"
-#~ msgid "Invite contacts to the conversation (Ctrl+G)"
-#~ msgstr "Пригласить к беседе (Ctrl+G)"
+
 #~ msgid "Send a file (Ctrl+F)"
 #~ msgstr "Отправить файл (Ctrl+F)"
-#~ msgid "Show a list of emoticons (Alt+M)"
-#~ msgstr "Показать набор смайлов (Alt+M)"
-#~ msgid "Show a list of formattings"
-#~ msgstr "Показать список форматирования"
-#~ msgid "Show a menu of advanced functions (Alt+D)"
-#~ msgstr "Показать меню дополнительных функций (Alt+D)"
-#~ msgid "Show the contact's profile (Ctrl+I)"
-#~ msgstr "Показать информацию о контакте (Ctrl+I)"
-#~ msgid "Toggle audio session"
-#~ msgstr "Переключить аудио сеанс"
-#~ msgid "Toggle video session"
-#~ msgstr "Переключить видео сеанс"
+
 #~ msgid ""
 #~ "All chat states\n"
 #~ "Composing only\n"
@@ -10247,6 +10658,7 @@ msgstr " ресурс с приоритетом "
 #~ "Все состояния чата\n"
 #~ "Только печать\n"
 #~ "Отключено "
+
 #~ msgid ""
 #~ "Autodetect on every Gajim startup\n"
 #~ "Always use GNOME default applications\n"
@@ -10259,6 +10671,7 @@ msgstr " ресурс с приоритетом "
 #~ "Всегда использовать приложения KDE по умолчанию\n"
 #~ "Всегда использовать приложения XFCE4 по умолчанию\n"
 #~ "Другое"
+
 #~ msgid ""
 #~ "Detached roster with detached chats\n"
 #~ "Detached roster with single chat\n"
@@ -10271,6 +10684,7 @@ msgstr " ресурс с приоритетом "
 #~ "Всё в одном окне\n"
 #~ "Отдельно ростер и окна чатов сгруппированных по учетной записи\n"
 #~ "Отдельно ростер и окна чатов сгруппированных по типу"
+
 #~ msgid ""
 #~ "Pop it up\n"
 #~ "Notify me about it\n"
@@ -10279,6 +10693,7 @@ msgstr " ресурс с приоритетом "
 #~ "Показать всплывающее окно\n"
 #~ "Сообщить мне об этом\n"
 #~ "Показать в ростере"
+
 #~ msgid ""
 #~ "none\n"
 #~ "both\n"
@@ -10289,123 +10704,165 @@ msgstr " ресурс с приоритетом "
 #~ "оба\n"
 #~ "от\n"
 #~ "к"
+
 #~ msgid "gtk-cancel"
 #~ msgstr "gtk-cancel"
+
 #~ msgid "_Quit"
 #~ msgstr "_Выйти"
+
 #~ msgid "Enable"
 #~ msgstr "Включить"
+
 #~ msgid "Banners and clickable links"
 #~ msgstr "Кликабельные ссылки"
+
 #~ msgid "Ability to have clickable URLs in chat and groupchat window banners."
 #~ msgstr "Кликабельные ссылки в баннере."
+
 #~ msgid "Requires python-sexy."
 #~ msgstr "Требует python-sexy."
+
 #~ msgid "GTK+ runtime is missing libglade support"
 #~ msgstr "У GTK отсутствует поддержка libglade."
+
 #~ msgid ""
 #~ "Please remove your current GTK+ runtime and install the latest stable "
 #~ "version from %s"
 #~ msgstr ""
 #~ "Удалите вашу текущую версию GTK и установите последнюю стабильную версию "
 #~ "с %s"
+
 #~ msgid ""
 #~ "Please make sure that GTK+ and PyGTK have libglade support in your system."
 #~ msgstr "Удостоверьтесь, что GTK+ и PyGTK поддерживают libglade."
+
 #~ msgid "Gajim needs PySQLite2 to run"
 #~ msgstr "Gajim для запуска требуется PySQLite2"
+
 #~ msgid "_Incoming message:"
 #~ msgstr "_Входящее сообщение:"
+
 #~ msgid "_Outgoing message:"
 #~ msgstr "_Исходящее сообщение:"
+
 #~ msgid "gtk-ok"
 #~ msgstr "gtk-ok"
+
 #~ msgid "Wrong host"
 #~ msgstr "Неверный хост"
+
 #~ msgid "Invalid local address? :-O"
 #~ msgstr "Неправильный локальный адрес? :-O"
+
 #~ msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 #~ msgstr "отсутствует библиотека pysqlite2 (или python-pysqlite2). Выход..."
+
 #~ msgid ""
 #~ "The host %s you configured as the ft_add_hosts_to_send advanced option is "
 #~ "not valid, so ignored."
 #~ msgstr ""
 #~ "Хост %s, который настроен как ft_add_hosts_to_send, не действителен, "
 #~ "поэтому игнорируется."
+
 #~ msgid "OpenPGP passphrase was not given"
 #~ msgstr "Не задана парольная фраза OpenPGP"
+
 #~ msgid ""
 #~ "To continue sending and receiving messages, you will need to reconnect."
 #~ msgstr ""
 #~ "Требуется переподключение для продолжения приема и отправки сообщений."
+
 #~ msgid ""
 #~ "You are not connected or not visible to others. Your message could not be "
 #~ "sent."
 #~ msgstr ""
 #~ "Вы не подключены или невидимы для других. Ваше сообщение нельзя отправить."
+
 #~ msgid "[This message is encrypted]"
 #~ msgstr "[Это сообщение зашифровано]"
+
 #~ msgid "Trayicon"
 #~ msgstr "Иконка в системном трее"
+
 #~ msgid "A icon in systemtray reflecting the current presence."
 #~ msgstr "Иконка в системном лотке отображающая текущий статус."
+
 #~ msgid ""
 #~ "Requires python-gnome2-extras or compiled trayicon module from Gajim "
 #~ "sources."
 #~ msgstr ""
 #~ "Требует python-gnome2-extras или скомпилированного модуля trayicon из "
 #~ "исходных кодов Gajim."
+
 #~ msgid "Requires PyGTK >= 2.10."
 #~ msgstr "Требует PyGTK >= 2.10."
+
 #~ msgid "%i days ago"
 #~ msgid_plural "%i days ago"
 #~ msgstr[0] "%i день назад"
 #~ msgstr[1] "%i дня назад"
 #~ msgstr[2] "%i дней назад"
+
 #~ msgid "Enable link-local/zeroconf messaging"
 #~ msgstr ""
 #~ "Приём и отправка локальных (link-local) сообщений и сообщений в сетях "
 #~ "zeroconf"
+
 #~ msgid "Command not supported for zeroconf account."
 #~ msgstr "Команда не поддерживается учетной записью zeroconf."
+
 #~ msgid "Commands: %s"
 #~ msgstr "Команды: %s"
+
 #~ msgid "Usage: /%s, clears the text window."
 #~ msgstr "Использование: /%s, очищает текстовое окно."
+
 #~ msgid "Usage: /%s, hide the chat buttons."
 #~ msgstr "Использование: /%s, скрывает кнопки беседы."
+
 #~ msgid ""
 #~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
 #~ "third person. (e.g. /%(command)s explodes.)"
 #~ msgstr ""
 #~ "Использование: /%(command)s <действие>, совершает действие в текущей "
 #~ "комнате. Используйте третье лицо (например, «/%(command)s взрывается».)"
+
 #~ msgid "Usage: /%s, sends a ping to the contact"
 #~ msgstr "Использование: /%s, посылает пинг контакту"
+
 #~ msgid "Usage: /%s, send the message to the contact"
 #~ msgstr "Использование: /%s, посылает сообщение контакту"
+
 #~ msgid "No help info for /%s"
 #~ msgstr "Нет подсказки для /%s"
+
 #~ msgid "Nickname not found: %s"
 #~ msgstr "Ник не обнаружен: %s"
+
 #~ msgid "This group chat has no subject"
 #~ msgstr "У этой комнаты нет темы"
+
 #~ msgid "Invited %(contact_jid)s to %(room_jid)s."
 #~ msgstr "Пригласил(а) %(contact_jid)s в %(room_jid)s."
+
 #~ msgid ""
 #~ "There is an ambiguity: %d nicks match.\n"
 #~ " Please use graphical interface "
 #~ msgstr ""
 #~ "Неоднозначность: %d ника совпадают.\n"
 #~ " Используйте графический интерфейс"
+
 #~ msgid "Nickname not found"
 #~ msgstr "Ник не обнаружен"
+
 #~ msgid ""
 #~ "There is an ambiguity: %d nicks match.\n"
 #~ " Please use graphical interface"
 #~ msgstr ""
 #~ "Неоднозначность: %d ника совпадают.\n"
 #~ " Используйте графический интерфейс"
+
 #~ 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 \"@\". "
@@ -10414,265 +10871,363 @@ msgstr " ресурс с приоритетом "
 #~ "Использование: /%s <ник|JID> [причина], запрещает JID заходить в комнату. "
 #~ "Ник посетителя можно подставить, если он не содержит «@». Если JID в "
 #~ "данный момент находится в комнате, то он/она/оно также будет выгнан."
+
 #~ msgid ""
 #~ "Usage: /%s <nickname>, opens a private chat window with the specified "
 #~ "occupant."
 #~ msgstr ""
 #~ "Использование: /%s <ник>, открывает окно привата с указанным посетителем."
+
 #~ msgid ""
 #~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
 #~ "if specified."
 #~ msgstr ""
 #~ "Использование: /%s [причина], закрывает текущее окно или вкладку, приводя "
 #~ "причину, если она указана."
+
 #~ msgid ""
 #~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
 #~ "optionally providing a reason."
 #~ msgstr ""
 #~ "Использование: /%s <JID> [причина], приглашает JID в текущую комнату, с "
 #~ "возможным указанием причины."
+
 #~ msgid ""
 #~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
 #~ "optionally using specified nickname."
 #~ msgstr ""
 #~ "Использование: /%s <комната>@<сервер>[/ник], предлагает подключиться к "
 #~ "комната@сервер, с возможным указанием ника."
+
 #~ msgid ""
 #~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
 #~ "nickname from the group chat and optionally displays a reason."
 #~ msgstr ""
 #~ "Использование: /%s <ник> [причина], удаляет посетителя с указанным ником "
 #~ "из комнаты с возможным указанием причины."
+
 #~ msgid ""
 #~ "Usage: /%s <nickname> [message], opens a private message window and sends "
 #~ "message to the occupant specified by nickname."
 #~ msgstr ""
 #~ "Использование: /%s <ник> [сообщение], открывает окно личной беседы и "
 #~ "отсылает сообщение посетителю с указанным ником."
+
 #~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 #~ msgstr "Использование: /%s <ник>, меняет ваш ник в текущей комнате."
+
 #~ msgid "Usage: /%s , display the names of group chat occupants."
 #~ msgstr "Использование: /%s, показывает список присутствующих в комнате."
+
 #~ msgid ""
 #~ "Usage: /%s [topic], displays or updates the current group chat topic."
 #~ msgstr ""
 #~ "Использование: /%s [тема], показывает или изменяет текущую тему комнаты."
+
 #~ msgid ""
 #~ "Usage: /%s <message>, sends a message without looking for other commands."
 #~ msgstr ""
 #~ "Использование: /%s <сообщение>, отсылает сообщение без поиска других "
 #~ "команд в нем."
+
 #~ msgid ""
 #~ "Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
 #~ "messages."
 #~ msgstr "Использование: /%s <ник>, запретить <ник> отправлять вам сообщения."
+
 #~ msgid ""
 #~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
 #~ "messages."
 #~ msgstr "Использование: /%s <ник>, разрешить <ник> отправлять вам сообщения."
+
 #~ msgid "Add Special _Notification"
 #~ msgstr "Добавить специальное _уведомление"
+
 #~ msgid "Assign Open_PGP Key"
 #~ msgstr "Назначить ключ  Open_PGP"
+
 #~ msgid "B_OSH Port:"
 #~ msgstr "Порт B_OSH:"
+
 #~ msgid "Show _roster"
 #~ msgstr "Показать _ростер"
+
 #~ msgid "File transfer stopped by the contact at the other end"
 #~ msgstr "Передача файла остановлена контактом на той стороне"
+
 #~ msgid "Message Body"
 #~ msgstr "Сообщение"
+
 #~ msgid "Generic"
 #~ msgstr "Общие"
+
 #~ msgid ""
 #~ "%(title)s by %(artist)s\n"
 #~ "from %(source)s"
 #~ msgstr ""
 #~ "%(title)s by %(artist)s\n"
 #~ "из %(source)s"
+
 #~ msgid "Duplicate Jabber ID"
 #~ msgstr "Дублирующийся Jabber ID"
+
 #~ msgid "This account is already configured in Gajim."
 #~ msgstr "Этот контакт уже настроен в Gajim."
+
 #~ msgid "Mood"
 #~ msgstr "Настроение"
+
 #~ msgid "Activity"
 #~ msgstr "Занятие"
+
 #~ msgid "Your JID:"
 #~ msgstr "Ваш JID:"
+
 #~ msgid ""
 #~ "Requires python-gnome2-extras or compilation of gtkspell module from "
 #~ "Gajim sources."
 #~ msgstr ""
 #~ "Требует python-gnome2-extras или скомпилированного модуля gtkspell из "
 #~ "исходных кодов Gajim."
+
 #~ msgid "OS version"
 #~ msgstr "Версия GTK+:"
+
 #~ msgid "Client name"
 #~ msgstr "Имя контакта"
+
 #~ msgid "Name:"
 #~ msgstr "Имя:"
+
 #~ msgid "Modify Account"
 #~ msgstr "Редактировать учетную запись"
+
 #~ msgid "Gajim account %s"
 #~ msgstr "Учётная запись Gajim %s"
+
 #~ msgid "PyOpenSSL"
 #~ msgstr "PyOpenSSL"
+
 #~ msgid "gajim-remote"
 #~ msgstr "gajim-remote"
+
 #~ msgid "OpenGPG"
 #~ msgstr "OpenGPG"
+
 #~ msgid "gnome-keyring"
 #~ msgstr "gnome-keyring"
+
 #~ msgid "Notification-daemon"
 #~ msgstr "Notification-daemon"
+
 #~ msgid "Idle"
 #~ msgstr "Время бездействия"
+
 #~ msgid "libsexy"
 #~ msgstr "libsexy"
+
 #~ msgid "_Host:"
 #~ msgstr "_Хост:"
+
 #~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 #~ msgstr ""
 #~ "Щелкните, чтобы просмотреть сервисы предоставляемые jabber сервером "
 #~ "(например, MSN, ICQ транспорты)"
+
 #~ msgid "Servers Features"
 #~ msgstr "Параметры сервера"
+
 #~ msgid "Requires compilation of the idle module from Gajim sources."
 #~ msgstr "Требует скомпилированного модуля idle из исходных кодов Gajim."
+
 #~ msgid "The username used to identify the Last.fm account."
 #~ msgstr "Имя пользователя на Last.fm."
+
 #~ msgid "Network Manager support not available"
 #~ msgstr "Network Manager не используется"
+
 #~ msgid "Session Management support not available (missing gnome.ui module)"
 #~ msgstr ""
 #~ "Отсутствует поддержка управления сеансами (отсутствует модуль gnome.ui)"
+
 #~ msgid "Thoughtful"
 #~ msgstr "В раздумье"
+
 #~ msgid ""
 #~ "If checked, Gajim will sort contacts in roster window and groupchats by "
 #~ "their status and not by the shown name"
 #~ msgstr ""
 #~ "Если отмечено, то Gajim будет сортировать контакты в окне ростера и в "
 #~ "окнах комнат по статусу, а не по имени"
+
 #~ msgid "E2E encryption enabled"
 #~ msgstr "E2E шифрование включено"
+
 #~ msgid "A_ccounts"
 #~ msgstr "_Учётные записи"
+
 #~ msgid "<b>\"%(title)s\"</b> by "
 #~ msgstr "<b>\"%(title)s\"</b> "
+
 #~ msgid "%(title)s by %(artist)s\n"
 #~ msgstr "%(title)s %(artist)s\n"
+
 #~ msgid "The following message was "
 #~ msgstr "Следующее сообщение было "
+
 #~ msgid "Close"
 #~ msgstr "Закрыть"
+
 #~ msgid "Verify remote identity"
 #~ msgstr "Проверьте удаленную идентичность"
+
 #~ msgid "This message was not delivered"
 #~ msgstr "[Это сообщение зашифровано]"
+
 #~ msgid "Other"
 #~ msgstr "Другое"
+
 #~ msgid "<b>Doing Chores</b>"
 #~ msgstr "<b>Работа по хозяйству</b>"
+
 #~ msgid "<b>Drinking</b>"
 #~ msgstr "<b>Пью</b>"
+
 #~ msgid "<b>Eating</b>"
 #~ msgstr "<b>Ем</b>"
+
 #~ msgid "<b>Exercising</b>"
 #~ msgstr "<b>Упражняюсь</b>"
+
 #~ msgid "<b>Grooming</b>"
 #~ msgstr "<b>Уход за собой</b>"
+
 #~ msgid "<b>Having an Appointment</b>"
 #~ msgstr "<b>Встреча</b>"
+
 #~ msgid "<b>Relaxing</b>"
 #~ msgstr "<b>Отдыхаю</b>"
+
 #~ msgid "<b>Talking</b>"
 #~ msgstr "<b>Разговариваю</b>"
+
 #~ msgid "<b>Traveling</b>"
 #~ msgstr "<b>Путешествую</b>"
+
 #~ msgid "<b>Working</b>"
 #~ msgstr "<b>Работаю</b>"
+
 #~ msgid ""
 #~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
 #~ "third person. (e.g. /%s explodes.)"
 #~ msgstr ""
 #~ "Использование: /% <действие>, совершает действие в текущей комнате. "
 #~ "Используйте третье лицо (например, «/%s взрывается».)"
+
 #~ msgid "%s is now %s"
 #~ msgstr "%s %s"
+
 #~ msgid "%s - %s"
 #~ msgstr "%s - %s"
+
 #~ msgid "mood"
 #~ msgstr "настроение"
+
 #~ msgid "cold"
 #~ msgstr "неприветливый"
+
 #~ msgid "hot"
 #~ msgstr "страстный"
+
 #~ msgid "moody"
 #~ msgstr "капризный"
+
 #~ msgid "sick"
 #~ msgstr "больной"
+
 #~ msgid "working"
 #~ msgstr "работаю"
+
 #~ msgid "eating"
 #~ msgstr "кушаю"
+
 #~ msgid "inactive"
 #~ msgstr "неактивен"
+
 #~ msgid "walking"
 #~ msgstr "гуляю"
+
 #~ msgid "sleeping"
 #~ msgstr "Сплю"
+
 #~ msgid "Accept"
 #~ msgstr "Принять"
+
 #~ msgid "Invitation Received"
 #~ msgstr "Получено приглашение"
+
 #~ msgid "Confirm Passphrase"
 #~ msgstr "Подтверждение парольной фразы"
+
 #~ msgid "Enter your new passphrase again for confirmation"
 #~ msgstr "Введите снова для подтверждения"
+
 #~ msgid "Create Passphrase"
 #~ msgstr "Создать парольную фразу"
+
 #~ msgid "Passphrases did not match.\n"
 #~ msgstr "Пароли не совпадают.\n"
+
 #~ msgid ""
 #~ "When negotiating an encrypted session, should Gajim prefer to use public "
 #~ "keys for identification?"
 #~ msgstr ""
 #~ "Когда устанавливается зашифрованная сессия, дожен ли Gajim предпочитать "
 #~ "использовать открытый ключ для идентификации?"
+
 #~ msgid "Click to see past conversations with this contact"
 #~ msgstr "Щелкните для просмотра последних бесед с этим человеком"
+
 #~ msgid "Click to see past conversation in this room"
 #~ msgstr "Щелкните для просмотра бесед в этой комнате"
+
 #~ msgid "<b>Publish and Subscribe</b>"
 #~ msgstr "<b>Отправка и получение</b>"
+
 #~ msgid "Allow others to see your:"
 #~ msgstr "_Позволить ему или ей видеть мой статус"
+
 #~ msgid "Receive your contact's:"
 #~ msgstr "Получать от ваших контактов:"
+
 #~ msgid "Tune"
 #~ msgstr "Слушаю"
+
 #~ msgid ""
 #~ "\n"
 #~ "From: %(from_address)s"
 #~ msgstr ""
 #~ "\n"
 #~ "От: %(from_address)s"
+
 #~ msgid ""
 #~ "If checked, Gajim can regularly poll a Last.fm account and sends recently "
 #~ "played songs through PEP."
 #~ msgstr ""
 #~ "Если включено, Gajim будет проверять аккаунт на Last.fm и менять ваш PEP "
 #~ "статус на имя проигрываемого трека. "
+
 #~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 #~ msgstr ""
 #~ "Нет такой команды: /%s (если вы хотите её просто передать, то добавьте к "
 #~ "ней префикс /say)"
+
 #~ msgid "<b>History Viewer</b>"
 #~ msgstr "<b>Менеджер истории</b>"
+
 #~ msgid "<b>JID Selection</b>"
 #~ msgstr "<b>Выбор JID</b>"
+
 #~ msgid ""
 #~ "Choose the chatlog you want to view. \n"
 #~ "Enter the jid of a groupchat or a contact here. For online accounts you "
@@ -10680,45 +11235,64 @@ msgstr " ресурс с приоритетом "
 #~ msgstr ""
 #~ "Выберите лог чата, который хотите посмотреть. \n"
 #~ "Введите jid чата или контакта. Для онлайн контактов можете ввести ники."
+
 #~ msgid "in"
 #~ msgstr "в"
+
 #~ msgid "Role:"
 #~ msgstr "Обязанности:"
+
 #~ msgid "Affiliation:"
 #~ msgstr "Ранг:"
+
 #~ msgid "Connection to host could not be established"
 #~ msgstr "Не удалось соединиться с хостом"
+
 #~ msgid ""
 #~ "Connection to host could not be established: Incorrect answer from server."
 #~ msgstr "Нельзя подключиться к хосту: Неверный ответ от сервера."
+
 #~ msgid "_Services"
 #~ msgstr "_Сервисы"
+
 #~ msgid "City:"
 #~ msgstr "Город:"
+
 #~ msgid "Company:"
 #~ msgstr "Компания:"
+
 #~ msgid "Country:"
 #~ msgstr "Страна:"
+
 #~ msgid "Given:"
 #~ msgstr "Имя:"
+
 #~ msgid "Middle:"
 #~ msgstr "Отчество:"
+
 #~ msgid "Position:"
 #~ msgstr "Должность:"
+
 #~ msgid "Prefix:"
 #~ msgstr "Префикс:"
+
 #~ msgid "State:"
 #~ msgstr "Штат:"
+
 #~ msgid "Suffix:"
 #~ msgstr "Суффикс:"
+
 #~ msgid "Ask:"
 #~ msgstr "Спрашивать:"
+
 #~ msgid "Client:"
 #~ msgstr "Клиент:"
+
 #~ msgid "OS:"
 #~ msgstr "ОС:"
+
 #~ msgid "Subscription:"
 #~ msgstr "Подписка:"
+
 #~ msgid "%s is now %s (%s)"
 #~ msgstr "%s %s (%s)"
-
diff --git a/po/sk.po b/po/sk.po
index 3dd0ee1813c2b178a08cc9df5496f4b5f9ae9101..542ea6148438be67715acb33410ecd2c57bd3af3 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -4,11 +4,15 @@
 # Juraj Michalek <juraj.michalek@asinus.org>, 2005.
 # Pavol Klačanský <pavol@klacansky.com>, 2008, 2009, 2010.
 # 
+#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 11:28+0200\n"
+"POT-Creation-Date: 2010-10-01 20:39+0200\n"
 "PO-Revision-Date: 2010-02-28 20:43+0100\n"
 "Last-Translator: Pavol Klačanský <pavol@klacansky.com>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -26,7 +30,7 @@ msgstr "_Pripojiť sa k diskusnej skupine..."
 msgid "_Add Contact..."
 msgstr "_Pridať kontakt..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:17
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
 msgid "_Discover Services"
 msgstr "_Preskúmať služby"
 
@@ -46,7 +50,7 @@ msgstr "_Otvoriť Gmail Inbox"
 msgid "_Personal Events"
 msgstr "_Osobné udalosti"
 
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:23
+#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
 msgid "_Start Chat..."
 msgstr "_Začať rozhovor..."
 
@@ -78,10 +82,6 @@ msgid "<b>Please select a server</b>"
 msgstr "<b>Prosím, vyberte server</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid "@"
-msgstr "@"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
@@ -89,64 +89,64 @@ msgstr ""
 "Pridať tento certifikát do zoznamu dôverných certifikátov.SHA1 odtlačok "
 "certifikátu:\n"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:10
 msgid "Anon_ymous authentication"
 msgstr "Anon_ymná autentifikácia"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Connect when I press Finish"
 msgstr "Pripojiť, keď stlačím Dokončiť"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Pomocník - Tvorba účtu"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "I already have an account I want to _use"
 msgstr "Už mám účet a chcem ho po_užívať"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I want to _register for a new account"
 msgstr "Chcem si za_registrovať nový účet"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:16
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 #: ../data/gui/accounts_window.ui.h:28
 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/gui/account_creation_wizard_window.ui.h:17
+#: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Spravovať..."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:18
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
 #: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2263 ../src/config.py:2342
-#: ../src/config.py:2355 ../src/config.py:3596 ../src/config.py:3671
-#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513
-#: ../src/dialogs.py:526 ../src/roster_window.py:2890
-#: ../src/roster_window.py:2896 ../src/roster_window.py:2901
+#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
+#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
+#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
+#: ../src/dialogs.py:527 ../src/roster_window.py:2956
+#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
 msgid "None"
 msgstr "Žiadny"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:19
+#: ../data/gui/account_creation_wizard_window.ui.h:18
 msgid "Prox_y:"
 msgstr "Prox_y:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #: ../data/gui/accounts_window.ui.h:48
 msgid "Save pass_word"
 msgstr "Uložiť hes_lo"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:21
+#: ../data/gui/account_creation_wizard_window.ui.h:20
 msgid "Set my profile when I connect"
 msgstr "Nastaviť môj profil, keď som pripojený"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:22
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Use custom hostname/port"
 msgstr "Použiť vlastný názov hostiteľa/portu"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:23
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -154,34 +154,34 @@ msgstr ""
 "Potrebujete mať účet, aby ste sa mohli pripojiť\n"
 "do siete Jabber."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-#: ../data/gui/roster_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:16
 msgid "_Advanced"
 msgstr "_Pokročilé"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:25
 msgid "_Finish"
 msgstr "_Dokončiť"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:27
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Hostname:"
 msgstr "Názov _hostiteľa:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #: ../data/gui/accounts_window.ui.h:62
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:28
 #: ../data/gui/accounts_window.ui.h:64
 msgid "_Password:"
 msgstr "_Heslo:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:29
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:31
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Server:"
 msgstr "_Server:"
 
@@ -289,17 +289,17 @@ msgstr "Prvé meno:"
 #. No configured account
 #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
 #: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592
-#: ../src/notify.py:608
+#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
+#: ../src/notify.py:616
 msgid "Gajim"
 msgstr "Gajim"
 
 #. FIXME: Ugly workaround.
 #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
 #. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:61
-#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121
-#: ../src/roster_window.py:2832 ../src/roster_window.py:5379
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
+#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
 msgid "General"
 msgstr "Všeobecné"
 
@@ -358,7 +358,7 @@ msgstr "Informácie o vás sú uložené na serveri"
 
 #: ../data/gui/accounts_window.ui.h:35
 #: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:830
+#: ../src/dialogs.py:831
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -372,7 +372,7 @@ msgid "Mer_ge accounts"
 msgstr "Z_lúčiť účty"
 
 #: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2356
+#: ../src/config.py:2358
 msgid "No key selected"
 msgstr "Žiadny kľúč nie je vybraný"
 
@@ -399,7 +399,7 @@ msgid "Priority will change automatically according to your status."
 msgstr "Priorita sa zmení automatický podľa stavu."
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5329
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
 msgid "Re_name"
 msgstr "Preme_novať"
 
@@ -622,38 +622,43 @@ msgid "Deletes Message of the Day"
 msgstr "Odstráni správu dňa"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
+#, fuzzy
+msgid "Edit Archi_ving Preferences"
+msgstr "_Predvoľby"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Edit _Privacy Lists..."
 msgstr "_Upraviť súkromné zoznamy..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sends a message to users currently connected to this server"
 msgstr "Poslať správu práve pripojeným používateľom k tomuto serveru"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Set MOTD..."
 msgstr "Nastaviť správu dňa..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Nastavovať správu dňa"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Show _XML Console"
 msgstr "Zobraziť _XML konzolu"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "Update MOTD..."
 msgstr "Aktualizovať správu dňa..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "Aktualizovať správy dňa"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:11
 msgid "_Administrator"
 msgstr "_Administrátor"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:11
+#: ../data/gui/advanced_menuitem_menu.ui.h:12
 msgid "_Send Server Message..."
 msgstr "_Poslať serverovú správu..."
 
@@ -687,7 +692,7 @@ msgid "All statuses"
 msgstr "VÅ¡etky stavy"
 
 #: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:233
+#: ../src/common/commands.py:106 ../src/common/helpers.py:239
 #: ../src/tooltips.py:193
 msgid "Away"
 msgstr "Preč"
@@ -740,7 +745,7 @@ msgid "Have "
 msgstr "Má"
 
 #: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:249
 msgid "Invisible"
 msgstr "Neviditeľný"
 
@@ -749,7 +754,7 @@ msgid "Launch a command"
 msgstr "Vykonať príkaz"
 
 #: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:216 ../src/tooltips.py:197
+#: ../src/common/helpers.py:222 ../src/tooltips.py:197
 msgid "Not Available"
 msgstr "Neprítomný"
 
@@ -793,12 +798,13 @@ msgid "_Disable existing sound for this event"
 msgstr "Z_akázať zvuky pre túto udalosť"
 
 #: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in roster"
+#, fuzzy
+msgid "_Disable showing event in notification area"
 msgstr "Z_akázať zobrazovanie udalostí v zozname"
 
 #: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in systray"
-msgstr "Z_akázať zobrazovanie udalostí v oblasti systémových upozornení"
+msgid "_Disable showing event in roster"
+msgstr "Z_akázať zobrazovanie udalostí v zozname"
 
 #: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
@@ -809,12 +815,13 @@ msgid "_Open chat window with user"
 msgstr "_Otvoriť okno rozhovoru s používateľom"
 
 #: ../data/gui/advanced_notifications_window.ui.h:35
-msgid "_Show event in roster"
+#, fuzzy
+msgid "_Show event in notification area"
 msgstr "_Zobraziť udalosť v zozname"
 
 #: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in systray"
-msgstr "_Zobraziť udalosť v oblasti systémových upozornení"
+msgid "_Show event in roster"
+msgstr "_Zobraziť udalosť v zozname"
 
 #: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
@@ -842,6 +849,45 @@ msgstr "Skupiny"
 msgid "when I'm in"
 msgstr "keď som v"
 
+#: ../data/gui/archiving_preferences_window.ui.h:1
+msgid "<i>Method Auto</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "<i>Method Local</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:3
+msgid "<i>Method Manual</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:4
+#, fuzzy
+msgid "Auto"
+msgstr "Automaticky pripojiť"
+
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Concede"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "Forbid"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:7
+#, fuzzy
+msgid "No"
+msgstr "Žiadny"
+
+#: ../data/gui/archiving_preferences_window.ui.h:8
+#, fuzzy
+msgid "Prefer"
+msgstr "Predvoľby"
+
+#: ../data/gui/archiving_preferences_window.ui.h:9
+msgid "Yes"
+msgstr ""
+
 #: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Záznam:"
@@ -868,8 +914,8 @@ msgstr "Blokované kontakty"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5348
-#: ../src/roster_window.py:5476 ../src/roster_window.py:5609
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
+#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
 msgid "_Unblock"
 msgstr "_Odblokovať"
 
@@ -957,7 +1003,7 @@ msgid "_Start Chat"
 msgstr "_Začať rozhovor"
 
 #. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4184
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
 msgid "#"
 msgstr "#"
 
@@ -1005,13 +1051,50 @@ msgstr "8"
 msgid "9"
 msgstr "9"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:13
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Pridať tento kontakt do zoznamu (Ctrl+D)"
+
 #: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Prehliadať históriu rozhovoru (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:15
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Pozvať kontakty do rozhovoru (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Zobraziť zoznam emotikon (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
+#, fuzzy
+msgid "Show a list of formattings"
+msgstr "Zobraziť zoznam emotikon (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Zobraziť ponuku pokročilých funkcií (Alt+D)"
+
+#: ../data/gui/chat_control.ui.h:19
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr "Zobraziť profil kontaktu (Ctrl+I)"
+
+#: ../data/gui/chat_control.ui.h:20
+msgid "Toggle audio session"
+msgstr "Prepnúť zvukovú reláciu"
+
+#: ../data/gui/chat_control.ui.h:21
+msgid "Toggle video session"
+msgstr "Prepnúť video reláciu"
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
 #: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Poslať"
 
-#: ../data/gui/chat_control.ui.h:15 ../data/gui/groupchat_control.ui.h:3
+#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
 msgid "label"
 msgstr ""
 
@@ -1059,8 +1142,8 @@ msgstr "Upraviť _skupiny..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5284
-#: ../src/roster_window.py:5444
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
+#: ../src/roster_window.py:5516
 msgid "In_vite to"
 msgstr "Poz_vať do"
 
@@ -1072,8 +1155,8 @@ msgstr "Pozvať _kontakty"
 msgid "Remo_ve"
 msgstr "O_dstrániť"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5294
-#: ../src/roster_window.py:5533
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
+#: ../src/roster_window.py:5605
 msgid "Send Cus_tom Status"
 msgstr "Poslať vlas_tný stav"
 
@@ -1106,8 +1189,8 @@ msgid "_Allow him/her to see my status"
 msgstr "_Povoliť jemu/jej vidieť môj stav"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5482 ../src/roster_window.py:5612
+#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
+#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
 msgid "_Block"
 msgstr "_Blokovať"
 
@@ -1117,8 +1200,8 @@ msgstr "_Odmietnuť jemu/jej zobrazenie stavu"
 
 #: ../data/gui/contact_context_menu.ui.h:20
 #: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:21
-#: ../src/roster_window.py:5683
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
+#: ../src/roster_window.py:5755
 msgid "_History"
 msgstr "_História"
 
@@ -1252,7 +1335,7 @@ msgstr "<b>Farby kariet diskusného okna</b>"
 msgid "Account row"
 msgstr "Účet"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:925
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
 msgid "Bold"
 msgstr "Tučné"
 
@@ -1290,7 +1373,7 @@ msgstr "Skupina"
 msgid "Inactive"
 msgstr "Neaktívny"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:926
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
 msgid "Italic"
 msgstr "Kurzíva"
 
@@ -1338,7 +1421,7 @@ msgstr "Zmeniť _predmet..."
 msgid "Configure _Room..."
 msgstr "Nastaviť _miestnosť..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1782
+#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
 msgid "_Bookmark"
 msgstr "Zálož_ky"
 
@@ -1399,19 +1482,31 @@ msgstr "_Poslať súkromnú správu"
 msgid "_Voice"
 msgstr "_Hlas"
 
+#: ../data/gui/groupchat_control.ui.h:1
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Zazáložkovať túto miestosť (Ctrl+B)"
+
+#: ../data/gui/groupchat_control.ui.h:3
+msgid "Change the room's subject (Alt+T)"
+msgstr "Zmeniť predmet v miestnosti (Alt+T)"
+
+#: ../data/gui/groupchat_control.ui.h:4
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Zmeniť vašu prezývku (Ctrl+N)"
+
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Vytvoriť novú správu"
 
-#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
-msgid "From"
-msgstr "Od"
+#: ../data/gui/groups_post_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:2
+msgid "From:"
+msgstr "Od:"
 
-#. holds subject
-#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
-#: ../src/history_manager.py:219
-msgid "Subject"
-msgstr "Predmet"
+#: ../data/gui/groups_post_window.ui.h:3
+#: ../data/gui/single_message_window.ui.h:7
+msgid "Subject:"
+msgstr "Predmet:"
 
 #: ../data/gui/history_manager.ui.h:1
 msgid ""
@@ -1429,8 +1524,8 @@ msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Vitajte v Gajim správca histórie</b></big>"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3208
-#: ../src/dialogs.py:3305
+#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
+#: ../src/dialogs.py:3321
 msgid "Delete"
 msgstr "Odstrániť"
 
@@ -1488,12 +1583,75 @@ msgstr "Hľadať:"
 msgid "_Log conversation history"
 msgstr "Zaznamenávať históriu k_onverzácie"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
+msgid "approve"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:2
+msgid "body"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:3
+msgid "concede"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:4
+msgid "expire"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:5
+msgid "false"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:6
+msgid "forbid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:7
+#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+msgid "jid"
+msgstr "jid"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:8
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
+#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
+msgid "message"
+msgstr "správa"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
+msgid "oppose"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
+#, fuzzy
+msgid "otr"
+msgstr "ostatné"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:11
+msgid "prefer"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:12
+msgid "require"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:13
+msgid "save"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:14
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
 msgid "Bro_wse Rooms"
 msgstr "_Prehliadať"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2180
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
 msgid "Join Group Chat"
 msgstr "Pripojiť sa k diskusnej skupine"
 
@@ -1531,8 +1689,8 @@ msgstr "Server:"
 msgid "_Bookmark this room"
 msgstr "Zazáložkovať túto miestnosť"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1341
-#: ../src/disco.py:1786
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../src/disco.py:1804
 msgid "_Join"
 msgstr "_Pripojiť"
 
@@ -1633,6 +1791,74 @@ msgstr "_Používateľské meno:"
 msgid "Passphrase"
 msgstr "Passfráza"
 
+#: ../data/gui/plugins_window.ui.h:1
+msgid "&lt;empty&gt;"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:2
+msgid "<empty>"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:3
+#, fuzzy
+msgid "Authors:"
+msgstr "Au_torizovať"
+
+#: ../data/gui/plugins_window.ui.h:4
+#, fuzzy
+msgid "Available"
+msgstr "_Prítomný"
+
+#: ../data/gui/plugins_window.ui.h:5
+#, fuzzy
+msgid "Configure"
+msgstr "_Nastavovať"
+
+#: ../data/gui/plugins_window.ui.h:6
+#, fuzzy
+msgid "Descrition:"
+msgstr "Popis:"
+
+#: ../data/gui/plugins_window.ui.h:7
+#, fuzzy
+msgid "Homepage:"
+msgstr "<b>Domovská stránka:</b>"
+
+#: ../data/gui/plugins_window.ui.h:8
+msgid "Install"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:9
+msgid "Installed"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:10
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:11
+msgid "Plugins"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:12
+msgid "Uninstall"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:13
+#, fuzzy
+msgid "Version:"
+msgstr "Verzia GTK+:"
+
+#: ../data/gui/plugins_window.ui.h:14
+msgid "button"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:15
+msgid "homepage url"
+msgstr ""
+
 #: ../data/gui/popup_notification_window.ui.h:1
 #, fuzzy
 msgid "Event Type"
@@ -1758,120 +1984,100 @@ msgid "Always"
 msgstr "Preč"
 
 #: ../data/gui/preferences_window.ui.h:31
-#, fuzzy
-msgid "Always use GNOME default applications"
-msgstr "Vždy použiť štandartné aplikácie OS/X"
-
-#: ../data/gui/preferences_window.ui.h:32
-#, fuzzy
-msgid "Always use KDE default applications"
-msgstr "Vždy použiť štandartné aplikácie OS/X"
-
-#: ../data/gui/preferences_window.ui.h:33
-#, fuzzy
-msgid "Always use Xfce default applications"
-msgstr "Vždy použiť štandartné aplikácie OS/X"
-
-#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Vyžiadať správu o stave, keď som:"
 
-#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
 msgid "Audio / Video"
 msgstr "Zvuk / Video"
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:33
 msgid "Audio input device"
 msgstr "Vstupné zariadenie zvuku"
 
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Audio output device"
 msgstr "Výstupné zariadenie zvuku"
 
-#: ../data/gui/preferences_window.ui.h:38
-#, fuzzy
-msgid "Autodetect on every Gajim startup"
-msgstr "Prip_ojiť sa pri štarte programu Gajim"
-
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:35
 msgid "Chat message:"
 msgstr "Správa rozhovoru:"
 
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:36
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Kontrolovať pri spustení, či je Gajim pre_dvoleným Jabber klientom"
 
-#: ../data/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:37
 #, fuzzy
 msgid "Composing only"
 msgstr "Píše správu"
 
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:38
 msgid "Configure color and font of the interface"
 msgstr "Nastavovať farbu a písmo rozhrania"
 
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:39
 msgid "Contact's message:"
 msgstr "Správa kontaktu:"
 
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:40
 msgid "Contact's nickname:"
 msgstr "Prezývka kontaktu:"
 
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:41
 msgid "Custom"
 msgstr "Vlastný"
 
-#: ../data/gui/preferences_window.ui.h:46
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Detached roster with chat grouped by account"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Detached roster with detached chats"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:45
 msgid "Detached roster with single chat"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
-#: ../src/config.py:671
+#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
+#: ../src/config.py:665
 msgid "Disabled"
 msgstr "Zakázané"
 
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:47
 msgid "Display _activity of contacts in roster"
 msgstr "Zobraziť _aktivitu kontaktov v zozname kontaktov"
 
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:48
 msgid "Display _extra email details"
 msgstr "Zobraziť ďalši_e podrobnosti o e-maile"
 
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:49
 msgid "Display _location of contacts in roster"
 msgstr "Zobraziť _pozíciu kontaktov v zozname"
 
-#: ../data/gui/preferences_window.ui.h:54
+#: ../data/gui/preferences_window.ui.h:50
 msgid "Display _tunes of contacts in roster"
 msgstr "Zobraziť _hudbu kontaktov v zozname kontaktov"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display a_vatars of contacts in roster"
 msgstr "Zobraziť a_vatary v zozname kontaktov"
 
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display m_ood of contacts in roster"
 msgstr "Zobraziť _náladu kontaktov v zozname kontaktov"
 
-#: ../data/gui/preferences_window.ui.h:57
+#: ../data/gui/preferences_window.ui.h:53
 msgid "Display status _messages of contacts in roster"
 msgstr "Zobraziť stavovú _informáciu kontaktov v zozname kontaktov"
 
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:54
 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 "
@@ -1881,7 +2087,7 @@ msgstr ""
 "inou osobou. Tu môžete vybrať stavy, ktoré majú byť zobrazované v diskusnom "
 "okne."
 
-#: ../data/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:55
 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 "
@@ -1891,7 +2097,7 @@ msgstr ""
 "vašim kontaktom. Tu môžete vybrať stavy, o ktorých majú byť odosielané "
 "informácie druhej strane."
 
-#: ../data/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:56
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1899,11 +2105,11 @@ msgstr ""
 "Gajim vás bude upozorňovať vyskakovacími oknami v pravej spodnej časti "
 "obrazovky na kontakty, ktoré sa práve odpojili"
 
-#: ../data/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:58
 msgid "Hide all buttons in chat windows"
 msgstr "Skryje všetky tlačidlá v oknách rozhovorov"
 
-#: ../data/gui/preferences_window.ui.h:63
+#: ../data/gui/preferences_window.ui.h:59
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1911,20 +2117,20 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim povolí ostatným zistiť operačný systém, ktorý "
 "používate"
 
-#: ../data/gui/preferences_window.ui.h:64
+#: ../data/gui/preferences_window.ui.h:60
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 "Ak je zaškrtnuté, Gajim pridá informácie o odosielateľovi do nových e-mailov"
 
-#: ../data/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:61
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Ak je zaškrtnuté, Gajim zmení stav na Preč, keď nebude používaný počítač."
 
-#: ../data/gui/preferences_window.ui.h:66
+#: ../data/gui/preferences_window.ui.h:62
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1932,7 +2138,7 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim zmení stav na Neprítomný, keď nebude dlhšie "
 "používaný počítač."
 
-#: ../data/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1940,7 +2146,7 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim bude zobrazovať avatarov v zozname kontaktov a v "
 "oknách s diskusnými skupinami."
 
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1948,14 +2154,14 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim bude zobrazovať správu o stave kontaktov pod menom v "
 "zozname kontaktov a v oknách s diskusnými skupinami"
 
-#: ../data/gui/preferences_window.ui.h:69
+#: ../data/gui/preferences_window.ui.h:65
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "Ak je zaškrtnuté, Gajim bude zobrazovať aktivitu kontaktov v okne sozoznamom "
 "kontaktov."
 
-#: ../data/gui/preferences_window.ui.h:70
+#: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the location of contacts in the roster window"
@@ -1963,21 +2169,21 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim bude zobrazovať náladu kontaktov v okne so zoznamom "
 "kontaktovi."
 
-#: ../data/gui/preferences_window.ui.h:71
+#: ../data/gui/preferences_window.ui.h:67
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
 "Ak je zaškrtnuté, Gajim bude zobrazovať náladu kontaktov v okne so zoznamom "
 "kontaktovi."
 
-#: ../data/gui/preferences_window.ui.h:72
+#: ../data/gui/preferences_window.ui.h:68
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Ak je zaškrtnuté, Gajim bude zobrazovať hudbu kontaktov v okne so zoznamom "
 "kontaktov"
 
-#: ../data/gui/preferences_window.ui.h:73
+#: ../data/gui/preferences_window.ui.h:69
 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 "
@@ -1988,7 +2194,7 @@ msgstr ""
 "pravým na vstupné pole, predvolený jazyk bude použitý pre tento kontakt "
 "alebo diskusnú skupinu."
 
-#: ../data/gui/preferences_window.ui.h:74
+#: ../data/gui/preferences_window.ui.h:70
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1998,14 +2204,14 @@ msgstr ""
 "neautorizovaných kontaktov. Použite opatrne, pretože to blokuje všetky "
 "správy od akýchkoľvek kontaktov, ktoré nie sú v zozname"
 
-#: ../data/gui/preferences_window.ui.h:75
+#: ../data/gui/preferences_window.ui.h:71
 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/gui/preferences_window.ui.h:76
+#: ../data/gui/preferences_window.ui.h:72
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -2013,7 +2219,7 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim zobrazí oznámenie, keď bude prijatý nový e-mail cez "
 "GMail"
 
-#: ../data/gui/preferences_window.ui.h:77
+#: ../data/gui/preferences_window.ui.h:73
 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, "
@@ -2023,7 +2229,7 @@ msgstr ""
 "kontakt z MSN bude mať ekvivalentné ikonky pre stavy prítomný, preč, "
 "zaneprázdnený, atď...)"
 
-#: ../data/gui/preferences_window.ui.h:78
+#: ../data/gui/preferences_window.ui.h:74
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -2031,7 +2237,7 @@ msgstr ""
 "Ak je povolené, Gajim sa nebude pýtať na správu o stave. Namiesto nej bude "
 "použitá predvolená špecifikovaná správa."
 
-#: ../data/gui/preferences_window.ui.h:79
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2039,45 +2245,45 @@ msgstr ""
 "Ak nie je zakázané, Gajim nahradí ascii emotikony ako ':)' ekvivalentným "
 "grafickým obrázkom"
 
-#: ../data/gui/preferences_window.ui.h:80
+#: ../data/gui/preferences_window.ui.h:76
 msgid "Log _encrypted chat session"
 msgstr "Zaznamenať reláciu šifrova_ného rozhovoru"
 
-#: ../data/gui/preferences_window.ui.h:81
+#: ../data/gui/preferences_window.ui.h:77
 msgid "Ma_ke message windows compact"
 msgstr "Zmeniť okno správ na _kompaktné"
 
-#: ../data/gui/preferences_window.ui.h:82
+#: ../data/gui/preferences_window.ui.h:78
 msgid "Ma_nage..."
 msgstr "_Spravovať..."
 
-#: ../data/gui/preferences_window.ui.h:83
+#: ../data/gui/preferences_window.ui.h:79
 #, fuzzy
 msgid "Never"
 msgstr "Server"
 
-#: ../data/gui/preferences_window.ui.h:84
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Notifications"
 msgstr "Oznámenia"
 
-#: ../data/gui/preferences_window.ui.h:85
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Notify me about contacts that sign _in"
 msgstr "Upozorniť ma, keď sa kontakty pr_ihlásia"
 
-#: ../data/gui/preferences_window.ui.h:86
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Notify me about contacts that sign _out"
 msgstr "Upozorniť ma, keď sa kontakty _odhlásia"
 
-#: ../data/gui/preferences_window.ui.h:87
+#: ../data/gui/preferences_window.ui.h:83
 #, fuzzy
 msgid "Notify me about it"
 msgstr "Upozorniť ma, keď sa kontakty _odhlásia"
 
-#: ../data/gui/preferences_window.ui.h:88
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notify on new _GMail email"
 msgstr "Upozorniť keď príde na _Gmail e-mail"
 
-#: ../data/gui/preferences_window.ui.h:89
+#: ../data/gui/preferences_window.ui.h:85
 #, fuzzy
 msgid "Only when pending events"
 msgstr ""
@@ -2085,54 +2291,55 @@ msgstr ""
 "Len ak čakajú udalosti\n"
 "Vždy"
 
-#: ../data/gui/preferences_window.ui.h:90
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Personal Events"
 msgstr "Osobné udalosti"
 
-#: ../data/gui/preferences_window.ui.h:91
+#: ../data/gui/preferences_window.ui.h:87
 msgid "Play _sounds"
 msgstr "Prehrať _zvuky"
 
-#: ../data/gui/preferences_window.ui.h:92
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Pop it up"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:93
+#: ../data/gui/preferences_window.ui.h:89
 msgid "Preferences"
 msgstr "Predvoľby"
 
-#: ../data/gui/preferences_window.ui.h:94
+#: ../data/gui/preferences_window.ui.h:90
 msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:96
+#: ../data/gui/preferences_window.ui.h:92
 msgid "STUN server:"
 msgstr "STUN server:"
 
-#: ../data/gui/preferences_window.ui.h:97
+#: ../data/gui/preferences_window.ui.h:93
+#, fuzzy
+msgid "Show notification area icon:"
+msgstr "Notification-daemon"
+
+#: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
 msgid "Show only in roster"
 msgstr "_Zobraziť udalosť v zozname"
 
-#: ../data/gui/preferences_window.ui.h:98
-msgid "Show systray:"
-msgstr "Zobraziť oblasť systémových upozornení:"
-
-#: ../data/gui/preferences_window.ui.h:99
+#: ../data/gui/preferences_window.ui.h:95
 msgid "Sign _in"
 msgstr "Prihlás_il sa"
 
-#: ../data/gui/preferences_window.ui.h:100
+#: ../data/gui/preferences_window.ui.h:96
 msgid "Sign _out"
 msgstr "_Odhlásil sa"
 
-#: ../data/gui/preferences_window.ui.h:101
+#: ../data/gui/preferences_window.ui.h:97
 msgid "Single window for everything"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:102
+#: ../data/gui/preferences_window.ui.h:98
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2140,27 +2347,27 @@ msgstr ""
 "Niektoré správy môžu obsahovať rozširujúce informácie (formátovanie, farby, "
 "atď.). Ak je zaškrtnuté, Gajim bude zobrazovať len jednoduchý text."
 
-#: ../data/gui/preferences_window.ui.h:103
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sort contacts by status"
 msgstr "Usporiadať kontakty podľa stavu"
 
-#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
 msgid "Status"
 msgstr "Stav"
 
-#: ../data/gui/preferences_window.ui.h:105
+#: ../data/gui/preferences_window.ui.h:101
 msgid "Status _iconset:"
 msgstr "Zostava stavových _ikôn:"
 
-#: ../data/gui/preferences_window.ui.h:106
+#: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Štýl"
 
-#: ../data/gui/preferences_window.ui.h:107
+#: ../data/gui/preferences_window.ui.h:103
 msgid "T_heme:"
 msgstr "_Téma:"
 
-#: ../data/gui/preferences_window.ui.h:108
+#: ../data/gui/preferences_window.ui.h:104
 #, fuzzy
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
@@ -2171,7 +2378,7 @@ msgstr ""
 "Automatická správa pre stav preč. Ak je prázdna, Gajim nebude meniť súčasnú "
 "stavovú správu o stave"
 
-#: ../data/gui/preferences_window.ui.h:111
+#: ../data/gui/preferences_window.ui.h:107
 #, fuzzy
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
@@ -2182,122 +2389,127 @@ msgstr ""
 "Automatická správa pre stav neprítomný. Ak je prázdna, Gajim nebude meniť "
 "súčasnú správu o stave"
 
-#: ../data/gui/preferences_window.ui.h:114
+#: ../data/gui/preferences_window.ui.h:110
 msgid "Use _transports icons"
 msgstr "Použiť ikony _transportov"
 
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:111
+#, fuzzy
+msgid "Use default applications"
+msgstr "Vždy použiť štandartné aplikácie OS/X"
+
+#: ../data/gui/preferences_window.ui.h:112
 msgid "Use system _default"
 msgstr "Použiť systémové _nastavenia"
 
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:113
 #, fuzzy
 msgid "Video framerate"
 msgstr "Video test"
 
-#: ../data/gui/preferences_window.ui.h:117
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Video input device"
 msgstr "Vstupné zariadenie videa"
 
-#: ../data/gui/preferences_window.ui.h:118
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Video output device"
 msgstr "Výstupné zariadenie videa"
 
-#: ../data/gui/preferences_window.ui.h:119
+#: ../data/gui/preferences_window.ui.h:116
 #, fuzzy
 msgid "Video size"
 msgstr "Video test"
 
-#: ../data/gui/preferences_window.ui.h:120
+#: ../data/gui/preferences_window.ui.h:117
 msgid "When new event is received:"
 msgstr "Keď nastane nová udalosť:"
 
-#: ../data/gui/preferences_window.ui.h:121
+#: ../data/gui/preferences_window.ui.h:118
 msgid "Your message:"
 msgstr "Vaša správa:"
 
-#: ../data/gui/preferences_window.ui.h:122
+#: ../data/gui/preferences_window.ui.h:119
 msgid "Your nickname:"
 msgstr "Vaša prezývka:"
 
-#: ../data/gui/preferences_window.ui.h:123
+#: ../data/gui/preferences_window.ui.h:120
 msgid "_Away after:"
 msgstr "_Preč po:"
 
-#: ../data/gui/preferences_window.ui.h:124
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Prehliadač:"
 
-#: ../data/gui/preferences_window.ui.h:125
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Display chat state notifications:"
 msgstr "Zo_braziť oznámenia o stave rozhovoru:"
 
-#: ../data/gui/preferences_window.ui.h:126
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Emoticons:"
 msgstr "_Emotikony:"
 
-#: ../data/gui/preferences_window.ui.h:127
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_File manager:"
 msgstr "_Správca súborov:"
 
-#: ../data/gui/preferences_window.ui.h:128
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_Highlight misspelled words"
 msgstr "_Zvýrazniť zle napísané slová"
 
-#: ../data/gui/preferences_window.ui.h:129
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorovať udalosti od kontaktov, ktoré nie sú v zozname"
 
-#: ../data/gui/preferences_window.ui.h:130
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignorovať rozšírený obsah prichádzajúcich správ"
 
-#: ../data/gui/preferences_window.ui.h:131
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Log status changes of contacts"
 msgstr "_Zaznamenať zmenu stavu kontaktu"
 
-#: ../data/gui/preferences_window.ui.h:132
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Mail client:"
 msgstr "_E-mailový klient:"
 
-#: ../data/gui/preferences_window.ui.h:133
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Not available after:"
 msgstr "_Neprítomný po:"
 
-#: ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Open..."
 msgstr "_Otvoriť..."
 
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Reset to Default Colors"
 msgstr "Náv_rat k pôvodnému nastaveniu farieb"
 
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Send chat state notifications:"
 msgstr "Odo_slať oznámenia o stave rozhovoru:"
 
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Status message:"
 msgstr "_Správa o stave:"
 
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_URL highlight:"
 msgstr "Zvýrazňovanie _URL:"
 
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_Window behavior:"
 msgstr "_Správanie okna:"
 
-#: ../data/gui/preferences_window.ui.h:140
+#: ../data/gui/preferences_window.ui.h:137
 msgid "in _group chats"
 msgstr "v _diskusných skupiných"
 
-#: ../data/gui/preferences_window.ui.h:141
+#: ../data/gui/preferences_window.ui.h:138
 #, fuzzy
 msgid "in _roster"
 msgstr "Nie je v zozname"
 
-#: ../data/gui/preferences_window.ui.h:142
+#: ../data/gui/preferences_window.ui.h:139
 msgid "minutes"
 msgstr "minút"
 
@@ -2350,7 +2562,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Poradie:"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3436
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
 msgid "Privacy List"
 msgstr "Súkromný zoznam"
 
@@ -2562,8 +2774,8 @@ msgstr "Odstrániť účet z Gajim aj zo _serveru"
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5492 ../src/roster_window.py:5622
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
+#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
 msgid "_Remove"
 msgstr "O_dstrániť"
 
@@ -2607,56 +2819,60 @@ msgid "Help online"
 msgstr "Pomocník online"
 
 #: ../data/gui/roster_window.ui.h:8
+msgid "P_lugins"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:9
 msgid "Profile, A_vatar"
 msgstr "Profil, a_vatar"
 
-#: ../data/gui/roster_window.ui.h:9
+#: ../data/gui/roster_window.ui.h:10
 msgid "Show Only _Active Contacts"
 msgstr "Zobraziť len _aktívne kontakty"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
 msgid "Show Trans_ports"
 msgstr "Zobraziť trans_porty"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
 msgid "Show _Offline Contacts"
 msgstr "Zobraziť _odhlásené kontakty"
 
-#: ../data/gui/roster_window.ui.h:12 ../src/statusicon.py:326
+#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
 msgid "Show _Roster"
 msgstr "Zobraziť _zoznam"
 
-#: ../data/gui/roster_window.ui.h:13
+#: ../data/gui/roster_window.ui.h:14
 msgid "_Accounts"
 msgstr "Úč_ty"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
 #: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Akcie"
 
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
 msgid "_Contents"
 msgstr "Ob_sah"
 
-#: ../data/gui/roster_window.ui.h:18 ../src/disco.py:1502
+#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
 msgid "_Edit"
 msgstr "_Upraviť"
 
-#: ../data/gui/roster_window.ui.h:19
+#: ../data/gui/roster_window.ui.h:20
 msgid "_FAQ"
 msgstr "Často k_ladené otázky"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Help"
 msgstr "_Pomocník"
 
-#: ../data/gui/roster_window.ui.h:22
+#: ../data/gui/roster_window.ui.h:23
 msgid "_Send Single Message..."
 msgstr "Poslať krátku _správu..."
 
-#: ../data/gui/roster_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:25
 msgid "_View"
 msgstr "_Zobraziť"
 
@@ -2674,11 +2890,11 @@ msgid "_Add contact"
 msgstr "_Pridať kontakt"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5634
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
 msgid "_Information"
 msgstr "_Informácie"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1353
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
 msgid "_Search"
 msgstr "_Hľadať"
 
@@ -2698,10 +2914,6 @@ msgstr "Registrovaný na"
 msgid "_Cancel"
 msgstr "_Zrušiť"
 
-#: ../data/gui/single_message_window.ui.h:2
-msgid "From:"
-msgstr "Od:"
-
 #: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Odpoveď na túto správu"
@@ -2718,10 +2930,6 @@ msgstr "Poslať správu"
 msgid "Send message and close window"
 msgstr "Poslať správu a zatvoriť okno"
 
-#: ../data/gui/single_message_window.ui.h:7
-msgid "Subject:"
-msgstr "Predmet:"
-
 #: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Pre:"
@@ -2930,25 +3138,35 @@ msgstr "Gajim - internetový komunikátor"
 msgid "Jabber IM Client"
 msgstr "Jabber IM klient"
 
-#: ../src/adhoc_commands.py:314
+#: ../src/adhoc_commands.py:323
 msgid "Cancel confirmation"
 msgstr "Zrušiť potvrdenie"
 
-#: ../src/adhoc_commands.py:315
+#: ../src/adhoc_commands.py:324
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:351 ../src/adhoc_commands.py:374
+#: ../src/adhoc_commands.py:370
+#, fuzzy
+msgid "Invalid Form"
+msgstr "Neplatná miestnosť"
+
+#: ../src/adhoc_commands.py:371
+#, fuzzy
+msgid "The form is not filled correctly."
+msgstr "Prezývka obsahuje nepovolené znaky."
+
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:360
+#: ../src/adhoc_commands.py:399
 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:471
+#: ../src/adhoc_commands.py:513
 msgid "Service returned an error."
 msgstr "Služba vrátila chybu"
 
@@ -2973,7 +3191,7 @@ msgstr "Celočíselný"
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:945
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
 msgid "Color"
 msgstr "Farba"
 
@@ -3011,256 +3229,265 @@ msgstr[2] "Dostali ste novú položku:"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "English"
 msgstr "Angličtina"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Belarusian"
 msgstr "Bieloruština"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Bulgarian"
 msgstr "Bulharčina"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Breton"
 msgstr "Bretónčina"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Czech"
 msgstr "Čeština"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "German"
 msgstr "Nemčina"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Greek"
 msgstr "Gréčtina"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "British"
 msgstr "Britština"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Spanish"
 msgstr "Španielčina"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Basque"
 msgstr "Baskičtina"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "French"
 msgstr "Francúzština"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Croatian"
 msgstr "Chorvátčina"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Italian"
 msgstr "Taliančina"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian (b)"
 msgstr "Nórčina (b)"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Dutch"
 msgstr "Holandština"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian"
 msgstr "Nórčina"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Polish"
 msgstr "Poľština"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Portuguese"
 msgstr "Portugalčina"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Brazilian Portuguese"
 msgstr "Brazílska portugalčina"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Russian"
 msgstr "Ruština"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Serbian"
 msgstr "Srbština"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Swedish"
 msgstr "Švédčina"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Chinese (Ch)"
 msgstr "Čínština (Ch)"
 
-#: ../src/chat_control.py:479
+#: ../src/chat_control.py:496
 msgid "Spelling language"
 msgstr "Jazyk používaný pri kontrole pravopisu"
 
 #. we are not connected
-#: ../src/chat_control.py:511 ../src/chat_control.py:720
+#: ../src/chat_control.py:528 ../src/chat_control.py:737
 msgid "A connection is not available"
 msgstr "Pripojenie nie je dostupné"
 
-#: ../src/chat_control.py:512 ../src/chat_control.py:721
+#: ../src/chat_control.py:529 ../src/chat_control.py:738
 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:927
+#: ../src/chat_control.py:944
 msgid "Underline"
 msgstr "Podčiarknuté"
 
-#: ../src/chat_control.py:928
+#: ../src/chat_control.py:945
 msgid "Strike"
 msgstr "Preškrtnuté"
 
-#: ../src/chat_control.py:951
+#: ../src/chat_control.py:968
 msgid "Font"
 msgstr "Písmo"
 
-#: ../src/chat_control.py:960
+#: ../src/chat_control.py:977
 msgid "Clear formating"
 msgstr "Vymazať formátovanie"
 
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1055
 msgid "Really send file?"
 msgstr "Skutočne poslať súbor?"
 
-#: ../src/chat_control.py:1039
+#: ../src/chat_control.py:1056
 #, 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:1503 ../src/chat_control.py:1987
+#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
 msgid "GPG encryption enabled"
 msgstr "Povolené GPG šifrovanie"
 
 #. Add to roster
-#: ../src/chat_control.py:1528 ../src/common/contacts.py:158
+#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
 #: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:245 ../src/dialogs.py:1064 ../src/dialogs.py:2078
-#: ../src/dialogs.py:2107 ../src/gui_interface.py:674
+#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
+#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
 #: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1610 ../src/roster_window.py:1612
-#: ../src/roster_window.py:1942 ../src/roster_window.py:3289
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
+#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
+#: ../src/roster_window.py:3382
 msgid "Not in Roster"
 msgstr "Nie je v zozname"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1575
 msgid "This contact does not support file transfer."
 msgstr "Tento kontakt nepodporuje prenos súborov."
 
-#: ../src/chat_control.py:1561
+#: ../src/chat_control.py:1578
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1656
+#: ../src/chat_control.py:1677
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:1869
 #, 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:1967 ../src/dialogs.py:4866
+#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
 msgid "No GPG key assigned"
 msgstr "Nie je priradený GPG kľúč"
 
-#: ../src/chat_control.py:1968
+#: ../src/chat_control.py:1991
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1977
+#: ../src/chat_control.py:2000
 msgid "GPG encryption disabled"
 msgstr "Zakázané GPG šifrovanie"
 
-#: ../src/chat_control.py:2003
+#: ../src/chat_control.py:2026
 msgid "Session WILL be logged"
 msgstr "Relácia BUDE zaznamenaná"
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:2028
 msgid "Session WILL NOT be logged"
 msgstr "Relácia NEBUDE zaznamenaná"
 
 #. encryption %s active
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is"
 msgstr "je"
 
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is NOT"
 msgstr "NIE je"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will"
 msgstr "bude"
 
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will NOT"
 msgstr "NEbude"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2051
 msgid "and authenticated"
 msgstr "a overený"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2032
+#: ../src/chat_control.py:2055
 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:2039
+#: ../src/chat_control.py:2062
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2182
+#: ../src/chat_control.py:2205
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2191
+#: ../src/chat_control.py:2215
+msgid "This session WILL be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2217
+#, fuzzy
+msgid "This session WILL NOT be archived on server"
+msgstr "Relácia NEBUDE zaznamenaná"
+
+#: ../src/chat_control.py:2226
 msgid "This session is encrypted"
 msgstr "Táto relácia je šifrovaná"
 
-#: ../src/chat_control.py:2194
+#: ../src/chat_control.py:2229
 msgid " and WILL be logged"
 msgstr " a BUDE zaznamenaná"
 
-#: ../src/chat_control.py:2196
+#: ../src/chat_control.py:2231
 msgid " and WILL NOT be logged"
 msgstr " a NEBUDE zaznamenaná"
 
-#: ../src/chat_control.py:2201
+#: ../src/chat_control.py:2236
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3268,40 +3495,38 @@ msgstr ""
 "Identita vzdialeného kontaktu nie je overená. Pre viac podrobností kliknite "
 "na tlačidlo v tvare štítu."
 
-#: ../src/chat_control.py:2203
+#: ../src/chat_control.py:2238
 msgid "E2E encryption disabled"
 msgstr "E2E šifrovanie zakázané"
 
-#: ../src/chat_control.py:2241 ../src/chat_control.py:2254
+#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
 msgid "The following message was NOT encrypted"
 msgstr "Nasledujúca správa NEbola šifrovaná"
 
-#: ../src/chat_control.py:2247
+#: ../src/chat_control.py:2288
 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:2519
+#: ../src/chat_control.py:2566
 #, 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:2520
+#: ../src/chat_control.py:2567
 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:2663 ../src/common/connection_handlers.py:1635
-#: ../src/common/connection_handlers.py:1758
-#: ../src/common/connection_handlers.py:1960
-#: ../src/common/connection_handlers.py:2110 ../src/common/connection.py:452
+#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
 #: ../src/gajim.py:159 ../src/session.py:138
 msgid "Database Error"
 msgstr "Chyba databázy"
 
-#: ../src/chat_control.py:2664
+#: ../src/chat_control.py:2714
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3310,7 +3535,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:2906
+#: ../src/chat_control.py:2962
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s je teraz %(status)s"
@@ -3324,28 +3549,28 @@ msgstr "vytváranie záznamov databáz"
 msgid "creating cache database"
 msgstr "vytváranie záznamov databáz"
 
-#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
-#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
-#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
-#: ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
 #, 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:275 ../src/common/check_paths.py:282
-#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
-#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
-#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:333
+#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
+#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
+#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
 msgid "Gajim will now exit"
 msgstr "Gajim bude ukončený"
 
-#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
+#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
 #, 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:342
+#: ../src/common/check_paths.py:351
 #, python-format
 msgid "creating %s directory"
 msgstr "vytváram priečinok %s"
@@ -3409,9 +3634,9 @@ msgstr "Zvolte diskusné skupiny, ktoré chcete opustiť"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:801
-#: ../src/roster_window.py:1614 ../src/roster_window.py:1616
-#: ../src/roster_window.py:5251
+#: ../src/common/helpers.py:57 ../src/roster_window.py:815
+#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
+#: ../src/roster_window.py:5323
 msgid "Groupchats"
 msgstr "Diskuné skupiny"
 
@@ -3469,7 +3694,8 @@ msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
 #: ../src/common/config.py:88
-msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgid ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
 #: ../src/common/config.py:93
@@ -3519,9 +3745,9 @@ msgstr ""
 "Zoznam (oddelený medzerami) a riadkov (účet a skupina), ktoré sú zabalené."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:501
-#: ../src/common/optparser.py:290 ../src/common/optparser.py:486
-#: ../src/common/optparser.py:520 ../src/gui_interface.py:3370
+#: ../src/common/config.py:106 ../src/common/config.py:505
+#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
+#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
 msgid "default"
 msgstr "predvolená"
 
@@ -3729,7 +3955,8 @@ msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC štandard znamená KiB = 1024 bajtov, KB = 1000 bajtov."
 
 #: ../src/common/config.py:197
-msgid "Notify of events in the system trayicon."
+#, fuzzy
+msgid "Notify of events in the notification area."
 msgstr "Upozorňovať na udalosti v oblasti systémových upozornení."
 
 #: ../src/common/config.py:203
@@ -3762,9 +3989,10 @@ msgid ""
 msgstr "Bodkočiarkou oddelený zoznam slov bude zvýraznený v diskusnej skupine."
 
 #: ../src/common/config.py:221
+#, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
+"setting is taken into account only if notification icon is used."
 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."
@@ -4032,7 +4260,7 @@ msgstr ""
 #: ../src/common/config.py:270
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
-"systray icon."
+"notification icon."
 msgstr ""
 
 #: ../src/common/config.py:271
@@ -4204,11 +4432,15 @@ msgstr ""
 msgid "Message that is sent to contacts you want to add"
 msgstr "Prosím vyplňte údaje o kontakte, ktorý chcete pridať"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:374
+msgid "Last time we syncronized with logs from server."
+msgstr ""
+
+#: ../src/common/config.py:436
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Má tento kontakt k dispozícii OpenPGP?"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4216,150 +4448,157 @@ msgstr ""
 "Mal by sa Gajim spúšťať automaticky so šifrovanou reláciou pre tento kontakt "
 "keď je to možné?"
 
-#: ../src/common/config.py:437 ../src/common/config.py:440
+#: ../src/common/config.py:438 ../src/common/config.py:441
 msgid "Language for which we want to check misspelled words"
 msgstr "Jazyk v ktorom má byť prevádzaná kontrola pravopisu"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:447
 msgid "all or space separated status"
 msgstr "všetky alebo medzerou oddelené stavy"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:448
 msgid "'yes', 'no', or 'both'"
 msgstr "'áno', 'nie', alebo 'oboje'"
 
-#: ../src/common/config.py:448 ../src/common/config.py:450
-#: ../src/common/config.py:451 ../src/common/config.py:454
-#: ../src/common/config.py:455
+#: ../src/common/config.py:449 ../src/common/config.py:451
+#: ../src/common/config.py:452 ../src/common/config.py:455
+#: ../src/common/config.py:456
 msgid "'yes', 'no' or ''"
 msgstr "'áno', 'nie' alebo ''"
 
-#: ../src/common/config.py:461 ../src/common/pep.py:157
+#: ../src/common/config.py:460
+msgid ""
+"State whether plugins should be activated on exit (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
+msgstr ""
+
+#: ../src/common/config.py:465 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Spím"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back soon"
 msgstr "Hneď som späť"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back in some minutes."
 msgstr "Som späť za pár minút."
 
-#: ../src/common/config.py:463 ../src/common/pep.py:127
+#: ../src/common/config.py:467 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Jem"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:467
 msgid "I'm eating, so leave me a message."
 msgstr "Práve jem, prosím nechajte mi odkaz."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "I'm watching a movie."
 msgstr "Pozerám film."
 
-#: ../src/common/config.py:465 ../src/common/pep.py:186
+#: ../src/common/config.py:469 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Pracujem"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:469
 msgid "I'm working."
 msgstr "Pracujem."
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "Phone"
 msgstr "Telefonujem"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "I'm on the phone."
 msgstr "Telefonujem."
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "Out"
 msgstr "Vonku"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "I'm out enjoying life."
 msgstr "Som vonku a užívam si život."
 
-#: ../src/common/config.py:478
+#: ../src/common/config.py:482
 msgid "I'm available."
 msgstr "Prítomný."
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:483
 msgid "I'm free for chat."
 msgstr "Mám čas na rozhovor."
 
-#: ../src/common/config.py:480 ../src/config.py:1600
+#: ../src/common/config.py:484 ../src/config.py:1600
 msgid "Be right back."
 msgstr "Za chvíľu som späť."
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:485
 msgid "I'm not available."
 msgstr "Nie som prítomný."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:486
 msgid "Do not disturb."
 msgstr "Nerušiť."
 
-#: ../src/common/config.py:483 ../src/common/config.py:484
+#: ../src/common/config.py:487 ../src/common/config.py:488
 msgid "Bye!"
 msgstr "Ahoj!"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:498
 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:495
+#: ../src/common/config.py:499
 msgid "Sound to play when any MUC message arrives."
 msgstr "Prehrať zvuk keď príde nejaká MUC správa."
 
-#: ../src/common/config.py:504 ../src/common/optparser.py:304
+#: ../src/common/config.py:508 ../src/common/optparser.py:308
 msgid "green"
 msgstr "zelená"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:290
+#: ../src/common/config.py:512 ../src/common/optparser.py:294
 msgid "grocery"
 msgstr "obchod s potravinami"
 
-#: ../src/common/config.py:512
+#: ../src/common/config.py:516
 msgid "human"
 msgstr "človek"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:520
 msgid "marine"
 msgstr "námornícka"
 
-#: ../src/common/connection_handlers.py:84
+#: ../src/common/connection_handlers.py:94
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Nie je možné nahrať idle modul"
 
-#: ../src/common/connection_handlers.py:117
+#: ../src/common/connection_handlers.py:127
 #, 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:124
+#: ../src/common/connection_handlers.py:134
 msgid "Registration succeeded"
 msgstr "Registrácia úspešná"
 
-#: ../src/common/connection_handlers.py:125
+#: ../src/common/connection_handlers.py:135
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registrácia pomocou agenta %s bola úspešná"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 msgid "Registration failed"
 msgstr "Registrácia zlyhala"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 #, fuzzy, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -4367,38 +4606,34 @@ msgstr ""
 "Registrácia pomocou agenta %(agent)s zlyhala s chybou %(error)s: "
 "%(error_msg)s"
 
-#: ../src/common/connection_handlers.py:445
-#: ../src/common/connection_handlers.py:1633
-#: ../src/common/connection_handlers.py:1756
-#: ../src/common/connection_handlers.py:1957
-#: ../src/common/connection_handlers.py:2108 ../src/common/connection.py:449
+#: ../src/common/connection_handlers.py:466
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
 #: ../src/gajim.py:341
 msgid "Disk Write Error"
 msgstr "Chyba pri zápise na disk"
 
-#: ../src/common/connection_handlers.py:678 ../src/common/connection.py:1472
+#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
 msgid "Invisibility not supported"
 msgstr "Neviditeľnosť nie je podporovaná"
 
-#: ../src/common/connection_handlers.py:679 ../src/common/connection.py:1473
+#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Účet %s nepodporuje neviditeľnosť."
 
-#: ../src/common/connection_handlers.py:1446 ../src/common/connection.py:253
-#: ../src/config.py:2091 ../src/config.py:2100 ../src/config.py:2168
-#: ../src/config.py:3560 ../src/dataforms_widget.py:597 ../src/dialogs.py:2931
+#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
+#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
+#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
 msgid "Invalid Jabber ID"
 msgstr "Nesprávné Jabber ID"
 
-#: ../src/common/connection_handlers.py:1447
+#: ../src/common/connection_handlers.py:1405
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1636
-#: ../src/common/connection_handlers.py:1759
-#: ../src/common/connection_handlers.py:1961
-#: ../src/common/connection_handlers.py:2111 ../src/common/connection.py:453
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
 #: ../src/gajim.py:160 ../src/session.py:139
 #, python-format
 msgid ""
@@ -4409,90 +4644,6 @@ msgstr ""
 "trac.gajim.org/wiki/DatabaseBackup) alebo ho odstrániť (všetko v histórii "
 "bude stratené)."
 
-#: ../src/common/connection_handlers.py:1805
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Prezývka nie je povolená: %s"
-
-#: ../src/common/connection_handlers.py:1902
-#: ../src/common/connection_handlers.py:1911
-#: ../src/common/connection_handlers.py:1918
-#: ../src/common/connection_handlers.py:1922
-#: ../src/common/connection_handlers.py:1926
-#: ../src/common/connection_handlers.py:1931 ../src/gui_interface.py:139
-msgid "Unable to join group chat"
-msgstr "Nie je možné pripojiť sa do diskusnej skupiny"
-
-#: ../src/common/connection_handlers.py:1903
-#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:1912
-#, python-format
-msgid "You are banned from group chat %s."
-msgstr "Dostali ste ban z diskusnej skupiny %s."
-
-#: ../src/common/connection_handlers.py:1919
-#, python-format
-msgid "Group chat %s does not exist."
-msgstr "Diskusná skupina %s neexistuje."
-
-#: ../src/common/connection_handlers.py:1923
-msgid "Group chat creation is restricted."
-msgstr "Vytváranie diskusných skupín je obmedzené."
-
-#: ../src/common/connection_handlers.py:1927
-#, 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:1932
-#, 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:1976
-msgid "Room has been destroyed"
-msgstr "Miestnosť bola zničená"
-
-#: ../src/common/connection_handlers.py:1984
-#, python-format
-msgid "You can join this room instead: %s"
-msgstr "Môžete sa prihlásiť do tejto miestnosti namiesto: %s"
-
-#: ../src/common/connection_handlers.py:2020
-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:2041
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "sme prihlásení k %s"
-
-#: ../src/common/connection_handlers.py:2043
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "požiadavka na odhlásenie od %s"
-
-#: ../src/common/connection_handlers.py:2045
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "sme odhlásení od %s"
-
-#: ../src/common/connection_handlers.py:2240
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"JID %s nevyhovuje RFC špecifikácii. Nebude pridaný do vášho zoznamu. Použite "
-"nástroje na správu zoznamu, napríklad: http://jru.jabberstudio.org/ pre jeho "
-"odstránenie"
-
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr "Nepodarilo sa získať problematický certfikát"
@@ -4621,27 +4772,27 @@ msgstr ""
 msgid "Application verification failure"
 msgstr "Zlyhalo overenie aplikácie"
 
-#: ../src/common/connection.py:254 ../src/dialogs.py:2932
+#: ../src/common/connection.py:256 ../src/dialogs.py:2948
 #, 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:276
+#: ../src/common/connection.py:278
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:281
 #, 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:331
+#: ../src/common/connection.py:333
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Táto správa je *šifrovaná* (Pozrite :XEP:`27`]"
 
-#: ../src/common/connection.py:439
+#: ../src/common/connection.py:441
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4650,78 +4801,78 @@ msgstr ""
 "Predmet: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:807
+#: ../src/common/connection.py:809
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Spojenie s účtom \"%s\" bolo stratené"
 
-#: ../src/common/connection.py:808
+#: ../src/common/connection.py:810
 msgid "Reconnect manually."
 msgstr "Znovu pripojiť manuálne."
 
-#: ../src/common/connection.py:820
+#: ../src/common/connection.py:822
 #, 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:854
+#: ../src/common/connection.py:856
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s poskytol rozdielny registračný formulár"
 
-#: ../src/common/connection.py:867
+#: ../src/common/connection.py:869
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Neznáma chyba SSL: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:882
+#: ../src/common/connection.py:884
 msgid "Invalid answer"
 msgstr "Nesprávna odpoveď"
 
-#: ../src/common/connection.py:883
+#: ../src/common/connection.py:885
 #, 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:1165 ../src/common/connection.py:1294
-#: ../src/common/connection.py:1784
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
+#: ../src/common/connection.py:1792
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nie je možné pripojiť sa k \"%s\""
 
-#: ../src/common/connection.py:1166 ../src/gui_interface.py:755
+#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
 msgid "Check your connection or try again later."
 msgstr "Skontrolujte svoje pripojenie alebo to skúste neskôr."
 
-#: ../src/common/connection.py:1171
+#: ../src/common/connection.py:1173
 #, python-format
 msgid "Server replied: %s"
 msgstr "Server odpovedal: %s"
 
-#: ../src/common/connection.py:1184
+#: ../src/common/connection.py:1186
 msgid "Connection to proxy failed"
 msgstr "Pripojenie k proxy zlyhalo"
 
-#: ../src/common/connection.py:1215 ../src/common/connection.py:1274
+#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Nie je možné pripojiť sa k účtu %s"
 
-#: ../src/common/connection.py:1216 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
 #, 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:1241
+#: ../src/common/connection.py:1243
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1244
+#: ../src/common/connection.py:1246
 #, python-format
 msgid ""
 "\n"
@@ -4730,7 +4881,7 @@ msgstr ""
 "\n"
 "Chyba SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1248
 #, python-format
 msgid ""
 "\n"
@@ -4739,24 +4890,24 @@ msgstr ""
 "\n"
 "Neznáma chyba SSL: %d"
 
-#: ../src/common/connection.py:1295
+#: ../src/common/connection.py:1297
 msgid "Check your connection or try again later"
 msgstr "Skontrolujte svoje pripojenie alebo to skúste neskôr"
 
-#: ../src/common/connection.py:1324
+#: ../src/common/connection.py:1329
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Overenie zlyhalo s \"%s\""
 
-#: ../src/common/connection.py:1326
+#: ../src/common/connection.py:1331
 msgid "Please check your login and password for correctness."
 msgstr "Prosím, skontrolujte správnosť prihlasovacieho mena a hesla."
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1400
 msgid "Error while removing privacy list"
 msgstr "Chyba počas odstraňovania súkromného zoznamu"
 
-#: ../src/common/connection.py:1396
+#: ../src/common/connection.py:1401
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4765,24 +4916,24 @@ 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:1650
+#: ../src/common/connection.py:1658
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Poslať kontakt: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1653
+#: ../src/common/connection.py:1661
 msgid "Sent contacts:"
 msgstr "Poslať kontakty:"
 
-#: ../src/common/connection.py:1799 ../src/common/connection.py:1822
+#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
 msgid "Not fetched because of invisible status"
 msgstr "Nie je možné získať, pretože aktuálny stav je: Neviditeľný"
 
-#: ../src/common/connection.py:2254
+#: ../src/common/connection.py:2262
 msgid "Unregister failed"
 msgstr "Odstránenie účtu zlyhalo"
 
-#: ../src/common/connection.py:2255
+#: ../src/common/connection.py:2263
 #, fuzzy, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
@@ -4790,16 +4941,16 @@ msgstr ""
 "%(error_msg)s"
 
 #: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:674
+#: ../src/gui_interface.py:551
 msgid "Observers"
 msgstr "Pozorovatelia"
 
 #: ../src/common/contacts.py:139 ../src/common/contacts.py:366
 #: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1499 ../src/gui_interface.py:424
-#: ../src/roster_window.py:840 ../src/roster_window.py:1525
-#: ../src/roster_window.py:1606 ../src/roster_window.py:1608
-#: ../src/roster_window.py:1769
+#: ../src/disco.py:1517 ../src/roster_window.py:854
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
+#: ../src/roster_window.py:2466
 msgid "Transports"
 msgstr "Transporty"
 
@@ -5026,203 +5177,219 @@ msgstr "Koniec týždňa"
 msgid "Weekend!"
 msgstr "Víkend!"
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:148
+msgid "Username must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:153
 msgid "Invalid character in username."
 msgstr "Nepovolený znak v názve účtu."
 
-#: ../src/common/helpers.py:156
-msgid "Server address required."
-msgstr "Adresa serveru je požadovaná."
+#: ../src/common/helpers.py:159
+msgid "Server must be between 1 and 1023 chars"
+msgstr ""
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 msgid "Invalid character in hostname."
 msgstr "Nepovolený znak v názve hostiteľa."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:166
+msgid "Server address required."
+msgstr "Adresa serveru je požadovaná."
+
+#: ../src/common/helpers.py:170
+msgid "Resource must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:175
 msgid "Invalid character in resource."
 msgstr "Nepovolený znak v zdroji."
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:215
 msgid "_Busy"
 msgstr "_Zaneprázdnený"
 
-#: ../src/common/helpers.py:211 ../src/tooltips.py:195
+#: ../src/common/helpers.py:217 ../src/tooltips.py:195
 msgid "Busy"
 msgstr "Zaneprázdnený"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:220
 msgid "_Not Available"
 msgstr "_Neprítomný"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:225
 msgid "_Free for Chat"
 msgstr "_Mám čas na debatu"
 
-#: ../src/common/helpers.py:221 ../src/tooltips.py:191
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Free for Chat"
 msgstr "Mám čas na debatu"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:230
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?stav prenosu:Pozastavené"
 
-#: ../src/common/helpers.py:226 ../src/tooltips.py:189
+#: ../src/common/helpers.py:232 ../src/tooltips.py:189
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?stav prenosu:Pozastavené"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:234
 msgid "Connecting"
 msgstr "Pripájanie"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:237
 msgid "A_way"
 msgstr "P_reč"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:242
 msgid "_Offline"
 msgstr "_Odhlásený"
 
-#: ../src/common/helpers.py:238 ../src/tooltips.py:199
+#: ../src/common/helpers.py:244 ../src/tooltips.py:199
 msgid "Offline"
 msgstr "Odhlásený"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:247
 msgid "_Invisible"
 msgstr "_Neviditeľný"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:253
 msgid "?contact has status:Unknown"
 msgstr "?kontakt má stav:Neznámy"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:255
 msgid "?contact has status:Has errors"
 msgstr "?kontakt má stav:Chyba"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:260
 msgid "?Subscription we already have:None"
 msgstr "?Zápis už máme:Žiadny"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:262
 msgid "To"
 msgstr "Pre"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
+msgid "From"
+msgstr "Od"
+
+#: ../src/common/helpers.py:266
 msgid "Both"
 msgstr "Oba"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:274
 msgid "?Ask (for Subscription):None"
 msgstr "?Vyžiadať (zápis): Žiadny"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:276
 msgid "Subscribe"
 msgstr "Zapísať"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:285
 msgid "?Group Chat Contact Role:None"
 msgstr "?Rola kontaktu v diskusnej skupine: žiadna"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:288
 msgid "Moderators"
 msgstr "Moderátori"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:290
 msgid "Moderator"
 msgstr "Moderátor"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:293
 msgid "Participants"
 msgstr "Účastníci"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:295
 msgid "Participant"
 msgstr "Účastník"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:298
 msgid "Visitors"
 msgstr "Návštevníci"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:300
 msgid "Visitor"
 msgstr "Návštevník"
 
-#: ../src/common/helpers.py:300 ../src/tooltips.py:210
+#: ../src/common/helpers.py:306 ../src/tooltips.py:210
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Príslušnosť kontaktu v diskusnej skupine: žiadna"
 
-#: ../src/common/helpers.py:302 ../src/tooltips.py:216
+#: ../src/common/helpers.py:308 ../src/tooltips.py:216
 msgid "Owner"
 msgstr "Vlastník"
 
-#: ../src/common/helpers.py:304 ../src/tooltips.py:214
+#: ../src/common/helpers.py:310 ../src/tooltips.py:214
 msgid "Administrator"
 msgstr "Administrátor"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:212
+#: ../src/common/helpers.py:312 ../src/tooltips.py:212
 msgid "Member"
 msgstr "ÄŒlen"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:351
 msgid "is paying attention to the conversation"
 msgstr "sleduje konverzáciu"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:353
 msgid "is doing something else"
 msgstr "robí niečo iné"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:355
 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:352
+#: ../src/common/helpers.py:358
 msgid "paused composing a message"
 msgstr "prestal písať správu"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:360
 msgid "has closed the chat window or tab"
 msgstr "zatvoril okno alebo záložku"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:619
+#: ../src/common/helpers.py:625
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:622
+#: ../src/common/helpers.py:628
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:626
+#: ../src/common/helpers.py:632
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:629
+#: ../src/common/helpers.py:635
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:633
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:636
+#: ../src/common/helpers.py:642
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:645
 #, python-format
 msgid "%s B"
 msgstr "%s B"
@@ -5267,12 +5434,12 @@ msgstr "Gajim - %s"
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:111
+#: ../src/common/jingle_rtp.py:107
 #, python-format
 msgid "%s configuration error"
 msgstr "%s konfiguračná chyba"
 
-#: ../src/common/jingle_rtp.py:112
+#: ../src/common/jingle_rtp.py:108
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5284,30 +5451,30 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:209
+#: ../src/common/jingle_rtp.py:205
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:210
+#: ../src/common/jingle_rtp.py:206
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Chybová správa: %s"
 
-#: ../src/common/jingle_rtp.py:336
+#: ../src/common/jingle_rtp.py:335
 msgid "audio input"
 msgstr "zvukový vstup"
 
-#: ../src/common/jingle_rtp.py:339
+#: ../src/common/jingle_rtp.py:338
 msgid "audio output"
 msgstr "zvukový výstup"
 
-#: ../src/common/jingle_rtp.py:382
+#: ../src/common/jingle_rtp.py:381
 msgid "video input"
 msgstr "video vstup"
 
-#: ../src/common/jingle_rtp.py:390
+#: ../src/common/jingle_rtp.py:389
 msgid "video output"
 msgstr "video výstup"
 
@@ -5383,11 +5550,11 @@ msgstr "X Window System (bez Xv)"
 msgid "error: cannot open %s for reading"
 msgstr "chyba: nie je možné otvoriť %s na čítanie"
 
-#: ../src/common/optparser.py:299 ../src/common/optparser.py:300
+#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
 msgid "cyan"
 msgstr "azúrová"
 
-#: ../src/common/optparser.py:379
+#: ../src/common/optparser.py:383
 msgid "migrating logs database to indices"
 msgstr ""
 
@@ -6059,7 +6226,7 @@ msgstr ""
 "Možno máte spustenú inú inštanciu programu Gajim. Prenos súboru bude zrušený."
 
 #. we're not english
-#: ../src/common/stanza_session.py:303
+#: ../src/common/stanza_session.py:423
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6067,11 +6234,11 @@ msgstr ""
 "[Toto je časť šifrovanej relácie. Ak vidíte túto správu, potom je niečo "
 "nesprávne.]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:178
+#: ../src/common/zeroconf/connection_zeroconf.py:181
 msgid "Avahi error"
 msgstr "Chyba Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:179
+#: ../src/common/zeroconf/connection_zeroconf.py:182
 #, python-format
 msgid ""
 "%s\n"
@@ -6080,44 +6247,44 @@ msgstr ""
 "%s\n"
 "Link-local správy nemusia správne fungovať."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:190
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 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:199
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Could not start local service"
 msgstr "Nie je možné spustiť lokálnu službu"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Nie je možné použiť port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-#: ../src/common/zeroconf/connection_zeroconf.py:283
-#: ../src/common/zeroconf/connection_zeroconf.py:294
-#: ../src/common/zeroconf/connection_zeroconf.py:308
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:286
+#: ../src/common/zeroconf/connection_zeroconf.py:297
+#: ../src/common/zeroconf/connection_zeroconf.py:311
 msgid "Please check if avahi-daemon is running."
 msgstr "Prosím skontrolujte, či je spustený program avahi-daemon"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:282
-#: ../src/common/zeroconf/connection_zeroconf.py:293
-#: ../src/common/zeroconf/connection_zeroconf.py:307
+#: ../src/common/zeroconf/connection_zeroconf.py:285
+#: ../src/common/zeroconf/connection_zeroconf.py:296
+#: ../src/common/zeroconf/connection_zeroconf.py:310
 #, 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:325
+#: ../src/common/zeroconf/connection_zeroconf.py:328
 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:335
+#: ../src/common/zeroconf/connection_zeroconf.py:338
 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:360
+#: ../src/common/zeroconf/connection_zeroconf.py:363
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6138,16 +6305,16 @@ msgstr "Predvolená správa"
 msgid "Enabled"
 msgstr "Povolené"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3078
+#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
 msgid "Default"
 msgstr "Predvolené"
 
-#: ../src/config.py:739 ../src/dialogs.py:1395
+#: ../src/config.py:733 ../src/dialogs.py:1409
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Slovník pre jazyk %s nie je k dispozícii"
 
-#: ../src/config.py:740
+#: ../src/config.py:734
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6166,9 +6333,9 @@ msgid "status message text"
 msgstr "text správy o stave"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2383 ../src/dialogs.py:2449
-#: ../src/dialogs.py:3215 ../src/disco.py:866 ../src/disco.py:1726
-#: ../src/disco.py:2030 ../src/history_window.py:90
+#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
+#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
+#: ../src/disco.py:2048 ../src/history_window.py:90
 msgid "Name"
 msgstr "Meno"
 
@@ -6204,7 +6371,7 @@ msgstr ""
 "Všetky okná s diskusiami a diskusnými skupinami budú zatvorené. Prajete si "
 "pokračovať?"
 
-#: ../src/config.py:1976 ../src/config.py:2509 ../src/config.py:2545
+#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
 msgid "You are currently connected to the server"
 msgstr "Ste pripojený na server"
 
@@ -6239,133 +6406,133 @@ msgstr "Názov účtu nemôže byť prázdny."
 msgid "Account name cannot contain spaces."
 msgstr "Názov účtu nemôže obsahovať medzery."
 
-#: ../src/config.py:2072
+#: ../src/config.py:2074
 msgid "Rename Account"
 msgstr "Premenovať účet"
 
-#: ../src/config.py:2073
+#: ../src/config.py:2075
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Zadať nový názov pre účet %s"
 
-#: ../src/config.py:2101
+#: ../src/config.py:2103
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID musí byť v tvare \"používateľ@menoserveru\"."
 
-#: ../src/config.py:2318 ../src/config.py:3606
+#: ../src/config.py:2320 ../src/config.py:3623
 msgid "Invalid entry"
 msgstr "Nesprávny záznam"
 
-#: ../src/config.py:2319 ../src/config.py:3607
+#: ../src/config.py:2321 ../src/config.py:3624
 msgid "Custom port must be a port number."
 msgstr "Vlastný port musí byť číslo portu."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2342
 msgid "Failed to get secret keys"
 msgstr "Nepodarilo sa získať tajné kľúče"
 
-#: ../src/config.py:2341
+#: ../src/config.py:2343
 msgid "There is no OpenPGP secret key available."
 msgstr "Nie je tu tajný OpenPGP kľúč k dispozícii."
 
-#: ../src/config.py:2375
+#: ../src/config.py:2377
 msgid "OpenPGP Key Selection"
 msgstr "Výber OpenPGP kľúča"
 
-#: ../src/config.py:2376
+#: ../src/config.py:2378
 msgid "Choose your OpenPGP key"
 msgstr "Vyberte váš OpenPGP kľúč"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2385
 msgid "No such account available"
 msgstr "Taký účet nie je k dispozícii"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2386
 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:2391 ../src/dialogs.py:2136 ../src/dialogs.py:2371
-#: ../src/dialogs.py:2557 ../src/disco.py:511 ../src/profile_window.py:339
+#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
+#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
 msgid "You are not connected to the server"
 msgstr "Nie ste pripojený k serveru"
 
-#: ../src/config.py:2392
+#: ../src/config.py:2394
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez pripojenia nemôžete meniť osobné informácie."
 
-#: ../src/config.py:2396
+#: ../src/config.py:2398
 msgid "Your server doesn't support Vcard"
 msgstr "Server nepodporuje Vcard"
 
-#: ../src/config.py:2397
+#: ../src/config.py:2399
 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:2510 ../src/config.py:2546
+#: ../src/config.py:2512 ../src/config.py:2548
 msgid "To disable the account, you must be disconnected."
 msgstr "Pre zakázanie účtu, musíte byť odpojený."
 
-#: ../src/config.py:2515
+#: ../src/config.py:2517
 msgid "Account Local already exists."
 msgstr "Účet Local už existuje."
 
-#: ../src/config.py:2516
+#: ../src/config.py:2518
 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:2673
+#: ../src/config.py:2675
 #, python-format
 msgid "Edit %s"
 msgstr "Upraviť %s"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2677
 #, python-format
 msgid "Register to %s"
 msgstr "Registrovať na %s"
 
 #. list at the beginning
-#: ../src/config.py:2711
+#: ../src/config.py:2713
 msgid "Ban List"
 msgstr "ÄŒierna listina"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2714
 msgid "Member List"
 msgstr "Zoznam členov"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2714
 msgid "Owner List"
 msgstr "Zoznam vlastníkov"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2715
 msgid "Administrator List"
 msgstr "Zoznam správcov"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2763 ../src/disco.py:873 ../src/history_manager.py:201
+#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2773
+#: ../src/config.py:2789
 msgid "Reason"
 msgstr "Dôvod"
 
-#: ../src/config.py:2780
+#: ../src/config.py:2796
 msgid "Nick"
 msgstr "Prezývka"
 
-#: ../src/config.py:2786
+#: ../src/config.py:2802
 msgid "Role"
 msgstr "Rola"
 
-#: ../src/config.py:2813
+#: ../src/config.py:2829
 msgid "Banning..."
 msgstr "Zakazujem..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2815
+#: ../src/config.py:2831
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6373,11 +6540,11 @@ msgstr ""
 "<b>Koho chcete zakázať?</b>\n"
 "\n"
 
-#: ../src/config.py:2817
+#: ../src/config.py:2833
 msgid "Adding Member..."
 msgstr "Pridáva sa člen..."
 
-#: ../src/config.py:2818
+#: ../src/config.py:2834
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6385,11 +6552,11 @@ msgstr ""
 "<b>Koho chcete pridať k členom?</b>\n"
 "\n"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2836
 msgid "Adding Owner..."
 msgstr "Pridáva sa vlastník..."
 
-#: ../src/config.py:2821
+#: ../src/config.py:2837
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6397,17 +6564,17 @@ msgstr ""
 "<b>Koho chcete určiť za vlastníka?</b>\n"
 "\n"
 
-#: ../src/config.py:2823
+#: ../src/config.py:2839
 msgid "Adding Administrator..."
 msgstr "Pridáva sa Administrátor..."
 
-#: ../src/config.py:2824
+#: ../src/config.py:2840
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr ""
 
-#: ../src/config.py:2825
+#: ../src/config.py:2841
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6423,81 +6590,81 @@ 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:2926
+#: ../src/config.py:2943
 #, python-format
 msgid "Removing %s account"
 msgstr "Odstraňuje sa účet %s"
 
-#: ../src/config.py:2941
+#: ../src/config.py:2958
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Emotikony zakázané"
 
-#: ../src/config.py:2942
+#: ../src/config.py:2959
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2955 ../src/gui_interface.py:1132
-#: ../src/gui_interface.py:1243
+#: ../src/config.py:2972 ../src/gui_interface.py:311
+#: ../src/gui_interface.py:1048
 msgid "Password Required"
 msgstr "Heslo je požadované"
 
-#: ../src/config.py:2956 ../src/gui_interface.py:1223
+#: ../src/config.py:2973 ../src/gui_interface.py:1028
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Vložte heslo pre váš účet %s"
 
-#: ../src/config.py:2957 ../src/gui_interface.py:1243
+#: ../src/config.py:2974 ../src/gui_interface.py:1048
 msgid "Save password"
 msgstr "Uložiť heslo"
 
-#: ../src/config.py:2967
+#: ../src/config.py:2984
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Účet \"%s\" je pripojený na server"
 
-#: ../src/config.py:2968
+#: ../src/config.py:2985
 msgid "If you remove it, the connection will be lost."
 msgstr "Ak dôjde k odstráneniu, stratíte spojenie."
 
-#: ../src/config.py:2982
+#: ../src/config.py:2999
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "Pripojenie k serveru %s zlyhalo"
 
-#: ../src/config.py:2983
+#: ../src/config.py:3000
 msgid "What would you like to do?"
 msgstr "Čo si prajete vykonať?"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3001
 msgid "Remove only from Gajim"
 msgstr "Odstrániť iba z programu Gajim"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3002
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3078
+#: ../src/config.py:3095
 msgid "?print_status:All"
 msgstr "?zobrazovaný stav:All"
 
-#: ../src/config.py:3079
+#: ../src/config.py:3096
 msgid "Enter and leave only"
 msgstr "Len vstúpiť a vystúpiť"
 
-#: ../src/config.py:3080
+#: ../src/config.py:3097
 msgid "?print_status:None"
 msgstr "?zobrazovaný stav:None"
 
-#: ../src/config.py:3150
+#: ../src/config.py:3167
 msgid "New Group Chat"
 msgstr "Nová diskusná skupina"
 
-#: ../src/config.py:3183
+#: ../src/config.py:3200
 msgid "This bookmark has invalid data"
 msgstr "Táto záložka obsahuje chybné údaje"
 
-#: ../src/config.py:3184
+#: ../src/config.py:3201
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6505,27 +6672,27 @@ msgstr ""
 "odstráňte túto záložku."
 
 #. invalid char
-#: ../src/config.py:3302 ../src/dialogs.py:1934
+#: ../src/config.py:3319 ../src/dialogs.py:1950
 msgid "Invalid nickname"
 msgstr "Neplatná prezývka"
 
-#: ../src/config.py:3303 ../src/config.py:3317 ../src/config.py:3331
+#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
 msgid "Character not allowed"
 msgstr "Znak nie je povolený"
 
-#: ../src/config.py:3316 ../src/config.py:3582
+#: ../src/config.py:3333 ../src/config.py:3599
 msgid "Invalid server"
 msgstr "Neplatný server"
 
-#: ../src/config.py:3330
+#: ../src/config.py:3347
 msgid "Invalid room"
 msgstr "Neplatná miestnosť"
 
-#: ../src/config.py:3498
+#: ../src/config.py:3515
 msgid "Account has been added successfully"
 msgstr "Účet bol úspešne pridaný"
 
-#: ../src/config.py:3499 ../src/config.py:3505
+#: ../src/config.py:3516 ../src/config.py:3522
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6535,32 +6702,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:3504
+#: ../src/config.py:3521
 msgid "Your new account has been created successfully"
 msgstr "Váš nový účet bol úspešne vytvorený"
 
-#: ../src/config.py:3543
+#: ../src/config.py:3560
 msgid "Invalid username"
 msgstr "Nesprávne meno používateľa"
 
-#: ../src/config.py:3545
+#: ../src/config.py:3562
 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:3583
+#: ../src/config.py:3600
 msgid "Please provide a server on which you want to register."
 msgstr "Poskytnite, prosím, server na ktorom sa chcete zaregistrovať."
 
-#: ../src/config.py:3639 ../src/gui_interface.py:1904
+#: ../src/config.py:3656 ../src/gui_interface.py:1693
 msgid "Certificate Already in File"
 msgstr "Certifikát už v súbore"
 
-#: ../src/config.py:3640 ../src/gui_interface.py:1905
+#: ../src/config.py:3657 ../src/gui_interface.py:1694
 #, 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:3717
+#: ../src/config.py:3734
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6575,7 +6742,7 @@ msgstr ""
 "SSL chyba: %(error)s\n"
 "Chcete sa ešte pripojiť k tomuto serveru?"
 
-#: ../src/config.py:3723 ../src/gui_interface.py:1932
+#: ../src/config.py:3740 ../src/gui_interface.py:1721
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6586,70 +6753,79 @@ msgstr ""
 "SHA1 fingerprint certifikátu:\n"
 "%s"
 
-#: ../src/config.py:3755 ../src/config.py:3789
+#: ../src/config.py:3772 ../src/config.py:3806
 msgid "An error occurred during account creation"
 msgstr "Vyskytla sa chyba počas tvorby účtu"
 
-#: ../src/config.py:3854
+#: ../src/config.py:3871
 msgid "Account name is in use"
 msgstr "Názov účtu je už používaný"
 
-#: ../src/config.py:3855
+#: ../src/config.py:3872
 msgid "You already have an account using this name."
 msgstr "Už máte účet s týmto názvom."
 
-#: ../src/config.py:4009
+#: ../src/config.py:3991
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/config.py:3992
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#: ../src/config.py:4036
 msgid "Active"
 msgstr "Aktívne"
 
-#: ../src/config.py:4017
+#: ../src/config.py:4044
 msgid "Event"
 msgstr "Udalosť"
 
-#: ../src/config.py:4052
+#: ../src/config.py:4079
 msgid "First Message Received"
 msgstr "Prvá prijatá správa"
 
-#: ../src/config.py:4053
+#: ../src/config.py:4080
 msgid "Next Message Received Focused"
 msgstr "Ďalšia prijatá správa zameraná"
 
-#: ../src/config.py:4055
+#: ../src/config.py:4082
 msgid "Next Message Received Unfocused"
 msgstr "Ďalšia prijatá správa nezameraná"
 
-#: ../src/config.py:4056
+#: ../src/config.py:4083
 msgid "Contact Connected"
 msgstr "Kontakt pripojený"
 
-#: ../src/config.py:4057
+#: ../src/config.py:4084
 msgid "Contact Disconnected"
 msgstr "Kontakt odpojený"
 
-#: ../src/config.py:4058
+#: ../src/config.py:4085
 msgid "Message Sent"
 msgstr "Správa odoslaná"
 
-#: ../src/config.py:4059
+#: ../src/config.py:4086
 msgid "Group Chat Message Highlight"
 msgstr "Zvýraznenie správ v diskusnej skupine"
 
-#: ../src/config.py:4060
+#: ../src/config.py:4087
 msgid "Group Chat Message Received"
 msgstr "Prijatá správa - diskusná skupina"
 
-#: ../src/config.py:4061
+#: ../src/config.py:4088
 msgid "GMail Email Received"
 msgstr "Prijatý GMail e-mail"
 
-#: ../src/conversation_textview.py:600
+#: ../src/conversation_textview.py:601
 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:619
+#: ../src/conversation_textview.py:620
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6657,44 +6833,44 @@ msgstr ""
 "Zatiaľ čo ste nevenovali pozornosť tejto diskusnej skupine, pribudol "
 "nasledujúci text, ktorý je pod čiarou"
 
-#: ../src/conversation_textview.py:739
+#: ../src/conversation_textview.py:740
 msgid "_Quote"
 msgstr "_Ç“vodzovky"
 
-#: ../src/conversation_textview.py:746
+#: ../src/conversation_textview.py:747
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Akcie pre \"%s\""
 
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Read _Wikipedia Article"
 msgstr "Čítať článok na _Wikipédii"
 
-#: ../src/conversation_textview.py:763
+#: ../src/conversation_textview.py:765
 msgid "Look it up in _Dictionary"
 msgstr "Vyhľadať to v _slovníku"
 
-#: ../src/conversation_textview.py:780
+#: ../src/conversation_textview.py:782
 #, 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:793
+#: ../src/conversation_textview.py:795
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL pre web vyhľadávanie chýba \"%s\""
 
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 msgid "Web _Search for it"
 msgstr "_Hľadať na webe"
 
-#: ../src/conversation_textview.py:802
+#: ../src/conversation_textview.py:804
 msgid "Open as _Link"
 msgstr "Otvoriť ako _odkaz"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1296
+#: ../src/conversation_textview.py:1298
 #, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6703,186 +6879,191 @@ msgstr[1] "Včera"
 msgstr[2] "Pred %i dňami"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1344 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Predmet: %s\n"
 
-#: ../src/dataforms_widget.py:544
+#: ../src/dataforms_widget.py:545
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Nie je možné nahrať idle modul"
 
-#: ../src/dataforms_widget.py:546
+#: ../src/dataforms_widget.py:547
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Neviditeľnosť nie je podporovaná"
 
-#: ../src/dataforms_widget.py:601
+#: ../src/dataforms_widget.py:562
+msgid "This field is required"
+msgstr ""
+
+#: ../src/dataforms_widget.py:607
 msgid "Jabber ID already in list"
 msgstr "Jabber Id je už v zozname"
 
-#: ../src/dataforms_widget.py:602
+#: ../src/dataforms_widget.py:608
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Zadané Jabber ID je už v zozname. Zvoľte iné."
 
 #. Default jid
-#: ../src/dataforms_widget.py:613
+#: ../src/dataforms_widget.py:619
 msgid "new@jabber.id"
 msgstr "nové@jabber.id"
 
-#: ../src/dataforms_widget.py:616 ../src/dataforms_widget.py:618
+#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "nové%d@jabber.id"
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktné meno: <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:195
 msgid "Group"
 msgstr "Skupina"
 
-#: ../src/dialogs.py:201
+#: ../src/dialogs.py:202
 msgid "In the group"
 msgstr "V skupine"
 
-#: ../src/dialogs.py:292
+#: ../src/dialogs.py:293
 msgid "KeyID"
 msgstr "ID kľúča"
 
-#: ../src/dialogs.py:297
+#: ../src/dialogs.py:298
 msgid "Contact name"
 msgstr "Meno kontaktu"
 
-#: ../src/dialogs.py:469
+#: ../src/dialogs.py:470
 msgid "Set Mood"
 msgstr "Nastaviť náladu"
 
-#: ../src/dialogs.py:589
+#: ../src/dialogs.py:590
 #, python-format
 msgid "%s Status Message"
 msgstr "%s správa o stave"
 
-#: ../src/dialogs.py:603
+#: ../src/dialogs.py:604
 msgid "Status Message"
 msgstr "Správa o stave"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:794
 msgid "Overwrite Status Message?"
 msgstr "Prepísať správu o stave?"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:795
 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:802
+#: ../src/dialogs.py:803
 msgid "Save as Preset Status Message"
 msgstr "Uložiť ako prednastavenú správu o stave"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:804
 msgid "Please type a name for this status message"
 msgstr "Zadajte prosím názov pre túto stavovú správu"
 
-#: ../src/dialogs.py:831
+#: ../src/dialogs.py:832
 msgid "AIM Address:"
 msgstr "AIM adresa:"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:833
 msgid "GG Number:"
 msgstr "GG číslo:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:834
 msgid "ICQ Number:"
 msgstr "ICQ číslo:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:835
 msgid "MSN Address:"
 msgstr "MSN adresa:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:836
 msgid "Yahoo! Address:"
 msgstr "Yahoo! adresa:"
 
-#: ../src/dialogs.py:872
+#: ../src/dialogs.py:873
 #, 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:875
+#: ../src/dialogs.py:876
 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:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
+#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
+#: ../src/dialogs.py:3464
 msgid "Invalid User ID"
 msgstr "Nespravné ID používateľa"
 
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1052
 msgid "The user ID must not contain a resource."
 msgstr "ID používateľa nesmie obsahovať zdroj."
 
-#: ../src/dialogs.py:1051
+#: ../src/dialogs.py:1057
 msgid "You cannot add yourself to your roster."
 msgstr "Nemôžete pridať seba do vášho zoznamu kontaktov."
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1071
 msgid "Contact already in roster"
 msgstr "Kontakt je už v zozname"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1072
 msgid "This contact is already listed in your roster."
 msgstr "Tento kontakt je už uvedený v zozname."
 
-#: ../src/dialogs.py:1112
+#: ../src/dialogs.py:1118
 msgid "User ID:"
 msgstr "Používateľské ID:"
 
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1189
 msgid "A GTK+ jabber client"
 msgstr "GTK+ jabber klient"
 
-#: ../src/dialogs.py:1176
+#: ../src/dialogs.py:1190
 msgid "GTK+ Version:"
 msgstr "Verzia GTK+:"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1191
 msgid "PyGTK Version:"
 msgstr "Verzia PyGTK:"
 
-#: ../src/dialogs.py:1187
+#: ../src/dialogs.py:1201
 msgid "Current Developers:"
 msgstr "Súčasní vývojári:"
 
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1203
 msgid "Past Developers:"
 msgstr "Bývalí vývojári:"
 
-#: ../src/dialogs.py:1195
+#: ../src/dialogs.py:1209
 msgid "THANKS:"
 msgstr "POÄŽAKOVANIE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1215
 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:1213
+#: ../src/dialogs.py:1227
 msgid "translator-credits"
 msgstr ""
 "Juraj Michálek (juraj.michalek AT asinus.org)\n"
 "Pavol Klačanský <pavol@klacansky.com>"
 
-#: ../src/dialogs.py:1396
+#: ../src/dialogs.py:1410
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6891,100 +7072,100 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1935 ../src/dialogs.py:2322
+#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
 msgid "The nickname has not allowed characters."
 msgstr "Prezývka obsahuje nepovolené znaky."
 
-#: ../src/dialogs.py:2053
+#: ../src/dialogs.py:2069
 #, 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:2056
+#: ../src/dialogs.py:2072
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Požiadavka na prihlásenie od %s"
 
-#: ../src/dialogs.py:2131 ../src/gui_interface.py:2672
+#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Už ste v diskusnej skupine %s"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2153
 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:2178
+#: ../src/dialogs.py:2194
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Pripojiť sa k diskusnej skupine s účtom %s"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2325
 msgid "Invalid Account"
 msgstr "Neplatný účet"
 
-#: ../src/dialogs.py:2310
+#: ../src/dialogs.py:2326
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Účet s ktorým chcete vstúpiť do miestnosti"
 
-#: ../src/dialogs.py:2321
+#: ../src/dialogs.py:2337
 msgid "Invalid Nickname"
 msgstr "Neplatná prezývka"
 
-#: ../src/dialogs.py:2326 ../src/dialogs.py:2332
-#: ../src/groupchat_control.py:1832
+#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
+#: ../src/groupchat_control.py:1847
 msgid "Invalid group chat Jabber ID"
 msgstr "Nesprávne Jabber ID diskusnej skupiny"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2343
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "zadajte, prosím, Jabber ID diskusnej skupiny ako miestnosť@server."
 
-#: ../src/dialogs.py:2333 ../src/groupchat_control.py:1833
+#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Jabber ID diskusnej skupiny obsahuje nepovolené znaky."
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2356
 msgid "This is not a group chat"
 msgstr "Toto nie je diskusná skupina"
 
-#: ../src/dialogs.py:2341
+#: ../src/dialogs.py:2357
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s nie je názov diskusnej skupiny."
 
-#: ../src/dialogs.py:2372
+#: ../src/dialogs.py:2388
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bez pripojenie nemôžete synchronizovať vaše kontakty."
 
-#: ../src/dialogs.py:2386
+#: ../src/dialogs.py:2402
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2421
+#: ../src/dialogs.py:2437
 msgid "This account is not connected to the server"
 msgstr "Tento účet nie je pripojený k serveru"
 
-#: ../src/dialogs.py:2422
+#: ../src/dialogs.py:2438
 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:2446
+#: ../src/dialogs.py:2462
 msgid "Synchronise"
 msgstr "Synchronizovať"
 
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2523
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Začať rozhovor s účtom %s"
 
-#: ../src/dialogs.py:2509
+#: ../src/dialogs.py:2525
 msgid "Start Chat"
 msgstr "Začať rozhovor"
 
-#: ../src/dialogs.py:2510
+#: ../src/dialogs.py:2526
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6993,165 +7174,165 @@ msgstr ""
 "odoslať správu:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2536 ../src/dialogs.py:2917 ../src/dialogs.py:3129
+#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
 msgid "Connection not available"
 msgstr "Pripojenie nie je dostupné"
 
-#: ../src/dialogs.py:2537 ../src/dialogs.py:2918 ../src/dialogs.py:3130
+#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Prosím, uistite sa, že ste pripojený k \"%s\"."
 
-#: ../src/dialogs.py:2546 ../src/dialogs.py:2549
+#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
 msgid "Invalid JID"
 msgstr "Nesprávne JID"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2565
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nie je možné spracovať \"%s\"."
 
-#: ../src/dialogs.py:2558
+#: ../src/dialogs.py:2574
 msgid "Without a connection, you can not change your password."
 msgstr "Bez pripojenia nemôžete meniť heslo."
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "Invalid password"
 msgstr "Nesprávne heslo"
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "You must enter a password."
 msgstr "Musíte vložiť heslo."
 
-#: ../src/dialogs.py:2581
+#: ../src/dialogs.py:2597
 msgid "Passwords do not match"
 msgstr "Heslá sa nezhodujú"
 
-#: ../src/dialogs.py:2582
+#: ../src/dialogs.py:2598
 msgid "The passwords typed in both fields must be identical."
 msgstr "Heslá vložené do oboch polí sa musia zhodovať."
 
 #. default value
-#: ../src/dialogs.py:2619 ../src/notify.py:247 ../src/notify.py:473
+#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
 msgid "Contact Signed In"
 msgstr "Kontakt sa prihlasil"
 
-#: ../src/dialogs.py:2621 ../src/notify.py:255 ../src/notify.py:475
+#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
 msgid "Contact Signed Out"
 msgstr "Kontakt sa odhlásil"
 
 #. chat message
-#: ../src/dialogs.py:2623 ../src/notify.py:277 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
 msgid "New Message"
 msgstr "Nová správa"
 
 #. single message
-#: ../src/dialogs.py:2623 ../src/notify.py:259 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
 msgid "New Single Message"
 msgstr "Nová krátka správa"
 
 #. private message
-#: ../src/dialogs.py:2624 ../src/notify.py:265 ../src/notify.py:478
+#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
 msgid "New Private Message"
 msgstr "Nová súkromná správa"
 
-#: ../src/dialogs.py:2624 ../src/gui_interface.py:1358 ../src/notify.py:487
+#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
 msgid "New E-mail"
 msgstr "Nový e-mail"
 
-#: ../src/dialogs.py:2626 ../src/gui_interface.py:1420 ../src/notify.py:480
+#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
 msgid "File Transfer Request"
 msgstr "Požiadavka na prenos súboru"
 
-#: ../src/dialogs.py:2628 ../src/gui_interface.py:1320
-#: ../src/gui_interface.py:1389 ../src/notify.py:482
+#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
+#: ../src/gui_interface.py:1186 ../src/notify.py:482
 msgid "File Transfer Error"
 msgstr "Chyba pri prenose súboru"
 
-#: ../src/dialogs.py:2630 ../src/gui_interface.py:1466
-#: ../src/gui_interface.py:1489 ../src/gui_interface.py:1506
+#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
+#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
 #: ../src/notify.py:484
 msgid "File Transfer Completed"
 msgstr "Prenos súboru dokončený"
 
-#: ../src/dialogs.py:2631 ../src/gui_interface.py:1469 ../src/notify.py:485
+#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
 msgid "File Transfer Stopped"
 msgstr "Prenos súboru zastavený"
 
-#: ../src/dialogs.py:2633 ../src/gui_interface.py:1152 ../src/notify.py:489
+#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
 msgid "Groupchat Invitation"
 msgstr "Pozvánka do diskusnej skupiny"
 
-#: ../src/dialogs.py:2635 ../src/notify.py:239 ../src/notify.py:491
+#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
 msgid "Contact Changed Status"
 msgstr "Kontakt zmenil stav"
 
-#: ../src/dialogs.py:2836
+#: ../src/dialogs.py:2852
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Krátka správa s použitím účtu %s"
 
-#: ../src/dialogs.py:2838
+#: ../src/dialogs.py:2854
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Krátka správa v účte %s"
 
-#: ../src/dialogs.py:2840
+#: ../src/dialogs.py:2856
 msgid "Single Message"
 msgstr "Krátku správu"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2843
+#: ../src/dialogs.py:2859
 #, python-format
 msgid "Send %s"
 msgstr "Poslať %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:2882
 #, python-format
 msgid "Received %s"
 msgstr "Prijatý %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2889
+#: ../src/dialogs.py:2905
 #, 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:2968
+#: ../src/dialogs.py:2984
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:2985
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napísal:\n"
 
-#: ../src/dialogs.py:3028
+#: ../src/dialogs.py:3044
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML konzola pre %s"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3046
 msgid "XML Console"
 msgstr "XML konzola"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 msgid "add"
 msgstr "pridať"
 
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 msgid "modify"
 msgstr "upraviť"
 
-#: ../src/dialogs.py:3160
+#: ../src/dialogs.py:3176
 msgid "remove"
 msgstr "zmazať"
 
-#: ../src/dialogs.py:3188
+#: ../src/dialogs.py:3204
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7159,155 +7340,189 @@ msgid ""
 msgstr ""
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3204 ../src/dialogs.py:3250
+#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
 msgid "Add"
 msgstr "Pridať"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3206 ../src/dialogs.py:3281
+#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
 msgid "Modify"
 msgstr "Upraviť"
 
-#: ../src/dialogs.py:3212
+#: ../src/dialogs.py:3228
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3218
+#: ../src/dialogs.py:3234
 msgid "Groups"
 msgstr "Skupiny"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3342
 #, 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:3340
+#: ../src/dialogs.py:3356
 #, python-format
 msgid "Added  %s contacts"
 msgstr "Pridaných %s kontaktov"
 
-#: ../src/dialogs.py:3377
+#: ../src/dialogs.py:3393
 #, python-format
 msgid "Removed  %s contacts"
 msgstr "Odstránených %s kontaktov"
 
-#: ../src/dialogs.py:3430
+#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#, python-format
+msgid "Archiving Preferences for %s"
+msgstr ""
+
+#: ../src/dialogs.py:3473
+#, fuzzy
+msgid "Invalid expire value"
+msgstr "Neplatný názov servera"
+
+#: ../src/dialogs.py:3474
+msgid "Expire must be a valid positive integer."
+msgstr ""
+
+#: ../src/dialogs.py:3521
+msgid "There is an error with the form"
+msgstr ""
+
+#: ../src/dialogs.py:3732
+#, fuzzy
+msgid "There is an error"
+msgstr "Služba vrátila chybu"
+
+#: ../src/dialogs.py:3796
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Súkromný zoznam <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3434
+#: ../src/dialogs.py:3800
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Súkromný zoznam pre %s"
 
-#: ../src/dialogs.py:3490
+#: ../src/dialogs.py:3856
 #, 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:3495
+#: ../src/dialogs.py:3861
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Poradie: %(order)s, akcia: %(action)s"
 
-#: ../src/dialogs.py:3539
+#: ../src/dialogs.py:3905
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Upraviť pravidlo</b>"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:4016
 msgid "<b>Add a rule</b>"
 msgstr "<b>Pridať pravidlo</b>"
 
-#: ../src/dialogs.py:3750
+#: ../src/dialogs.py:4116
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Súkromné zoznamy pre %s"
 
-#: ../src/dialogs.py:3752
+#: ../src/dialogs.py:4118
 msgid "Privacy Lists"
 msgstr "Súkromné zoznamy"
 
-#: ../src/dialogs.py:3822
+#: ../src/dialogs.py:4188
 msgid "Invalid List Name"
 msgstr "Nesprávny názov zoznamu"
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4189
 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:3855
+#: ../src/dialogs.py:4221
 msgid "You are invited to a groupchat"
 msgstr "Ste pozvaný do diskusnej skupiny"
 
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4224
 msgid "$Contact has invited you to join a discussion"
 msgstr ""
 
-#: ../src/dialogs.py:3860
+#: ../src/dialogs.py:4226
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr ""
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4234
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentár: %s"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4236
 msgid "Do you want to accept the invitation?"
 msgstr "Chcete prijať pozvanie?"
 
-#: ../src/dialogs.py:3932
+#: ../src/dialogs.py:4298
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:3942 ../src/dialogs.py:3985 ../src/dialogs.py:4041
+#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
+#: ../src/dialogs.py:4495
 msgid "All files"
 msgstr "Všetky súbory"
 
-#: ../src/dialogs.py:3947
+#: ../src/dialogs.py:4313
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:3975
+#: ../src/dialogs.py:4341
 msgid "Choose Sound"
 msgstr "Vybrať zvuk"
 
-#: ../src/dialogs.py:3990
+#: ../src/dialogs.py:4356
 msgid "Wav Sounds"
 msgstr "Wav zvuky"
 
-#: ../src/dialogs.py:4028
+#: ../src/dialogs.py:4394
 msgid "Choose Image"
 msgstr "Vybrať obrázok"
 
-#: ../src/dialogs.py:4046
+#: ../src/dialogs.py:4412
 msgid "Images"
 msgstr "Obrázky"
 
-#: ../src/dialogs.py:4113
+#: ../src/dialogs.py:4482
+#, fuzzy
+msgid "Choose Archive"
+msgstr "Vybrať obrázok"
+
+#: ../src/dialogs.py:4500
+#, fuzzy
+msgid "Zip files"
+msgstr "Všetky súbory"
+
+#: ../src/dialogs.py:4525
 #, python-format
 msgid "When %s becomes:"
 msgstr "Keď %s sa stane:"
 
-#: ../src/dialogs.py:4115
+#: ../src/dialogs.py:4527
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Pridáva sa špeciálne oznámenie pre %s"
 
-#: ../src/dialogs.py:4190
+#: ../src/dialogs.py:4602
 msgid "Condition"
 msgstr "Podmienka"
 
-#: ../src/dialogs.py:4310
+#: ../src/dialogs.py:4722
 msgid "when I am "
 msgstr "keď som "
 
-#: ../src/dialogs.py:4786
+#: ../src/dialogs.py:5198
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7315,38 +7530,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4789
+#: ../src/dialogs.py:5201
 msgid "You have already verified this contact's identity."
 msgstr "Identitu tohto kontaktu ste už overili."
 
-#: ../src/dialogs.py:4795 ../src/dialogs.py:4879
+#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
 msgid "Contact's identity verified"
 msgstr "Identita kontaktu overená"
 
-#: ../src/dialogs.py:4801
+#: ../src/dialogs.py:5213
 msgid "Verify again..."
 msgstr "Overiť znovu..."
 
-#: ../src/dialogs.py:4806
+#: ../src/dialogs.py:5218
 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:4809 ../src/dialogs.py:4860 ../src/dialogs.py:4873
+#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
 msgid "Contact's identity NOT verified"
 msgstr "Identita kontaktu NEoverená"
 
-#: ../src/dialogs.py:4814
+#: ../src/dialogs.py:5226
 msgid "Verify..."
 msgstr "Overiť..."
 
-#: ../src/dialogs.py:4825
+#: ../src/dialogs.py:5237
 msgid "Have you verified the contact's identity?"
 msgstr "Overili ste identitu kontaktu?"
 
-#: ../src/dialogs.py:4826
+#: ../src/dialogs.py:5238
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7356,28 +7571,28 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4827
+#: ../src/dialogs.py:5239
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4861
+#: ../src/dialogs.py:5273
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "Kľúč (%s) kontaktu <b>sa nezhoduje</b>  s kľúčom prideleným v programe Gajim."
 
-#: ../src/dialogs.py:4867
+#: ../src/dialogs.py:5279
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "K tomuto kontaktu nie je priradený GPG kľúč. Preto nemôžete šifrovať správy."
 
-#: ../src/dialogs.py:4874
+#: ../src/dialogs.py:5286
 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:4880
+#: ../src/dialogs.py:5292
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7385,19 +7600,19 @@ msgstr ""
 "Tento kontakt má priradený GPG kľúč a vy ho považujete za dôveryhodný, "
 "správy budú šifrované."
 
-#: ../src/dialogs.py:4945
+#: ../src/dialogs.py:5357
 msgid "an audio and video"
 msgstr "zvuk a video"
 
-#: ../src/dialogs.py:4947
+#: ../src/dialogs.py:5359
 msgid "an audio"
 msgstr "zvuk"
 
-#: ../src/dialogs.py:4949
+#: ../src/dialogs.py:5361
 msgid "a video"
 msgstr "video"
 
-#: ../src/dialogs.py:4953
+#: ../src/dialogs.py:5365
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7413,24 +7628,24 @@ msgstr "Ostatný"
 msgid "Conference"
 msgstr "Konferencia"
 
-#: ../src/disco.py:512
+#: ../src/disco.py:513
 msgid "Without a connection, you can not browse available services"
 msgstr "Bez pripojenia, nemôžete prehliadať dostupné služby"
 
-#: ../src/disco.py:589
+#: ../src/disco.py:600
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Prehliadanie služieb s použitím účtu %s"
 
-#: ../src/disco.py:591
+#: ../src/disco.py:602
 msgid "Service Discovery"
 msgstr "Prehliadanie služieb"
 
-#: ../src/disco.py:741
+#: ../src/disco.py:758
 msgid "The service could not be found"
 msgstr "Služba nebola nájdená"
 
-#: ../src/disco.py:742
+#: ../src/disco.py:759
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7438,93 +7653,93 @@ msgstr ""
 "Žiadna služba nie je k dispozícii na zadanej adrese alebo neodpovedá. "
 "Skontrolujte adresu a skúste opäť."
 
-#: ../src/disco.py:746 ../src/disco.py:1082
+#: ../src/disco.py:763 ../src/disco.py:1100
 msgid "The service is not browsable"
 msgstr "Služba nie je prehľadávateľná"
 
-#: ../src/disco.py:747
+#: ../src/disco.py:764
 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:786 ../src/disco.py:796
+#: ../src/disco.py:804 ../src/disco.py:814
 msgid "Invalid Server Name"
 msgstr "Neplatný názov servera"
 
-#: ../src/disco.py:850
+#: ../src/disco.py:868
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Prehliadanie %(address)s s použitím účtu %(account)s"
 
-#: ../src/disco.py:894
+#: ../src/disco.py:912
 msgid "_Browse"
 msgstr "_Prehliadať"
 
-#: ../src/disco.py:1083
+#: ../src/disco.py:1101
 msgid "This service does not contain any items to browse."
 msgstr "Táto služba neobsahuje žiadne položky na prehliadanie."
 
-#: ../src/disco.py:1323
+#: ../src/disco.py:1341
 msgid "_Execute Command"
 msgstr "_Vykonať príkaz"
 
-#: ../src/disco.py:1333 ../src/disco.py:1504
+#: ../src/disco.py:1351 ../src/disco.py:1522
 msgid "Re_gister"
 msgstr "Re_gistrácia"
 
-#: ../src/disco.py:1545
+#: ../src/disco.py:1563
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Prieskúmava sa %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1736
+#: ../src/disco.py:1754
 msgid "Users"
 msgstr "Používatelia"
 
 #. Description column
-#: ../src/disco.py:1744
+#: ../src/disco.py:1762
 msgid "Description"
 msgstr "Popis"
 
 #. Id column
-#: ../src/disco.py:1752
+#: ../src/disco.py:1770
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1817 ../src/gui_interface.py:3182
+#: ../src/disco.py:1835 ../src/gui_interface.py:2995
 msgid "Bookmark already set"
 msgstr "Záložka je už nastavená"
 
-#: ../src/disco.py:1818 ../src/gui_interface.py:3183
+#: ../src/disco.py:1836 ../src/gui_interface.py:2996
 #, 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:1827 ../src/gui_interface.py:3197
+#: ../src/disco.py:1845 ../src/gui_interface.py:3010
 msgid "Bookmark has been added successfully"
 msgstr "Záložka bola úspešne pridaná"
 
-#: ../src/disco.py:1828 ../src/gui_interface.py:3198
+#: ../src/disco.py:1846 ../src/gui_interface.py:3011
 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:2039
+#: ../src/disco.py:2057
 msgid "Subscribed"
 msgstr "Prihlásiť"
 
-#: ../src/disco.py:2047
+#: ../src/disco.py:2065
 msgid "Node"
 msgstr ""
 
-#: ../src/disco.py:2111
+#: ../src/disco.py:2129
 msgid "New post"
 msgstr "Nová správa"
 
-#: ../src/disco.py:2117
+#: ../src/disco.py:2135
 msgid "_Subscribe"
 msgstr "_Zapísať"
 
-#: ../src/disco.py:2123
+#: ../src/disco.py:2141
 msgid "_Unsubscribe"
 msgstr "_Odhlásiť"
 
@@ -7696,17 +7911,19 @@ msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Prevádza LaTeX výrazy medzi $$ $$."
 
 #: ../src/features_window.py:95
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
-"in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 "Vyžaduje texlive-latex-base a dvipng. Musíte nastaviť 'use_latex' na True v "
 "Editore rozšírenej konfigurácie."
 
 #: ../src/features_window.py:96
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
+"You have to set 'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 "Vyžaduje texlive-latex-base a dvipng (Všetko je v MikTeX). Musíte nastaviť "
 "'use_latex' na True v Editore rozšírenej konfigurácie."
@@ -7862,34 +8079,34 @@ msgstr "Popis: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s vám chce poslať súbor:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Nie je možné prepísať existujúci súbor \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
 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:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 msgid "This file already exists"
 msgstr "Tento súbor už existuje"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 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:369 ../src/gtkgui_helpers.py:914
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Do priečinku \"%s\" nie je možné zapisovať"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
 msgid "You do not have permission to create files in this directory."
 msgstr "Nemáte oprávnenie vytvoriť súbor v tomto priečinku."
 
@@ -7988,28 +8205,28 @@ msgstr ""
 "Pravdepodobne už jeden program Gajim beží\n"
 "Želáte si aj napriek tomu spustiť Gajim?"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
 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:80
+#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
 msgid "command"
 msgstr "príkaz"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "ukáž pomocníka pre príkaz"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Zobraziť alebo skryť okno so zoznamom"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Vyskakovacie okno s ďalšou čakajúcou udalosťou"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8017,6 +8234,13 @@ msgstr ""
 "Vypíše zoznam všetkých kontaktov v zozname kontaktov. Každý kontakt sa "
 "zobrazí na novom riadku"
 
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
+#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
+#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
+#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
 #: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
 #: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
 #: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
@@ -8028,43 +8252,35 @@ msgstr ""
 msgid "account"
 msgstr "účet"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "zobraziť len kontakty daného účtu"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Vypíše zoznam registrovaných účtov"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
 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:109
+#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
 msgid "status"
 msgstr "stav"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106
 #, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"accoun't previous status"
+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:110 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
-msgid "message"
-msgstr "správa"
-
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "správa o stave"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8072,44 +8288,20 @@ 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:117
-msgid "Changes the priority of account or accounts"
-msgstr "Zmení prioritu účtu alebo účtov"
-
-#: ../src/gajim-remote.py:119
-msgid "priority"
-msgstr "priorita"
-
-#: ../src/gajim-remote.py:119
-msgid "priority you want to give to the account"
-msgstr "priorita, ktorú chcete udeliť účtu"
-
-#: ../src/gajim-remote.py:121
-#, fuzzy
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-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:127
+#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
 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:129
+#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID kontaktu, s ktorým chcete komunikovať"
 
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
 #: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 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:134
-msgid "message content. The account must be specified or \"\""
-msgstr ""
-
-#: ../src/gajim-remote.py:139
+#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
 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 "
@@ -8119,30 +8311,35 @@ msgstr ""
 "nepovinné. Ak chcete nastaviť iba 'účet', bez 'OpenPGP kľúča', nastavte "
 "'OpenPGP kľúč' na ''."
 
+#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
 #: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID kontaktu, ktorý prijme správu"
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
+#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "obsah správy"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "pgp kľúč"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "ak je špecifikovaný, správa bude zašifrovaná s použitím verejného kľúča"
 
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
+#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "ak je špecifikovaný, správa bude odoslaná s použitím tohoto účtu"
 
-#: ../src/gajim-remote.py:152
+#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
 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 "
@@ -8152,142 +8349,285 @@ msgstr ""
 "nepovinné. Ak chcete nastaviť iba 'účet', bez 'OpenPGP kľúča', nastavte "
 "'OpenPGP kľúč' na ''."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "predmet"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "predmet správy"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Pošle novú správu diskusnej skupine do ktorej ste sa prihlásili."
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr ""
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Získať podrobné informácie o kontakte"
 
+#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
+#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
 #: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
 #: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID kontaktu"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Získať podrobné informácie o účte"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Názov účtu"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Poslať súbor kontaktu"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "file"
 msgstr "súbor"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Cesta k súboru"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "ak je špecifikovaný, súbor bude odoslaný s použitím tohto účtom"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Výpis všetkých nastavení a ich hodnôt"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Nastavuje hodnotu 'kľúča' na 'hodnotu'."
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "kľúč=hodnota"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'kľúč' je názov vlastnosti, 'hodnota' je hodnota, na ktorú má byť nastavený"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Odstrániť položku predvoľby"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
 msgid "key"
 msgstr "kľúč"
 
-#: ../src/gajim-remote.py:209
-msgid "name of the preference to be deleted"
-msgstr "názov nastavenia, ktoré má byť zmazané"
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "name of the preference to be deleted"
+msgstr "názov nastavenia, ktoré má byť zmazané"
+
+#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+msgid "Writes the current state of Gajim preferences to the .config file"
+msgstr "Zapíše aktuálny stav nastavení programu Gajim do súboru .config"
+
+#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
+msgid "Removes contact from roster"
+msgstr "Odstráni kontakt zo zoznamu"
+
+#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+msgid "Adds contact to roster"
+msgstr "Pridá kontakt do zoznamu"
+
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+msgid "Adds new contact to this account"
+msgstr "Pridá nový kontakt do tohto účtu"
+
+#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+msgid "Returns current status (the global one unless account is specified)"
+msgstr "Vráti aktuálny stav (použije sa globálny, pokiaľ nie je vybraný účet)"
+
+#: ../src/gajim-remote-plugin.py:226
+#, fuzzy
+msgid ""
+"Returns current status message(the global one unless account is specified)"
+msgstr ""
+"Vráti aktuálnu správu o stave (použije sa globálny, pokiaľ nie je vybraný "
+"účet)"
+
+#: ../src/gajim-remote-plugin.py:233 ../src/gajim-remote.py:249
+msgid "Returns number of unread messages"
+msgstr "Vráti počet neprečítaných správ"
+
+#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+msgid "Opens 'Start Chat' dialog"
+msgstr "Otvorí dialóg 'Začiatok diskusie'"
+
+#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+msgid "Starts chat, using this account"
+msgstr "Začať rozhovor s použitím účtu %s"
+
+#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+msgid "Sends custom XML"
+msgstr "Odoslať vlastné XML"
+
+#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+msgid "XML to send"
+msgstr "XML na odoslanie"
+
+#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+"Účet na ktorý bude XML odoslané; ak nie je špecifikovaný, XML bude odoslané "
+"všetkým účtom"
+
+#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
+msgid "Handle a xmpp:/ uri"
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
+msgid "uri"
+msgstr "uri"
+
+#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+msgid "Join a MUC room"
+msgstr "Pripojiť MUC miestnosť"
+
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+msgid "room"
+msgstr "miestnosť"
+
+#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+msgid "nick"
+msgstr "prezývka"
+
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+msgid "password"
+msgstr "heslo"
+
+#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+msgid "Check if Gajim is running"
+msgstr "Kontrolovať, či je Gajim spustený"
+
+#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
+#: ../src/gajim-remote.py:300
+msgid "Shows or hides the ipython window"
+msgstr "Zobraziť alebo skryť okno ipython"
+
+#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+msgid "Missing argument \"contact_jid\""
+msgstr "Chýbajúci argument \"contact_jid\""
+
+#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#, python-format
+msgid ""
+"'%s' is not in your roster.\n"
+"Please specify account for sending the message."
+msgstr ""
+"'%s' nie je vo vašom zozname.\n"
+"Prosím, špecifikujte účet, z ktorého odoslať správu."
+
+#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+msgid "You have no active account"
+msgstr "Nemáte žiadny aktívny účet"
+
+#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+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-plugin.py:412
+#, python-format
+msgid ""
+"Usage: %s %s %s \n"
+"\t %s"
+msgstr ""
+"Použitie: %s %s %s \n"
+"\t %s"
 
-#: ../src/gajim-remote.py:213
-msgid "Writes the current state of Gajim preferences to the .config file"
-msgstr "Zapíše aktuálny stav nastavení programu Gajim do súboru .config"
+#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+msgid "Arguments:"
+msgstr "Argumenty:"
 
-#: ../src/gajim-remote.py:218
-msgid "Removes contact from roster"
-msgstr "Odstráni kontakt zo zoznamu"
+#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#, python-format
+msgid "%s not found"
+msgstr "%s nenájdený"
 
-#: ../src/gajim-remote.py:227
-msgid "Adds contact to roster"
-msgstr "Pridá kontakt do zoznamu"
+#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
+#, python-format
+msgid ""
+"Usage: %s command [arguments]\n"
+"Command is one of:\n"
+msgstr ""
+"Použitie: %s príkaz [argumenty]\n"
+"Príkaz je jeden z:\n"
 
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "jid"
+#: ../src/gajim-remote-plugin.py:496
+#, fuzzy, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Príliš veľa argumentov. \n"
+"Zadajte \"%(basename)s help %(command)s\" pre viac informácií"
 
-#: ../src/gajim-remote.py:230
-msgid "Adds new contact to this account"
-msgstr "Pridá nový kontakt do tohto účtu"
+#: ../src/gajim-remote-plugin.py:500
+#, fuzzy, python-format
+msgid ""
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Argument \"%(arg)s\" nie je špecifikovaný. \n"
+"Zadajte \"%(basename)s help %(command)s\" pre viac informácií"
 
-#: ../src/gajim-remote.py:235
-msgid "Returns current status (the global one unless account is specified)"
-msgstr "Vráti aktuálny stav (použije sa globálny, pokiaľ nie je vybraný účet)"
+#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
+msgid "Wrong uri"
+msgstr "Nesprávna uri"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:109
+#, fuzzy
 msgid ""
-"Returns current status message (the global one unless account is specified)"
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
 msgstr ""
-"Vráti aktuálnu správu o stave (použije sa globálny, pokiaľ nie je vybraný "
-"účet)"
+"jeden z: odhlásený, prítomný, chat, preč, diskutovať, zaneprázdnený, "
+"neviditeľný"
 
-#: ../src/gajim-remote.py:249
-msgid "Returns number of unread messages"
-msgstr "Vráti počet neprečítaných správ"
+#: ../src/gajim-remote.py:117
+msgid "Changes the priority of account or accounts"
+msgstr "Zmení prioritu účtu alebo účtov"
 
-#: ../src/gajim-remote.py:253
-msgid "Opens 'Start Chat' dialog"
-msgstr "Otvorí dialóg 'Začiatok diskusie'"
+#: ../src/gajim-remote.py:119
+msgid "priority"
+msgstr "priorita"
 
-#: ../src/gajim-remote.py:255
-msgid "Starts chat, using this account"
-msgstr "Začať rozhovor s použitím účtu %s"
+#: ../src/gajim-remote.py:119
+msgid "priority you want to give to the account"
+msgstr "priorita, ktorú chcete udeliť účtu"
 
-#: ../src/gajim-remote.py:259
-msgid "Sends custom XML"
-msgstr "Odoslať vlastné XML"
+#: ../src/gajim-remote.py:121
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+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:261
-msgid "XML to send"
-msgstr "XML na odoslanie"
+#: ../src/gajim-remote.py:134
+msgid "message content. The account must be specified or \"\""
+msgstr ""
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:242
 msgid ""
-"Account in which the xml will be sent; if not specified, xml will be sent to "
-"all accounts"
+"Returns current status message (the global one unless account is specified)"
 msgstr ""
-"Účet na ktorý bude XML odoslané; ak nie je špecifikovaný, XML bude odoslané "
-"všetkým účtom"
+"Vráti aktuálnu správu o stave (použije sa globálny, pokiaľ nie je vybraný "
+"účet)"
 
 #: ../src/gajim-remote.py:268
 msgid "Change the avatar"
@@ -8306,14 +8646,6 @@ msgstr ""
 "Účet na ktorý bude XML odoslané; ak nie je špecifikovaný, XML bude odoslané "
 "všetkým účtom"
 
-#: ../src/gajim-remote.py:277
-msgid "Handle a xmpp:/ uri"
-msgstr ""
-
-#: ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "uri"
-
 #: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr ""
@@ -8326,30 +8658,14 @@ msgstr "Účet ktorý chcete ovládať"
 msgid "Message content"
 msgstr "Obsah správy"
 
-#: ../src/gajim-remote.py:286
-msgid "Join a MUC room"
-msgstr "Pripojiť MUC miestnosť"
-
-#: ../src/gajim-remote.py:288
-msgid "room"
-msgstr "miestnosť"
-
 #: ../src/gajim-remote.py:288
 msgid "Room JID"
 msgstr "JID miestnosti"
 
-#: ../src/gajim-remote.py:289
-msgid "nick"
-msgstr "prezývka"
-
 #: ../src/gajim-remote.py:289
 msgid "Nickname to use"
 msgstr "Prezývka na používanie"
 
-#: ../src/gajim-remote.py:290
-msgid "password"
-msgstr "heslo"
-
 #: ../src/gajim-remote.py:290
 msgid "Password to enter the room"
 msgstr "Heslo pre vstup do miestnosti"
@@ -8358,35 +8674,6 @@ msgstr "Heslo pre vstup do miestnosti"
 msgid "Account from which you want to enter the room"
 msgstr "Účet s ktorým chcete vstúpiť do miestnosti"
 
-#: ../src/gajim-remote.py:296
-msgid "Check if Gajim is running"
-msgstr "Kontrolovať, či je Gajim spustený"
-
-#: ../src/gajim-remote.py:300
-msgid "Shows or hides the ipython window"
-msgstr "Zobraziť alebo skryť okno ipython"
-
-#: ../src/gajim-remote.py:327
-msgid "Missing argument \"contact_jid\""
-msgstr "Chýbajúci argument \"contact_jid\""
-
-#: ../src/gajim-remote.py:348
-#, python-format
-msgid ""
-"'%s' is not in your roster.\n"
-"Please specify account for sending the message."
-msgstr ""
-"'%s' nie je vo vašom zozname.\n"
-"Prosím, špecifikujte účet, z ktorého odoslať správu."
-
-#: ../src/gajim-remote.py:351
-msgid "You have no active account"
-msgstr "Nemáte žiadny aktívny účet"
-
-#: ../src/gajim-remote.py:404
-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:431
 #, python-format
 msgid ""
@@ -8396,24 +8683,6 @@ msgstr ""
 "Použitie: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:435
-msgid "Arguments:"
-msgstr "Argumenty:"
-
-#: ../src/gajim-remote.py:439
-#, python-format
-msgid "%s not found"
-msgstr "%s nenájdený"
-
-#: ../src/gajim-remote.py:445
-#, python-format
-msgid ""
-"Usage: %s command [arguments]\n"
-"Command is one of:\n"
-msgstr ""
-"Použitie: %s príkaz [argumenty]\n"
-"Príkaz je jeden z:\n"
-
 #: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
@@ -8436,10 +8705,6 @@ msgstr ""
 msgid "No uri given"
 msgstr ""
 
-#: ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Nesprávna uri"
-
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Téma"
@@ -8465,198 +8730,196 @@ msgstr "Nemôžete odstrániť súčastnú tému"
 msgid "Please first choose another for your current theme."
 msgstr "Prosím, vyberte najskôr inú tému ako sučastnú."
 
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:170
 msgid "Sending private message failed"
 msgstr "Odoslanie súkromnej správy sa nepodarilo"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:171
+#: ../src/groupchat_control.py:172
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 
-#: ../src/groupchat_control.py:450
+#: ../src/groupchat_control.py:455
 msgid "Insert Nickname"
 msgstr "Vložiť prezývku"
 
-#: ../src/groupchat_control.py:631
+#: ../src/groupchat_control.py:636
 msgid "Conversation with "
 msgstr "Rozhovor s "
 
-#: ../src/groupchat_control.py:633
+#: ../src/groupchat_control.py:638
 msgid "Continued conversation"
 msgstr "Pokračovanie rozhovoru"
 
-#. Can be a message (see handle_event_gc_config_change in
-#. gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1272 ../src/gui_interface.py:1080
+#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1286
 msgid "Room logging is enabled"
 msgstr "Zaznamenávanie miestosti je povolené"
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1288
 msgid "A new room has been created"
 msgstr "Bola vytvorená nová miestnosť"
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1291
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1287
+#: ../src/groupchat_control.py:1297
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s bol vykopnutý: %(reason)s"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1300
 #, 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:1300
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s bol zakázaný: %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1312
 #, 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:1314 ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
 #, python-format
 msgid "You are now known as %s"
 msgstr "Teraz ste známy ako %s"
 
-#: ../src/groupchat_control.py:1330 ../src/gui_interface.py:919
+#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s je známy ako %(new_nick)s"
 
-#: ../src/groupchat_control.py:1372 ../src/groupchat_control.py:1377
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1392
 #, 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:1374
+#: ../src/groupchat_control.py:1383
 msgid "affiliation changed"
 msgstr "príslušnosť zmenená"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1388
 msgid "room configuration changed to members-only"
 msgstr "nastavenie miestnosti sa zmenilo na len členovia"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1394
 msgid "system shutdown"
 msgstr "vypnutie systému"
 
-#: ../src/groupchat_control.py:1470
+#: ../src/groupchat_control.py:1477
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1474
+#: ../src/groupchat_control.py:1481
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1489
+#: ../src/groupchat_control.py:1496
 #, 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:1493
+#: ../src/groupchat_control.py:1500
 #, 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:1522
+#: ../src/groupchat_control.py:1530
 #, python-format
 msgid "%s has left"
 msgstr "%s odišiel"
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1535
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s sa pripojil do diskusnej skupiny"
 
-#: ../src/groupchat_control.py:1529 ../src/gui_interface.py:946
+#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
 #: ../src/history_window.py:447 ../src/notify.py:234
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s je teraz %(status)s"
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1774
 #, 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:1761
+#: ../src/groupchat_control.py:1776
 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:1765 ../src/gui_interface.py:1216
-#: ../src/gui_interface.py:1992 ../src/gui_interface.py:2029
-#: ../src/gui_interface.py:2064 ../src/message_window.py:224
-#: ../src/roster_window.py:2739 ../src/roster_window.py:3399
-#: ../src/roster_window.py:4123
+#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
+#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
+#: ../src/gui_interface.py:1853 ../src/message_window.py:224
+#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
+#: ../src/roster_window.py:4195
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "Znovu sa už _nepýtať"
 
-#: ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:1814
 msgid "Changing Subject"
 msgstr "Zmena predmetu"
 
-#: ../src/groupchat_control.py:1800
+#: ../src/groupchat_control.py:1815
 msgid "Please specify the new subject:"
 msgstr "Prosím, špecifikujte nový predmet:"
 
-#: ../src/groupchat_control.py:1807
+#: ../src/groupchat_control.py:1822
 msgid "Changing Nickname"
 msgstr "Zmena prezývky"
 
-#: ../src/groupchat_control.py:1808
+#: ../src/groupchat_control.py:1823
 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:1839
+#: ../src/groupchat_control.py:1854
 #, python-format
 msgid "Destroying %s"
 msgstr "Ničí sa %s"
 
-#: ../src/groupchat_control.py:1840
+#: ../src/groupchat_control.py:1855
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1842
+#: ../src/groupchat_control.py:1857
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2028
+#: ../src/groupchat_control.py:2046
 #, python-format
 msgid "Kicking %s"
 msgstr "Vykopnúť %s"
 
-#: ../src/groupchat_control.py:2029 ../src/groupchat_control.py:2356
+#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
 msgid "You may specify a reason below:"
 msgstr "Môžete dole špecifikovať dôvod:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2355
+#: ../src/groupchat_control.py:2373
 #, python-format
 msgid "Banning %s"
 msgstr "Zakazujem %s"
@@ -8682,54 +8945,63 @@ msgid "Details"
 msgstr "Podrobnosti"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
+#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Chyba: nie je možné otvoriť %s na čítanie"
 
-#: ../src/gtkgui_helpers.py:400
+#: ../src/gtkgui_helpers.py:404
 msgid "Error reading file:"
 msgstr "Chyba čítania súboru:"
 
-#: ../src/gtkgui_helpers.py:403
+#: ../src/gtkgui_helpers.py:407
 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:444
+#: ../src/gtkgui_helpers.py:448
 #, 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:818
+#: ../src/gtkgui_helpers.py:822
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim nie je štandartným Jabber klientom"
 
-#: ../src/gtkgui_helpers.py:819
+#: ../src/gtkgui_helpers.py:823
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Chcete, aby bol Gajim štandartným Jabber klientom?"
 
-#: ../src/gtkgui_helpers.py:820
+#: ../src/gtkgui_helpers.py:824
 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:887
+#: ../src/gtkgui_helpers.py:891
 msgid "Extension not supported"
 msgstr "Rozšírenie nie je podporované"
 
-#: ../src/gtkgui_helpers.py:888
+#: ../src/gtkgui_helpers.py:892
 #, 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:924
+#: ../src/gtkgui_helpers.py:928
 msgid "Save Image as..."
 msgstr "Uložiť obrázok ako..."
 
-#: ../src/gui_interface.py:140
+#. we are banned
+#. group chat does not exist
+#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
+#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
+#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
+#: ../src/gui_interface.py:348
+msgid "Unable to join group chat"
+msgstr "Nie je možné pripojiť sa do diskusnej skupiny"
+
+#: ../src/gui_interface.py:138
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8737,59 +9009,94 @@ msgid ""
 "Please specify another nickname below:"
 msgstr ""
 
-#: ../src/gui_interface.py:143
+#: ../src/gui_interface.py:141
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:159
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Prijať túto požiadavku?"
 
-#: ../src/gui_interface.py:161
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr ""
 
-#: ../src/gui_interface.py:164
+#: ../src/gui_interface.py:163
 #, 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/gui_interface.py:213 ../src/notify.py:493
+#: ../src/gui_interface.py:209 ../src/notify.py:493
 msgid "Connection Failed"
 msgstr "Spojenie zlyhalo"
 
-#: ../src/gui_interface.py:606 ../src/gui_interface.py:610
+#: ../src/gui_interface.py:312
+#, 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/gui_interface.py:324
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/gui_interface.py:333
+#, python-format
+msgid "You are banned from group chat %s."
+msgstr "Dostali ste ban z diskusnej skupiny %s."
+
+#: ../src/gui_interface.py:338
+#, python-format
+msgid "Group chat %s does not exist."
+msgstr "Diskusná skupina %s neexistuje."
+
+#: ../src/gui_interface.py:341
+msgid "Group chat creation is restricted."
+msgstr "Vytváranie diskusných skupín je obmedzené."
+
+#: ../src/gui_interface.py:344
+#, 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/gui_interface.py:349
+#, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Nie ste v zozname členov v skupinovej diskusii %s."
+
+#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Chyba %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:621 ../src/gui_interface.py:636
+#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "chyba pri odosielaní %(message)s ( %(error)s )"
 
-#: ../src/gui_interface.py:663 ../src/notify.py:495
+#: ../src/gui_interface.py:540 ../src/notify.py:495
 msgid "Subscription request"
 msgstr "Požiadavka o zapísanie"
 
-#: ../src/gui_interface.py:688
+#: ../src/gui_interface.py:565
 msgid "Authorization accepted"
 msgstr "Autorizácia akceptovaná"
 
-#: ../src/gui_interface.py:689
+#: ../src/gui_interface.py:566
 #, 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/gui_interface.py:702
+#: ../src/gui_interface.py:579
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" vás odstránil zo svojho zoznamu"
 
-#: ../src/gui_interface.py:703
+#: ../src/gui_interface.py:580
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8797,60 +9104,54 @@ msgstr ""
 "Budete vždy vidieť jeho alebo ju ako neprihlásený.\n"
 "Chcete odstrániť jeho alebo ju zo zoznamu kontaktov?"
 
-#: ../src/gui_interface.py:727 ../src/notify.py:497
+#: ../src/gui_interface.py:604 ../src/notify.py:497
 msgid "Unsubscribed"
 msgstr "Nezapísaný"
 
-#: ../src/gui_interface.py:754
+#: ../src/gui_interface.py:631
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Spojenie s \"%s\" nie je možné nadviazať"
 
-#: ../src/gui_interface.py:1015
+#: ../src/gui_interface.py:859
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s má nastavený predmet na %(subject)s"
 
-#: ../src/gui_interface.py:1083
+#: ../src/gui_interface.py:926
 msgid "Room now shows unavailable member"
 msgstr "Miestnosť práve zobrazuje nedostupného člena"
 
-#: ../src/gui_interface.py:1085
+#: ../src/gui_interface.py:928
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gui_interface.py:1087
+#: ../src/gui_interface.py:930
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:1091
+#: ../src/gui_interface.py:934
 msgid "Room logging is now enabled"
 msgstr "Zaznamenávanie miestnosti je teraz povolené"
 
-#: ../src/gui_interface.py:1093
+#: ../src/gui_interface.py:936
 msgid "Room logging is now disabled"
 msgstr "Zaznamenávanie miestnosti je teraz zakázané"
 
-#: ../src/gui_interface.py:1095
+#: ../src/gui_interface.py:938
 msgid "Room is now non-anonymous"
 msgstr "Miestnosť je teraz neanonymná"
 
-#: ../src/gui_interface.py:1098
+#: ../src/gui_interface.py:941
 msgid "Room is now semi-anonymous"
 msgstr "Miestnosť je teraz poloanonymná"
 
-#: ../src/gui_interface.py:1101
+#: ../src/gui_interface.py:944
 msgid "Room is now fully-anonymous"
 msgstr "Miestnosť je teraz anonymná"
 
-#: ../src/gui_interface.py:1133
-#, 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/gui_interface.py:1180
+#: ../src/gui_interface.py:985
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -8858,29 +9159,29 @@ 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/gui_interface.py:1182 ../src/gui_interface.py:1189
+#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Momentálne ste pripojený bez vášho OpenPGP kľúča."
 
-#: ../src/gui_interface.py:1184
+#: ../src/gui_interface.py:989
 msgid "Your passphrase is incorrect"
 msgstr "Vaša passfráza je nesprávna"
 
-#: ../src/gui_interface.py:1188
+#: ../src/gui_interface.py:993
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Nesprávne OpenGPG heslo"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid "GPG key not trusted"
 msgstr "GPG kľúč nie je dôveryhodný"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
 msgstr ""
 
-#: ../src/gui_interface.py:1226
+#: ../src/gui_interface.py:1031
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not                 correctly started "
@@ -8889,12 +9190,12 @@ msgstr ""
 "Správca zväzku kľúčov je nainštalovaný, \t\t\t\tale nesprávne spustený "
 "(pravdepodobne je nesprávne \t\t\t\tnastavená premenná prostredia)"
 
-#: ../src/gui_interface.py:1330
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nový e-mail %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1332
+#: ../src/gui_interface.py:1133
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -8902,7 +9203,7 @@ msgstr[0] "Máte %d nových e-mailov"
 msgstr[1] "Máte %d nový e-mail"
 msgstr[2] "Máte %d nové e-maily"
 
-#: ../src/gui_interface.py:1345
+#: ../src/gui_interface.py:1146
 #, python-format
 msgid ""
 "\n"
@@ -8917,78 +9218,78 @@ msgstr ""
 "Predmet: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1418
+#: ../src/gui_interface.py:1215
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vám chce poslať súbor."
 
-#: ../src/gui_interface.py:1455 ../src/roster_window.py:1856
+#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
 msgid "Remote contact stopped transfer"
 msgstr "Vzdialený kontakt zastavil prenos"
 
-#: ../src/gui_interface.py:1458 ../src/roster_window.py:1858
+#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
 msgid "Error opening file"
 msgstr "Chyba otvárania súboru"
 
-#: ../src/gui_interface.py:1490
+#: ../src/gui_interface.py:1287
 #, 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/gui_interface.py:1494
+#: ../src/gui_interface.py:1291
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Prenos súboru %(filename)s od %(name)s zastavený."
 
-#: ../src/gui_interface.py:1507
+#: ../src/gui_interface.py:1304
 #, 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/gui_interface.py:1511
+#: ../src/gui_interface.py:1308
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Prenos súboru %(filename)s pre %(name)s zastavený."
 
-#: ../src/gui_interface.py:1623
+#: ../src/gui_interface.py:1426
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gui_interface.py:1630
+#: ../src/gui_interface.py:1433
 msgid "Unable to decrypt message"
 msgstr "Nepodarilo sa dešifrovať správu"
 
-#: ../src/gui_interface.py:1702
+#: ../src/gui_interface.py:1505
 msgid "Username Conflict"
 msgstr "Konflikt používateľských mien"
 
-#: ../src/gui_interface.py:1703
+#: ../src/gui_interface.py:1506
 msgid "Please type a new username for your local account"
 msgstr "Prosím, zadajte nové používateľské meno pre váš miestny účet"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1519
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gui_interface.py:1729
+#: ../src/gui_interface.py:1532
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gui_interface.py:1740
+#: ../src/gui_interface.py:1543
 msgid "Error."
 msgstr "Chyba."
 
-#: ../src/gui_interface.py:1768
+#: ../src/gui_interface.py:1556
 msgid "Resource Conflict"
 msgstr "Konflikt zdroju"
 
-#: ../src/gui_interface.py:1769
+#: ../src/gui_interface.py:1557
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -8997,20 +9298,20 @@ msgstr ""
 "zdroj"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1816
+#: ../src/gui_interface.py:1604
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s chce začať hlasový rozhovor."
 
-#: ../src/gui_interface.py:1819
+#: ../src/gui_interface.py:1607
 msgid "Voice Chat Request"
 msgstr "Požiadavka na hlasový rozhovor"
 
-#: ../src/gui_interface.py:1927
+#: ../src/gui_interface.py:1716
 msgid "Error verifying SSL certificate"
 msgstr "Chyba overovania SSL certifikátu"
 
-#: ../src/gui_interface.py:1928
+#: ../src/gui_interface.py:1717
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9018,15 +9319,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1936
+#: ../src/gui_interface.py:1725
 msgid "Ignore this error for this certificate."
 msgstr "Ignorovať túto chybu pre tento certifikát."
 
-#: ../src/gui_interface.py:1956
+#: ../src/gui_interface.py:1745
 msgid "SSL certificate error"
 msgstr "Chyba SSL certifikátu"
 
-#: ../src/gui_interface.py:1957
+#: ../src/gui_interface.py:1746
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9043,12 +9344,12 @@ msgstr ""
 "\n"
 "Chcete sa predsa len pripojiť a aktualizovať odtlačok certifikátu?"
 
-#: ../src/gui_interface.py:1987 ../src/gui_interface.py:2024
-#: ../src/gui_interface.py:2060
+#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
+#: ../src/gui_interface.py:1849
 msgid "Insecure connection"
 msgstr "Nezabezpečené spojenie"
 
-#: ../src/gui_interface.py:1988
+#: ../src/gui_interface.py:1777
 #, fuzzy
 msgid ""
 "You are about to connect to the server with an insecure connection. This "
@@ -9058,12 +9359,12 @@ 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/gui_interface.py:1991 ../src/gui_interface.py:2028
-#: ../src/gui_interface.py:2063
+#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
+#: ../src/gui_interface.py:1852
 msgid "Yes, I really want to connect insecurely"
 msgstr "Áno, chcem sa naozaj pripojiť nezabezpečene"
 
-#: ../src/gui_interface.py:2025
+#: ../src/gui_interface.py:1814
 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?"
@@ -9071,7 +9372,7 @@ 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/gui_interface.py:2061
+#: ../src/gui_interface.py:1850
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9081,18 +9382,18 @@ msgstr ""
 "že to chcete urobiť?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2624 ../src/gui_interface.py:2647
+#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
 msgid "Emoticons disabled"
 msgstr "Emotikony zakázané"
 
-#: ../src/gui_interface.py:2625
+#: ../src/gui_interface.py:2423
 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/gui_interface.py:2648
+#: ../src/gui_interface.py:2446
 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 "
@@ -9102,40 +9403,40 @@ msgstr ""
 "aktualizovať formát súboru emoticons.py. Pre viac podrobností pozrite http://"
 "trac.gajim.org/wiki/Emoticons."
 
-#: ../src/gui_interface.py:2679 ../src/roster_window.py:3560
+#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
 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/gui_interface.py:3058
+#: ../src/gui_interface.py:2871
 msgid "Could not save your settings and preferences"
 msgstr "Nie je možné uložiť nastavenia"
 
-#: ../src/gui_interface.py:3592
+#: ../src/gui_interface.py:3411
 msgid "Passphrase Required"
 msgstr "Passfráza je požadovaná"
 
-#: ../src/gui_interface.py:3593
+#: ../src/gui_interface.py:3412
 #, 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/gui_interface.py:3607
+#: ../src/gui_interface.py:3426
 msgid "GPG key expired"
 msgstr "GPG kľúč vypršal"
 
-#: ../src/gui_interface.py:3608
+#: ../src/gui_interface.py:3427
 #, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Váš GPG kľúč vypršal, a preto budete pripojený do %s bez OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3617
+#: ../src/gui_interface.py:3436
 msgid "Wrong Passphrase"
 msgstr "Nesprávna passfráza"
 
-#: ../src/gui_interface.py:3618
+#: ../src/gui_interface.py:3437
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Prosím zadajte znova vašu GPG passfrázu alebo stlačte Zrušiť."
 
@@ -9173,6 +9474,11 @@ msgstr "Prezývka"
 msgid "Message"
 msgstr "Správa"
 
+#. holds subject
+#: ../src/history_manager.py:188 ../src/history_manager.py:219
+msgid "Subject"
+msgstr "Predmet"
+
 #: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -9270,19 +9576,19 @@ msgstr "Chystáte sa zavrieť niekoľko kariet"
 msgid "Do you really want to close them all?"
 msgstr "Naozaj chcete zavrieť všetky?"
 
-#: ../src/message_window.py:484
+#: ../src/message_window.py:485
 msgid "Chats"
 msgstr "Rozhovory"
 
-#: ../src/message_window.py:486
+#: ../src/message_window.py:487
 msgid "Group Chats"
 msgstr "Diskusné skupiny"
 
-#: ../src/message_window.py:488
+#: ../src/message_window.py:489
 msgid "Private Chats"
 msgstr "Súkromné rozhovory"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:495
 msgid "Messages"
 msgstr "Správy"
 
@@ -9338,56 +9644,56 @@ msgstr "Správa od %(nickname)s"
 msgid "Ignore"
 msgstr "Ignorovať"
 
-#: ../src/profile_window.py:57
+#: ../src/profile_window.py:58
 msgid "Retrieving profile..."
 msgstr "Získava sa profil..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2935
+#: ../src/profile_window.py:111 ../src/roster_window.py:3001
 msgid "File is empty"
 msgstr "Súbor je prázdny"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2938
+#: ../src/profile_window.py:114 ../src/roster_window.py:3004
 msgid "File does not exist"
 msgstr "Súbor neexistuje"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2940 ../src/roster_window.py:2951
+#: ../src/profile_window.py:128 ../src/profile_window.py:144
+#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
 msgid "Could not load image"
 msgstr "Nie je možné načítať obrázok"
 
-#: ../src/profile_window.py:214
+#: ../src/profile_window.py:215
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Kontaktné informácie"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:216
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Formát: YYYY-MM-DD"
 
-#: ../src/profile_window.py:269
+#: ../src/profile_window.py:270
 msgid "Information received"
 msgstr "Informácie prijaté"
 
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:341
 msgid "Without a connection you can not publish your contact information."
 msgstr "Bez pripojenie nemôžete publikovať informácie o vašom kontakte."
 
-#: ../src/profile_window.py:353
+#: ../src/profile_window.py:354
 msgid "Sending profile..."
 msgstr "Odosielanie profilu..."
 
-#: ../src/profile_window.py:368
+#: ../src/profile_window.py:369
 msgid "Information NOT published"
 msgstr "Informácie neboli zverejnené"
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:376
 msgid "vCard publication failed"
 msgstr "zverejnenia vCard zlyhalo"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:377
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9395,52 +9701,52 @@ msgstr ""
 "Nastala chyba pri zverejňovaní vašich osobných údajov, skúste to prosím "
 "neskôr."
 
-#: ../src/roster_window.py:256 ../src/roster_window.py:1012
+#: ../src/roster_window.py:262 ../src/roster_window.py:1026
 msgid "Merged accounts"
 msgstr "Zlúčené účty"
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1942
 msgid "Authorization has been sent"
 msgstr "Autorizácia bola odoslaná"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1943
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Od teraz bude \"%s\" vidieť váš stav."
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1966
 msgid "Subscription request has been sent"
 msgstr "Žiadosť o zapísanie bola odoslaná"
 
-#: ../src/roster_window.py:1944
+#: ../src/roster_window.py:1967
 #, 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:1958
+#: ../src/roster_window.py:1981
 msgid "Authorization has been removed"
 msgstr "Autorizácia bola odstránená"
 
-#: ../src/roster_window.py:1959
+#: ../src/roster_window.py:1982
 #, 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:1986
+#: ../src/roster_window.py:2009
 msgid "GPG is not usable"
 msgstr "GPG je nepoužitelný"
 
-#: ../src/roster_window.py:1987
+#: ../src/roster_window.py:2010
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Budete pripojený k %s bez OpenPGP."
 
-#: ../src/roster_window.py:2199 ../src/roster_window.py:3496
+#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
 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:2200 ../src/roster_window.py:3497
+#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9449,37 +9755,37 @@ msgstr ""
 "diskusných skupín. Ste si skutočne istý, že chcete zmeniť stav na "
 "neviditeľný?"
 
-#: ../src/roster_window.py:2226
+#: ../src/roster_window.py:2249
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2288
+#: ../src/roster_window.py:2311
 msgid "Really quit Gajim?"
 msgstr "Naozaj ukončiť program Gajim?"
 
-#: ../src/roster_window.py:2289
+#: ../src/roster_window.py:2312
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Ste si istý, že chcete ukončiť program Gajim?"
 
-#: ../src/roster_window.py:2290
+#: ../src/roster_window.py:2313
 msgid "Always close Gajim"
 msgstr "Vždy zavrieť Gajim"
 
-#: ../src/roster_window.py:2373
+#: ../src/roster_window.py:2396
 msgid "You have running file transfers"
 msgstr "Prebiehajú u vás prenosy súborov"
 
-#: ../src/roster_window.py:2374
+#: ../src/roster_window.py:2397
 msgid ""
-"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2405 ../src/roster_window.py:2653
+#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
 msgid "You have unread messages"
 msgstr "Máte neprečítané správy"
 
-#: ../src/roster_window.py:2406
+#: ../src/roster_window.py:2429
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9487,16 +9793,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:2654
+#: ../src/roster_window.py:2720
 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:2657
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" bude odstránený"
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2724
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9504,11 +9810,11 @@ msgstr ""
 "Už nebudete môcť prijímať a odosielať správy tomuto kontaktu cez tento "
 "transport."
 
-#: ../src/roster_window.py:2661
+#: ../src/roster_window.py:2727
 msgid "Transports will be removed"
 msgstr "Transport bude odstránený"
 
-#: ../src/roster_window.py:2666
+#: ../src/roster_window.py:2732
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9517,69 +9823,69 @@ msgstr ""
 "Už nebudete môcť prijímať a odosielať správy tomuto kontaktu cez tento "
 "transport: %s"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2800
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "Chystáte sa zablokovať kontakt. Ste si skutočne istý, že chcete pokračovať?"
 
-#: ../src/roster_window.py:2736
+#: ../src/roster_window.py:2802
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2827
+#: ../src/roster_window.py:2893
 msgid "Rename Contact"
 msgstr "Premenovať kontakt"
 
-#: ../src/roster_window.py:2828
+#: ../src/roster_window.py:2894
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Zadať novú prezývku pre kontakt %s"
 
-#: ../src/roster_window.py:2835
+#: ../src/roster_window.py:2901
 msgid "Rename Group"
 msgstr "Premenovať skupinu"
 
-#: ../src/roster_window.py:2836
+#: ../src/roster_window.py:2902
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Zadať nové meno skupiny %s"
 
-#: ../src/roster_window.py:2881
+#: ../src/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Odstrániť skupinu"
 
-#: ../src/roster_window.py:2882
+#: ../src/roster_window.py:2948
 #, 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:2883
+#: ../src/roster_window.py:2949
 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:2922
+#: ../src/roster_window.py:2988
 msgid "Assign OpenPGP Key"
 msgstr "Prideliť Open_PGP kľúč"
 
-#: ../src/roster_window.py:2923
+#: ../src/roster_window.py:2989
 msgid "Select a key to apply to the contact"
 msgstr "Vybrať kľúč a aplikovať ho na kontakt"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3372
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" bude odstránený zo zoznamu"
 
-#: ../src/roster_window.py:3308
+#: ../src/roster_window.py:3374
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3313
+#: ../src/roster_window.py:3379
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9588,11 +9894,11 @@ msgstr ""
 "znamená, že ona alebo on vás vždy uvidí ako odhlásený."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3319
+#: ../src/roster_window.py:3385
 msgid "Do you want to continue?"
 msgstr "Chcete pokračovať?"
 
-#: ../src/roster_window.py:3323
+#: ../src/roster_window.py:3389
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9600,16 +9906,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:3326
+#: ../src/roster_window.py:3392
 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:3330
+#: ../src/roster_window.py:3396
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakt bude odstránený zo zoznamu"
 
-#: ../src/roster_window.py:3335
+#: ../src/roster_window.py:3401
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9619,7 +9925,7 @@ msgstr ""
 "taktiež odstránite vašu autorizáciu, to znamená, že vás budú vidieť ako "
 "odhlásený."
 
-#: ../src/roster_window.py:3393
+#: ../src/roster_window.py:3459
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want  to continue?"
@@ -9627,27 +9933,27 @@ msgstr ""
 "Chystáte sa poslať vlastnú správu o stave. Ste si skutočne istý, že chcete "
 "pokračovať?"
 
-#: ../src/roster_window.py:3395
+#: ../src/roster_window.py:3461
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he or she will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3414
+#: ../src/roster_window.py:3480
 msgid "No account available"
 msgstr "Žiadne účty nie sú dostupné"
 
-#: ../src/roster_window.py:3415
+#: ../src/roster_window.py:3481
 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:4023
+#: ../src/roster_window.py:4095
 msgid "Metacontacts storage not supported by your server"
 msgstr "Server nepodporuje ukladanie metakontaktov"
 
-#: ../src/roster_window.py:4025
+#: ../src/roster_window.py:4097
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9655,25 +9961,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:4117
+#: ../src/roster_window.py:4189
 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:4119
+#: ../src/roster_window.py:4191
 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:4234
+#: ../src/roster_window.py:4306
 msgid "Invalid file URI:"
 msgstr "Neplatná URI súboru:"
 
-#: ../src/roster_window.py:4246
+#: ../src/roster_window.py:4318
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9681,12 +9987,12 @@ 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:4361
+#: ../src/roster_window.py:4433
 #, python-format
 msgid "Send %s to %s"
 msgstr "Poslať %s do %s"
 
-#: ../src/roster_window.py:4367
+#: ../src/roster_window.py:4439
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Poslať súbor kontaktu"
@@ -9696,142 +10002,142 @@ msgstr "Poslať súbor kontaktu"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4816 ../src/roster_window.py:4889
-#: ../src/roster_window.py:4898 ../src/statusicon.py:246
-#: ../src/statusicon.py:293 ../src/statusicon.py:299
+#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
+#: ../src/roster_window.py:4970 ../src/statusicon.py:263
+#: ../src/statusicon.py:310 ../src/statusicon.py:316
 #, python-format
 msgid "using account %s"
 msgstr "použiť účet %s"
 
 #. add
-#: ../src/roster_window.py:4905
+#: ../src/roster_window.py:4977
 #, python-format
 msgid "to %s account"
 msgstr "pre %s účet"
 
 #. disco
-#: ../src/roster_window.py:4910
+#: ../src/roster_window.py:4982
 #, python-format
 msgid "using %s account"
 msgstr "použiť %s účet"
 
-#: ../src/roster_window.py:4948 ../src/statusicon.py:309
+#: ../src/roster_window.py:5020 ../src/statusicon.py:326
 msgid "_Manage Bookmarks..."
 msgstr "_Spravovať záložky..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4968
+#: ../src/roster_window.py:5040
 #, python-format
 msgid "of account %s"
 msgstr "účtu %s"
 
-#: ../src/roster_window.py:5009
+#: ../src/roster_window.py:5081
 #, python-format
 msgid "for account %s"
 msgstr "pre účet %s"
 
-#: ../src/roster_window.py:5069 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
 msgid "_Change Status Message"
 msgstr "_Zmeniť správu o stave"
 
-#: ../src/roster_window.py:5102
+#: ../src/roster_window.py:5174
 msgid "Publish Tune"
 msgstr "Hudba"
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5176
 msgid "Publish Location"
 msgstr "Publikovať umiestnenie"
 
-#: ../src/roster_window.py:5107
+#: ../src/roster_window.py:5179
 msgid "Configure Services..."
 msgstr "Nastavovať služby..."
 
-#: ../src/roster_window.py:5252
+#: ../src/roster_window.py:5324
 msgid "_Maximize All"
 msgstr "_Maximalizovať všetko"
 
-#: ../src/roster_window.py:5262 ../src/roster_window.py:5436
+#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
 msgid "Send Group M_essage"
 msgstr "Poslať sprá_vu skupine"
 
-#: ../src/roster_window.py:5270
+#: ../src/roster_window.py:5342
 msgid "To all users"
 msgstr "Všetkým používateľom"
 
-#: ../src/roster_window.py:5274
+#: ../src/roster_window.py:5346
 msgid "To all online users"
 msgstr "Všetkým pripojeným používateľom"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5456
+#: ../src/roster_window.py:5528
 msgid "_Manage Contacts"
 msgstr "S_pravovať kontakty"
 
 #. Edit Groups
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5537
 msgid "Edit _Groups"
 msgstr "Upraviť _skupiny"
 
 #. Send single message
-#: ../src/roster_window.py:5520
+#: ../src/roster_window.py:5592
 msgid "Send Single Message"
 msgstr "Poslať krátku správu"
 
 #. Execute Command
-#: ../src/roster_window.py:5567
+#: ../src/roster_window.py:5639
 msgid "Execute Command..."
 msgstr "Vykonať príkaz..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5577
+#: ../src/roster_window.py:5649
 msgid "_Manage Transport"
 msgstr "S_pravovať transport"
 
 #. Modify Transport
-#: ../src/roster_window.py:5586
+#: ../src/roster_window.py:5658
 msgid "_Modify Transport"
 msgstr "_Upraviť transport"
 
 #. Rename
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5668
 msgid "_Rename"
 msgstr "_Premenovať"
 
-#: ../src/roster_window.py:5656
+#: ../src/roster_window.py:5728
 msgid "_Maximize"
 msgstr "Ma_ximalizovať"
 
-#: ../src/roster_window.py:5665
+#: ../src/roster_window.py:5737
 msgid "_Reconnect"
 msgstr "Znovu p_ripojiť"
 
-#: ../src/roster_window.py:5672
+#: ../src/roster_window.py:5744
 msgid "_Disconnect"
 msgstr "O_dpojiť"
 
 #. History manager
-#: ../src/roster_window.py:5754
+#: ../src/roster_window.py:5833
 msgid "History Manager"
 msgstr "Správca histórie"
 
-#: ../src/roster_window.py:5765
+#: ../src/roster_window.py:5844
 msgid "_Join New Group Chat"
 msgstr "_Pripojiť sa k diskusnej skupine"
 
-#: ../src/roster_window.py:5938
+#: ../src/roster_window.py:6019
 msgid "Change Status Message..."
 msgstr "Zmeniť správu o stave..."
 
-#: ../src/search_window.py:94
+#: ../src/search_window.py:105
 msgid "Waiting for results"
 msgstr "Čakám na výsledky"
 
-#: ../src/search_window.py:132 ../src/search_window.py:210
+#: ../src/search_window.py:143 ../src/search_window.py:220
 msgid "Error in received dataform"
 msgstr ""
 
 #. No result
-#: ../src/search_window.py:166 ../src/search_window.py:202
+#: ../src/search_window.py:177 ../src/search_window.py:212
 msgid "No result"
 msgstr "Žiadny výsledok"
 
@@ -9844,21 +10150,22 @@ msgstr "Chyba pri zápise na disk"
 msgid "Subject: %s"
 msgstr "Predmet: %s"
 
-#: ../src/session.py:433 ../src/session.py:468
+#: ../src/session.py:447 ../src/session.py:491
 msgid "Confirm these session options"
 msgstr "Potvrdiť tieto voľby relácie"
 
-#: ../src/session.py:435
+#: ../src/session.py:448
 #, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
+"The remote client wants '\n"
+"                            'to negotiate an session with these features:\n"
 "\n"
 "%s\n"
 "\n"
 "Are these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:469
+#: ../src/session.py:492
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9873,16 +10180,16 @@ msgstr ""
 "\n"
 "Pokračovať s reláciou?"
 
-#: ../src/statusicon.py:210
+#: ../src/statusicon.py:227
 msgid "_Change Status Message..."
 msgstr "_Zmeniť správu o stave..."
 
-#: ../src/statusicon.py:322
+#: ../src/statusicon.py:339
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "v _zozname kontaktov"
 
-#: ../src/statusicon.py:333
+#: ../src/statusicon.py:350
 msgid "Hide this menu"
 msgstr "Skryť toto menu"
 
@@ -10021,32 +10328,32 @@ msgstr ""
 "Táto služba neodpovedala podrobnejšími informáciami.\n"
 "Je pravdepodobne zastaralá alebo poškodená"
 
-#: ../src/vcard.py:251
+#: ../src/vcard.py:265
 msgid "?Client:Unknown"
 msgstr "?Klient: Neznámy"
 
-#: ../src/vcard.py:253
+#: ../src/vcard.py:267
 msgid "?OS:Unknown"
 msgstr "?OS:Neznámy"
 
-#: ../src/vcard.py:274
+#: ../src/vcard.py:288
 msgid "?Time:Unknown"
 msgstr "?Čas: Neznámy"
 
-#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
+#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:345
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:349
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Pričlenenie:</b>"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:357
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10054,7 +10361,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:345
+#: ../src/vcard.py:359
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10062,12 +10369,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:347
+#: ../src/vcard.py:361
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 
 #. None
-#: ../src/vcard.py:349
+#: ../src/vcard.py:363
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10075,18 +10382,71 @@ 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:356
+#: ../src/vcard.py:370
 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:358
+#: ../src/vcard.py:372
 msgid "There is no pending subscription request."
 msgstr "Nie sú tu žiadne čakajúce požiadavky o zapísanie."
 
-#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
+#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
 msgid " resource with priority "
 msgstr " zdroj s prioritou "
 
+#~ msgid "@"
+#~ msgstr "@"
+
+#~ msgid "_Disable showing event in systray"
+#~ msgstr "Z_akázať zobrazovanie udalostí v oblasti systémových upozornení"
+
+#~ msgid "_Show event in systray"
+#~ msgstr "_Zobraziť udalosť v oblasti systémových upozornení"
+
+#, fuzzy
+#~ msgid "Always use GNOME default applications"
+#~ msgstr "Vždy použiť štandartné aplikácie OS/X"
+
+#, fuzzy
+#~ msgid "Always use Xfce default applications"
+#~ msgstr "Vždy použiť štandartné aplikácie OS/X"
+
+#, fuzzy
+#~ msgid "Autodetect on every Gajim startup"
+#~ msgstr "Prip_ojiť sa pri štarte programu Gajim"
+
+#~ msgid "Show systray:"
+#~ msgstr "Zobraziť oblasť systémových upozornení:"
+
+#~ msgid "Nickname not allowed: %s"
+#~ msgstr "Prezývka nie je povolená: %s"
+
+#~ msgid "Room has been destroyed"
+#~ msgstr "Miestnosť bola zničená"
+
+#~ msgid "You can join this room instead: %s"
+#~ msgstr "Môžete sa prihlásiť do tejto miestnosti namiesto: %s"
+
+#~ msgid "I would like to add you to my roster."
+#~ msgstr "Chcem si vás pridať do môjho zoznamu."
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "sme prihlásení k %s"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "požiadavka na odhlásenie od %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "sme odhlásení od %s"
+
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "JID %s nevyhovuje RFC špecifikácii. Nebude pridaný do vášho zoznamu. "
+#~ "Použite nástroje na správu zoznamu, napríklad: http://jru.jabberstudio."
+#~ "org/ pre jeho odstránenie"
+
 #, fuzzy
 #~ msgid "Mic volume:"
 #~ msgstr "Hlasitosť zvuku:"
@@ -10094,9 +10454,6 @@ msgstr " zdroj s prioritou "
 #~ msgid "Sound volume:"
 #~ msgstr "Hlasitosť zvuku:"
 
-#~ msgid "_Available"
-#~ msgstr "_Prítomný"
-
 #~ msgid "Gajim needs PySQLite2 to run"
 #~ msgstr "Gajim potrebuje PySQLite2 pre svoj beh"
 
@@ -10217,46 +10574,9 @@ msgstr " zdroj s prioritou "
 #~ "SOCKS5\n"
 #~ "BOSH"
 
-#~ msgid "Add this contact to roster (Ctrl+D)"
-#~ msgstr "Pridať tento kontakt do zoznamu (Ctrl+D)"
-
-#~ msgid "Bookmark this room (Ctrl+B)"
-#~ msgstr "Zazáložkovať túto miestosť (Ctrl+B)"
-
-#~ msgid "Browse the chat history (Ctrl+H)"
-#~ msgstr "Prehliadať históriu rozhovoru (Ctrl+H)"
-
-#~ msgid "Change the room's subject (Alt+T)"
-#~ msgstr "Zmeniť predmet v miestnosti (Alt+T)"
-
-#~ msgid "Change your nickname (Ctrl+N)"
-#~ msgstr "Zmeniť vašu prezývku (Ctrl+N)"
-
-#~ msgid "Invite contacts to the conversation (Ctrl+G)"
-#~ msgstr "Pozvať kontakty do rozhovoru (Ctrl+G)"
-
 #~ msgid "Send a file (Ctrl+F)"
 #~ msgstr "Poslať súbor (Ctrl+F)"
 
-#~ msgid "Show a list of emoticons (Alt+M)"
-#~ msgstr "Zobraziť zoznam emotikon (Alt+M)"
-
-#, fuzzy
-#~ msgid "Show a list of formattings"
-#~ msgstr "Zobraziť zoznam emotikon (Alt+M)"
-
-#~ msgid "Show a menu of advanced functions (Alt+D)"
-#~ msgstr "Zobraziť ponuku pokročilých funkcií (Alt+D)"
-
-#~ msgid "Show the contact's profile (Ctrl+I)"
-#~ msgstr "Zobraziť profil kontaktu (Ctrl+I)"
-
-#~ msgid "Toggle audio session"
-#~ msgstr "Prepnúť zvukovú reláciu"
-
-#~ msgid "Toggle video session"
-#~ msgstr "Prepnúť video reláciu"
-
 #~ msgid ""
 #~ "All chat states\n"
 #~ "Composing only\n"
@@ -10315,9 +10635,6 @@ msgstr " zdroj s prioritou "
 #~ msgid "gtk-cancel"
 #~ msgstr "gtk-cancel"
 
-#~ msgid "_Preferences"
-#~ msgstr "_Predvoľby"
-
 #~ msgid "_Quit"
 #~ msgstr "_Koniec"
 
@@ -10460,9 +10777,6 @@ msgstr " zdroj s prioritou "
 #~ "Vyžaduje python-gnome2-extras alebo kompiláciu gtkspell modulu zo "
 #~ "zdrojových kódov Gajim."
 
-#~ msgid "Notification-daemon"
-#~ msgstr "Notification-daemon"
-
 #~ msgid "Trayicon"
 #~ msgstr "Trayikona"
 
@@ -10665,19 +10979,9 @@ msgstr " zdroj s prioritou "
 #~ msgid "sleeping"
 #~ msgstr "spím"
 
-#~ msgid "other"
-#~ msgstr "ostatné"
-
 #~ msgid "%s is now %s"
 #~ msgstr "%s je teraz %s"
 
-#~ msgid ""
-#~ "Usage: %s %s %s \n"
-#~ "\t %s"
-#~ msgstr ""
-#~ "Použitie: %s %s %s \n"
-#~ "\t %s"
-
 #~ msgid "%s - %s"
 #~ msgstr "%s - %s"
 
diff --git a/po/sr.po b/po/sr.po
index 0b77869f6e4ca4ca387d32cc3a318984354d65c8..ae1bafeecc80f557f7b5380ecd7ba57dd07f4b3b 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -5,11 +5,15 @@
 #
 # B. Kokanovic <branko.kokanovic@gmail.com>, 2007.
 # Branko Kokanovic <branko.kokanovic@gmail.com>, 2008, 2009.
+#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: sr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 11:28+0200\n"
+"POT-Creation-Date: 2010-10-01 20:39+0200\n"
 "PO-Revision-Date: 2009-10-29 23:50+0100\n"
 "Last-Translator: Branko Kokanovic <branko.kokanovic@gmail.com>\n"
 "Language-Team:  <sr@li.org>\n"
@@ -29,7 +33,7 @@ msgstr "Прикључи се _групном разговору..."
 msgid "_Add Contact..."
 msgstr "_Додај контакт..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:17
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
 msgid "_Discover Services"
 msgstr "_Откривање сервиса"
 
@@ -49,7 +53,7 @@ msgstr "_Отвори Гмаил долазну пошту"
 msgid "_Personal Events"
 msgstr "Лични догађаји"
 
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:23
+#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
 msgid "_Start Chat..."
 msgstr "_Започни разговор"
 
@@ -81,10 +85,6 @@ msgid "<b>Please select a server</b>"
 msgstr "<b>Молимо одаберите сервер</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid "@"
-msgstr "@"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
@@ -92,64 +92,64 @@ msgstr ""
 "Додајте овај сертификат листи сертификата којима верујете\n"
 "SHA1 потпис сертификата:\n"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:10
 msgid "Anon_ymous authentication"
 msgstr "Анон_имно пријављивање"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Connect when I press Finish"
 msgstr "Повежи се када притиснем Заврши"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Гајим: чаробњак за креирање налога"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "I already have an account I want to _use"
 msgstr "Већ имам налог који желим да користим"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I want to _register for a new account"
 msgstr "Желим да региструјем нови налог"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:16
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 #: ../data/gui/accounts_window.ui.h:28
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Ако је означено, Гајим ће памтити лозинку за овај налог"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:17
+#: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Подеси..."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:18
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
 #: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2263 ../src/config.py:2342
-#: ../src/config.py:2355 ../src/config.py:3596 ../src/config.py:3671
-#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513
-#: ../src/dialogs.py:526 ../src/roster_window.py:2890
-#: ../src/roster_window.py:2896 ../src/roster_window.py:2901
+#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
+#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
+#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
+#: ../src/dialogs.py:527 ../src/roster_window.py:2956
+#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
 msgid "None"
 msgstr "Ништа"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:19
+#: ../data/gui/account_creation_wizard_window.ui.h:18
 msgid "Prox_y:"
 msgstr "Прок_си:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #: ../data/gui/accounts_window.ui.h:48
 msgid "Save pass_word"
 msgstr "Сними лозинку"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:21
+#: ../data/gui/account_creation_wizard_window.ui.h:20
 msgid "Set my profile when I connect"
 msgstr "Постави мој профил при повезивању"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:22
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Use custom hostname/port"
 msgstr "Користи Ваше одређено име хоста/порт "
 
-#: ../data/gui/account_creation_wizard_window.ui.h:23
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -157,34 +157,34 @@ msgstr ""
 "Морате поседовати рачун да бисте се могли повезати\n"
 "на џабер мрежу."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-#: ../data/gui/roster_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:16
 msgid "_Advanced"
 msgstr "_Напредно"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:25
 msgid "_Finish"
 msgstr "_Заврши"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:27
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Hostname:"
 msgstr "Име хоста:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #: ../data/gui/accounts_window.ui.h:62
 msgid "_Jabber ID:"
 msgstr "_Џабер ИД:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:28
 #: ../data/gui/accounts_window.ui.h:64
 msgid "_Password:"
 msgstr "_Лозинка:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:29
 msgid "_Port:"
 msgstr "_Порт:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:31
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Server:"
 msgstr "_Сервер:"
 
@@ -292,17 +292,17 @@ msgstr "Име:"
 #. No configured account
 #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
 #: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592
-#: ../src/notify.py:608
+#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
+#: ../src/notify.py:616
 msgid "Gajim"
 msgstr "Гајим"
 
 #. FIXME: Ugly workaround.
 #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
 #. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:61
-#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121
-#: ../src/roster_window.py:2832 ../src/roster_window.py:5379
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
+#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
 msgid "General"
 msgstr "Опште"
 
@@ -360,7 +360,7 @@ msgstr "Информације о Вама, како су ускладиштен
 
 #: ../data/gui/accounts_window.ui.h:35
 #: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:830
+#: ../src/dialogs.py:831
 msgid "Jabber ID:"
 msgstr "Џабер ИД:"
 
@@ -374,7 +374,7 @@ msgid "Mer_ge accounts"
 msgstr "_Споји налоге"
 
 #: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2356
+#: ../src/config.py:2358
 msgid "No key selected"
 msgstr "Није одабран ниједан кључ"
 
@@ -401,7 +401,7 @@ msgid "Priority will change automatically according to your status."
 msgstr "Приоритет ће бити аутоматски промењен према Вашем статусу."
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5329
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
 msgid "Re_name"
 msgstr "Преи_менуј"
 
@@ -626,38 +626,43 @@ msgid "Deletes Message of the Day"
 msgstr "Брише поруку дана"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
+#, fuzzy
+msgid "Edit Archi_ving Preferences"
+msgstr "_Подешавања"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Edit _Privacy Lists..."
 msgstr "Измени листе _приватности..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sends a message to users currently connected to this server"
 msgstr "Шаље поруку тренутно повезаним корисницима овог сервера"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Set MOTD..."
 msgstr "Постави поруку дана..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Поставља поруку дана"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Show _XML Console"
 msgstr "Прикажи _XML Конзолу"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "Update MOTD..."
 msgstr "Освежи поруку дана..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "Освежава поруку дана"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:11
 msgid "_Administrator"
 msgstr "_Администратор"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:11
+#: ../data/gui/advanced_menuitem_menu.ui.h:12
 msgid "_Send Server Message..."
 msgstr "_Пошаљи серверску поруку..."
 
@@ -691,7 +696,7 @@ msgid "All statuses"
 msgstr "Сви статуси"
 
 #: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:233
+#: ../src/common/commands.py:106 ../src/common/helpers.py:239
 #: ../src/tooltips.py:193
 msgid "Away"
 msgstr "Одсутан"
@@ -744,7 +749,7 @@ msgid "Have "
 msgstr "Имам "
 
 #: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:249
 msgid "Invisible"
 msgstr "Невидљив"
 
@@ -753,7 +758,7 @@ msgid "Launch a command"
 msgstr "Покрените команду"
 
 #: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:216 ../src/tooltips.py:197
+#: ../src/common/helpers.py:222 ../src/tooltips.py:197
 msgid "Not Available"
 msgstr "Недоступан"
 
@@ -796,12 +801,13 @@ msgid "_Disable existing sound for this event"
 msgstr "_Онемогући постојећи звук за овај догађај"
 
 #: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in roster"
+#, fuzzy
+msgid "_Disable showing event in notification area"
 msgstr "_Онемогући приказивање догађаја у листи контаката"
 
 #: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in systray"
-msgstr "_Онемогући приказивање догађаја у системској касети"
+msgid "_Disable showing event in roster"
+msgstr "_Онемогући приказивање догађаја у листи контаката"
 
 #: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
@@ -812,12 +818,13 @@ msgid "_Open chat window with user"
 msgstr "_Отвори прозор за разговор са корисником"
 
 #: ../data/gui/advanced_notifications_window.ui.h:35
-msgid "_Show event in roster"
+#, fuzzy
+msgid "_Show event in notification area"
 msgstr "Прикажи догађај у листи контаката"
 
 #: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in systray"
-msgstr "Прикажи догађај у системској касети"
+msgid "_Show event in roster"
+msgstr "Прикажи догађај у листи контаката"
 
 #: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
@@ -845,6 +852,45 @@ msgstr "Групе"
 msgid "when I'm in"
 msgstr "када сам у"
 
+#: ../data/gui/archiving_preferences_window.ui.h:1
+msgid "<i>Method Auto</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "<i>Method Local</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:3
+msgid "<i>Method Manual</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:4
+#, fuzzy
+msgid "Auto"
+msgstr "Аутоматско повезивање"
+
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Concede"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "Forbid"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:7
+#, fuzzy
+msgid "No"
+msgstr "Ништа"
+
+#: ../data/gui/archiving_preferences_window.ui.h:8
+#, fuzzy
+msgid "Prefer"
+msgstr "Подешавања"
+
+#: ../data/gui/archiving_preferences_window.ui.h:9
+msgid "Yes"
+msgstr ""
+
 #: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Унос:"
@@ -871,8 +917,8 @@ msgstr "Блокирани контакти"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5348
-#: ../src/roster_window.py:5476 ../src/roster_window.py:5609
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
+#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
 msgid "_Unblock"
 msgstr "_Одблокирај"
 
@@ -960,7 +1006,7 @@ msgid "_Start Chat"
 msgstr "_Започни разговор"
 
 #. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4184
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
 msgid "#"
 msgstr "#"
 
@@ -1008,13 +1054,50 @@ msgstr ""
 msgid "9"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:13
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Додај овај контакт на листу (Ctrl+D)"
+
 #: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Прегледај историјат разговора (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:15
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Позови контакте у конверзацију (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Прикажи листу смајлија (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
+msgid "Show a list of formattings"
+msgstr "Прикажи листу форматирања"
+
+#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Прикажи мени напредних функција (Alt+A)"
+
+#: ../data/gui/chat_control.ui.h:19
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr "Прикажи профил контакта (Ctrl+I)"
+
+#: ../data/gui/chat_control.ui.h:20
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:21
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
 #: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Пошаљи"
 
-#: ../data/gui/chat_control.ui.h:15 ../data/gui/groupchat_control.ui.h:3
+#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
 msgid "label"
 msgstr ""
 
@@ -1064,8 +1147,8 @@ msgstr "Измени _групе..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5284
-#: ../src/roster_window.py:5444
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
+#: ../src/roster_window.py:5516
 msgid "In_vite to"
 msgstr "Позо_ви у"
 
@@ -1077,8 +1160,8 @@ msgstr "Позови контакте"
 msgid "Remo_ve"
 msgstr "_Уклони"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5294
-#: ../src/roster_window.py:5533
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
+#: ../src/roster_window.py:5605
 msgid "Send Cus_tom Status"
 msgstr "Пошаљи кориснички дефинисан статус"
 
@@ -1111,8 +1194,8 @@ msgid "_Allow him/her to see my status"
 msgstr "_Дозволи му/јој да види мој статус"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5482 ../src/roster_window.py:5612
+#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
+#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
 msgid "_Block"
 msgstr "_Блокирај"
 
@@ -1122,8 +1205,8 @@ msgstr "_Забрани му/јој да види мој статус"
 
 #: ../data/gui/contact_context_menu.ui.h:20
 #: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:21
-#: ../src/roster_window.py:5683
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
+#: ../src/roster_window.py:5755
 msgid "_History"
 msgstr "_Историјат"
 
@@ -1256,7 +1339,7 @@ msgstr "<b>Боје језичака статуса разговора</b>"
 msgid "Account row"
 msgstr "Налог"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:925
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
 msgid "Bold"
 msgstr "Подебљано"
 
@@ -1294,7 +1377,7 @@ msgstr "Група"
 msgid "Inactive"
 msgstr "Неактивно"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:926
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
 msgid "Italic"
 msgstr "Курзив"
 
@@ -1342,7 +1425,7 @@ msgstr "Промени _тему..."
 msgid "Configure _Room..."
 msgstr "Подеси _собу..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1782
+#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
 msgid "_Bookmark"
 msgstr "_Маркирај ову со_бу"
 
@@ -1402,19 +1485,31 @@ msgstr "_Пошаљи приватну поруку"
 msgid "_Voice"
 msgstr "_Глас"
 
+#: ../data/gui/groupchat_control.ui.h:1
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "_Маркирај ову собу (Ctrl+B)"
+
+#: ../data/gui/groupchat_control.ui.h:3
+msgid "Change the room's subject (Alt+T)"
+msgstr "Промени тему собе (Alt+T)"
+
+#: ../data/gui/groupchat_control.ui.h:4
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Промени надимак (Ctrl+N)"
+
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Направи нову објаву"
 
-#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
-msgid "From"
-msgstr "Од"
+#: ../data/gui/groups_post_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:2
+msgid "From:"
+msgstr "Од:"
 
-#. holds subject
-#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
-#: ../src/history_manager.py:219
-msgid "Subject"
-msgstr "Тема"
+#: ../data/gui/groups_post_window.ui.h:3
+#: ../data/gui/single_message_window.ui.h:7
+msgid "Subject:"
+msgstr "Тема:"
 
 #: ../data/gui/history_manager.ui.h:1
 msgid ""
@@ -1431,8 +1526,8 @@ msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Добродошли у Гајимов менаџер дневника историјата</b></big>"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3208
-#: ../src/dialogs.py:3305
+#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
+#: ../src/dialogs.py:3321
 msgid "Delete"
 msgstr "Обриши"
 
@@ -1490,12 +1585,75 @@ msgstr "Претрага:"
 msgid "_Log conversation history"
 msgstr "_Памти у дневнику историјат разговора"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
+msgid "approve"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:2
+msgid "body"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:3
+msgid "concede"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:4
+msgid "expire"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:5
+msgid "false"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:6
+msgid "forbid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:7
+#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+msgid "jid"
+msgstr "џид"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:8
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
+#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
+msgid "message"
+msgstr "порука"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
+msgid "oppose"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
+#, fuzzy
+msgid "otr"
+msgstr "Наложен"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:11
+msgid "prefer"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:12
+msgid "require"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:13
+msgid "save"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:14
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
 msgid "Bro_wse Rooms"
 msgstr "_Преглед"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2180
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
 msgid "Join Group Chat"
 msgstr "Придружи се групном разговору"
 
@@ -1533,8 +1691,8 @@ msgstr "Сервер:"
 msgid "_Bookmark this room"
 msgstr "Маркирај ову собу"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1341
-#: ../src/disco.py:1786
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../src/disco.py:1804
 msgid "_Join"
 msgstr "_Придружи се"
 
@@ -1639,6 +1797,75 @@ msgstr "_Корисничко име:"
 msgid "Passphrase"
 msgstr "Лозинка"
 
+#: ../data/gui/plugins_window.ui.h:1
+msgid "&lt;empty&gt;"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:2
+msgid "<empty>"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:3
+#, fuzzy
+msgid "Authors:"
+msgstr "_Одобри ауторизацију"
+
+#: ../data/gui/plugins_window.ui.h:4
+#, fuzzy
+msgid "Available"
+msgstr "_Доступан"
+
+#: ../data/gui/plugins_window.ui.h:5
+#, fuzzy
+msgid "Configure"
+msgstr "_Конфигуриши"
+
+#: ../data/gui/plugins_window.ui.h:6
+#, fuzzy
+msgid "Descrition:"
+msgstr "Опис:"
+
+#: ../data/gui/plugins_window.ui.h:7
+#, fuzzy
+msgid "Homepage:"
+msgstr "<b>Лична страна:</b>"
+
+#: ../data/gui/plugins_window.ui.h:8
+msgid "Install"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:9
+#, fuzzy
+msgid "Installed"
+msgstr "Застој"
+
+#: ../data/gui/plugins_window.ui.h:10
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:11
+msgid "Plugins"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:12
+msgid "Uninstall"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:13
+#, fuzzy
+msgid "Version:"
+msgstr "ГТК+ верзија:"
+
+#: ../data/gui/plugins_window.ui.h:14
+msgid "button"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:15
+msgid "homepage url"
+msgstr ""
+
 #: ../data/gui/popup_notification_window.ui.h:1
 #, fuzzy
 msgid "Event Type"
@@ -1767,123 +1994,103 @@ msgid "Always"
 msgstr "Одсутан"
 
 #: ../data/gui/preferences_window.ui.h:31
-#, fuzzy
-msgid "Always use GNOME default applications"
-msgstr "Увек користи апликацију коју оперативни систем нуди"
-
-#: ../data/gui/preferences_window.ui.h:32
-#, fuzzy
-msgid "Always use KDE default applications"
-msgstr "Увек користи апликацију коју оперативни систем нуди"
-
-#: ../data/gui/preferences_window.ui.h:33
-#, fuzzy
-msgid "Always use Xfce default applications"
-msgstr "Увек користи апликацију коју оперативни систем нуди"
-
-#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Питај за статусну поруку при:"
 
-#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
 msgid "Audio / Video"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:33
 msgid "Audio input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Audio output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:38
-#, fuzzy
-msgid "Autodetect on every Gajim startup"
-msgstr "По_вежи се приликом покретања Гајима"
-
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:35
 msgid "Chat message:"
 msgstr "Порука разговора:"
 
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:36
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Провери по стартовању да ли је Гајим подразумевани џабер клијент"
 
-#: ../data/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:37
 #, fuzzy
 msgid "Composing only"
 msgstr "Састављање"
 
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:38
 msgid "Configure color and font of the interface"
 msgstr "Конфигурисање боје и фонта интерфејса"
 
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Порука разговора:"
 
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Име контакта"
 
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:41
 msgid "Custom"
 msgstr "Кориснички"
 
-#: ../data/gui/preferences_window.ui.h:46
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Detached roster with chat grouped by account"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Detached roster with detached chats"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:45
 msgid "Detached roster with single chat"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
-#: ../src/config.py:671
+#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
+#: ../src/config.py:665
 msgid "Disabled"
 msgstr "Онемогућено"
 
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:47
 msgid "Display _activity of contacts in roster"
 msgstr "Прикажи активности контаката на листи"
 
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:48
 msgid "Display _extra email details"
 msgstr "Прикажи додатне е-мејл детаље"
 
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:49
 #, fuzzy
 msgid "Display _location of contacts in roster"
 msgstr "Прикажи _расположења контаката на листи"
 
-#: ../data/gui/preferences_window.ui.h:54
+#: ../data/gui/preferences_window.ui.h:50
 msgid "Display _tunes of contacts in roster"
 msgstr "Прикажи _песме контаката на листи"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display a_vatars of contacts in roster"
 msgstr "Прикажи _аватаре контаката на листи"
 
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display m_ood of contacts in roster"
 msgstr "Прикажи _расположења контаката на листи"
 
-#: ../data/gui/preferences_window.ui.h:57
+#: ../data/gui/preferences_window.ui.h:53
 msgid "Display status _messages of contacts in roster"
 msgstr "Прикажи статусне поруке контаката на листи"
 
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:54
 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 "
@@ -1893,7 +2100,7 @@ msgstr ""
 "са контактом. Овде можете одредити која стања разговора ће се приказивати у "
 "прозорима разговора."
 
-#: ../data/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:55
 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 "
@@ -1903,7 +2110,7 @@ msgstr ""
 "са контактом. Овде можете одредити која стања разговора ће се слати другој "
 "особи."
 
-#: ../data/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:56
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1911,11 +2118,11 @@ msgstr ""
 "Гајим ће Вас обавестити о контактима који су се управо одјавили са искачућим "
 "прозором у доњем десном углу екрана"
 
-#: ../data/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:58
 msgid "Hide all buttons in chat windows"
 msgstr "Сакриј сву дугмад у прозору разговора"
 
-#: ../data/gui/preferences_window.ui.h:63
+#: ../data/gui/preferences_window.ui.h:59
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1923,7 +2130,7 @@ msgstr ""
 "Ако је означена, Гајим ће дозволити другима да погледају који оперативни "
 "систем користите"
 
-#: ../data/gui/preferences_window.ui.h:64
+#: ../data/gui/preferences_window.ui.h:60
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1931,14 +2138,14 @@ msgstr ""
 "Ако је означена, Гајим ће уједно укључити и информације о пошиљаоцу нових е-"
 "мејлова"
 
-#: ../data/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:61
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Ако је означена, Гајим ће аутоматски променити статус у Одсутан када рачунар "
 "није у употреби."
 
-#: ../data/gui/preferences_window.ui.h:66
+#: ../data/gui/preferences_window.ui.h:62
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1946,7 +2153,7 @@ msgstr ""
 "Ако је означена, Гајим ће променити статус у Недоступан када рачунар још "
 "дуже није у употреби"
 
-#: ../data/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1954,7 +2161,7 @@ msgstr ""
 "Ако је означена, Гајим ће приказивати аватаре контаката у листи контаката и "
 "у групним разговорима"
 
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1962,32 +2169,32 @@ msgstr ""
 "Ако је означена, Гајим ће приказивати статусне поруке контаката испод имена "
 "контакта у листи контаката и у групним разговорима"
 
-#: ../data/gui/preferences_window.ui.h:69
+#: ../data/gui/preferences_window.ui.h:65
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "Ако је означена, Гајим ће приказивати активности контаката у листи контаката"
 
-#: ../data/gui/preferences_window.ui.h:70
+#: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the location of contacts in the roster window"
 msgstr ""
 "Ако је означена, Гајим ће приказивати расположење контаката у листи контаката"
 
-#: ../data/gui/preferences_window.ui.h:71
+#: ../data/gui/preferences_window.ui.h:67
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
 "Ако је означена, Гајим ће приказивати расположење контаката у листи контаката"
 
-#: ../data/gui/preferences_window.ui.h:72
+#: ../data/gui/preferences_window.ui.h:68
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Ако је означена, Гајим ће приказивати песме контаката у листи контаката"
 
-#: ../data/gui/preferences_window.ui.h:73
+#: ../data/gui/preferences_window.ui.h:69
 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 "
@@ -1998,7 +2205,7 @@ msgstr ""
 "поље за унос, подразумевани језик ће бити коришћен за овај контакт или "
 "групни разговор."
 
-#: ../data/gui/preferences_window.ui.h:74
+#: ../data/gui/preferences_window.ui.h:70
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -2007,7 +2214,7 @@ msgstr ""
 "Ако је означена, Гајим ће игнорисати све долазне догађајеКористите са "
 "опрезом, блокираће све поруке које долазе од људи ван Ваше листе контаката"
 
-#: ../data/gui/preferences_window.ui.h:75
+#: ../data/gui/preferences_window.ui.h:71
 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 "
@@ -2017,7 +2224,7 @@ msgstr ""
 "када се користи E2E енкрипција, друга страна мора да се сложи са чувањем "
 "дневника, у супротном се поруке неће памтити."
 
-#: ../data/gui/preferences_window.ui.h:76
+#: ../data/gui/preferences_window.ui.h:72
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -2025,7 +2232,7 @@ msgstr ""
 "Ако је означена, Гајим ће приказати поруку када се прими нови е-мејл преко "
 "GMail-амејлова"
 
-#: ../data/gui/preferences_window.ui.h:77
+#: ../data/gui/preferences_window.ui.h:73
 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, "
@@ -2034,7 +2241,7 @@ msgstr ""
 "Ако је означено, Гајим ће користити статусне иконе специфичне за протокол. "
 "(нпр. контакт са МСН-а ће имати мсн иконе за своје статусе)"
 
-#: ../data/gui/preferences_window.ui.h:78
+#: ../data/gui/preferences_window.ui.h:74
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -2042,7 +2249,7 @@ msgstr ""
 "Ако је означена, Гајим неће питати за статусну поруку. Већ постављена "
 "подразумевана порука ће бити коришћена."
 
-#: ../data/gui/preferences_window.ui.h:79
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2050,45 +2257,45 @@ msgstr ""
 "Ако није онемогућено, Гајим ће заменити ascii смајлије као нпр. ':)' са "
 "еквивалентним анимираним или статичним графичким смајлијима"
 
-#: ../data/gui/preferences_window.ui.h:80
+#: ../data/gui/preferences_window.ui.h:76
 msgid "Log _encrypted chat session"
 msgstr "Уписуј у дневник шифроване сесије разговора"
 
-#: ../data/gui/preferences_window.ui.h:81
+#: ../data/gui/preferences_window.ui.h:77
 msgid "Ma_ke message windows compact"
 msgstr "Начини прозор поруке компактним"
 
-#: ../data/gui/preferences_window.ui.h:82
+#: ../data/gui/preferences_window.ui.h:78
 msgid "Ma_nage..."
 msgstr "Поде_си..."
 
-#: ../data/gui/preferences_window.ui.h:83
+#: ../data/gui/preferences_window.ui.h:79
 #, fuzzy
 msgid "Never"
 msgstr "Сервер"
 
-#: ../data/gui/preferences_window.ui.h:84
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Notifications"
 msgstr "Обавештења"
 
-#: ../data/gui/preferences_window.ui.h:85
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Notify me about contacts that sign _in"
 msgstr "Обавести ме о контактима који се _пријаве"
 
-#: ../data/gui/preferences_window.ui.h:86
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Notify me about contacts that sign _out"
 msgstr "Обавести ме о контактима који се _одјаве"
 
-#: ../data/gui/preferences_window.ui.h:87
+#: ../data/gui/preferences_window.ui.h:83
 #, fuzzy
 msgid "Notify me about it"
 msgstr "Обавести ме о контактима који се _одјаве"
 
-#: ../data/gui/preferences_window.ui.h:88
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notify on new _GMail email"
 msgstr "Обавести ме о новопристиглој Гмаил е-мејл пошти"
 
-#: ../data/gui/preferences_window.ui.h:89
+#: ../data/gui/preferences_window.ui.h:85
 #, fuzzy
 msgid "Only when pending events"
 msgstr ""
@@ -2096,55 +2303,56 @@ msgstr ""
 "Само за догађаје на чекању\n"
 "Увек"
 
-#: ../data/gui/preferences_window.ui.h:90
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Personal Events"
 msgstr "Лични догађаји"
 
-#: ../data/gui/preferences_window.ui.h:91
+#: ../data/gui/preferences_window.ui.h:87
 msgid "Play _sounds"
 msgstr "Пуштај звукове"
 
-#: ../data/gui/preferences_window.ui.h:92
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Pop it up"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:93
+#: ../data/gui/preferences_window.ui.h:89
 msgid "Preferences"
 msgstr "Подешавања"
 
-#: ../data/gui/preferences_window.ui.h:94
+#: ../data/gui/preferences_window.ui.h:90
 msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:96
+#: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
 msgid "STUN server:"
 msgstr "Сервер:"
 
-#: ../data/gui/preferences_window.ui.h:97
+#: ../data/gui/preferences_window.ui.h:93
+#, fuzzy
+msgid "Show notification area icon:"
+msgstr "Notification-daemon"
+
+#: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
 msgid "Show only in roster"
 msgstr "Прикажи догађај у листи контаката"
 
-#: ../data/gui/preferences_window.ui.h:98
-msgid "Show systray:"
-msgstr "Прикажи у системској касети:"
-
-#: ../data/gui/preferences_window.ui.h:99
+#: ../data/gui/preferences_window.ui.h:95
 msgid "Sign _in"
 msgstr "Пријављивању"
 
-#: ../data/gui/preferences_window.ui.h:100
+#: ../data/gui/preferences_window.ui.h:96
 msgid "Sign _out"
 msgstr "Одјављивању"
 
-#: ../data/gui/preferences_window.ui.h:101
+#: ../data/gui/preferences_window.ui.h:97
 msgid "Single window for everything"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:102
+#: ../data/gui/preferences_window.ui.h:98
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2152,27 +2360,27 @@ msgstr ""
 "Неке поруке могу укључивати богати садржај (форматирање, боје итд.). Ако је "
 "означено, Гајим ће само приказивати сирови текст поруке."
 
-#: ../data/gui/preferences_window.ui.h:103
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sort contacts by status"
 msgstr "Сортирај контакте по статусу"
 
-#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
 msgid "Status"
 msgstr "Статус"
 
-#: ../data/gui/preferences_window.ui.h:105
+#: ../data/gui/preferences_window.ui.h:101
 msgid "Status _iconset:"
 msgstr "Скуп статусних икона:"
 
-#: ../data/gui/preferences_window.ui.h:106
+#: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Стил"
 
-#: ../data/gui/preferences_window.ui.h:107
+#: ../data/gui/preferences_window.ui.h:103
 msgid "T_heme:"
 msgstr "Т_ема:"
 
-#: ../data/gui/preferences_window.ui.h:108
+#: ../data/gui/preferences_window.ui.h:104
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2184,7 +2392,7 @@ msgstr ""
 "$S ће бити замењено претходном статусном поруком\n"
 "$T ће бити замењено са временом одсутности"
 
-#: ../data/gui/preferences_window.ui.h:111
+#: ../data/gui/preferences_window.ui.h:107
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2196,121 +2404,126 @@ msgstr ""
 "$S ће бити замењено претходном статусном поруком\n"
 "$T ће бити замењено са временом недоступности"
 
-#: ../data/gui/preferences_window.ui.h:114
+#: ../data/gui/preferences_window.ui.h:110
 msgid "Use _transports icons"
 msgstr "Користи иконе за _транспорте"
 
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:111
+#, fuzzy
+msgid "Use default applications"
+msgstr "Увек користи апликацију коју оперативни систем нуди"
+
+#: ../data/gui/preferences_window.ui.h:112
 msgid "Use system _default"
 msgstr "Користи системски подразумевано"
 
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:113
 msgid "Video framerate"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:117
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Video input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:118
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Video output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:119
+#: ../data/gui/preferences_window.ui.h:116
 msgid "Video size"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:120
+#: ../data/gui/preferences_window.ui.h:117
 msgid "When new event is received:"
 msgstr "Када се прими нови догађај:"
 
-#: ../data/gui/preferences_window.ui.h:121
+#: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
 msgid "Your message:"
 msgstr "Порука грешке: %s"
 
-#: ../data/gui/preferences_window.ui.h:122
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your nickname:"
 msgstr "Надимак:"
 
-#: ../data/gui/preferences_window.ui.h:123
+#: ../data/gui/preferences_window.ui.h:120
 msgid "_Away after:"
 msgstr "Аутом_атски одсутан после:"
 
-#: ../data/gui/preferences_window.ui.h:124
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Интернет прегледач:"
 
-#: ../data/gui/preferences_window.ui.h:125
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Display chat state notifications:"
 msgstr "_Приказана обавештења о стању разговора:"
 
-#: ../data/gui/preferences_window.ui.h:126
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Emoticons:"
 msgstr "_Смајлији:"
 
-#: ../data/gui/preferences_window.ui.h:127
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_File manager:"
 msgstr "_Прегледач датотека:"
 
-#: ../data/gui/preferences_window.ui.h:128
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_Highlight misspelled words"
 msgstr "_Обоји погрешно написане речи"
 
-#: ../data/gui/preferences_window.ui.h:129
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Игнориши догађаје од контаката који нису на листи"
 
-#: ../data/gui/preferences_window.ui.h:130
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Игнориши богато форматирани садржај у пристиглим порукама"
 
-#: ../data/gui/preferences_window.ui.h:131
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Log status changes of contacts"
 msgstr "_Записуј у дневник статусне промене контаката"
 
-#: ../data/gui/preferences_window.ui.h:132
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Mail client:"
 msgstr "_Е-мејл клијент:"
 
-#: ../data/gui/preferences_window.ui.h:133
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Not available after:"
 msgstr "Аутоматски _недоступан након:"
 
-#: ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Open..."
 msgstr "_Отвори..."
 
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Reset to Default Colors"
 msgstr "_Поново учитај подразумеване боје"
 
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Send chat state notifications:"
 msgstr "Пошаљи обавештења о стању разговора:"
 
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Status message:"
 msgstr "_Статусна порука:"
 
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_URL highlight:"
 msgstr "URL осветљавање:"
 
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_Window behavior:"
 msgstr "Понашање прозора:"
 
-#: ../data/gui/preferences_window.ui.h:140
+#: ../data/gui/preferences_window.ui.h:137
 msgid "in _group chats"
 msgstr "у _групним разговорима"
 
-#: ../data/gui/preferences_window.ui.h:141
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _roster"
 msgstr "у _листи контаката"
 
-#: ../data/gui/preferences_window.ui.h:142
+#: ../data/gui/preferences_window.ui.h:139
 msgid "minutes"
 msgstr "минута"
 
@@ -2362,7 +2575,7 @@ msgstr "Џабер ИД"
 msgid "Order:"
 msgstr "Поредак:"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3436
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
 msgid "Privacy List"
 msgstr "Листа приватности"
 
@@ -2573,8 +2786,8 @@ msgstr "Уклони налог и из Гајима и са сервера"
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5492 ../src/roster_window.py:5622
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
+#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
 msgid "_Remove"
 msgstr "_Уклони"
 
@@ -2620,56 +2833,60 @@ msgid "Help online"
 msgstr "Помоћ са интернета"
 
 #: ../data/gui/roster_window.ui.h:8
+msgid "P_lugins"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:9
 msgid "Profile, A_vatar"
 msgstr "Профил, А_ватар"
 
-#: ../data/gui/roster_window.ui.h:9
+#: ../data/gui/roster_window.ui.h:10
 msgid "Show Only _Active Contacts"
 msgstr "Прикажи само _активне контакте"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
 msgid "Show Trans_ports"
 msgstr "Прикажи транс_порте"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
 msgid "Show _Offline Contacts"
 msgstr "Прикажи контакте који нису на вези"
 
-#: ../data/gui/roster_window.ui.h:12 ../src/statusicon.py:326
+#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
 msgid "Show _Roster"
 msgstr "_Прикажи листу контаката"
 
-#: ../data/gui/roster_window.ui.h:13
+#: ../data/gui/roster_window.ui.h:14
 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/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
 #: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Акције"
 
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
 msgid "_Contents"
 msgstr "_Садржај"
 
-#: ../data/gui/roster_window.ui.h:18 ../src/disco.py:1502
+#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
 msgid "_Edit"
 msgstr "_Измени"
 
-#: ../data/gui/roster_window.ui.h:19
+#: ../data/gui/roster_window.ui.h:20
 msgid "_FAQ"
 msgstr "_ЧПП"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Help"
 msgstr "_Помоћ"
 
-#: ../data/gui/roster_window.ui.h:22
+#: ../data/gui/roster_window.ui.h:23
 msgid "_Send Single Message..."
 msgstr "Пошаљи једну _поруку..."
 
-#: ../data/gui/roster_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:25
 msgid "_View"
 msgstr "_Приказ"
 
@@ -2686,11 +2903,11 @@ msgid "_Add contact"
 msgstr "Додај _контакт"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5634
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
 msgid "_Information"
 msgstr "Информације"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1353
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
 msgid "_Search"
 msgstr "_Претрага"
 
@@ -2710,10 +2927,6 @@ msgstr "Региструј се на"
 msgid "_Cancel"
 msgstr "_Одустани"
 
-#: ../data/gui/single_message_window.ui.h:2
-msgid "From:"
-msgstr "Од:"
-
 #: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Одговори на ову поруку"
@@ -2730,10 +2943,6 @@ msgstr "Пошаљи поруку"
 msgid "Send message and close window"
 msgstr "Пошаљи поруку и затвори прозор"
 
-#: ../data/gui/single_message_window.ui.h:7
-msgid "Subject:"
-msgstr "Тема:"
-
 #: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "За:"
@@ -2941,25 +3150,35 @@ msgstr "Гајим Брзе Поруке"
 msgid "Jabber IM Client"
 msgstr "Џабер IM Клијент"
 
-#: ../src/adhoc_commands.py:314
+#: ../src/adhoc_commands.py:323
 msgid "Cancel confirmation"
 msgstr "Поништи одобравање"
 
-#: ../src/adhoc_commands.py:315
+#: ../src/adhoc_commands.py:324
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr "Тренутно извршавате команду. Да ли желите да је прекинете?"
 
-#: ../src/adhoc_commands.py:351 ../src/adhoc_commands.py:374
+#: ../src/adhoc_commands.py:370
+#, fuzzy
+msgid "Invalid Form"
+msgstr "Неисправна соба"
+
+#: ../src/adhoc_commands.py:371
+#, fuzzy
+msgid "The form is not filled correctly."
+msgstr "Надимак садржи недозвољене карактере."
+
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
 msgid "Service sent malformed data"
 msgstr "Сервис је послао лоше податке"
 
-#: ../src/adhoc_commands.py:360
+#: ../src/adhoc_commands.py:399
 msgid "Service changed the session identifier."
 msgstr "Сервис је изменио идентификатор сесије."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:471
+#: ../src/adhoc_commands.py:513
 msgid "Service returned an error."
 msgstr "Сервис је вратио грешку."
 
@@ -2984,7 +3203,7 @@ msgstr "Цео број"
 msgid "Text"
 msgstr "Текст"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:945
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
 msgid "Color"
 msgstr "Боја"
 
@@ -3022,184 +3241,184 @@ msgstr[2] "Примили сте нове уносе (%(count)d није при
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "English"
 msgstr "Енглески"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Belarusian"
 msgstr "Белоруски"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Bulgarian"
 msgstr "Бугарски"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Breton"
 msgstr "Бретански"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Czech"
 msgstr "Чешки"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "German"
 msgstr "Немачки"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Greek"
 msgstr "Грчки"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "British"
 msgstr "Британски"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Esperanto"
 msgstr "Есперанто"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Spanish"
 msgstr "Шпански"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Basque"
 msgstr "Баскијски"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "French"
 msgstr "Француски"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Croatian"
 msgstr "Хрватски"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Italian"
 msgstr "Италијански"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian (b)"
 msgstr "Норвешки (б)"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Dutch"
 msgstr "Холандски"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian"
 msgstr "Норвешки"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Polish"
 msgstr "Пољски"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Portuguese"
 msgstr "Португалски"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Brazilian Portuguese"
 msgstr "Бразилски португалски"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Russian"
 msgstr "Руски"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Serbian"
 msgstr "Српски"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Slovak"
 msgstr "Словачки"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Swedish"
 msgstr "Шведски"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Chinese (Ch)"
 msgstr "Кинески (Ch)"
 
-#: ../src/chat_control.py:479
+#: ../src/chat_control.py:496
 msgid "Spelling language"
 msgstr "Језик за правопис"
 
 #. we are not connected
-#: ../src/chat_control.py:511 ../src/chat_control.py:720
+#: ../src/chat_control.py:528 ../src/chat_control.py:737
 msgid "A connection is not available"
 msgstr "Веза није доступна"
 
-#: ../src/chat_control.py:512 ../src/chat_control.py:721
+#: ../src/chat_control.py:529 ../src/chat_control.py:738
 msgid "Your message can not be sent until you are connected."
 msgstr "Ваша порука не може бити послата ако нисте повезани."
 
-#: ../src/chat_control.py:927
+#: ../src/chat_control.py:944
 msgid "Underline"
 msgstr "Подвучено"
 
-#: ../src/chat_control.py:928
+#: ../src/chat_control.py:945
 msgid "Strike"
 msgstr "Прецртано"
 
-#: ../src/chat_control.py:951
+#: ../src/chat_control.py:968
 msgid "Font"
 msgstr "Фонт"
 
-#: ../src/chat_control.py:960
+#: ../src/chat_control.py:977
 msgid "Clear formating"
 msgstr "Очисти форматирање"
 
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1055
 msgid "Really send file?"
 msgstr "Стварно пошаљи датотеку?"
 
-#: ../src/chat_control.py:1039
+#: ../src/chat_control.py:1056
 #, 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:1503 ../src/chat_control.py:1987
+#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
 msgid "GPG encryption enabled"
 msgstr "GPG енкрипција омогућена"
 
 #. Add to roster
-#: ../src/chat_control.py:1528 ../src/common/contacts.py:158
+#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
 #: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:245 ../src/dialogs.py:1064 ../src/dialogs.py:2078
-#: ../src/dialogs.py:2107 ../src/gui_interface.py:674
+#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
+#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
 #: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1610 ../src/roster_window.py:1612
-#: ../src/roster_window.py:1942 ../src/roster_window.py:3289
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
+#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
+#: ../src/roster_window.py:3382
 msgid "Not in Roster"
 msgstr "Није на листи контаката"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1575
 msgid "This contact does not support file transfer."
 msgstr "Овак контакт не подржава пренос датотека."
 
-#: ../src/chat_control.py:1561
+#: ../src/chat_control.py:1578
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr "Морате знати прави џабер ИД контакта да бисте му/јој послали датотеку."
 
-#: ../src/chat_control.py:1656
+#: ../src/chat_control.py:1677
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:1869
 #, 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:1967 ../src/dialogs.py:4866
+#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
 msgid "No GPG key assigned"
 msgstr "Нема додељеног GPG кључа"
 
-#: ../src/chat_control.py:1968
+#: ../src/chat_control.py:1991
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3207,50 +3426,50 @@ msgstr ""
 "Ниједан GPG кључ није додаљен овом контакту. Не можете шифровати поруке са "
 "GPG-ом."
 
-#: ../src/chat_control.py:1977
+#: ../src/chat_control.py:2000
 msgid "GPG encryption disabled"
 msgstr "GPG енкрипција онемогућена"
 
-#: ../src/chat_control.py:2003
+#: ../src/chat_control.py:2026
 msgid "Session WILL be logged"
 msgstr "Сесија ЋЕ бити памћена"
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:2028
 msgid "Session WILL NOT be logged"
 msgstr "Сесија НЕЋЕ бити памћена"
 
 #. encryption %s active
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is"
 msgstr "је"
 
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is NOT"
 msgstr "НИЈЕ"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will"
 msgstr "ће"
 
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will NOT"
 msgstr "НЕЋЕ"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2051
 msgid "and authenticated"
 msgstr "и пријављени"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2032
+#: ../src/chat_control.py:2055
 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:2039
+#: ../src/chat_control.py:2062
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3259,48 +3478,57 @@ msgstr ""
 "%(type)s шифровање %(status)s активан %(authenticated)s.\n"
 "Ваша сесија разговора %(logged)s бити памћена."
 
-#: ../src/chat_control.py:2182
+#: ../src/chat_control.py:2205
 msgid "Session negotiation cancelled"
 msgstr "Успостављање сесије прекинуто"
 
-#: ../src/chat_control.py:2191
+#: ../src/chat_control.py:2215
+msgid "This session WILL be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2217
+#, fuzzy
+msgid "This session WILL NOT be archived on server"
+msgstr "Сесија НЕЋЕ бити памћена"
+
+#: ../src/chat_control.py:2226
 msgid "This session is encrypted"
 msgstr "Ова сесија је шифрована"
 
-#: ../src/chat_control.py:2194
+#: ../src/chat_control.py:2229
 msgid " and WILL be logged"
 msgstr "и БИЋЕ памћена"
 
-#: ../src/chat_control.py:2196
+#: ../src/chat_control.py:2231
 msgid " and WILL NOT be logged"
 msgstr "и НЕЋЕ бити памћена"
 
-#: ../src/chat_control.py:2201
+#: ../src/chat_control.py:2236
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 "Идентитет другог корисника није потврђен. Кликните на штит за више детаља."
 
-#: ../src/chat_control.py:2203
+#: ../src/chat_control.py:2238
 msgid "E2E encryption disabled"
 msgstr "E2E енкрипција онемогућена"
 
-#: ../src/chat_control.py:2241 ../src/chat_control.py:2254
+#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
 msgid "The following message was NOT encrypted"
 msgstr "Следећа порука НИЈЕ била шифрована"
 
-#: ../src/chat_control.py:2247
+#: ../src/chat_control.py:2288
 msgid "The following message was encrypted"
 msgstr "Следећа порука је била шифрована"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2519
+#: ../src/chat_control.py:2566
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "\"%s\" Вам је управо послао поруку"
 
-#: ../src/chat_control.py:2520
+#: ../src/chat_control.py:2567
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3308,15 +3536,13 @@ msgstr ""
 "Ако затворите овај језичак, а историјат разговора није омогућен, ова порука "
 "ће бити изгубљена."
 
-#: ../src/chat_control.py:2663 ../src/common/connection_handlers.py:1635
-#: ../src/common/connection_handlers.py:1758
-#: ../src/common/connection_handlers.py:1960
-#: ../src/common/connection_handlers.py:2110 ../src/common/connection.py:452
+#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
 #: ../src/gajim.py:159 ../src/session.py:138
 msgid "Database Error"
 msgstr "Грешка са базом података"
 
-#: ../src/chat_control.py:2664
+#: ../src/chat_control.py:2714
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3325,7 +3551,7 @@ msgstr ""
 "Датотека базе података (%s) се не може читати. Покушајте да је поправите или "
 "уклоните (сав историјат порука ће бити изгубљен)."
 
-#: ../src/chat_control.py:2906
+#: ../src/chat_control.py:2962
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s је сада %(status)s"
@@ -3339,28 +3565,28 @@ msgstr "креирам базу дневника"
 msgid "creating cache database"
 msgstr "креирам базу дневника"
 
-#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
-#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
-#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
-#: ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s је датотека, али би требала бити фасцикла"
 
-#: ../src/common/check_paths.py:275 ../src/common/check_paths.py:282
-#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
-#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
-#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:333
+#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
+#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
+#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
 msgid "Gajim will now exit"
 msgstr "Гајим ће се сада завршити"
 
-#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
+#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s jе фасцикла, али би требала бити датотека"
 
-#: ../src/common/check_paths.py:342
+#: ../src/common/check_paths.py:351
 #, python-format
 msgid "creating %s directory"
 msgstr "креирам фасциклу %s"
@@ -3424,9 +3650,9 @@ msgstr "Одаберите групне разговоре које желите
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:801
-#: ../src/roster_window.py:1614 ../src/roster_window.py:1616
-#: ../src/roster_window.py:5251
+#: ../src/common/helpers.py:57 ../src/roster_window.py:815
+#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
+#: ../src/roster_window.py:5323
 msgid "Groupchats"
 msgstr "Групни разговори"
 
@@ -3488,7 +3714,9 @@ msgstr ""
 "недоступности"
 
 #: ../src/common/config.py:88
-msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+#, fuzzy
+msgid ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 "Када приказати иконицу у системској касети. Може бити 'never', 'on_event', "
 "'always'."
@@ -3540,9 +3768,9 @@ msgstr ""
 "Листа (одвојена бланко знаковима) редова (налога и група) који су отворени."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:501
-#: ../src/common/optparser.py:290 ../src/common/optparser.py:486
-#: ../src/common/optparser.py:520 ../src/gui_interface.py:3370
+#: ../src/common/config.py:106 ../src/common/config.py:505
+#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
+#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
 msgid "default"
 msgstr "подразумевано"
 
@@ -3766,7 +3994,8 @@ msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC стандард дефинише КiБ = 1024 бајтова, КБ = 1000 бајтова"
 
 #: ../src/common/config.py:197
-msgid "Notify of events in the system trayicon."
+#, fuzzy
+msgid "Notify of events in the notification area."
 msgstr "Обавести ме о свим догађајима у икони системске касете."
 
 #: ../src/common/config.py:203
@@ -3804,9 +4033,10 @@ msgstr ""
 "разговорима"
 
 #: ../src/common/config.py:221
+#, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
+"setting is taken into account only if notification icon is used."
 msgstr ""
 "Ако је истинито, Гајим се завршава када се притисне X дугме. Ово подешавање "
 "се користи само ако је икона системске касете у употреби."
@@ -4079,9 +4309,10 @@ msgstr ""
 "склањају."
 
 #: ../src/common/config.py:270
+#, fuzzy
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
-"systray icon."
+"notification icon."
 msgstr ""
 "Ако је истинито, прозор обавештења од сервиса обавештења ће бити закачен за "
 "системску касету."
@@ -4279,11 +4510,15 @@ msgstr ""
 msgid "Message that is sent to contacts you want to add"
 msgstr "Молимо Вас испуните податке за контакт кога желите додати"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:374
+msgid "Last time we syncronized with logs from server."
+msgstr ""
+
+#: ../src/common/config.py:436
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Да ли је OpenPGP омогућен за овај контакт?"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4291,101 +4526,108 @@ msgstr ""
 "Да ли Гајим треба аутоматски да започне шифровану везу са овим контактом "
 "када је могуће?"
 
-#: ../src/common/config.py:437 ../src/common/config.py:440
+#: ../src/common/config.py:438 ../src/common/config.py:441
 msgid "Language for which we want to check misspelled words"
 msgstr "Језик у коме желите проверавати неисправно написане речи"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:447
 msgid "all or space separated status"
 msgstr "све или размаком одвојен статус"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:448
 msgid "'yes', 'no', or 'both'"
 msgstr "'да', 'не', или 'обоје'"
 
-#: ../src/common/config.py:448 ../src/common/config.py:450
-#: ../src/common/config.py:451 ../src/common/config.py:454
-#: ../src/common/config.py:455
+#: ../src/common/config.py:449 ../src/common/config.py:451
+#: ../src/common/config.py:452 ../src/common/config.py:455
+#: ../src/common/config.py:456
 msgid "'yes', 'no' or ''"
 msgstr "'да', 'не' или ''"
 
-#: ../src/common/config.py:461 ../src/common/pep.py:157
+#: ../src/common/config.py:460
+msgid ""
+"State whether plugins should be activated on exit (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
+msgstr ""
+
+#: ../src/common/config.py:465 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Спавам"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back soon"
 msgstr "Враћам се брзо"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back in some minutes."
 msgstr "Враћам се за пар минута."
 
-#: ../src/common/config.py:463 ../src/common/pep.py:127
+#: ../src/common/config.py:467 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Једем"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:467
 msgid "I'm eating, so leave me a message."
 msgstr "Једем, оставите поруку."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "Movie"
 msgstr "Филм"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "I'm watching a movie."
 msgstr "Гледам филм."
 
-#: ../src/common/config.py:465 ../src/common/pep.py:186
+#: ../src/common/config.py:469 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Радим."
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:469
 msgid "I'm working."
 msgstr "Радим."
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "I'm on the phone."
 msgstr "Телефонирам."
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "Out"
 msgstr "Напољу"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "I'm out enjoying life."
 msgstr "Напољу сам, уживам у животу."
 
-#: ../src/common/config.py:478
+#: ../src/common/config.py:482
 msgid "I'm available."
 msgstr "Доступан сам."
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:483
 msgid "I'm free for chat."
 msgstr "Слободан сам за разговор."
 
-#: ../src/common/config.py:480 ../src/config.py:1600
+#: ../src/common/config.py:484 ../src/config.py:1600
 msgid "Be right back."
 msgstr "Одмах се враћам."
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:485
 msgid "I'm not available."
 msgstr "Недоступан сам."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:486
 msgid "Do not disturb."
 msgstr "Не сметај."
 
-#: ../src/common/config.py:483 ../src/common/config.py:484
+#: ../src/common/config.py:487 ../src/common/config.py:488
 msgid "Bye!"
 msgstr "Поздрав!"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:498
 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."
@@ -4394,88 +4636,84 @@ msgstr ""
 "muc_highlight_words, или када нека порука групног разговора садржи Ваш "
 "надимак."
 
-#: ../src/common/config.py:495
+#: ../src/common/config.py:499
 msgid "Sound to play when any MUC message arrives."
 msgstr "Звук који ће се пустити када стигне нека MUC порука."
 
-#: ../src/common/config.py:504 ../src/common/optparser.py:304
+#: ../src/common/config.py:508 ../src/common/optparser.py:308
 msgid "green"
 msgstr "зелена"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:290
+#: ../src/common/config.py:512 ../src/common/optparser.py:294
 msgid "grocery"
 msgstr "намирнице"
 
-#: ../src/common/config.py:512
+#: ../src/common/config.py:516
 msgid "human"
 msgstr "људска"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:520
 msgid "marine"
 msgstr "морска"
 
-#: ../src/common/connection_handlers.py:84
+#: ../src/common/connection_handlers.py:94
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Није могуће учитавање модула idle"
 
-#: ../src/common/connection_handlers.py:117
+#: ../src/common/connection_handlers.py:127
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Информације о регистрацији за транспорт %s нису дошле на време"
 
-#: ../src/common/connection_handlers.py:124
+#: ../src/common/connection_handlers.py:134
 msgid "Registration succeeded"
 msgstr "Регистрација успешна"
 
-#: ../src/common/connection_handlers.py:125
+#: ../src/common/connection_handlers.py:135
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Регистрација са агентом %s успешна"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 msgid "Registration failed"
 msgstr "Регистрација неуспела"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 #, 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:445
-#: ../src/common/connection_handlers.py:1633
-#: ../src/common/connection_handlers.py:1756
-#: ../src/common/connection_handlers.py:1957
-#: ../src/common/connection_handlers.py:2108 ../src/common/connection.py:449
+#: ../src/common/connection_handlers.py:466
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
 #: ../src/gajim.py:341
 msgid "Disk Write Error"
 msgstr "Грешка при упису на диск"
 
-#: ../src/common/connection_handlers.py:678 ../src/common/connection.py:1472
+#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
 msgid "Invisibility not supported"
 msgstr "Невидљивост није подржана"
 
-#: ../src/common/connection_handlers.py:679 ../src/common/connection.py:1473
+#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Налог %s не подржава невидљивост."
 
-#: ../src/common/connection_handlers.py:1446 ../src/common/connection.py:253
-#: ../src/config.py:2091 ../src/config.py:2100 ../src/config.py:2168
-#: ../src/config.py:3560 ../src/dataforms_widget.py:597 ../src/dialogs.py:2931
+#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
+#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
+#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
 msgid "Invalid Jabber ID"
 msgstr "Неисправан џабер ИД"
 
-#: ../src/common/connection_handlers.py:1447
+#: ../src/common/connection_handlers.py:1405
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr "Порука од неисправног џабер ИД-а, игнорисана је."
 
-#: ../src/common/connection_handlers.py:1636
-#: ../src/common/connection_handlers.py:1759
-#: ../src/common/connection_handlers.py:1961
-#: ../src/common/connection_handlers.py:2111 ../src/common/connection.py:453
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
 #: ../src/gajim.py:160 ../src/session.py:139
 #, python-format
 msgid ""
@@ -4486,89 +4724,6 @@ msgstr ""
 "(погледајте http://trac.gajim.org/wiki/DatabaseBackup) или  уклоните (сав "
 "историјат порука ће бити изгубљен)."
 
-#: ../src/common/connection_handlers.py:1805
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Недозвољен надимак: %s "
-
-#: ../src/common/connection_handlers.py:1902
-#: ../src/common/connection_handlers.py:1911
-#: ../src/common/connection_handlers.py:1918
-#: ../src/common/connection_handlers.py:1922
-#: ../src/common/connection_handlers.py:1926
-#: ../src/common/connection_handlers.py:1931 ../src/gui_interface.py:139
-msgid "Unable to join group chat"
-msgstr "Није могуће придружити се групном разговору"
-
-#: ../src/common/connection_handlers.py:1903
-#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr "Достигнут највећи број корисника за %s"
-
-#: ../src/common/connection_handlers.py:1912
-#, python-format
-msgid "You are banned from group chat %s."
-msgstr "Забрањен Вам је приступ овом групном разговору %s."
-
-#: ../src/common/connection_handlers.py:1919
-#, python-format
-msgid "Group chat %s does not exist."
-msgstr "Групни разговор.%s не постоји."
-
-#: ../src/common/connection_handlers.py:1923
-msgid "Group chat creation is restricted."
-msgstr "Стварање групних разговора Вам није дозвољено."
-
-#: ../src/common/connection_handlers.py:1927
-#, python-format
-msgid "Your registered nickname must be used in group chat %s."
-msgstr "Морате користити Ваш регистровани надимак у групном разговору %s."
-
-#: ../src/common/connection_handlers.py:1932
-#, 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:1976
-msgid "Room has been destroyed"
-msgstr "Соба групног разговора је уништена"
-
-#: ../src/common/connection_handlers.py:1984
-#, python-format
-msgid "You can join this room instead: %s"
-msgstr "Можете се прикључити соби %s уместо ове"
-
-#: ../src/common/connection_handlers.py:2020
-msgid "I would like to add you to my roster."
-msgstr "Желео бих да те додам на моју листу контаката."
-
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2041
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "сада сте претплаћени на %s"
-
-#: ../src/common/connection_handlers.py:2043
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "захтев за укидање претплате од контакта %s"
-
-#: ../src/common/connection_handlers.py:2045
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "сада Вам је укинута претплата од контакта %s"
-
-#: ../src/common/connection_handlers.py:2240
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"Џабер ИД %s не поштује RFC правила. Неће бити додат на Вашу листу контаката. "
-"Употребите алате као што је http://jru.jabberstudio.org/ да бисте га уклонили"
-
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr "Нисам успео да узмем сертификат издавача"
@@ -4697,27 +4852,27 @@ msgstr "Употреба кључа не укључује потписивање
 msgid "Application verification failure"
 msgstr "Верификација апликације неуспела"
 
-#: ../src/common/connection.py:254 ../src/dialogs.py:2932
+#: ../src/common/connection.py:256 ../src/dialogs.py:2948
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Није могуће послати поруку за %s, овај џабер ИД није исправан."
 
-#: ../src/common/connection.py:276
+#: ../src/common/connection.py:278
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr "Нити је удаљено присуство потписано, нити је кључ додељен."
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:281
 #, 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:331
+#: ../src/common/connection.py:333
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Ова порука је *шифрована* (Погледајте :XEP:`27`]"
 
-#: ../src/common/connection.py:439
+#: ../src/common/connection.py:441
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4726,76 +4881,76 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:807
+#: ../src/common/connection.py:809
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Изгубљена веза са рачуном \"%s\""
 
-#: ../src/common/connection.py:808
+#: ../src/common/connection.py:810
 msgid "Reconnect manually."
 msgstr "Поново се повежите ручно."
 
-#: ../src/common/connection.py:820
+#: ../src/common/connection.py:822
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Сервер %(name)s је лоше одговорио на захтев регистрације:: %(error)s"
 
-#: ../src/common/connection.py:854
+#: ../src/common/connection.py:856
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Сервер %s је понудио другачију форму за регистрацију"
 
-#: ../src/common/connection.py:867
+#: ../src/common/connection.py:869
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Непозната SSL грешка: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:882
+#: ../src/common/connection.py:884
 msgid "Invalid answer"
 msgstr "Неисправан одговор"
 
-#: ../src/common/connection.py:883
+#: ../src/common/connection.py:885
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Транспорт %(name)s је лоше одговорио на захтев регистрације: %(error)s"
 
-#: ../src/common/connection.py:1165 ../src/common/connection.py:1294
-#: ../src/common/connection.py:1784
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
+#: ../src/common/connection.py:1792
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Веза са \"%s\" није могућа"
 
-#: ../src/common/connection.py:1166 ../src/gui_interface.py:755
+#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
 msgid "Check your connection or try again later."
 msgstr "Проверите Вашу конекцију или покушајте касније."
 
-#: ../src/common/connection.py:1171
+#: ../src/common/connection.py:1173
 #, python-format
 msgid "Server replied: %s"
 msgstr "Сервер је одговорио: %s"
 
-#: ../src/common/connection.py:1184
+#: ../src/common/connection.py:1186
 msgid "Connection to proxy failed"
 msgstr "Веза са проксијем прекинута"
 
-#: ../src/common/connection.py:1215 ../src/common/connection.py:1274
+#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Веза са %s није могућа"
 
-#: ../src/common/connection.py:1216 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Изгубљена веза са налогом %s. Покушајте поново да се конектујете."
 
-#: ../src/common/connection.py:1241
+#: ../src/common/connection.py:1243
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Аутентичност сертификата %s може бити неисправна."
 
-#: ../src/common/connection.py:1244
+#: ../src/common/connection.py:1246
 #, python-format
 msgid ""
 "\n"
@@ -4804,7 +4959,7 @@ msgstr ""
 "\n"
 "SSL грешка: <b>%s</b>"
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1248
 #, python-format
 msgid ""
 "\n"
@@ -4813,24 +4968,24 @@ msgstr ""
 "\n"
 "Непозната SSL грешка: %d"
 
-#: ../src/common/connection.py:1295
+#: ../src/common/connection.py:1297
 msgid "Check your connection or try again later"
 msgstr "Проверите Вашу конекцију или покушајте касније"
 
-#: ../src/common/connection.py:1324
+#: ../src/common/connection.py:1329
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Пријављивање са \"%s\" неуспешно"
 
-#: ../src/common/connection.py:1326
+#: ../src/common/connection.py:1331
 msgid "Please check your login and password for correctness."
 msgstr "Молимо Вас да проверите Ваше корисничко име и лозинку од грешака."
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1400
 msgid "Error while removing privacy list"
 msgstr "Грешка приликом уклањања листа приватности"
 
-#: ../src/common/connection.py:1396
+#: ../src/common/connection.py:1401
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4839,39 +4994,39 @@ msgstr ""
 "Листа приватности %s није уклоњена. Можда је активна у неком од Ваших "
 "ресурса на вези. Деактивирајте је тамо и покушајте поново."
 
-#: ../src/common/connection.py:1650
+#: ../src/common/connection.py:1658
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Послати контакти: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1653
+#: ../src/common/connection.py:1661
 msgid "Sent contacts:"
 msgstr "Послати контакти:"
 
-#: ../src/common/connection.py:1799 ../src/common/connection.py:1822
+#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
 msgid "Not fetched because of invisible status"
 msgstr "Није дохваћено због статуса невидљивости"
 
-#: ../src/common/connection.py:2254
+#: ../src/common/connection.py:2262
 msgid "Unregister failed"
 msgstr "Одјава регистрације неуспела"
 
-#: ../src/common/connection.py:2255
+#: ../src/common/connection.py:2263
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr "Одјава регистрације са сервером %(server)s неуспела: %(error)s"
 
 #: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:674
+#: ../src/gui_interface.py:551
 msgid "Observers"
 msgstr "Посматрачи"
 
 #: ../src/common/contacts.py:139 ../src/common/contacts.py:366
 #: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1499 ../src/gui_interface.py:424
-#: ../src/roster_window.py:840 ../src/roster_window.py:1525
-#: ../src/roster_window.py:1606 ../src/roster_window.py:1608
-#: ../src/roster_window.py:1769
+#: ../src/disco.py:1517 ../src/roster_window.py:854
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
+#: ../src/roster_window.py:2466
 msgid "Transports"
 msgstr "Преноси"
 
@@ -5098,203 +5253,219 @@ msgstr "Крај недеље"
 msgid "Weekend!"
 msgstr "Викенд!"
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:148
+msgid "Username must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:153
 msgid "Invalid character in username."
 msgstr "Неисправан карактер у корисничком имену."
 
-#: ../src/common/helpers.py:156
-msgid "Server address required."
-msgstr "Потребна је адреса сервера."
+#: ../src/common/helpers.py:159
+msgid "Server must be between 1 and 1023 chars"
+msgstr ""
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 msgid "Invalid character in hostname."
 msgstr "Неисправан карактер у имену хоста."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:166
+msgid "Server address required."
+msgstr "Потребна је адреса сервера."
+
+#: ../src/common/helpers.py:170
+msgid "Resource must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:175
 msgid "Invalid character in resource."
 msgstr "Неисправан карактер у ресурсу."
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:215
 msgid "_Busy"
 msgstr "_Заузет"
 
-#: ../src/common/helpers.py:211 ../src/tooltips.py:195
+#: ../src/common/helpers.py:217 ../src/tooltips.py:195
 msgid "Busy"
 msgstr "Заузет"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:220
 msgid "_Not Available"
 msgstr "_Недоступан"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:225
 msgid "_Free for Chat"
 msgstr "_Слободан за разговор"
 
-#: ../src/common/helpers.py:221 ../src/tooltips.py:191
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Free for Chat"
 msgstr "Слободан за разговор"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:230
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?статус преноса:Паузиран"
 
-#: ../src/common/helpers.py:226 ../src/tooltips.py:189
+#: ../src/common/helpers.py:232 ../src/tooltips.py:189
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?статус преноса:Паузиран"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:234
 msgid "Connecting"
 msgstr "Повезивање"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:237
 msgid "A_way"
 msgstr "О_дсутан"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:242
 msgid "_Offline"
 msgstr "_Није на вези"
 
-#: ../src/common/helpers.py:238 ../src/tooltips.py:199
+#: ../src/common/helpers.py:244 ../src/tooltips.py:199
 msgid "Offline"
 msgstr "Није на вези"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:247
 msgid "_Invisible"
 msgstr "_Невидљив"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:253
 msgid "?contact has status:Unknown"
 msgstr "?контакт има статус:Непознат"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:255
 msgid "?contact has status:Has errors"
 msgstr "?контакт има статус:Постоје грешке"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:260
 msgid "?Subscription we already have:None"
 msgstr "?Тренутна претплата:Ниједна"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:262
 msgid "To"
 msgstr "За"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
+msgid "From"
+msgstr "Од"
+
+#: ../src/common/helpers.py:266
 msgid "Both"
 msgstr "Обоје"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:274
 msgid "?Ask (for Subscription):None"
 msgstr "?Питај (за претплату):Ниједна"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:276
 msgid "Subscribe"
 msgstr "Претплатите се"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:285
 msgid "?Group Chat Contact Role:None"
 msgstr "?Улога контакта у групном разговору:Никаква"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:288
 msgid "Moderators"
 msgstr "Модератори"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:290
 msgid "Moderator"
 msgstr "Модератор"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:293
 msgid "Participants"
 msgstr "Учесници"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:295
 msgid "Participant"
 msgstr "Учесник"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:298
 msgid "Visitors"
 msgstr "Posjetitelji"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:300
 msgid "Visitor"
 msgstr "Посетилац"
 
-#: ../src/common/helpers.py:300 ../src/tooltips.py:210
+#: ../src/common/helpers.py:306 ../src/tooltips.py:210
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Везаност контакта у групном разоговру:Никаква"
 
-#: ../src/common/helpers.py:302 ../src/tooltips.py:216
+#: ../src/common/helpers.py:308 ../src/tooltips.py:216
 msgid "Owner"
 msgstr "Власник"
 
-#: ../src/common/helpers.py:304 ../src/tooltips.py:214
+#: ../src/common/helpers.py:310 ../src/tooltips.py:214
 msgid "Administrator"
 msgstr "Администратор"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:212
+#: ../src/common/helpers.py:312 ../src/tooltips.py:212
 msgid "Member"
 msgstr "Члан"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:351
 msgid "is paying attention to the conversation"
 msgstr "слуша конверзацију"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:353
 msgid "is doing something else"
 msgstr "ради нешто друго"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:355
 msgid "is composing a message..."
 msgstr "пише поруку..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:352
+#: ../src/common/helpers.py:358
 msgid "paused composing a message"
 msgstr "пауза при писању поруке"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:360
 msgid "has closed the chat window or tab"
 msgstr "је затворио/затворила прозор или језичак разговора"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:619
+#: ../src/common/helpers.py:625
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:622
+#: ../src/common/helpers.py:628
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:626
+#: ../src/common/helpers.py:632
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:629
+#: ../src/common/helpers.py:635
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:633
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:636
+#: ../src/common/helpers.py:642
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:645
 #, python-format
 msgid "%s B"
 msgstr "%s B"
@@ -5339,12 +5510,12 @@ msgstr "Гајим - %s"
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:111
+#: ../src/common/jingle_rtp.py:107
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Конфигурација собе"
 
-#: ../src/common/jingle_rtp.py:112
+#: ../src/common/jingle_rtp.py:108
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5356,30 +5527,30 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:209
+#: ../src/common/jingle_rtp.py:205
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:210
+#: ../src/common/jingle_rtp.py:206
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Порука грешке: %s"
 
-#: ../src/common/jingle_rtp.py:336
+#: ../src/common/jingle_rtp.py:335
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:339
+#: ../src/common/jingle_rtp.py:338
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:382
+#: ../src/common/jingle_rtp.py:381
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:390
+#: ../src/common/jingle_rtp.py:389
 msgid "video output"
 msgstr ""
 
@@ -5456,11 +5627,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "грешка: не могу отворити %s за читање"
 
-#: ../src/common/optparser.py:299 ../src/common/optparser.py:300
+#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
 msgid "cyan"
 msgstr "цијан"
 
-#: ../src/common/optparser.py:379
+#: ../src/common/optparser.py:383
 msgid "migrating logs database to indices"
 msgstr "пребацујем базу дневника у индексе"
 
@@ -6132,18 +6303,18 @@ msgstr ""
 "Можда већ имате покренуту инстанцу Гајима. Пренос датотека ће бити прекинут."
 
 #. we're not english
-#: ../src/common/stanza_session.py:303
+#: ../src/common/stanza_session.py:423
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 "[Ово је део шифроване сесије. Уколико видите ово, нешто је пошло наопако.]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:178
+#: ../src/common/zeroconf/connection_zeroconf.py:181
 msgid "Avahi error"
 msgstr "Авахи грешка"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:179
+#: ../src/common/zeroconf/connection_zeroconf.py:182
 #, python-format
 msgid ""
 "%s\n"
@@ -6152,44 +6323,44 @@ msgstr ""
 "%s\n"
 "Поруке локалне мреже можда неће радити како треба."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:190
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Проверите да ли је Авахи или Bonjour инсталиран."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:199
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Could not start local service"
 msgstr "Није могуће покренути локални сервис"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Не могу се повезати на порт %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-#: ../src/common/zeroconf/connection_zeroconf.py:283
-#: ../src/common/zeroconf/connection_zeroconf.py:294
-#: ../src/common/zeroconf/connection_zeroconf.py:308
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:286
+#: ../src/common/zeroconf/connection_zeroconf.py:297
+#: ../src/common/zeroconf/connection_zeroconf.py:311
 msgid "Please check if avahi-daemon is running."
 msgstr "Молимо проверите да ли је avahi-демон покренут."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:282
-#: ../src/common/zeroconf/connection_zeroconf.py:293
-#: ../src/common/zeroconf/connection_zeroconf.py:307
+#: ../src/common/zeroconf/connection_zeroconf.py:285
+#: ../src/common/zeroconf/connection_zeroconf.py:296
+#: ../src/common/zeroconf/connection_zeroconf.py:310
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Није могуће променити статус рачуна \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:325
+#: ../src/common/zeroconf/connection_zeroconf.py:328
 msgid "Your message could not be sent."
 msgstr "Ваша порука није могла бити послата."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:335
+#: ../src/common/zeroconf/connection_zeroconf.py:338
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Контакт није на вези. Вашу поруку није могуће послати."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:363
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6209,16 +6380,16 @@ msgstr "Подразумевана порука"
 msgid "Enabled"
 msgstr "Омогућен"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3078
+#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
 msgid "Default"
 msgstr "Подразумевано"
 
-#: ../src/config.py:739 ../src/dialogs.py:1395
+#: ../src/config.py:733 ../src/dialogs.py:1409
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Речник за језик %s није доступан"
 
-#: ../src/config.py:740
+#: ../src/config.py:734
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6236,9 +6407,9 @@ msgid "status message text"
 msgstr "текст статусне поруке"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2383 ../src/dialogs.py:2449
-#: ../src/dialogs.py:3215 ../src/disco.py:866 ../src/disco.py:1726
-#: ../src/disco.py:2030 ../src/history_window.py:90
+#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
+#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
+#: ../src/disco.py:2048 ../src/history_window.py:90
 msgid "Name"
 msgstr "Име"
 
@@ -6274,7 +6445,7 @@ msgstr ""
 "Прозори свих разговора и групних разговора ће бити затворени. Желите ли да "
 "наставите?"
 
-#: ../src/config.py:1976 ../src/config.py:2509 ../src/config.py:2545
+#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
 msgid "You are currently connected to the server"
 msgstr "Тренутно сте спојени на сервер"
 
@@ -6310,131 +6481,131 @@ msgstr "Име налога не може бити празно."
 msgid "Account name cannot contain spaces."
 msgstr "Име налога не може да садржи белине."
 
-#: ../src/config.py:2072
+#: ../src/config.py:2074
 msgid "Rename Account"
 msgstr "Преименуј налог"
 
-#: ../src/config.py:2073
+#: ../src/config.py:2075
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Унесите ново име за налог%s"
 
-#: ../src/config.py:2101
+#: ../src/config.py:2103
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Џабер ИД мора бити облика \"корисник@сервер\"."
 
-#: ../src/config.py:2318 ../src/config.py:3606
+#: ../src/config.py:2320 ../src/config.py:3623
 msgid "Invalid entry"
 msgstr "Неисправан унос"
 
-#: ../src/config.py:2319 ../src/config.py:3607
+#: ../src/config.py:2321 ../src/config.py:3624
 msgid "Custom port must be a port number."
 msgstr "Ваш порт мора бити број порта."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2342
 msgid "Failed to get secret keys"
 msgstr "Неуспело узимање тајних кључева"
 
-#: ../src/config.py:2341
+#: ../src/config.py:2343
 msgid "There is no OpenPGP secret key available."
 msgstr "Нема доступних OpenPGP тајних кључева."
 
-#: ../src/config.py:2375
+#: ../src/config.py:2377
 msgid "OpenPGP Key Selection"
 msgstr "Одабир OpenPGP Кључева"
 
-#: ../src/config.py:2376
+#: ../src/config.py:2378
 msgid "Choose your OpenPGP key"
 msgstr "Одаберите Ваш OpenPGP кључ"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2385
 msgid "No such account available"
 msgstr "Није доступан такав налог"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2386
 msgid "You must create your account before editing your personal information."
 msgstr "Морате направити Ваш налог пре измена личних информација."
 
-#: ../src/config.py:2391 ../src/dialogs.py:2136 ../src/dialogs.py:2371
-#: ../src/dialogs.py:2557 ../src/disco.py:511 ../src/profile_window.py:339
+#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
+#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
 msgid "You are not connected to the server"
 msgstr "Нисте повезани на сервер"
 
-#: ../src/config.py:2392
+#: ../src/config.py:2394
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Без везе са сервером, није могућа измена личних информација."
 
-#: ../src/config.py:2396
+#: ../src/config.py:2398
 msgid "Your server doesn't support Vcard"
 msgstr "Ваш сервер не подржава Vcard"
 
-#: ../src/config.py:2397
+#: ../src/config.py:2399
 msgid "Your server can't save your personal information."
 msgstr "Ваш сервер не може да сачува Ваше личне информације."
 
-#: ../src/config.py:2510 ../src/config.py:2546
+#: ../src/config.py:2512 ../src/config.py:2548
 msgid "To disable the account, you must be disconnected."
 msgstr "Да бисте онемогућили налог, морате бити раскачени."
 
-#: ../src/config.py:2515
+#: ../src/config.py:2517
 msgid "Account Local already exists."
 msgstr "Рачун локал већ постоји."
 
-#: ../src/config.py:2516
+#: ../src/config.py:2518
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Молимо Вас, преименујте или уклоните пре омогућавања локалних порука."
 
-#: ../src/config.py:2673
+#: ../src/config.py:2675
 #, python-format
 msgid "Edit %s"
 msgstr "Измени %s"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2677
 #, python-format
 msgid "Register to %s"
 msgstr "Региструј се на %s"
 
 #. list at the beginning
-#: ../src/config.py:2711
+#: ../src/config.py:2713
 msgid "Ban List"
 msgstr "Листа забрана"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2714
 msgid "Member List"
 msgstr "Листа чланова"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2714
 msgid "Owner List"
 msgstr "Листа власника"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2715
 msgid "Administrator List"
 msgstr "Листа администратора"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2763 ../src/disco.py:873 ../src/history_manager.py:201
+#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
 msgid "JID"
 msgstr "ЏИД"
 
-#: ../src/config.py:2773
+#: ../src/config.py:2789
 msgid "Reason"
 msgstr "Разлог"
 
-#: ../src/config.py:2780
+#: ../src/config.py:2796
 msgid "Nick"
 msgstr "Надимак"
 
-#: ../src/config.py:2786
+#: ../src/config.py:2802
 msgid "Role"
 msgstr "Улога"
 
-#: ../src/config.py:2813
+#: ../src/config.py:2829
 msgid "Banning..."
 msgstr "Забрана..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2815
+#: ../src/config.py:2831
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6442,11 +6613,11 @@ msgstr ""
 "<b>Кога желите забранити?</b>\n"
 "\n"
 
-#: ../src/config.py:2817
+#: ../src/config.py:2833
 msgid "Adding Member..."
 msgstr "Додавање члана..."
 
-#: ../src/config.py:2818
+#: ../src/config.py:2834
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6454,11 +6625,11 @@ msgstr ""
 "<b>Кога желите да поставите чланом?</b>\n"
 "\n"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2836
 msgid "Adding Owner..."
 msgstr "Додавање власника..."
 
-#: ../src/config.py:2821
+#: ../src/config.py:2837
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6466,11 +6637,11 @@ msgstr ""
 "<b>Кога желите да поставите за власника?</b>\n"
 "\n"
 
-#: ../src/config.py:2823
+#: ../src/config.py:2839
 msgid "Adding Administrator..."
 msgstr "Додавање администратора..."
 
-#: ../src/config.py:2824
+#: ../src/config.py:2840
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6478,7 +6649,7 @@ msgstr ""
 "<b>Кога желите да поставите за администратора?</b>\n"
 "\n"
 
-#: ../src/config.py:2825
+#: ../src/config.py:2841
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6494,109 +6665,109 @@ msgstr ""
 "4. домен (само се домен поклапа, као и било који корисник@домен,\n"
 "домен/ресурс, или адреса која садржи поддомен."
 
-#: ../src/config.py:2926
+#: ../src/config.py:2943
 #, python-format
 msgid "Removing %s account"
 msgstr "Уклањање рачуна %s"
 
-#: ../src/config.py:2941
+#: ../src/config.py:2958
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Смајлији искључени"
 
-#: ../src/config.py:2942
+#: ../src/config.py:2959
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2955 ../src/gui_interface.py:1132
-#: ../src/gui_interface.py:1243
+#: ../src/config.py:2972 ../src/gui_interface.py:311
+#: ../src/gui_interface.py:1048
 msgid "Password Required"
 msgstr "Лозинка захтевана"
 
-#: ../src/config.py:2956 ../src/gui_interface.py:1223
+#: ../src/config.py:2973 ../src/gui_interface.py:1028
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Унесите Вашу лозинку за рачун %s"
 
-#: ../src/config.py:2957 ../src/gui_interface.py:1243
+#: ../src/config.py:2974 ../src/gui_interface.py:1048
 msgid "Save password"
 msgstr "Сачувај лозинку"
 
-#: ../src/config.py:2967
+#: ../src/config.py:2984
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Рачун \"%s\" је повезан на сервер"
 
-#: ../src/config.py:2968
+#: ../src/config.py:2985
 msgid "If you remove it, the connection will be lost."
 msgstr "Уколико га уклоните, веза ће бити изгубљена."
 
-#: ../src/config.py:2982
+#: ../src/config.py:2999
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Веза са проксијем прекинута"
 
-#: ../src/config.py:2983
+#: ../src/config.py:3000
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Шта желите да урадите?"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3001
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Уклони налог само из Гајима"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3002
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3078
+#: ../src/config.py:3095
 msgid "?print_status:All"
 msgstr "?испис статуса:Све"
 
-#: ../src/config.py:3079
+#: ../src/config.py:3096
 msgid "Enter and leave only"
 msgstr "Само ући и напустити"
 
-#: ../src/config.py:3080
+#: ../src/config.py:3097
 msgid "?print_status:None"
 msgstr "?print_status:None"
 
-#: ../src/config.py:3150
+#: ../src/config.py:3167
 msgid "New Group Chat"
 msgstr "Нови групни разговор"
 
-#: ../src/config.py:3183
+#: ../src/config.py:3200
 msgid "This bookmark has invalid data"
 msgstr "Овај маркер има неисправне податке"
 
-#: ../src/config.py:3184
+#: ../src/config.py:3201
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Молимо обавезно испуните поља сервера и собе или уклоните овај маркер."
 
 #. invalid char
-#: ../src/config.py:3302 ../src/dialogs.py:1934
+#: ../src/config.py:3319 ../src/dialogs.py:1950
 msgid "Invalid nickname"
 msgstr "Неисправан надимак"
 
-#: ../src/config.py:3303 ../src/config.py:3317 ../src/config.py:3331
+#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
 msgid "Character not allowed"
 msgstr "Карактер није дозвољен"
 
-#: ../src/config.py:3316 ../src/config.py:3582
+#: ../src/config.py:3333 ../src/config.py:3599
 msgid "Invalid server"
 msgstr "Неисправан сервер"
 
-#: ../src/config.py:3330
+#: ../src/config.py:3347
 msgid "Invalid room"
 msgstr "Неисправна соба"
 
-#: ../src/config.py:3498
+#: ../src/config.py:3515
 msgid "Account has been added successfully"
 msgstr "Налог је успешно додат"
 
-#: ../src/config.py:3499 ../src/config.py:3505
+#: ../src/config.py:3516 ../src/config.py:3522
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menu item under the Edit menu from the main "
@@ -6605,32 +6776,32 @@ msgstr ""
 "Можете поставити напредна подешавања налога притиском на дугме Напредно, или "
 "касније, кликом на ставку менија Налози под менијем Уреди из главног прозора."
 
-#: ../src/config.py:3504
+#: ../src/config.py:3521
 msgid "Your new account has been created successfully"
 msgstr "Ваш нови налог је успешно направљен"
 
-#: ../src/config.py:3543
+#: ../src/config.py:3560
 msgid "Invalid username"
 msgstr "Неисправно корисничко име"
 
-#: ../src/config.py:3545
+#: ../src/config.py:3562
 msgid "You must provide a username to configure this account."
 msgstr "Морате уписати корисничко име да бисте конфигурисали овај налог."
 
-#: ../src/config.py:3583
+#: ../src/config.py:3600
 msgid "Please provide a server on which you want to register."
 msgstr "Молимо одредите сервер на коме желите да се региструјете."
 
-#: ../src/config.py:3639 ../src/gui_interface.py:1904
+#: ../src/config.py:3656 ../src/gui_interface.py:1693
 msgid "Certificate Already in File"
 msgstr "Сертификат је већ у датотеци"
 
-#: ../src/config.py:3640 ../src/gui_interface.py:1905
+#: ../src/config.py:3657 ../src/gui_interface.py:1694
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Сертификат је већ у датотеци %s, па није поново додат."
 
-#: ../src/config.py:3717
+#: ../src/config.py:3734
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6645,7 +6816,7 @@ msgstr ""
 "SSL грешка: %(error)s\n"
 "Да ли и даље желите да се повежете на овај сервер?"
 
-#: ../src/config.py:3723 ../src/gui_interface.py:1932
+#: ../src/config.py:3740 ../src/gui_interface.py:1721
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6656,63 +6827,72 @@ msgstr ""
 "SHA1 отисак овог сертификата:\n"
 "%s"
 
-#: ../src/config.py:3755 ../src/config.py:3789
+#: ../src/config.py:3772 ../src/config.py:3806
 msgid "An error occurred during account creation"
 msgstr "Појавила се грешка при креирању налога"
 
-#: ../src/config.py:3854
+#: ../src/config.py:3871
 msgid "Account name is in use"
 msgstr "Име налога је већ употребљено"
 
-#: ../src/config.py:3855
+#: ../src/config.py:3872
 msgid "You already have an account using this name."
 msgstr "Већ имате налог са тим именом."
 
-#: ../src/config.py:4009
+#: ../src/config.py:3991
+msgid "PEP node was not removed"
+msgstr "PEP чвор није уклоњен"
+
+#: ../src/config.py:3992
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr "PEP чвор %(node)s није уклоњен: %(message)s"
+
+#: ../src/config.py:4036
 msgid "Active"
 msgstr "Активно"
 
-#: ../src/config.py:4017
+#: ../src/config.py:4044
 msgid "Event"
 msgstr "догађај"
 
-#: ../src/config.py:4052
+#: ../src/config.py:4079
 msgid "First Message Received"
 msgstr "Примљена Прва Порука"
 
-#: ../src/config.py:4053
+#: ../src/config.py:4080
 msgid "Next Message Received Focused"
 msgstr "Следећа Примљена Порука Фокусирана"
 
-#: ../src/config.py:4055
+#: ../src/config.py:4082
 msgid "Next Message Received Unfocused"
 msgstr "Следећа Примљена Порука Нефокусирана"
 
-#: ../src/config.py:4056
+#: ../src/config.py:4083
 msgid "Contact Connected"
 msgstr "Контакт На Вези"
 
-#: ../src/config.py:4057
+#: ../src/config.py:4084
 msgid "Contact Disconnected"
 msgstr "Контакт Отишао Са Везе"
 
-#: ../src/config.py:4058
+#: ../src/config.py:4085
 msgid "Message Sent"
 msgstr "Порука Послата"
 
-#: ../src/config.py:4059
+#: ../src/config.py:4086
 msgid "Group Chat Message Highlight"
 msgstr "Бојење Порука Са Групног Разговора"
 
-#: ../src/config.py:4060
+#: ../src/config.py:4087
 msgid "Group Chat Message Received"
 msgstr "Примљена Порука Са Групног Разговора"
 
-#: ../src/config.py:4061
+#: ../src/config.py:4088
 msgid "GMail Email Received"
 msgstr "Примљен Гмаил е-мејл"
 
-#: ../src/conversation_textview.py:600
+#: ../src/conversation_textview.py:601
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6722,7 +6902,7 @@ msgstr ""
 "стигла на други крај. Ако ова икона остане овако \n"
 "дуго времена, вероватно је да се порука изгубила."
 
-#: ../src/conversation_textview.py:619
+#: ../src/conversation_textview.py:620
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6730,44 +6910,44 @@ msgstr ""
 "Текст испод ове линије је оно што је речено од када сте последњи пут\n"
 "обратили пажњу на овај групни разговор"
 
-#: ../src/conversation_textview.py:739
+#: ../src/conversation_textview.py:740
 msgid "_Quote"
 msgstr "_Цитат"
 
-#: ../src/conversation_textview.py:746
+#: ../src/conversation_textview.py:747
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Акције за налог \"%s\""
 
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Read _Wikipedia Article"
 msgstr "Прочитајте чланак на _Википедији"
 
-#: ../src/conversation_textview.py:763
+#: ../src/conversation_textview.py:765
 msgid "Look it up in _Dictionary"
 msgstr "Потражи у Речнику"
 
-#: ../src/conversation_textview.py:780
+#: ../src/conversation_textview.py:782
 #, 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:793
+#: ../src/conversation_textview.py:795
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "УРЛ-у Веб претраге недостаје \"%s\""
 
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 msgid "Web _Search for it"
 msgstr "_Претражи Веб"
 
-#: ../src/conversation_textview.py:802
+#: ../src/conversation_textview.py:804
 msgid "Open as _Link"
 msgstr "Отвори као _Везу"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1296
+#: ../src/conversation_textview.py:1298
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6776,186 +6956,191 @@ msgstr[1] "Јуче"
 msgstr[2] "Јуче"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1344 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
 
-#: ../src/dataforms_widget.py:544
+#: ../src/dataforms_widget.py:545
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Није могуће учитавање модула idle"
 
-#: ../src/dataforms_widget.py:546
+#: ../src/dataforms_widget.py:547
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Невидљивост није подржана"
 
-#: ../src/dataforms_widget.py:601
+#: ../src/dataforms_widget.py:562
+msgid "This field is required"
+msgstr ""
+
+#: ../src/dataforms_widget.py:607
 msgid "Jabber ID already in list"
 msgstr "Џабер ID већ у листи контаката"
 
-#: ../src/dataforms_widget.py:602
+#: ../src/dataforms_widget.py:608
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Џабер ID који сте унели је већ на листи. Одаберите неки други."
 
 #. Default jid
-#: ../src/dataforms_widget.py:613
+#: ../src/dataforms_widget.py:619
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:616 ../src/dataforms_widget.py:618
+#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Име контакта: <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Џабер ИД: <i>%s</i>"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:195
 msgid "Group"
 msgstr "Група"
 
-#: ../src/dialogs.py:201
+#: ../src/dialogs.py:202
 msgid "In the group"
 msgstr "У групи"
 
-#: ../src/dialogs.py:292
+#: ../src/dialogs.py:293
 msgid "KeyID"
 msgstr "ИД Кључа"
 
-#: ../src/dialogs.py:297
+#: ../src/dialogs.py:298
 msgid "Contact name"
 msgstr "Име контакта"
 
-#: ../src/dialogs.py:469
+#: ../src/dialogs.py:470
 msgid "Set Mood"
 msgstr "Постави расположење"
 
-#: ../src/dialogs.py:589
+#: ../src/dialogs.py:590
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Статусна порука"
 
-#: ../src/dialogs.py:603
+#: ../src/dialogs.py:604
 msgid "Status Message"
 msgstr "Статусна порука"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:794
 msgid "Overwrite Status Message?"
 msgstr "Препиши статусну поруку?"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:795
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Ово име се већ користи. Да ли желите да препишете ову статусну поруку?"
 
-#: ../src/dialogs.py:802
+#: ../src/dialogs.py:803
 msgid "Save as Preset Status Message"
 msgstr "Сними као већ постављену статусну поруку"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:804
 msgid "Please type a name for this status message"
 msgstr "Молимо унесите име за ову статусну поруку"
 
-#: ../src/dialogs.py:831
+#: ../src/dialogs.py:832
 msgid "AIM Address:"
 msgstr "АИМ адреса:"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:833
 msgid "GG Number:"
 msgstr "ГГ Број:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:834
 msgid "ICQ Number:"
 msgstr "ICQ Број:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:835
 msgid "MSN Address:"
 msgstr "MSN адреса:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:836
 msgid "Yahoo! Address:"
 msgstr "Yahoo! адреса:"
 
-#: ../src/dialogs.py:872
+#: ../src/dialogs.py:873
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Молимо Вас испуните податке за контакт кога желите додати на налог %s"
 
-#: ../src/dialogs.py:875
+#: ../src/dialogs.py:876
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Молимо Вас испуните податке за контакт кога желите додати"
 
-#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
+#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
+#: ../src/dialogs.py:3464
 msgid "Invalid User ID"
 msgstr "Неисправан кориснички ИД"
 
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1052
 msgid "The user ID must not contain a resource."
 msgstr "ИД корисника не сме садржавати ресурс."
 
-#: ../src/dialogs.py:1051
+#: ../src/dialogs.py:1057
 msgid "You cannot add yourself to your roster."
 msgstr "Не можете додати себе у Вашу листу контаката."
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1071
 msgid "Contact already in roster"
 msgstr "Контакт је већ у листи"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1072
 msgid "This contact is already listed in your roster."
 msgstr "Контакт је већ у листи контаката."
 
-#: ../src/dialogs.py:1112
+#: ../src/dialogs.py:1118
 msgid "User ID:"
 msgstr "ИД корисника:"
 
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1189
 msgid "A GTK+ jabber client"
 msgstr "ГТК+ џабер клијент"
 
-#: ../src/dialogs.py:1176
+#: ../src/dialogs.py:1190
 msgid "GTK+ Version:"
 msgstr "ГТК+ верзија:"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1191
 msgid "PyGTK Version:"
 msgstr "PyГТК верзија:"
 
-#: ../src/dialogs.py:1187
+#: ../src/dialogs.py:1201
 msgid "Current Developers:"
 msgstr "Тренутни програмери:"
 
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1203
 msgid "Past Developers:"
 msgstr "Прошли програмери:"
 
-#: ../src/dialogs.py:1195
+#: ../src/dialogs.py:1209
 msgid "THANKS:"
 msgstr "ЗАХВАЛНИЦЕ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1215
 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:1213
+#: ../src/dialogs.py:1227
 msgid "translator-credits"
 msgstr "Б. Кокановић. <branko.kokanovic@gmail.com>"
 
-#: ../src/dialogs.py:1396
+#: ../src/dialogs.py:1410
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6968,100 +7153,100 @@ msgstr ""
 "\n"
 "Осветљавање лоше написаних речи неће бити у употреби"
 
-#: ../src/dialogs.py:1935 ../src/dialogs.py:2322
+#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
 msgid "The nickname has not allowed characters."
 msgstr "Надимак садржи недозвољене карактере."
 
-#: ../src/dialogs.py:2053
+#: ../src/dialogs.py:2069
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Захтев претплате на рачун %(account)s од %(jid)s"
 
-#: ../src/dialogs.py:2056
+#: ../src/dialogs.py:2072
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Захтев претплате од %s"
 
-#: ../src/dialogs.py:2131 ../src/gui_interface.py:2672
+#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Већ сте у групном разговору %s"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2153
 msgid "You can not join a group chat unless you are connected."
 msgstr "Не можете се прикључити групном разговору ако нисте повезани."
 
-#: ../src/dialogs.py:2178
+#: ../src/dialogs.py:2194
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Придружите се групном разговору преко налога %s"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2325
 msgid "Invalid Account"
 msgstr "Неисправан налог"
 
-#: ../src/dialogs.py:2310
+#: ../src/dialogs.py:2326
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Морате одабрати налог са кога желите да уђете у собу."
 
-#: ../src/dialogs.py:2321
+#: ../src/dialogs.py:2337
 msgid "Invalid Nickname"
 msgstr "Неисправан надимак"
 
-#: ../src/dialogs.py:2326 ../src/dialogs.py:2332
-#: ../src/groupchat_control.py:1832
+#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
+#: ../src/groupchat_control.py:1847
 msgid "Invalid group chat Jabber ID"
 msgstr "Неисправан Џабер ИД групног разговора"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2343
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "Џабер ИД групног разговора има недозвољене знаке."
 
-#: ../src/dialogs.py:2333 ../src/groupchat_control.py:1833
+#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Џабер ИД групног разговора има недозвољене знаке."
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2356
 msgid "This is not a group chat"
 msgstr "Ово није групни разговор"
 
-#: ../src/dialogs.py:2341
+#: ../src/dialogs.py:2357
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s није име групног разговора."
 
-#: ../src/dialogs.py:2372
+#: ../src/dialogs.py:2388
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Без везе, није могуће синхронизовати контакте."
 
-#: ../src/dialogs.py:2386
+#: ../src/dialogs.py:2402
 msgid "Server"
 msgstr "Сервер"
 
-#: ../src/dialogs.py:2421
+#: ../src/dialogs.py:2437
 msgid "This account is not connected to the server"
 msgstr "Овај налог није повезан на сервер"
 
-#: ../src/dialogs.py:2422
+#: ../src/dialogs.py:2438
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Не можете се синхронизовати са налогом ако нисте повезани."
 
-#: ../src/dialogs.py:2446
+#: ../src/dialogs.py:2462
 msgid "Synchronise"
 msgstr "Синхронизуј"
 
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2523
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Започни разговор са разуном %s"
 
-#: ../src/dialogs.py:2509
+#: ../src/dialogs.py:2525
 msgid "Start Chat"
 msgstr "Започни разговор"
 
-#: ../src/dialogs.py:2510
+#: ../src/dialogs.py:2526
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7070,168 +7255,168 @@ msgstr ""
 "послати поруку:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2536 ../src/dialogs.py:2917 ../src/dialogs.py:3129
+#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
 msgid "Connection not available"
 msgstr "Веза није доступна"
 
-#: ../src/dialogs.py:2537 ../src/dialogs.py:2918 ../src/dialogs.py:3130
+#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Молимо потврдите да сте спојени на \"%s\"."
 
-#: ../src/dialogs.py:2546 ../src/dialogs.py:2549
+#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
 msgid "Invalid JID"
 msgstr "Неисправан џабер ИД"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2565
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Није могуће разложити \"%s\"."
 
-#: ../src/dialogs.py:2558
+#: ../src/dialogs.py:2574
 msgid "Without a connection, you can not change your password."
 msgstr "Без везе није могућа промена лозинке."
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "Invalid password"
 msgstr "Неисправна лозинка"
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "You must enter a password."
 msgstr "Морате да унесете лозинку"
 
-#: ../src/dialogs.py:2581
+#: ../src/dialogs.py:2597
 msgid "Passwords do not match"
 msgstr "Лозинке се не поклапају"
 
-#: ../src/dialogs.py:2582
+#: ../src/dialogs.py:2598
 msgid "The passwords typed in both fields must be identical."
 msgstr "Лозинке уписане у оба поља морају бити идентичне."
 
 #. default value
-#: ../src/dialogs.py:2619 ../src/notify.py:247 ../src/notify.py:473
+#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
 msgid "Contact Signed In"
 msgstr "Контакт је на вези"
 
-#: ../src/dialogs.py:2621 ../src/notify.py:255 ../src/notify.py:475
+#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
 msgid "Contact Signed Out"
 msgstr "Контакт је отишао са везе"
 
 #. chat message
-#: ../src/dialogs.py:2623 ../src/notify.py:277 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
 msgid "New Message"
 msgstr "Нова Порука"
 
 #. single message
-#: ../src/dialogs.py:2623 ../src/notify.py:259 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
 msgid "New Single Message"
 msgstr "Нова Самостална Порука"
 
 #. private message
-#: ../src/dialogs.py:2624 ../src/notify.py:265 ../src/notify.py:478
+#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
 msgid "New Private Message"
 msgstr "Нова Приватна Порука"
 
-#: ../src/dialogs.py:2624 ../src/gui_interface.py:1358 ../src/notify.py:487
+#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
 msgid "New E-mail"
 msgstr "Нови Е-мејл"
 
-#: ../src/dialogs.py:2626 ../src/gui_interface.py:1420 ../src/notify.py:480
+#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
 msgid "File Transfer Request"
 msgstr "Захтев за преносом датотеке"
 
-#: ../src/dialogs.py:2628 ../src/gui_interface.py:1320
-#: ../src/gui_interface.py:1389 ../src/notify.py:482
+#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
+#: ../src/gui_interface.py:1186 ../src/notify.py:482
 msgid "File Transfer Error"
 msgstr "Грешка при преносу датотеке"
 
-#: ../src/dialogs.py:2630 ../src/gui_interface.py:1466
-#: ../src/gui_interface.py:1489 ../src/gui_interface.py:1506
+#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
+#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
 #: ../src/notify.py:484
 msgid "File Transfer Completed"
 msgstr "Пренос датотеке завршен"
 
-#: ../src/dialogs.py:2631 ../src/gui_interface.py:1469 ../src/notify.py:485
+#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
 msgid "File Transfer Stopped"
 msgstr "Пренос датотеке заустављен"
 
-#: ../src/dialogs.py:2633 ../src/gui_interface.py:1152 ../src/notify.py:489
+#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
 msgid "Groupchat Invitation"
 msgstr "Позив на групни разговор"
 
-#: ../src/dialogs.py:2635 ../src/notify.py:239 ../src/notify.py:491
+#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
 msgid "Contact Changed Status"
 msgstr "Контакт променио статус"
 
-#: ../src/dialogs.py:2836
+#: ../src/dialogs.py:2852
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Самостална порука користећи налог %s"
 
-#: ../src/dialogs.py:2838
+#: ../src/dialogs.py:2854
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Самостална порука на налогу %s"
 
-#: ../src/dialogs.py:2840
+#: ../src/dialogs.py:2856
 msgid "Single Message"
 msgstr "Самостална Порука"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2843
+#: ../src/dialogs.py:2859
 #, python-format
 msgid "Send %s"
 msgstr "Послате %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:2882
 #, python-format
 msgid "Received %s"
 msgstr "Примљене %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2889
+#: ../src/dialogs.py:2905
 #, 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:2968
+#: ../src/dialogs.py:2984
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:2985
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s пише:\n"
 
-#: ../src/dialogs.py:3028
+#: ../src/dialogs.py:3044
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Конзола за %s"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3046
 msgid "XML Console"
 msgstr "XML Конзола"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "add"
 msgstr "Тужан"
 
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "modify"
 msgstr "Измените"
 
-#: ../src/dialogs.py:3160
+#: ../src/dialogs.py:3176
 #, fuzzy
 msgid "remove"
 msgstr "_Уклони"
 
-#: ../src/dialogs.py:3188
+#: ../src/dialogs.py:3204
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7239,155 +7424,189 @@ msgid ""
 msgstr "<b>%s</b> жели да <b>%s</b> неке контакте у листу ваших контаката."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3204 ../src/dialogs.py:3250
+#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
 msgid "Add"
 msgstr "Додате"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3206 ../src/dialogs.py:3281
+#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
 msgid "Modify"
 msgstr "Измените"
 
-#: ../src/dialogs.py:3212
+#: ../src/dialogs.py:3228
 msgid "Jabber ID"
 msgstr "Џабер ИД"
 
-#: ../src/dialogs.py:3218
+#: ../src/dialogs.py:3234
 msgid "Groups"
 msgstr "Групе"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3342
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s је предложио да вас додам у листу мојих контаката."
 
-#: ../src/dialogs.py:3340
+#: ../src/dialogs.py:3356
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "Додај _контакт"
 
-#: ../src/dialogs.py:3377
+#: ../src/dialogs.py:3393
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Уклања контакт са листе"
 
-#: ../src/dialogs.py:3430
+#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#, python-format
+msgid "Archiving Preferences for %s"
+msgstr ""
+
+#: ../src/dialogs.py:3473
+#, fuzzy
+msgid "Invalid expire value"
+msgstr "Неисправано име сервера"
+
+#: ../src/dialogs.py:3474
+msgid "Expire must be a valid positive integer."
+msgstr ""
+
+#: ../src/dialogs.py:3521
+msgid "There is an error with the form"
+msgstr ""
+
+#: ../src/dialogs.py:3732
+#, fuzzy
+msgid "There is an error"
+msgstr "Сервис је вратио грешку."
+
+#: ../src/dialogs.py:3796
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Листа приватности <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3434
+#: ../src/dialogs.py:3800
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Листа приватности за %s"
 
-#: ../src/dialogs.py:3490
+#: ../src/dialogs.py:3856
 #, 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:3495
+#: ../src/dialogs.py:3861
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Редослед: %(order)s, акција: %(action)s"
 
-#: ../src/dialogs.py:3539
+#: ../src/dialogs.py:3905
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Измени правило</b>"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:4016
 msgid "<b>Add a rule</b>"
 msgstr "<b>Додај правило</b>"
 
-#: ../src/dialogs.py:3750
+#: ../src/dialogs.py:4116
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Листа приватности за %s"
 
-#: ../src/dialogs.py:3752
+#: ../src/dialogs.py:4118
 msgid "Privacy Lists"
 msgstr "Листа приватности"
 
-#: ../src/dialogs.py:3822
+#: ../src/dialogs.py:4188
 msgid "Invalid List Name"
 msgstr "Неисправно име листе"
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4189
 msgid "You must enter a name to create a privacy list."
 msgstr "Морате унети име за креирање листе приватности"
 
-#: ../src/dialogs.py:3855
+#: ../src/dialogs.py:4221
 msgid "You are invited to a groupchat"
 msgstr "Позвани сте у групни разговор"
 
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4224
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact Вас је позвао на разговор"
 
-#: ../src/dialogs.py:3860
+#: ../src/dialogs.py:4226
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact Вас је позвао на групни разговор у собу %(room_jid)s"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4234
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4236
 msgid "Do you want to accept the invitation?"
 msgstr "Да ли желите да прихватите ову позивницу?"
 
-#: ../src/dialogs.py:3932
+#: ../src/dialogs.py:4298
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:3942 ../src/dialogs.py:3985 ../src/dialogs.py:4041
+#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
+#: ../src/dialogs.py:4495
 msgid "All files"
 msgstr "Све датотеке"
 
-#: ../src/dialogs.py:3947
+#: ../src/dialogs.py:4313
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:3975
+#: ../src/dialogs.py:4341
 msgid "Choose Sound"
 msgstr "Одаберите звук"
 
-#: ../src/dialogs.py:3990
+#: ../src/dialogs.py:4356
 msgid "Wav Sounds"
 msgstr "Wav Звукови"
 
-#: ../src/dialogs.py:4028
+#: ../src/dialogs.py:4394
 msgid "Choose Image"
 msgstr "Одаберите слику"
 
-#: ../src/dialogs.py:4046
+#: ../src/dialogs.py:4412
 msgid "Images"
 msgstr "Слике"
 
-#: ../src/dialogs.py:4113
+#: ../src/dialogs.py:4482
+#, fuzzy
+msgid "Choose Archive"
+msgstr "Одаберите слику"
+
+#: ../src/dialogs.py:4500
+#, fuzzy
+msgid "Zip files"
+msgstr "Све датотеке"
+
+#: ../src/dialogs.py:4525
 #, python-format
 msgid "When %s becomes:"
 msgstr "Кад %s постане:"
 
-#: ../src/dialogs.py:4115
+#: ../src/dialogs.py:4527
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Додавање посебног обавештења за %s"
 
-#: ../src/dialogs.py:4190
+#: ../src/dialogs.py:4602
 msgid "Condition"
 msgstr "Услов"
 
-#: ../src/dialogs.py:4310
+#: ../src/dialogs.py:4722
 msgid "when I am "
 msgstr "када сам "
 
-#: ../src/dialogs.py:4786
+#: ../src/dialogs.py:5198
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7398,19 +7617,19 @@ msgstr ""
 "\n"
 "Кратка Аутентикациона Ниска ове сесије је: <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4789
+#: ../src/dialogs.py:5201
 msgid "You have already verified this contact's identity."
 msgstr "Већ сте потврдили идентитет овог контакта."
 
-#: ../src/dialogs.py:4795 ../src/dialogs.py:4879
+#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
 msgid "Contact's identity verified"
 msgstr "Идентитет контакта потврђен"
 
-#: ../src/dialogs.py:4801
+#: ../src/dialogs.py:5213
 msgid "Verify again..."
 msgstr "Потврдите поново..."
 
-#: ../src/dialogs.py:4806
+#: ../src/dialogs.py:5218
 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 "
@@ -7420,19 +7639,19 @@ msgstr ""
 "поруке или да Вам шаљу поруке, морате потврдити њихов идентитет кликајући "
 "дугме испод."
 
-#: ../src/dialogs.py:4809 ../src/dialogs.py:4860 ../src/dialogs.py:4873
+#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
 msgid "Contact's identity NOT verified"
 msgstr "Идентитет контакта НИЈЕ потврђен"
 
-#: ../src/dialogs.py:4814
+#: ../src/dialogs.py:5226
 msgid "Verify..."
 msgstr "Потврди..."
 
-#: ../src/dialogs.py:4825
+#: ../src/dialogs.py:5237
 msgid "Have you verified the contact's identity?"
 msgstr "Да ли сте проверили идентитет контакта?"
 
-#: ../src/dialogs.py:4826
+#: ../src/dialogs.py:5238
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7446,22 +7665,22 @@ msgstr ""
 "да ли и он има исту кратку Аутентикациону ниску као ви.\n"
 "Кратка Аутентикациона Ниска ове сесије: <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4827
+#: ../src/dialogs.py:5239
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Да ли сте разговарали са контактом и потврдили КАН?"
 
-#: ../src/dialogs.py:4861
+#: ../src/dialogs.py:5273
 #, 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:4867
+#: ../src/dialogs.py:5279
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Ниједан GPG кључ није додељен контакту. Не можете му слати шифроване поруке."
 
-#: ../src/dialogs.py:4874
+#: ../src/dialogs.py:5286
 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."
@@ -7470,7 +7689,7 @@ msgstr ""
 "поруке <b>не могу</b> бити шифроване. Употребите Вашег GPG клијента да дате "
 "поверење овом кључу."
 
-#: ../src/dialogs.py:4880
+#: ../src/dialogs.py:5292
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7478,19 +7697,19 @@ msgstr ""
 "GPG кључ је додељен овом контакту и Ви верујете овом кључу тако да ће поруке "
 "бити шифроване."
 
-#: ../src/dialogs.py:4945
+#: ../src/dialogs.py:5357
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4947
+#: ../src/dialogs.py:5359
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4949
+#: ../src/dialogs.py:5361
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4953
+#: ../src/dialogs.py:5365
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7506,24 +7725,24 @@ msgstr "Остали"
 msgid "Conference"
 msgstr "Конференција"
 
-#: ../src/disco.py:512
+#: ../src/disco.py:513
 msgid "Without a connection, you can not browse available services"
 msgstr "Без успостављене везе, не можете разгледати доступне услуге"
 
-#: ../src/disco.py:589
+#: ../src/disco.py:600
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Откривање услуга са налога %s"
 
-#: ../src/disco.py:591
+#: ../src/disco.py:602
 msgid "Service Discovery"
 msgstr "Откривање Услуга"
 
-#: ../src/disco.py:741
+#: ../src/disco.py:758
 msgid "The service could not be found"
 msgstr "Услуга не може бити нађена"
 
-#: ../src/disco.py:742
+#: ../src/disco.py:759
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7531,95 +7750,95 @@ msgstr ""
 "На наведеној адреси нема усуга, или нема одговора. Проверите адресу и "
 "покушајте поново."
 
-#: ../src/disco.py:746 ../src/disco.py:1082
+#: ../src/disco.py:763 ../src/disco.py:1100
 msgid "The service is not browsable"
 msgstr "Услуге нису претраживе"
 
-#: ../src/disco.py:747
+#: ../src/disco.py:764
 msgid "This type of service does not contain any items to browse."
 msgstr "Овај тип услуге не садржи елементе за претрагу"
 
-#: ../src/disco.py:786 ../src/disco.py:796
+#: ../src/disco.py:804 ../src/disco.py:814
 msgid "Invalid Server Name"
 msgstr "Неисправано име сервера"
 
-#: ../src/disco.py:850
+#: ../src/disco.py:868
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Претражујем %(address)s користећи налог %(account)s"
 
-#: ../src/disco.py:894
+#: ../src/disco.py:912
 msgid "_Browse"
 msgstr "_Преглед"
 
-#: ../src/disco.py:1083
+#: ../src/disco.py:1101
 msgid "This service does not contain any items to browse."
 msgstr "Ова услуга не садржи елементе за претрагу"
 
-#: ../src/disco.py:1323
+#: ../src/disco.py:1341
 msgid "_Execute Command"
 msgstr "_Изврши наредбу"
 
-#: ../src/disco.py:1333 ../src/disco.py:1504
+#: ../src/disco.py:1351 ../src/disco.py:1522
 msgid "Re_gister"
 msgstr "Ре_гистрација"
 
-#: ../src/disco.py:1545
+#: ../src/disco.py:1563
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Скенирање %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1736
+#: ../src/disco.py:1754
 msgid "Users"
 msgstr "Корисници"
 
 #. Description column
-#: ../src/disco.py:1744
+#: ../src/disco.py:1762
 msgid "Description"
 msgstr "Опис"
 
 #. Id column
-#: ../src/disco.py:1752
+#: ../src/disco.py:1770
 msgid "Id"
 msgstr "Идентификација"
 
-#: ../src/disco.py:1817 ../src/gui_interface.py:3182
+#: ../src/disco.py:1835 ../src/gui_interface.py:2995
 msgid "Bookmark already set"
 msgstr "Маркер је већ постављен"
 
-#: ../src/disco.py:1818 ../src/gui_interface.py:3183
+#: ../src/disco.py:1836 ../src/gui_interface.py:2996
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Групни разговор \"%s\" је већ маркиран."
 
-#: ../src/disco.py:1827 ../src/gui_interface.py:3197
+#: ../src/disco.py:1845 ../src/gui_interface.py:3010
 msgid "Bookmark has been added successfully"
 msgstr "Маркер успешно додат"
 
-#: ../src/disco.py:1828 ../src/gui_interface.py:3198
+#: ../src/disco.py:1846 ../src/gui_interface.py:3011
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Можете управљати Вашим маркерима помоћу менија Акције из Ваше листе "
 "контаката."
 
-#: ../src/disco.py:2039
+#: ../src/disco.py:2057
 msgid "Subscribed"
 msgstr "Претплаћен"
 
-#: ../src/disco.py:2047
+#: ../src/disco.py:2065
 msgid "Node"
 msgstr "Чвор"
 
-#: ../src/disco.py:2111
+#: ../src/disco.py:2129
 msgid "New post"
 msgstr "Нова објава"
 
-#: ../src/disco.py:2117
+#: ../src/disco.py:2135
 msgid "_Subscribe"
 msgstr "_Претплати се"
 
-#: ../src/disco.py:2123
+#: ../src/disco.py:2141
 msgid "_Unsubscribe"
 msgstr "_Укини претплату"
 
@@ -7792,17 +8011,19 @@ msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Претвара LaTeX изразе између $$ $$."
 
 #: ../src/features_window.py:95
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
-"in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 "Захтева texlive-latex-base, и dvipng. Морате подесити'use_latex' на True у "
 "едитору напредних подешавања."
 
 #: ../src/features_window.py:96
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
+"You have to set 'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 "Захтева texlive-latex-base и dvipng (све из MikTeX-а). Морате "
 "подесити'use_latex' на True у едитору напредних подешавања."
@@ -7959,33 +8180,33 @@ msgstr "Опис: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s Вам жели послати датотеку:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Није могуће преписати постојећу датотеку \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "Датотека са овим именом већ постоји и немате привилегијапреписати је."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 msgid "This file already exists"
 msgstr "Ова датотека већ постоји"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 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:369 ../src/gtkgui_helpers.py:914
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "У фасциклу \"%s\" није могуће писање"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
 msgid "You do not have permission to create files in this directory."
 msgstr "Немате привилегија за писање у овој фасцикли"
 
@@ -8088,28 +8309,28 @@ msgstr ""
 "Једна инстанца Гајима изгледа већ ради\n"
 "Свеједно желите покренути?"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "Приказује помоћ за одређену наредбу"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:80
+#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
 msgid "command"
 msgstr "наредба"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "прикажи помоћ за команду"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Приказује или скрива прозор листе контаката "
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "Искаче прозор са следећим догађајем на чекању"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8117,6 +8338,13 @@ msgstr ""
 "Исписује листу свих контаката са листе контаката. Сваки контакт је у "
 "посебној линији"
 
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
+#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
+#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
+#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
 #: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
 #: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
 #: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
@@ -8128,43 +8356,35 @@ msgstr ""
 msgid "account"
 msgstr "налог"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "приказује само контакте са овог налога"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Исписује листу регистрованих налога"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "Мења статус једног или више налога"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
 msgid "status"
 msgstr "статус"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106
 #, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"accoun't previous status"
+msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "једно од: није на вези, на вези, прича, одсутан, продужено одсутан, не "
 "узнемиравај, невидљив"
 
-#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
-msgid "message"
-msgstr "порука"
-
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "статусна порука"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8173,43 +8393,20 @@ msgstr ""
 "свих налога који имају укључену опцију \"синхронизација са глобалним статусом"
 "\""
 
-#: ../src/gajim-remote.py:117
-msgid "Changes the priority of account or accounts"
-msgstr "Мења статус једног или више налога"
-
-#: ../src/gajim-remote.py:119
-msgid "priority"
-msgstr "приоритет"
-
-#: ../src/gajim-remote.py:119
-msgid "priority you want to give to the account"
-msgstr "приоритет који желите да дате овом налогу"
-
-#: ../src/gajim-remote.py:121
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-msgstr ""
-"измена приоритета датог налога. Ако није одређен, мења се статус свих налога "
-"који имају постављену опцију \"синхронизација са глобалним статусом\""
-
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Приказује дијалог разговора како бисте могли разговарати са контактом"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "Џабер ИД контакта са којим желите разговарати"
 
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
 #: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "ако је назначено, контакт се узима са листе контаката овог налога"
 
-#: ../src/gajim-remote.py:134
-msgid "message content. The account must be specified or \"\""
-msgstr "садржај поруке. Налог мора бити назначен или \"\""
-
-#: ../src/gajim-remote.py:139
+#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
 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 "
@@ -8219,29 +8416,34 @@ msgstr ""
 "желите поставити само 'налог', без 'OpenPGP кључ', само поставите 'OpenPGP "
 "кључ' на ''."
 
+#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
 #: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "Џабер ИД контакта који ће примити поруку"
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
+#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "садржај поруке"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "pgp кључ"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "ако је назначено, порука ће бити шифрована користећи овај јавни кључ"
 
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
+#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "ако је назначено, порука ће бити послата користећи овај налог"
 
-#: ../src/gajim-remote.py:152
+#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
 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 "
@@ -8251,141 +8453,279 @@ msgstr ""
 "желите поставити само 'налог', без 'OpenPGP кључ', само поставите 'OpenPGP "
 "кључ' на ''."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "тема"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "тема поруке"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Шаље нову поруку на групни разговор коме сте се придружили."
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "Џабер ИД собе која ће примити поруку"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Даје детаљне информације о контакту"
 
+#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
+#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
 #: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
 #: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "Џабер ИД контакта"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Даје детаљне информације о налогу"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Име налога"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Шаље датотеку контакту"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "file"
 msgstr "датотека"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Путања до датотеке"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "ако је назначено, датотека ће бити послата коритећи овај налог"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Приказује сва подешавања и њихове вредности"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Поставља вредност 'кључа' на 'вредност'."
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "кључ=вредност"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
-"'кључ' је име ставке подешавања, 'вредност' је вредност на коју ће се ставка "
-"поставити"
+"'кључ' је име ставке подешавања, 'вредност' је вредност на коју ће се ставка "
+"поставити"
+
+#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
+msgid "Deletes a preference item"
+msgstr "Брише ставку подешавања"
+
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "key"
+msgstr "кључ"
+
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "name of the preference to be deleted"
+msgstr "име ставке подешавања које ће се брисати"
+
+#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+msgid "Writes the current state of Gajim preferences to the .config file"
+msgstr "Записује тренутно стање Гајим подешавања у .config датотеку"
+
+#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
+msgid "Removes contact from roster"
+msgstr "Уклања контакт са листе"
+
+#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+msgid "Adds contact to roster"
+msgstr "Додаје контакт на листу"
+
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+msgid "Adds new contact to this account"
+msgstr "Додаје нови контакт овом рачуну"
+
+#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+msgid "Returns current status (the global one unless account is specified)"
+msgstr "Враћа тренутни статус (глобални ако није назначен налог)"
+
+#: ../src/gajim-remote-plugin.py:226
+#, fuzzy
+msgid ""
+"Returns current status message(the global one unless account is specified)"
+msgstr "Враћа тренутну статусну поруку (глобалну ако није назначен налог)"
+
+#: ../src/gajim-remote-plugin.py:233 ../src/gajim-remote.py:249
+msgid "Returns number of unread messages"
+msgstr "Враћа број непрочитаних порука"
+
+#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+msgid "Opens 'Start Chat' dialog"
+msgstr "Отвара дијалог за започињање разговора"
+
+#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+msgid "Starts chat, using this account"
+msgstr "Започиње разговор, користећи овај налог"
+
+#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+msgid "Sends custom XML"
+msgstr "Шаље кориснички дефинисан XML"
+
+#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+msgid "XML to send"
+msgstr "XML за слање"
+
+#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+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-plugin.py:252 ../src/gajim-remote.py:277
+msgid "Handle a xmpp:/ uri"
+msgstr "Управља xmpp:/ uri-јем"
+
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
+msgid "uri"
+msgstr "uri"
+
+#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+msgid "Join a MUC room"
+msgstr "Придружи се новој соби"
+
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+msgid "room"
+msgstr "соба"
+
+#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+msgid "nick"
+msgstr "надимак"
+
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+msgid "password"
+msgstr "лозинка"
+
+#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+msgid "Check if Gajim is running"
+msgstr "Молимо проверите да ли је Гајим покренут"
+
+#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
+#: ../src/gajim-remote.py:300
+msgid "Shows or hides the ipython window"
+msgstr "Приказује или скрива ipython прозор"
+
+#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+msgid "Missing argument \"contact_jid\""
+msgstr "Недостаје аргумент \"contact_jid\""
+
+#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#, python-format
+msgid ""
+"'%s' is not in your roster.\n"
+"Please specify account for sending the message."
+msgstr ""
+"'%s' није на Вашј листи.\n"
+"Молимо одредите налог за слање поруке."
 
-#: ../src/gajim-remote.py:207
-msgid "Deletes a preference item"
-msgstr "Брише ставку подешавања"
+#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+msgid "You have no active account"
+msgstr "немате активних рачуна"
 
-#: ../src/gajim-remote.py:209
-msgid "key"
-msgstr "кључ"
+#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+msgid "It seems Gajim is not running. So you can't use gajim-remote."
+msgstr "Чини се да Гајим не ради. Не можете да користите gajim-remote."
 
-#: ../src/gajim-remote.py:209
-msgid "name of the preference to be deleted"
-msgstr "име ставке подешавања које ће се брисати"
+#: ../src/gajim-remote-plugin.py:412
+#, python-format
+msgid ""
+"Usage: %s %s %s \n"
+"\t %s"
+msgstr ""
 
-#: ../src/gajim-remote.py:213
-msgid "Writes the current state of Gajim preferences to the .config file"
-msgstr "Записује тренутно стање Гајим подешавања у .config датотеку"
+#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+msgid "Arguments:"
+msgstr "Аргументи:"
 
-#: ../src/gajim-remote.py:218
-msgid "Removes contact from roster"
-msgstr "Уклања контакт са листе"
+#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#, python-format
+msgid "%s not found"
+msgstr "%s није пронађен"
 
-#: ../src/gajim-remote.py:227
-msgid "Adds contact to roster"
-msgstr "Додаје контакт на листу"
+#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
+#, python-format
+msgid ""
+"Usage: %s command [arguments]\n"
+"Command is one of:\n"
+msgstr ""
+"Коришћење: %s наредба [аргументи]\n"
+"Наредба је једна од:\n"
 
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "џид"
+#: ../src/gajim-remote-plugin.py:496
+#, fuzzy, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Превише аргумената\n"
+"Укуцајте \"%(basename)s help %(command)s\" за више информација"
 
-#: ../src/gajim-remote.py:230
-msgid "Adds new contact to this account"
-msgstr "Додаје нови контакт овом рачуну"
+#: ../src/gajim-remote-plugin.py:500
+#, fuzzy, python-format
+msgid ""
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Аргумент \"%(arg)s\" није наведен. \n"
+"Укуцајте \"%(basename)s help %(command)s\" за више информација"
 
-#: ../src/gajim-remote.py:235
-msgid "Returns current status (the global one unless account is specified)"
-msgstr "Враћа тренутни статус (глобални ако није назначен налог)"
+#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
+msgid "Wrong uri"
+msgstr "Лош uri"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:109
+#, fuzzy
 msgid ""
-"Returns current status message (the global one unless account is specified)"
-msgstr "Враћа тренутну статусну поруку (глобалну ако није назначен налог)"
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
+msgstr ""
+"једно од: није на вези, на вези, прича, одсутан, продужено одсутан, не "
+"узнемиравај, невидљив"
 
-#: ../src/gajim-remote.py:249
-msgid "Returns number of unread messages"
-msgstr "Враћа број непрочитаних порука"
+#: ../src/gajim-remote.py:117
+msgid "Changes the priority of account or accounts"
+msgstr "Мења статус једног или више налога"
 
-#: ../src/gajim-remote.py:253
-msgid "Opens 'Start Chat' dialog"
-msgstr "Отвара дијалог за започињање разговора"
+#: ../src/gajim-remote.py:119
+msgid "priority"
+msgstr "приоритет"
 
-#: ../src/gajim-remote.py:255
-msgid "Starts chat, using this account"
-msgstr "Започиње разговор, користећи овај налог"
+#: ../src/gajim-remote.py:119
+msgid "priority you want to give to the account"
+msgstr "приоритет који желите да дате овом налогу"
 
-#: ../src/gajim-remote.py:259
-msgid "Sends custom XML"
-msgstr "Шаље кориснички дефинисан XML"
+#: ../src/gajim-remote.py:121
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"измена приоритета датог налога. Ако није одређен, мења се статус свих налога "
+"који имају постављену опцију \"синхронизација са глобалним статусом\""
 
-#: ../src/gajim-remote.py:261
-msgid "XML to send"
-msgstr "XML за слање"
+#: ../src/gajim-remote.py:134
+msgid "message content. The account must be specified or \"\""
+msgstr "садржај поруке. Налог мора бити назначен или \"\""
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:242
 msgid ""
-"Account in which the xml will be sent; if not specified, xml will be sent to "
-"all accounts"
-msgstr ""
-"Налог за који ће бити послан xml ; ако није одређен, xml ће бити послат за "
-"све налоге"
+"Returns current status message (the global one unless account is specified)"
+msgstr "Враћа тренутну статусну поруку (глобалну ако није назначен налог)"
 
 #: ../src/gajim-remote.py:268
 #, fuzzy
@@ -8406,14 +8746,6 @@ msgstr ""
 "Налог за који ће бити послан xml ; ако није одређен, xml ће бити послат за "
 "све налоге"
 
-#: ../src/gajim-remote.py:277
-msgid "Handle a xmpp:/ uri"
-msgstr "Управља xmpp:/ uri-јем"
-
-#: ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "uri"
-
 #: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr "URI за управљање"
@@ -8426,30 +8758,14 @@ msgstr "Налог у коме желите да управљате њиме"
 msgid "Message content"
 msgstr "Садржај поруке"
 
-#: ../src/gajim-remote.py:286
-msgid "Join a MUC room"
-msgstr "Придружи се новој соби"
-
-#: ../src/gajim-remote.py:288
-msgid "room"
-msgstr "соба"
-
 #: ../src/gajim-remote.py:288
 msgid "Room JID"
 msgstr "Џабер ID собе:"
 
-#: ../src/gajim-remote.py:289
-msgid "nick"
-msgstr "надимак"
-
 #: ../src/gajim-remote.py:289
 msgid "Nickname to use"
 msgstr "Надимак за коришћење"
 
-#: ../src/gajim-remote.py:290
-msgid "password"
-msgstr "лозинка"
-
 #: ../src/gajim-remote.py:290
 msgid "Password to enter the room"
 msgstr "Лозинка за улазак у собу"
@@ -8458,35 +8774,6 @@ msgstr "Лозинка за улазак у собу"
 msgid "Account from which you want to enter the room"
 msgstr "Налог са кога желите да уђете у собу"
 
-#: ../src/gajim-remote.py:296
-msgid "Check if Gajim is running"
-msgstr "Молимо проверите да ли је Гајим покренут"
-
-#: ../src/gajim-remote.py:300
-msgid "Shows or hides the ipython window"
-msgstr "Приказује или скрива ipython прозор"
-
-#: ../src/gajim-remote.py:327
-msgid "Missing argument \"contact_jid\""
-msgstr "Недостаје аргумент \"contact_jid\""
-
-#: ../src/gajim-remote.py:348
-#, python-format
-msgid ""
-"'%s' is not in your roster.\n"
-"Please specify account for sending the message."
-msgstr ""
-"'%s' није на Вашј листи.\n"
-"Молимо одредите налог за слање поруке."
-
-#: ../src/gajim-remote.py:351
-msgid "You have no active account"
-msgstr "немате активних рачуна"
-
-#: ../src/gajim-remote.py:404
-msgid "It seems Gajim is not running. So you can't use gajim-remote."
-msgstr "Чини се да Гајим не ради. Не можете да користите gajim-remote."
-
 #: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
@@ -8496,24 +8783,6 @@ msgstr ""
 "Коришћење: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:435
-msgid "Arguments:"
-msgstr "Аргументи:"
-
-#: ../src/gajim-remote.py:439
-#, python-format
-msgid "%s not found"
-msgstr "%s није пронађен"
-
-#: ../src/gajim-remote.py:445
-#, python-format
-msgid ""
-"Usage: %s command [arguments]\n"
-"Command is one of:\n"
-msgstr ""
-"Коришћење: %s наредба [аргументи]\n"
-"Наредба је једна од:\n"
-
 #: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
@@ -8536,10 +8805,6 @@ msgstr ""
 msgid "No uri given"
 msgstr ""
 
-#: ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Лош uri"
-
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Тема"
@@ -8565,179 +8830,177 @@ msgstr "Не можете избрисати Вашу тренутну тему"
 msgid "Please first choose another for your current theme."
 msgstr "Молимо Вас да прво одаберете неку другу тему."
 
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:170
 msgid "Sending private message failed"
 msgstr "Неуспешно слање приватне поруке"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:171
+#: ../src/groupchat_control.py:172
 #, 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:455
 msgid "Insert Nickname"
 msgstr "Убаци надимак"
 
-#: ../src/groupchat_control.py:631
+#: ../src/groupchat_control.py:636
 msgid "Conversation with "
 msgstr "Разговор са "
 
-#: ../src/groupchat_control.py:633
+#: ../src/groupchat_control.py:638
 msgid "Continued conversation"
 msgstr "Настављени разговор"
 
-#. Can be a message (see handle_event_gc_config_change in
-#. gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1272 ../src/gui_interface.py:1080
+#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Свима присутнима је дозвољено да виде ваш пун џабер ID"
 
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1286
 msgid "Room logging is enabled"
 msgstr "Логовање собе је омогућено"
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1288
 msgid "A new room has been created"
 msgstr "Нова соба је направљена"
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1291
 msgid "The server has assigned or modified your roomnick"
 msgstr "Сервер Вам је или доделио надимак или променио постојећи"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1287
+#: ../src/groupchat_control.py:1297
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s је избачен: %(reason)s"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1300
 #, 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:1300
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s има забрану: %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1312
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s има забрану од члана %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1314 ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
 #, python-format
 msgid "You are now known as %s"
 msgstr "Од сада сте познати као %s"
 
-#: ../src/groupchat_control.py:1330 ../src/gui_interface.py:919
+#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s је од сада познат као %(new_nick)s"
 
-#: ../src/groupchat_control.py:1372 ../src/groupchat_control.py:1377
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1392
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s је избачен из собе (%(reason)s)"
 
-#: ../src/groupchat_control.py:1374
+#: ../src/groupchat_control.py:1383
 msgid "affiliation changed"
 msgstr "везаност измењена"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1388
 msgid "room configuration changed to members-only"
 msgstr "конфигурација собе се променила на \"само чланови\""
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1394
 msgid "system shutdown"
 msgstr "гашење система"
 
-#: ../src/groupchat_control.py:1470
+#: ../src/groupchat_control.py:1477
 #, 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:1474
+#: ../src/groupchat_control.py:1481
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Афилијација %(nick)s је постављена на %(affiliation)s"
 
-#: ../src/groupchat_control.py:1489
+#: ../src/groupchat_control.py:1496
 #, 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:1493
+#: ../src/groupchat_control.py:1500
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Улога %(nick)s је постављена на %(role)s"
 
-#: ../src/groupchat_control.py:1522
+#: ../src/groupchat_control.py:1530
 #, python-format
 msgid "%s has left"
 msgstr "%s је отишао"
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1535
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s се придружио групном разговору"
 
-#: ../src/groupchat_control.py:1529 ../src/gui_interface.py:946
+#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
 #: ../src/history_window.py:447 ../src/notify.py:234
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s је тренутно %(status)s"
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1774
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Јесте ли сигурни да желите напустити групни разговор \"%s\"?"
 
-#: ../src/groupchat_control.py:1761
+#: ../src/groupchat_control.py:1776
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Ако затворите овај прозор, бићете искључени са овох групног разговора."
 
-#: ../src/groupchat_control.py:1765 ../src/gui_interface.py:1216
-#: ../src/gui_interface.py:1992 ../src/gui_interface.py:2029
-#: ../src/gui_interface.py:2064 ../src/message_window.py:224
-#: ../src/roster_window.py:2739 ../src/roster_window.py:3399
-#: ../src/roster_window.py:4123
+#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
+#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
+#: ../src/gui_interface.py:1853 ../src/message_window.py:224
+#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
+#: ../src/roster_window.py:4195
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Не питај ме више"
 
-#: ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:1814
 msgid "Changing Subject"
 msgstr "Промена Теме"
 
-#: ../src/groupchat_control.py:1800
+#: ../src/groupchat_control.py:1815
 msgid "Please specify the new subject:"
 msgstr "Молимо одредите нову тему:"
 
-#: ../src/groupchat_control.py:1807
+#: ../src/groupchat_control.py:1822
 msgid "Changing Nickname"
 msgstr "Промена надимка"
 
-#: ../src/groupchat_control.py:1808
+#: ../src/groupchat_control.py:1823
 msgid "Please specify the new nickname you want to use:"
 msgstr "Молимо одредите нови надимак који желите да користите:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1839
+#: ../src/groupchat_control.py:1854
 #, python-format
 msgid "Destroying %s"
 msgstr "Уништавам %s"
 
-#: ../src/groupchat_control.py:1840
+#: ../src/groupchat_control.py:1855
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8745,22 +9008,22 @@ msgstr ""
 "Управо ћете заувек уништити ову собу.\n"
 "Можете испод написати разлог:"
 
-#: ../src/groupchat_control.py:1842
+#: ../src/groupchat_control.py:1857
 msgid "You may also enter an alternate venue:"
 msgstr "Можете такође унети и алтернативну локацију:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2028
+#: ../src/groupchat_control.py:2046
 #, python-format
 msgid "Kicking %s"
 msgstr "Избацујем %s"
 
-#: ../src/groupchat_control.py:2029 ../src/groupchat_control.py:2356
+#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
 msgid "You may specify a reason below:"
 msgstr "Можете навести разлог испод:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2355
+#: ../src/groupchat_control.py:2373
 #, python-format
 msgid "Banning %s"
 msgstr "Забрањујем %s"
@@ -8784,55 +9047,64 @@ msgid "Details"
 msgstr "Детаљи"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
+#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Грешка: није могуће отворити %s за читање"
 
-#: ../src/gtkgui_helpers.py:400
+#: ../src/gtkgui_helpers.py:404
 msgid "Error reading file:"
 msgstr "Грешка при читању датотеке:"
 
-#: ../src/gtkgui_helpers.py:403
+#: ../src/gtkgui_helpers.py:407
 msgid "Error parsing file:"
 msgstr "Грешка при учитавању датотеке"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:444
+#: ../src/gtkgui_helpers.py:448
 #, 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:818
+#: ../src/gtkgui_helpers.py:822
 msgid "Gajim is not the default Jabber client"
 msgstr "Гајим није Ваш подразумевани џабер клијент"
 
-#: ../src/gtkgui_helpers.py:819
+#: ../src/gtkgui_helpers.py:823
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Желите ли да Вам Гајим постане подразумевани Гајим клијент?"
 
-#: ../src/gtkgui_helpers.py:820
+#: ../src/gtkgui_helpers.py:824
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 "Увек на стартовању проверавај да ли је Гајим подразумевани џабер клијент"
 
-#: ../src/gtkgui_helpers.py:887
+#: ../src/gtkgui_helpers.py:891
 msgid "Extension not supported"
 msgstr "Екстензија није подржана"
 
-#: ../src/gtkgui_helpers.py:888
+#: ../src/gtkgui_helpers.py:892
 #, 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:924
+#: ../src/gtkgui_helpers.py:928
 msgid "Save Image as..."
 msgstr "Сними слику као..."
 
-#: ../src/gui_interface.py:140
+#. we are banned
+#. group chat does not exist
+#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
+#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
+#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
+#: ../src/gui_interface.py:348
+msgid "Unable to join group chat"
+msgstr "Није могуће придружити се групном разговору"
+
+#: ../src/gui_interface.py:138
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8843,58 +9115,92 @@ msgstr ""
 "регистрован од стране неког од учесника.\n"
 "Молимо одредите други надимак испод:"
 
-#: ../src/gui_interface.py:143
+#: ../src/gui_interface.py:141
 msgid "Always use this nickname when there is a conflict"
 msgstr "Увек користи надимак када постоји конфликт"
 
-#: ../src/gui_interface.py:159
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Прихватате ли овај захтев?"
 
-#: ../src/gui_interface.py:161
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Прихватате ли овај захтев на налогу %s?"
 
-#: ../src/gui_interface.py:164
+#: ../src/gui_interface.py:163
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Ауторизација за %(url)s (ид: %(id)s)"
 
-#: ../src/gui_interface.py:213 ../src/notify.py:493
+#: ../src/gui_interface.py:209 ../src/notify.py:493
 msgid "Connection Failed"
 msgstr "Веза прекинута"
 
-#: ../src/gui_interface.py:606 ../src/gui_interface.py:610
+#: ../src/gui_interface.py:312
+#, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "Лозинка потребна за придруживање групном разговору %s. Унесите је."
+
+#: ../src/gui_interface.py:324
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr "Достигнут највећи број корисника за %s"
+
+#: ../src/gui_interface.py:333
+#, python-format
+msgid "You are banned from group chat %s."
+msgstr "Забрањен Вам је приступ овом групном разговору %s."
+
+#: ../src/gui_interface.py:338
+#, python-format
+msgid "Group chat %s does not exist."
+msgstr "Групни разговор.%s не постоји."
+
+#: ../src/gui_interface.py:341
+msgid "Group chat creation is restricted."
+msgstr "Стварање групних разговора Вам није дозвољено."
+
+#: ../src/gui_interface.py:344
+#, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Морате користити Ваш регистровани надимак у групном разговору %s."
+
+#: ../src/gui_interface.py:349
+#, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Нисте у листи чланова групног разговора %s."
+
+#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Грешка %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:621 ../src/gui_interface.py:636
+#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "грешка приликом слања %(message)s ( %(error)s )"
 
-#: ../src/gui_interface.py:663 ../src/notify.py:495
+#: ../src/gui_interface.py:540 ../src/notify.py:495
 msgid "Subscription request"
 msgstr "Захтев за претплатом"
 
-#: ../src/gui_interface.py:688
+#: ../src/gui_interface.py:565
 msgid "Authorization accepted"
 msgstr "Ауторизација прихваћена"
 
-#: ../src/gui_interface.py:689
+#: ../src/gui_interface.py:566
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Контакт \"%s\" је прихватио да видите његов/њен статус."
 
-#: ../src/gui_interface.py:702
+#: ../src/gui_interface.py:579
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контакт \"%s\" је укинуо претплату на њега"
 
-#: ../src/gui_interface.py:703
+#: ../src/gui_interface.py:580
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8902,61 +9208,56 @@ msgstr ""
 "Увек ћете га/је видети као да није на вези.\n"
 "Да ли желите да га/је уклоните са листе контаката?"
 
-#: ../src/gui_interface.py:727 ../src/notify.py:497
+#: ../src/gui_interface.py:604 ../src/notify.py:497
 msgid "Unsubscribed"
 msgstr "Укинута претплата"
 
-#: ../src/gui_interface.py:754
+#: ../src/gui_interface.py:631
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Контакт са \"%s\" се не може успоставити"
 
-#: ../src/gui_interface.py:1015
+#: ../src/gui_interface.py:859
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s је поставио тему на %(subject)s"
 
-#: ../src/gui_interface.py:1083
+#: ../src/gui_interface.py:926
 msgid "Room now shows unavailable member"
 msgstr "Соба сада приказује недоступне чланове"
 
-#: ../src/gui_interface.py:1085
+#: ../src/gui_interface.py:928
 msgid "room now does not show unavailable members"
 msgstr "соба сада не приказује недоступне чланове"
 
-#: ../src/gui_interface.py:1087
+#: ../src/gui_interface.py:930
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 "Десила се промена у конфигурацији собе (напомена: не утиче на приватност "
 "корисника)"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:1091
+#: ../src/gui_interface.py:934
 msgid "Room logging is now enabled"
 msgstr "Логовање у соби је сада омогућено"
 
-#: ../src/gui_interface.py:1093
+#: ../src/gui_interface.py:936
 msgid "Room logging is now disabled"
 msgstr "Логовање у соби је сада онемогућено"
 
-#: ../src/gui_interface.py:1095
+#: ../src/gui_interface.py:938
 msgid "Room is now non-anonymous"
 msgstr "Соба сада више није анонимна"
 
-#: ../src/gui_interface.py:1098
+#: ../src/gui_interface.py:941
 msgid "Room is now semi-anonymous"
 msgstr "Соба је сада полу анонимна"
 
-#: ../src/gui_interface.py:1101
+#: ../src/gui_interface.py:944
 msgid "Room is now fully-anonymous"
 msgstr "Соба је сада потпуно анонимна"
 
-#: ../src/gui_interface.py:1133
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Лозинка потребна за придруживање групном разговору %s. Унесите је."
-
-#: ../src/gui_interface.py:1180
+#: ../src/gui_interface.py:985
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -8964,23 +9265,23 @@ msgstr ""
 "Конфигурисали сте Гајим да користи GPG агента, али не постоји GPG агент који "
 "ради или је вратио лошу фразу лозинке.\n"
 
-#: ../src/gui_interface.py:1182 ../src/gui_interface.py:1189
+#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Тренутно сте повезани без OpenPGP кључа."
 
-#: ../src/gui_interface.py:1184
+#: ../src/gui_interface.py:989
 msgid "Your passphrase is incorrect"
 msgstr "Ваша лозинка није тачна"
 
-#: ../src/gui_interface.py:1188
+#: ../src/gui_interface.py:993
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "OpenGPG лозинка није тачна"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid "GPG key not trusted"
 msgstr "GPG кључ није од поверења"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
@@ -8988,7 +9289,7 @@ msgstr ""
 "GPG кључ који се користи за шифровање није од поверења. Да ли заиста желите "
 "да шифрујете ову поруку?"
 
-#: ../src/gui_interface.py:1226
+#: ../src/gui_interface.py:1031
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not                 correctly started "
@@ -8997,12 +9298,12 @@ msgstr ""
 "Gnome Keyring је инсталиран, али није \t\t\t\tправилно покренут (променљиве "
 "окружења вероватно нису \t\t\tправилно подешене)"
 
-#: ../src/gui_interface.py:1330
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Нови е-мејл за %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1332
+#: ../src/gui_interface.py:1133
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -9010,7 +9311,7 @@ msgstr[0] "Имате %d нови е-мејл разговор"
 msgstr[1] "Имате %d нова е-мејл разговора"
 msgstr[2] "Имате %d нових е-мејл разговора"
 
-#: ../src/gui_interface.py:1345
+#: ../src/gui_interface.py:1146
 #, python-format
 msgid ""
 "\n"
@@ -9025,42 +9326,42 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1418
+#: ../src/gui_interface.py:1215
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s Вам жели послати датотеку."
 
-#: ../src/gui_interface.py:1455 ../src/roster_window.py:1856
+#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
 msgid "Remote contact stopped transfer"
 msgstr "Удаљени контакт је прекинуо пренос"
 
-#: ../src/gui_interface.py:1458 ../src/roster_window.py:1858
+#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
 msgid "Error opening file"
 msgstr "Грешка при отварању датотеке"
 
-#: ../src/gui_interface.py:1490
+#: ../src/gui_interface.py:1287
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Успешно сте примили датотеку %(filename)s од контакта %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1494
+#: ../src/gui_interface.py:1291
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Пренос датотеке %(filename)s од контакта %(name)s је заустављен."
 
-#: ../src/gui_interface.py:1507
+#: ../src/gui_interface.py:1304
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Успешно сте послали датотеку %(filename)s за контакт %(name)s"
 
 #. ft stopped
-#: ../src/gui_interface.py:1511
+#: ../src/gui_interface.py:1308
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Пренос %(filename)s за контакт %(name)s је заустављен. "
 
-#: ../src/gui_interface.py:1623
+#: ../src/gui_interface.py:1426
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -9069,36 +9370,36 @@ msgstr ""
 "Не могу да дешифрујем поруку од контакта %s\n"
 "Можда је промењена."
 
-#: ../src/gui_interface.py:1630
+#: ../src/gui_interface.py:1433
 msgid "Unable to decrypt message"
 msgstr "Не могу да дешифрујем поруку"
 
-#: ../src/gui_interface.py:1702
+#: ../src/gui_interface.py:1505
 msgid "Username Conflict"
 msgstr "Конфликт корисничког имена"
 
-#: ../src/gui_interface.py:1703
+#: ../src/gui_interface.py:1506
 msgid "Please type a new username for your local account"
 msgstr "Молимо Вас унесите ново корисничко име за Ваш локални налог"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1519
 msgid "Ping?"
 msgstr "Пинг?"
 
-#: ../src/gui_interface.py:1729
+#: ../src/gui_interface.py:1532
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Понг! (%s s.)"
 
-#: ../src/gui_interface.py:1740
+#: ../src/gui_interface.py:1543
 msgid "Error."
 msgstr "Грешка."
 
-#: ../src/gui_interface.py:1768
+#: ../src/gui_interface.py:1556
 msgid "Resource Conflict"
 msgstr "Конфликт ресурса"
 
-#: ../src/gui_interface.py:1769
+#: ../src/gui_interface.py:1557
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -9107,21 +9408,21 @@ msgstr ""
 "ново име ресурса"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1816
+#: ../src/gui_interface.py:1604
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s Вам жели послати датотеку."
 
-#: ../src/gui_interface.py:1819
+#: ../src/gui_interface.py:1607
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Захтев за преносом датотеке"
 
-#: ../src/gui_interface.py:1927
+#: ../src/gui_interface.py:1716
 msgid "Error verifying SSL certificate"
 msgstr "Грешка при верификацији SSL сертификата"
 
-#: ../src/gui_interface.py:1928
+#: ../src/gui_interface.py:1717
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9132,15 +9433,15 @@ msgstr ""
 "%(error)s\n"
 "Да ли и даље желите да се конектујете на овај сервер?"
 
-#: ../src/gui_interface.py:1936
+#: ../src/gui_interface.py:1725
 msgid "Ignore this error for this certificate."
 msgstr "Игнориши ову грешку за овај сертификат."
 
-#: ../src/gui_interface.py:1956
+#: ../src/gui_interface.py:1745
 msgid "SSL certificate error"
 msgstr "Грешка SSL сертификата"
 
-#: ../src/gui_interface.py:1957
+#: ../src/gui_interface.py:1746
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9157,12 +9458,12 @@ msgstr ""
 "\n"
 "Да ли и даље желите да се конектујете и освежите отисак овог сертификата?"
 
-#: ../src/gui_interface.py:1987 ../src/gui_interface.py:2024
-#: ../src/gui_interface.py:2060
+#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
+#: ../src/gui_interface.py:1849
 msgid "Insecure connection"
 msgstr "Несигурна веза"
 
-#: ../src/gui_interface.py:1988
+#: ../src/gui_interface.py:1777
 #, fuzzy
 msgid ""
 "You are about to connect to the server with an insecure connection. This "
@@ -9172,12 +9473,12 @@ msgstr ""
 "Управо ћете послати лозинку преко несигурне везе. Требало би да инсталирате "
 "PyOpenSSL да спречите ово. Да ли желите да наставите?"
 
-#: ../src/gui_interface.py:1991 ../src/gui_interface.py:2028
-#: ../src/gui_interface.py:2063
+#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
+#: ../src/gui_interface.py:1852
 msgid "Yes, I really want to connect insecurely"
 msgstr "Да, заиста желим да се конектујем несигурном везом"
 
-#: ../src/gui_interface.py:2025
+#: ../src/gui_interface.py:1814
 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?"
@@ -9185,7 +9486,7 @@ msgstr ""
 "Управо ћете послати лозинку преко несигурне везе. Требало би да инсталирате "
 "PyOpenSSL да спречите ово. Да ли желите да наставите?"
 
-#: ../src/gui_interface.py:2061
+#: ../src/gui_interface.py:1850
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9195,17 +9496,17 @@ msgstr ""
 "желите то да урадите?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2624 ../src/gui_interface.py:2647
+#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
 msgid "Emoticons disabled"
 msgstr "Смајлији искључени"
 
-#: ../src/gui_interface.py:2625
+#: ../src/gui_interface.py:2423
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "Ваша тема за смајлије није нађена, па су смајлији искључени."
 
-#: ../src/gui_interface.py:2648
+#: ../src/gui_interface.py:2446
 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 "
@@ -9215,40 +9516,40 @@ msgstr ""
 "emoticons.py датотеке. Погледајте http://trac.gajim.org/wiki/Emoticons за "
 "више детаља."
 
-#: ../src/gui_interface.py:2679 ../src/roster_window.py:3560
+#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
 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/gui_interface.py:3058
+#: ../src/gui_interface.py:2871
 msgid "Could not save your settings and preferences"
 msgstr "Није могуће чување Ваших подешавања"
 
-#: ../src/gui_interface.py:3592
+#: ../src/gui_interface.py:3411
 msgid "Passphrase Required"
 msgstr "Лозинка неопходна"
 
-#: ../src/gui_interface.py:3593
+#: ../src/gui_interface.py:3412
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Унесите лозинку GPG кључа %(keyid)s (налог %(account)s)."
 
-#: ../src/gui_interface.py:3607
+#: ../src/gui_interface.py:3426
 msgid "GPG key expired"
 msgstr "GPG кључ истекао"
 
-#: ../src/gui_interface.py:3608
+#: ../src/gui_interface.py:3427
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Ваш GPG кључ је истекао, бићете повезани са %s без OpenPGP-а."
 
 #. ask again
-#: ../src/gui_interface.py:3617
+#: ../src/gui_interface.py:3436
 msgid "Wrong Passphrase"
 msgstr "Неисправна лозинка"
 
-#: ../src/gui_interface.py:3618
+#: ../src/gui_interface.py:3437
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Молимо поново укуцајте Вашу GPG лозинку или притисните Одустани"
 
@@ -9286,6 +9587,11 @@ msgstr "Надимак"
 msgid "Message"
 msgstr "Порука"
 
+#. holds subject
+#: ../src/history_manager.py:188 ../src/history_manager.py:219
+msgid "Subject"
+msgstr "Тема"
+
 #: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -9385,19 +9691,19 @@ msgstr "Затворићете неколико језичака"
 msgid "Do you really want to close them all?"
 msgstr "Да ли заиста желите да их све затворите?"
 
-#: ../src/message_window.py:484
+#: ../src/message_window.py:485
 msgid "Chats"
 msgstr "Разговори"
 
-#: ../src/message_window.py:486
+#: ../src/message_window.py:487
 msgid "Group Chats"
 msgstr "Групни разговори"
 
-#: ../src/message_window.py:488
+#: ../src/message_window.py:489
 msgid "Private Chats"
 msgstr "Приватни Разговори"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:495
 msgid "Messages"
 msgstr "Поруке"
 
@@ -9453,56 +9759,56 @@ msgstr "Нова порука од %(nickname)s"
 msgid "Ignore"
 msgstr "Игнориши"
 
-#: ../src/profile_window.py:57
+#: ../src/profile_window.py:58
 msgid "Retrieving profile..."
 msgstr "Дохватање профила..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2935
+#: ../src/profile_window.py:111 ../src/roster_window.py:3001
 msgid "File is empty"
 msgstr "Датотека је празна"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2938
+#: ../src/profile_window.py:114 ../src/roster_window.py:3004
 msgid "File does not exist"
 msgstr "Датотека не постоји"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2940 ../src/roster_window.py:2951
+#: ../src/profile_window.py:128 ../src/profile_window.py:144
+#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
 msgid "Could not load image"
 msgstr "Не могу учитати слику"
 
-#: ../src/profile_window.py:214
+#: ../src/profile_window.py:215
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Информације контакта"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:216
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Формат: ГГГГ-ММ-ДД"
 
-#: ../src/profile_window.py:269
+#: ../src/profile_window.py:270
 msgid "Information received"
 msgstr "Информације примљене"
 
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:341
 msgid "Without a connection you can not publish your contact information."
 msgstr "Ако нисте на вези, не можете објавити Баше информације"
 
-#: ../src/profile_window.py:353
+#: ../src/profile_window.py:354
 msgid "Sending profile..."
 msgstr "Слање профила..."
 
-#: ../src/profile_window.py:368
+#: ../src/profile_window.py:369
 msgid "Information NOT published"
 msgstr "Информације НИСУ објављене"
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:376
 msgid "vCard publication failed"
 msgstr "Публикација vCard неуспела"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:377
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9510,51 +9816,51 @@ msgstr ""
 "Настала је грешка приликом објављивања Ваших личних информација, покушајте "
 "поново касније."
 
-#: ../src/roster_window.py:256 ../src/roster_window.py:1012
+#: ../src/roster_window.py:262 ../src/roster_window.py:1026
 msgid "Merged accounts"
 msgstr "Спојени налози"
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1942
 msgid "Authorization has been sent"
 msgstr "Ауторизација послата"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1943
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Сада ће контакт \"%s\" знати Ваш статус."
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1966
 msgid "Subscription request has been sent"
 msgstr "Захтев за претплатом послат"
 
-#: ../src/roster_window.py:1944
+#: ../src/roster_window.py:1967
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ако контакт \"%s\" прихвати овај захтев, знаћете његов/њен статус."
 
-#: ../src/roster_window.py:1958
+#: ../src/roster_window.py:1981
 msgid "Authorization has been removed"
 msgstr "Ауторизација уклоњена"
 
-#: ../src/roster_window.py:1959
+#: ../src/roster_window.py:1982
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Сада ће Вас контакт \"%s\" увек видети као да нисте на вези."
 
-#: ../src/roster_window.py:1986
+#: ../src/roster_window.py:2009
 msgid "GPG is not usable"
 msgstr "GPG није употребљив"
 
-#: ../src/roster_window.py:1987
+#: ../src/roster_window.py:2010
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Повезаћете се на %s без OpenPGP кључа."
 
-#: ../src/roster_window.py:2199 ../src/roster_window.py:3496
+#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
 msgid "You are participating in one or more group chats"
 msgstr "Учествујете у једном или више групних разговора"
 
-#: ../src/roster_window.py:2200 ../src/roster_window.py:3497
+#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9562,38 +9868,38 @@ msgstr ""
 "Промена Вашег статуса у Невидљив ће резултовати  одвезивањем са тих групних "
 "разговора. Јесте ли сигурни да желите ићи на невидљиво?"
 
-#: ../src/roster_window.py:2226
+#: ../src/roster_window.py:2249
 msgid "desync'ed"
 msgstr "десинхронизован"
 
-#: ../src/roster_window.py:2288
+#: ../src/roster_window.py:2311
 msgid "Really quit Gajim?"
 msgstr "Стварно затворити Гајим?"
 
-#: ../src/roster_window.py:2289
+#: ../src/roster_window.py:2312
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Јесте ли сигурни да желите затворити Гајим?"
 
-#: ../src/roster_window.py:2290
+#: ../src/roster_window.py:2313
 msgid "Always close Gajim"
 msgstr "Увек затвори Гајим"
 
-#: ../src/roster_window.py:2373
+#: ../src/roster_window.py:2396
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Прекини пренос датотеке"
 
-#: ../src/roster_window.py:2374
+#: ../src/roster_window.py:2397
 msgid ""
-"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2405 ../src/roster_window.py:2653
+#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
 msgid "You have unread messages"
 msgstr "Имате непрочитаних порука"
 
-#: ../src/roster_window.py:2406
+#: ../src/roster_window.py:2429
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9601,16 +9907,16 @@ msgstr ""
 "Поруке ће бити доступне за читање и касније ако имате омогућен историјат и "
 "тај контакт у листи."
 
-#: ../src/roster_window.py:2654
+#: ../src/roster_window.py:2720
 msgid "You must read them before removing this transport."
 msgstr "Морате их прочитати пре уклањања овог транспорта."
 
-#: ../src/roster_window.py:2657
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспорт \"%s\" ће бити уклоњен"
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2724
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9618,11 +9924,11 @@ msgstr ""
 "Нећете више бити у могућности да размењујете поруке са конткатима са овог "
 "транспорта."
 
-#: ../src/roster_window.py:2661
+#: ../src/roster_window.py:2727
 msgid "Transports will be removed"
 msgstr "Транспорт ће бити уклоњен"
 
-#: ../src/roster_window.py:2666
+#: ../src/roster_window.py:2732
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9631,12 +9937,12 @@ msgstr ""
 "Нећете више бити у могућности да размењујете поруке са конткатима са ових "
 "транспорта: %s"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2800
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "Управо ћете блокирати контакт. Јесте ли сигурни да желите да наставите?"
 
-#: ../src/roster_window.py:2736
+#: ../src/roster_window.py:2802
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -9645,56 +9951,56 @@ msgstr ""
 "шаље."
 
 #. it's jid
-#: ../src/roster_window.py:2827
+#: ../src/roster_window.py:2893
 msgid "Rename Contact"
 msgstr "Преименуј контакт"
 
-#: ../src/roster_window.py:2828
+#: ../src/roster_window.py:2894
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Унесите нови надимак за контакт %s"
 
-#: ../src/roster_window.py:2835
+#: ../src/roster_window.py:2901
 msgid "Rename Group"
 msgstr "Преименуј групу"
 
-#: ../src/roster_window.py:2836
+#: ../src/roster_window.py:2902
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Унесите ново име за групу %s"
 
-#: ../src/roster_window.py:2881
+#: ../src/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Уклони групу"
 
-#: ../src/roster_window.py:2882
+#: ../src/roster_window.py:2948
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Желите ли уклонити групу %s са листе контаката?"
 
-#: ../src/roster_window.py:2883
+#: ../src/roster_window.py:2949
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Уједно уклоња и све контакте из ове групе из листе контаката"
 
-#: ../src/roster_window.py:2922
+#: ../src/roster_window.py:2988
 msgid "Assign OpenPGP Key"
 msgstr "Придружи OpenPGP Кључ"
 
-#: ../src/roster_window.py:2923
+#: ../src/roster_window.py:2989
 msgid "Select a key to apply to the contact"
 msgstr "Одаберите кључ за придруживање контакту"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3372
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контакт \"%s\" ће бити уклоњен са Ваше листе контаката"
 
-#: ../src/roster_window.py:3308
+#: ../src/roster_window.py:3374
 #, 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:3313
+#: ../src/roster_window.py:3379
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9703,11 +10009,11 @@ msgstr ""
 "особа увек видети као да нисте на вези."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3319
+#: ../src/roster_window.py:3385
 msgid "Do you want to continue?"
 msgstr "Да ли желите да наставите?"
 
-#: ../src/roster_window.py:3323
+#: ../src/roster_window.py:3389
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9715,16 +10021,16 @@ msgstr ""
 "Уклањањем овог контакта уједно подразумевано уклањате и одобрење што значи "
 "да ће Вас та особа увек видети као да нисте на вези."
 
-#: ../src/roster_window.py:3326
+#: ../src/roster_window.py:3392
 msgid "I want this contact to know my status after removal"
 msgstr "Желим да овај контакт зна мој статус и након уклањања"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3330
+#: ../src/roster_window.py:3396
 msgid "Contacts will be removed from your roster"
 msgstr "Контакти ће бити уклоњени са Ваше листе контаката"
 
-#: ../src/roster_window.py:3335
+#: ../src/roster_window.py:3401
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9734,7 +10040,7 @@ msgstr ""
 "уједно уклањате и одобрење пто значи да ће Вас те особе увек видети као да "
 "нисте на вези."
 
-#: ../src/roster_window.py:3393
+#: ../src/roster_window.py:3459
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want  to continue?"
@@ -9742,7 +10048,7 @@ msgstr ""
 "Управо ћете послати прилагођен статус. Јесте ли сигурни да желите да "
 "наставите?"
 
-#: ../src/roster_window.py:3395
+#: ../src/roster_window.py:3461
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -9751,21 +10057,21 @@ msgstr ""
 "Контакт ће вас привремено видети као %(status)s, али само док не промените "
 "статус. Онда ће видети глобални статус."
 
-#: ../src/roster_window.py:3414
+#: ../src/roster_window.py:3480
 msgid "No account available"
 msgstr "Нема доступних налога"
 
-#: ../src/roster_window.py:3415
+#: ../src/roster_window.py:3481
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Морате креирати налог пре него што можете да разговарате са осталим "
 "контактима."
 
-#: ../src/roster_window.py:4023
+#: ../src/roster_window.py:4095
 msgid "Metacontacts storage not supported by your server"
 msgstr "Чување псеудоконтаката није подржано од стране Вашег сервера"
 
-#: ../src/roster_window.py:4025
+#: ../src/roster_window.py:4097
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9773,13 +10079,13 @@ msgstr ""
 "Ваш сервер не подржава чување информација псеудоконтаката. Те информације "
 "неће бити сачуване при следећем повезивању."
 
-#: ../src/roster_window.py:4117
+#: ../src/roster_window.py:4189
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Управо ћете направити псеудоконткат. Јесте ли сигурни да желите наставити?"
 
-#: ../src/roster_window.py:4119
+#: ../src/roster_window.py:4191
 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 "
@@ -9789,11 +10095,11 @@ msgstr ""
 "Генерално, они се користе када иста особа има неколико Џабер налога или "
 "транспортних налога."
 
-#: ../src/roster_window.py:4234
+#: ../src/roster_window.py:4306
 msgid "Invalid file URI:"
 msgstr "Неисправан URI датотеке:"
 
-#: ../src/roster_window.py:4246
+#: ../src/roster_window.py:4318
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9801,12 +10107,12 @@ msgstr[0] "Да ли желите послати ову датотеку кон
 msgstr[1] "Да ли желите послати ове датотеке контакту %s:"
 msgstr[2] "Да ли желите послати ове датотеке контакту %s:"
 
-#: ../src/roster_window.py:4361
+#: ../src/roster_window.py:4433
 #, python-format
 msgid "Send %s to %s"
 msgstr "Пошаљи %s за %s"
 
-#: ../src/roster_window.py:4367
+#: ../src/roster_window.py:4439
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Направи метаконтакте од %s и %s"
@@ -9816,143 +10122,143 @@ msgstr "Направи метаконтакте од %s и %s"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4816 ../src/roster_window.py:4889
-#: ../src/roster_window.py:4898 ../src/statusicon.py:246
-#: ../src/statusicon.py:293 ../src/statusicon.py:299
+#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
+#: ../src/roster_window.py:4970 ../src/statusicon.py:263
+#: ../src/statusicon.py:310 ../src/statusicon.py:316
 #, python-format
 msgid "using account %s"
 msgstr "користећи рачун %s"
 
 #. add
-#: ../src/roster_window.py:4905
+#: ../src/roster_window.py:4977
 #, python-format
 msgid "to %s account"
 msgstr "на %s налог"
 
 #. disco
-#: ../src/roster_window.py:4910
+#: ../src/roster_window.py:4982
 #, python-format
 msgid "using %s account"
 msgstr "користећи %s рачун"
 
-#: ../src/roster_window.py:4948 ../src/statusicon.py:309
+#: ../src/roster_window.py:5020 ../src/statusicon.py:326
 msgid "_Manage Bookmarks..."
 msgstr "Управљање _маркерима..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4968
+#: ../src/roster_window.py:5040
 #, python-format
 msgid "of account %s"
 msgstr "налога %s"
 
-#: ../src/roster_window.py:5009
+#: ../src/roster_window.py:5081
 #, python-format
 msgid "for account %s"
 msgstr "за налог %s"
 
-#: ../src/roster_window.py:5069 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
 msgid "_Change Status Message"
 msgstr "_Измени статусну поруку"
 
-#: ../src/roster_window.py:5102
+#: ../src/roster_window.py:5174
 msgid "Publish Tune"
 msgstr "Објави песму"
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5176
 #, fuzzy
 msgid "Publish Location"
 msgstr "Објави песму"
 
-#: ../src/roster_window.py:5107
+#: ../src/roster_window.py:5179
 msgid "Configure Services..."
 msgstr "Конфигуриши сервисе..."
 
-#: ../src/roster_window.py:5252
+#: ../src/roster_window.py:5324
 msgid "_Maximize All"
 msgstr "_Увећај све"
 
-#: ../src/roster_window.py:5262 ../src/roster_window.py:5436
+#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
 msgid "Send Group M_essage"
 msgstr "П_ошаљи групну поруку"
 
-#: ../src/roster_window.py:5270
+#: ../src/roster_window.py:5342
 msgid "To all users"
 msgstr "Свим корисницима"
 
-#: ../src/roster_window.py:5274
+#: ../src/roster_window.py:5346
 msgid "To all online users"
 msgstr "Свим корисницима на вези"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5456
+#: ../src/roster_window.py:5528
 msgid "_Manage Contacts"
 msgstr "_Управљање контактима"
 
 #. Edit Groups
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5537
 msgid "Edit _Groups"
 msgstr "Измени _групе"
 
 #. Send single message
-#: ../src/roster_window.py:5520
+#: ../src/roster_window.py:5592
 msgid "Send Single Message"
 msgstr "Пошаљи једну поруку"
 
 #. Execute Command
-#: ../src/roster_window.py:5567
+#: ../src/roster_window.py:5639
 msgid "Execute Command..."
 msgstr "Изврши наредбу..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5577
+#: ../src/roster_window.py:5649
 msgid "_Manage Transport"
 msgstr "_Управљање транспортима"
 
 #. Modify Transport
-#: ../src/roster_window.py:5586
+#: ../src/roster_window.py:5658
 msgid "_Modify Transport"
 msgstr "_Измени транспорт"
 
 #. Rename
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5668
 msgid "_Rename"
 msgstr "_Преименуј"
 
-#: ../src/roster_window.py:5656
+#: ../src/roster_window.py:5728
 msgid "_Maximize"
 msgstr "_Увећај"
 
-#: ../src/roster_window.py:5665
+#: ../src/roster_window.py:5737
 msgid "_Reconnect"
 msgstr "У_логуј се поново"
 
-#: ../src/roster_window.py:5672
+#: ../src/roster_window.py:5744
 msgid "_Disconnect"
 msgstr "_Излогуј се"
 
 #. History manager
-#: ../src/roster_window.py:5754
+#: ../src/roster_window.py:5833
 msgid "History Manager"
 msgstr "Управник историјатом"
 
-#: ../src/roster_window.py:5765
+#: ../src/roster_window.py:5844
 msgid "_Join New Group Chat"
 msgstr "_Придруживање новом групном разговору"
 
-#: ../src/roster_window.py:5938
+#: ../src/roster_window.py:6019
 msgid "Change Status Message..."
 msgstr "Промени статусну поруку..."
 
-#: ../src/search_window.py:94
+#: ../src/search_window.py:105
 msgid "Waiting for results"
 msgstr "Чекам на резултате"
 
-#: ../src/search_window.py:132 ../src/search_window.py:210
+#: ../src/search_window.py:143 ../src/search_window.py:220
 msgid "Error in received dataform"
 msgstr "Грешка у примању форме за податке"
 
 #. No result
-#: ../src/search_window.py:166 ../src/search_window.py:202
+#: ../src/search_window.py:177 ../src/search_window.py:212
 msgid "No result"
 msgstr "Нема резултата"
 
@@ -9965,14 +10271,15 @@ msgstr "Грешка при упису на диск"
 msgid "Subject: %s"
 msgstr "Тема: %s"
 
-#: ../src/session.py:433 ../src/session.py:468
+#: ../src/session.py:447 ../src/session.py:491
 msgid "Confirm these session options"
 msgstr "Потврди ове опције сесије"
 
-#: ../src/session.py:435
+#: ../src/session.py:448
 #, fuzzy, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
+"The remote client wants '\n"
+"                            'to negotiate an session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -9984,7 +10291,7 @@ msgstr ""
 "\n"
 "\tДа ли су ове ставке прихватљиве?"
 
-#: ../src/session.py:469
+#: ../src/session.py:492
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9999,16 +10306,16 @@ msgstr ""
 "\n"
 "Наставити са сесијом?"
 
-#: ../src/statusicon.py:210
+#: ../src/statusicon.py:227
 msgid "_Change Status Message..."
 msgstr "_Промени статусну поруку..."
 
-#: ../src/statusicon.py:322
+#: ../src/statusicon.py:339
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "у _листи контаката"
 
-#: ../src/statusicon.py:333
+#: ../src/statusicon.py:350
 msgid "Hide this menu"
 msgstr "Сакриј овај мени"
 
@@ -10147,32 +10454,32 @@ msgstr ""
 "Овај сервис није могао одговорити са детаљним информацијама.\n"
 "Највероватније је застарео или у квару"
 
-#: ../src/vcard.py:251
+#: ../src/vcard.py:265
 msgid "?Client:Unknown"
 msgstr "?Клијент:Непознат"
 
-#: ../src/vcard.py:253
+#: ../src/vcard.py:267
 msgid "?OS:Unknown"
 msgstr "?ОС:Непознат"
 
-#: ../src/vcard.py:274
+#: ../src/vcard.py:288
 msgid "?Time:Unknown"
 msgstr "?Време:Непознато"
 
-#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
+#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
 #, python-format
 msgid "since %s"
 msgstr "од %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:345
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:349
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Везаност:</b>"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:357
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10180,7 +10487,7 @@ msgstr ""
 "Овај контакт је заинтересован за информације о Вашем присуству, али Вас не "
 "занимају информације о његовом/њеном присуству."
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:359
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10188,13 +10495,13 @@ msgstr ""
 "Ви сте заинтересовани за информације о присуству неког контакта, али њега/њу "
 "не занима Ваше присуство"
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:361
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "И Ви и Ваш контакт сте заинтересовани за информације о присуству један другог"
 
 #. None
-#: ../src/vcard.py:349
+#: ../src/vcard.py:363
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10202,26 +10509,70 @@ msgstr ""
 "Не интересује Вас присутност контакта, нити Ваша присутност интересује њега/"
 "њу"
 
-#: ../src/vcard.py:356
+#: ../src/vcard.py:370
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Чекате одговор контакта о Вашем захтеву за претплатом"
 
-#: ../src/vcard.py:358
+#: ../src/vcard.py:372
 msgid "There is no pending subscription request."
 msgstr "Нема захтева за претплатом на чекању."
 
-#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
+#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
 msgid " resource with priority "
 msgstr " ресурс са приоритетом "
 
-#~ msgid "_Available"
-#~ msgstr "_Доступан"
+#~ msgid "@"
+#~ msgstr "@"
+
+#~ msgid "_Disable showing event in systray"
+#~ msgstr "_Онемогући приказивање догађаја у системској касети"
+
+#~ msgid "_Show event in systray"
+#~ msgstr "Прикажи догађај у системској касети"
+
+#, fuzzy
+#~ msgid "Always use GNOME default applications"
+#~ msgstr "Увек користи апликацију коју оперативни систем нуди"
+
+#, fuzzy
+#~ msgid "Always use Xfce default applications"
+#~ msgstr "Увек користи апликацију коју оперативни систем нуди"
+
+#, fuzzy
+#~ msgid "Autodetect on every Gajim startup"
+#~ msgstr "По_вежи се приликом покретања Гајима"
+
+#~ msgid "Show systray:"
+#~ msgstr "Прикажи у системској касети:"
+
+#~ msgid "Nickname not allowed: %s"
+#~ msgstr "Недозвољен надимак: %s "
+
+#~ msgid "Room has been destroyed"
+#~ msgstr "Соба групног разговора је уништена"
+
+#~ msgid "You can join this room instead: %s"
+#~ msgstr "Можете се прикључити соби %s уместо ове"
+
+#~ msgid "I would like to add you to my roster."
+#~ msgstr "Желео бих да те додам на моју листу контаката."
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "сада сте претплаћени на %s"
 
-#~ msgid "PEP node was not removed"
-#~ msgstr "PEP чвор није уклоњен"
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "захтев за укидање претплате од контакта %s"
 
-#~ msgid "PEP node %(node)s was not removed: %(message)s"
-#~ msgstr "PEP чвор %(node)s није уклоњен: %(message)s"
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "сада Вам је укинута претплата од контакта %s"
+
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "Џабер ИД %s не поштује RFC правила. Неће бити додат на Вашу листу "
+#~ "контаката. Употребите алате као што је http://jru.jabberstudio.org/ да "
+#~ "бисте га уклонили"
 
 #~ msgid "Account Modification"
 #~ msgstr "Измена налога"
@@ -10331,40 +10682,9 @@ msgstr " ресурс са приоритетом "
 #~ msgid "gtk-delete"
 #~ msgstr "gtk-delete"
 
-#~ msgid "Add this contact to roster (Ctrl+D)"
-#~ msgstr "Додај овај контакт на листу (Ctrl+D)"
-
-#~ msgid "Bookmark this room (Ctrl+B)"
-#~ msgstr "_Маркирај ову собу (Ctrl+B)"
-
-#~ msgid "Browse the chat history (Ctrl+H)"
-#~ msgstr "Прегледај историјат разговора (Ctrl+H)"
-
-#~ msgid "Change the room's subject (Alt+T)"
-#~ msgstr "Промени тему собе (Alt+T)"
-
-#~ msgid "Change your nickname (Ctrl+N)"
-#~ msgstr "Промени надимак (Ctrl+N)"
-
-#~ msgid "Invite contacts to the conversation (Ctrl+G)"
-#~ msgstr "Позови контакте у конверзацију (Ctrl+G)"
-
 #~ msgid "Send a file (Ctrl+F)"
 #~ msgstr "Пошаљи датотеку (Ctrl+F)"
 
-#~ msgid "Show a list of emoticons (Alt+M)"
-#~ msgstr "Прикажи листу смајлија (Alt+M)"
-
-#~ msgid "Show a list of formattings"
-#~ msgstr "Прикажи листу форматирања"
-
-#, fuzzy
-#~ msgid "Show a menu of advanced functions (Alt+D)"
-#~ msgstr "Прикажи мени напредних функција (Alt+A)"
-
-#~ msgid "Show the contact's profile (Ctrl+I)"
-#~ msgstr "Прикажи профил контакта (Ctrl+I)"
-
 #~ msgid ""
 #~ "All chat states\n"
 #~ "Composing only\n"
@@ -10423,9 +10743,6 @@ msgstr " ресурс са приоритетом "
 #~ msgid "gtk-cancel"
 #~ msgstr "gtk-cancel"
 
-#~ msgid "_Preferences"
-#~ msgstr "_Подешавања"
-
 #~ msgid "_Quit"
 #~ msgstr "_Излаз"
 
@@ -10716,9 +11033,6 @@ msgstr " ресурс са приоритетом "
 #~ "Захтева python-gnome2-extras или компајлирање gtkspell модула из Гајим "
 #~ "изворног кода."
 
-#~ msgid "Notification-daemon"
-#~ msgstr "Notification-daemon"
-
 #~ msgid "Idle"
 #~ msgstr "У стању мировања"
 
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 2966c1f8b1fd4440de13ecc7384853ae9bcb95d7..0de9d97f8d0617bc92b36a4982f23938bac9f6ac 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -5,11 +5,15 @@
 #
 # B. Kokanovic <branko.kokanovic@gmail.com>, 2007.
 # Branko Kokanovic <branko.kokanovic@gmail.com>, 2008, 2009.
+#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: sr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 11:28+0200\n"
+"POT-Creation-Date: 2010-10-01 20:39+0200\n"
 "PO-Revision-Date: 2009-10-29 23:50+0100\n"
 "Last-Translator: Branko Kokanovic <branko.kokanovic@gmail.com>\n"
 "Language-Team:  <sr@li.org>\n"
@@ -29,7 +33,7 @@ msgstr "Priključi se _grupnom razgovoru..."
 msgid "_Add Contact..."
 msgstr "_Dodaj kontakt..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:17
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
 msgid "_Discover Services"
 msgstr "_Otkrivanje servisa"
 
@@ -49,7 +53,7 @@ msgstr "_Otvori Gmail dolaznu poštu"
 msgid "_Personal Events"
 msgstr "Lični događaji"
 
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:23
+#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
 msgid "_Start Chat..."
 msgstr "_Započni razgovor"
 
@@ -81,10 +85,6 @@ msgid "<b>Please select a server</b>"
 msgstr "<b>Molimo odaberite server</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid "@"
-msgstr "@"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
@@ -92,64 +92,64 @@ msgstr ""
 "Dodajte ovaj sertifikat listi sertifikata kojima verujete\n"
 "SHA1 potpis sertifikata:\n"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:10
 msgid "Anon_ymous authentication"
 msgstr "Anon_imno prijavljivanje"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Connect when I press Finish"
 msgstr "Poveži se kada pritisnem Završi"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: čarobnjak za kreiranje naloga"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "I already have an account I want to _use"
 msgstr "Već imam nalog koji želim da koristim"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I want to _register for a new account"
 msgstr "Želim da registrujem novi nalog"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:16
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 #: ../data/gui/accounts_window.ui.h:28
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Ako je označeno, Gajim će pamtiti lozinku za ovaj nalog"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:17
+#: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Podesi..."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:18
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
 #: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2263 ../src/config.py:2342
-#: ../src/config.py:2355 ../src/config.py:3596 ../src/config.py:3671
-#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513
-#: ../src/dialogs.py:526 ../src/roster_window.py:2890
-#: ../src/roster_window.py:2896 ../src/roster_window.py:2901
+#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
+#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
+#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
+#: ../src/dialogs.py:527 ../src/roster_window.py:2956
+#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
 msgid "None"
 msgstr "Ništa"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:19
+#: ../data/gui/account_creation_wizard_window.ui.h:18
 msgid "Prox_y:"
 msgstr "Prok_si:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #: ../data/gui/accounts_window.ui.h:48
 msgid "Save pass_word"
 msgstr "Snimi lozinku"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:21
+#: ../data/gui/account_creation_wizard_window.ui.h:20
 msgid "Set my profile when I connect"
 msgstr "Postavi moj profil pri povezivanju"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:22
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Use custom hostname/port"
 msgstr "Koristi Vaše određeno ime hosta/port "
 
-#: ../data/gui/account_creation_wizard_window.ui.h:23
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -157,34 +157,34 @@ msgstr ""
 "Morate posedovati račun da biste se mogli povezati\n"
 "na džaber mrežu."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-#: ../data/gui/roster_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:16
 msgid "_Advanced"
 msgstr "_Napredno"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:25
 msgid "_Finish"
 msgstr "_Završi"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:27
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Hostname:"
 msgstr "Ime hosta:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #: ../data/gui/accounts_window.ui.h:62
 msgid "_Jabber ID:"
 msgstr "_Džaber ID:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:28
 #: ../data/gui/accounts_window.ui.h:64
 msgid "_Password:"
 msgstr "_Lozinka:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:29
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:31
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Server:"
 msgstr "_Server:"
 
@@ -292,17 +292,17 @@ msgstr "Ime:"
 #. No configured account
 #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
 #: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592
-#: ../src/notify.py:608
+#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
+#: ../src/notify.py:616
 msgid "Gajim"
 msgstr "Gajim"
 
 #. FIXME: Ugly workaround.
 #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
 #. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:61
-#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121
-#: ../src/roster_window.py:2832 ../src/roster_window.py:5379
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
+#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
 msgid "General"
 msgstr "Opšte"
 
@@ -360,7 +360,7 @@ msgstr "Informacije o Vama, kako su uskladištene na serveru"
 
 #: ../data/gui/accounts_window.ui.h:35
 #: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:830
+#: ../src/dialogs.py:831
 msgid "Jabber ID:"
 msgstr "Džaber ID:"
 
@@ -374,7 +374,7 @@ msgid "Mer_ge accounts"
 msgstr "_Spoji naloge"
 
 #: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2356
+#: ../src/config.py:2358
 msgid "No key selected"
 msgstr "Nije odabran nijedan ključ"
 
@@ -401,7 +401,7 @@ msgid "Priority will change automatically according to your status."
 msgstr "Prioritet će biti automatski promenjen prema Vašem statusu."
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5329
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
 msgid "Re_name"
 msgstr "Prei_menuj"
 
@@ -626,38 +626,43 @@ msgid "Deletes Message of the Day"
 msgstr "Briše poruku dana"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
+#, fuzzy
+msgid "Edit Archi_ving Preferences"
+msgstr "_Podešavanja"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Edit _Privacy Lists..."
 msgstr "Izmeni liste _privatnosti..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sends a message to users currently connected to this server"
 msgstr "Å alje poruku trenutno povezanim korisnicima ovog servera"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Set MOTD..."
 msgstr "Postavi poruku dana..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Postavlja poruku dana"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Show _XML Console"
 msgstr "Prikaži _XML Konzolu"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "Update MOTD..."
 msgstr "Osveži poruku dana..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "Osvežava poruku dana"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:11
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:11
+#: ../data/gui/advanced_menuitem_menu.ui.h:12
 msgid "_Send Server Message..."
 msgstr "_Pošalji serversku poruku..."
 
@@ -691,7 +696,7 @@ msgid "All statuses"
 msgstr "Svi statusi"
 
 #: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:233
+#: ../src/common/commands.py:106 ../src/common/helpers.py:239
 #: ../src/tooltips.py:193
 msgid "Away"
 msgstr "Odsutan"
@@ -744,7 +749,7 @@ msgid "Have "
 msgstr "Imam "
 
 #: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:249
 msgid "Invisible"
 msgstr "Nevidljiv"
 
@@ -753,7 +758,7 @@ msgid "Launch a command"
 msgstr "Pokrenite komandu"
 
 #: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:216 ../src/tooltips.py:197
+#: ../src/common/helpers.py:222 ../src/tooltips.py:197
 msgid "Not Available"
 msgstr "Nedostupan"
 
@@ -797,12 +802,13 @@ msgid "_Disable existing sound for this event"
 msgstr "_Onemogući postojeći zvuk za ovaj događaj"
 
 #: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in roster"
+#, fuzzy
+msgid "_Disable showing event in notification area"
 msgstr "_Onemogući prikazivanje događaja u listi kontakata"
 
 #: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in systray"
-msgstr "_Onemogući prikazivanje događaja u sistemskoj kaseti"
+msgid "_Disable showing event in roster"
+msgstr "_Onemogući prikazivanje događaja u listi kontakata"
 
 #: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
@@ -813,12 +819,13 @@ msgid "_Open chat window with user"
 msgstr "_Otvori prozor za razgovor sa korisnikom"
 
 #: ../data/gui/advanced_notifications_window.ui.h:35
-msgid "_Show event in roster"
+#, fuzzy
+msgid "_Show event in notification area"
 msgstr "Prikaži događaj u listi kontakata"
 
 #: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in systray"
-msgstr "Prikaži događaj u sistemskoj kaseti"
+msgid "_Show event in roster"
+msgstr "Prikaži događaj u listi kontakata"
 
 #: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
@@ -846,6 +853,45 @@ msgstr "Grupe"
 msgid "when I'm in"
 msgstr "kada sam u"
 
+#: ../data/gui/archiving_preferences_window.ui.h:1
+msgid "<i>Method Auto</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "<i>Method Local</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:3
+msgid "<i>Method Manual</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:4
+#, fuzzy
+msgid "Auto"
+msgstr "Automatsko povezivanje"
+
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Concede"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "Forbid"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:7
+#, fuzzy
+msgid "No"
+msgstr "Ništa"
+
+#: ../data/gui/archiving_preferences_window.ui.h:8
+#, fuzzy
+msgid "Prefer"
+msgstr "Podešavanja"
+
+#: ../data/gui/archiving_preferences_window.ui.h:9
+msgid "Yes"
+msgstr ""
+
 #: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Unos:"
@@ -872,8 +918,8 @@ msgstr "Blokirani kontakti"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5348
-#: ../src/roster_window.py:5476 ../src/roster_window.py:5609
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
+#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
 msgid "_Unblock"
 msgstr "_Odblokiraj"
 
@@ -961,7 +1007,7 @@ msgid "_Start Chat"
 msgstr "_Započni razgovor"
 
 #. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4184
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
 msgid "#"
 msgstr "#"
 
@@ -1009,13 +1055,50 @@ msgstr ""
 msgid "9"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:13
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Dodaj ovaj kontakt na listu (Ctrl+D)"
+
 #: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Pregledaj istorijat razgovora (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:15
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Pozovi kontakte u konverzaciju (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Prikaži listu smajlija (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
+msgid "Show a list of formattings"
+msgstr "Prikaži listu formatiranja"
+
+#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Prikaži meni naprednih funkcija (Alt+A)"
+
+#: ../data/gui/chat_control.ui.h:19
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr "Prikaži profil kontakta (Ctrl+I)"
+
+#: ../data/gui/chat_control.ui.h:20
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:21
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
 #: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Pošalji"
 
-#: ../data/gui/chat_control.ui.h:15 ../data/gui/groupchat_control.ui.h:3
+#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
 msgid "label"
 msgstr ""
 
@@ -1065,8 +1148,8 @@ msgstr "Izmeni _grupe..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5284
-#: ../src/roster_window.py:5444
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
+#: ../src/roster_window.py:5516
 msgid "In_vite to"
 msgstr "Pozo_vi u"
 
@@ -1078,8 +1161,8 @@ msgstr "Pozovi kontakte"
 msgid "Remo_ve"
 msgstr "_Ukloni"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5294
-#: ../src/roster_window.py:5533
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
+#: ../src/roster_window.py:5605
 msgid "Send Cus_tom Status"
 msgstr "Pošalji korisnički definisan status"
 
@@ -1112,8 +1195,8 @@ msgid "_Allow him/her to see my status"
 msgstr "_Dozvoli mu/joj da vidi moj status"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5482 ../src/roster_window.py:5612
+#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
+#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
 msgid "_Block"
 msgstr "_Blokiraj"
 
@@ -1123,8 +1206,8 @@ msgstr "_Zabrani mu/joj da vidi moj status"
 
 #: ../data/gui/contact_context_menu.ui.h:20
 #: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:21
-#: ../src/roster_window.py:5683
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
+#: ../src/roster_window.py:5755
 msgid "_History"
 msgstr "_Istorijat"
 
@@ -1257,7 +1340,7 @@ msgstr "<b>Boje jezičaka statusa razgovora</b>"
 msgid "Account row"
 msgstr "Nalog"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:925
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
 msgid "Bold"
 msgstr "Podebljano"
 
@@ -1295,7 +1378,7 @@ msgstr "Grupa"
 msgid "Inactive"
 msgstr "Neaktivno"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:926
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
 msgid "Italic"
 msgstr "Kurziv"
 
@@ -1343,7 +1426,7 @@ msgstr "Promeni _temu..."
 msgid "Configure _Room..."
 msgstr "Podesi _sobu..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1782
+#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
 msgid "_Bookmark"
 msgstr "_Markiraj ovu so_bu"
 
@@ -1403,19 +1486,31 @@ msgstr "_Pošalji privatnu poruku"
 msgid "_Voice"
 msgstr "_Glas"
 
+#: ../data/gui/groupchat_control.ui.h:1
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "_Markiraj ovu sobu (Ctrl+B)"
+
+#: ../data/gui/groupchat_control.ui.h:3
+msgid "Change the room's subject (Alt+T)"
+msgstr "Promeni temu sobe (Alt+T)"
+
+#: ../data/gui/groupchat_control.ui.h:4
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Promeni nadimak (Ctrl+N)"
+
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Napravi novu objavu"
 
-#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
-msgid "From"
-msgstr "Od"
+#: ../data/gui/groups_post_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:2
+msgid "From:"
+msgstr "Od:"
 
-#. holds subject
-#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
-#: ../src/history_manager.py:219
-msgid "Subject"
-msgstr "Tema"
+#: ../data/gui/groups_post_window.ui.h:3
+#: ../data/gui/single_message_window.ui.h:7
+msgid "Subject:"
+msgstr "Tema:"
 
 #: ../data/gui/history_manager.ui.h:1
 msgid ""
@@ -1433,8 +1528,8 @@ msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Dobrodošli u Gajimov menadžer dnevnika istorijata</b></big>"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3208
-#: ../src/dialogs.py:3305
+#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
+#: ../src/dialogs.py:3321
 msgid "Delete"
 msgstr "Obriši"
 
@@ -1492,12 +1587,75 @@ msgstr "Pretraga:"
 msgid "_Log conversation history"
 msgstr "_Pamti u dnevniku istorijat razgovora"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
+msgid "approve"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:2
+msgid "body"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:3
+msgid "concede"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:4
+msgid "expire"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:5
+msgid "false"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:6
+msgid "forbid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:7
+#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+msgid "jid"
+msgstr "džid"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:8
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
+#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
+msgid "message"
+msgstr "poruka"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
+msgid "oppose"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
+#, fuzzy
+msgid "otr"
+msgstr "Naložen"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:11
+msgid "prefer"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:12
+msgid "require"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:13
+msgid "save"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:14
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
 msgid "Bro_wse Rooms"
 msgstr "_Pregled"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2180
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
 msgid "Join Group Chat"
 msgstr "Pridruži se grupnom razgovoru"
 
@@ -1535,8 +1693,8 @@ msgstr "Server:"
 msgid "_Bookmark this room"
 msgstr "Markiraj ovu sobu"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1341
-#: ../src/disco.py:1786
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../src/disco.py:1804
 msgid "_Join"
 msgstr "_Pridruži se"
 
@@ -1641,6 +1799,75 @@ msgstr "_Korisničko ime:"
 msgid "Passphrase"
 msgstr "Lozinka"
 
+#: ../data/gui/plugins_window.ui.h:1
+msgid "&lt;empty&gt;"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:2
+msgid "<empty>"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:3
+#, fuzzy
+msgid "Authors:"
+msgstr "_Odobri autorizaciju"
+
+#: ../data/gui/plugins_window.ui.h:4
+#, fuzzy
+msgid "Available"
+msgstr "_Dostupan"
+
+#: ../data/gui/plugins_window.ui.h:5
+#, fuzzy
+msgid "Configure"
+msgstr "_Konfiguriši"
+
+#: ../data/gui/plugins_window.ui.h:6
+#, fuzzy
+msgid "Descrition:"
+msgstr "Opis:"
+
+#: ../data/gui/plugins_window.ui.h:7
+#, fuzzy
+msgid "Homepage:"
+msgstr "<b>Lična strana:</b>"
+
+#: ../data/gui/plugins_window.ui.h:8
+msgid "Install"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:9
+#, fuzzy
+msgid "Installed"
+msgstr "Zastoj"
+
+#: ../data/gui/plugins_window.ui.h:10
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:11
+msgid "Plugins"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:12
+msgid "Uninstall"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:13
+#, fuzzy
+msgid "Version:"
+msgstr "GTK+ verzija:"
+
+#: ../data/gui/plugins_window.ui.h:14
+msgid "button"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:15
+msgid "homepage url"
+msgstr ""
+
 #: ../data/gui/popup_notification_window.ui.h:1
 #, fuzzy
 msgid "Event Type"
@@ -1769,123 +1996,103 @@ msgid "Always"
 msgstr "Odsutan"
 
 #: ../data/gui/preferences_window.ui.h:31
-#, fuzzy
-msgid "Always use GNOME default applications"
-msgstr "Uvek koristi aplikaciju koju operativni sistem nudi"
-
-#: ../data/gui/preferences_window.ui.h:32
-#, fuzzy
-msgid "Always use KDE default applications"
-msgstr "Uvek koristi aplikaciju koju operativni sistem nudi"
-
-#: ../data/gui/preferences_window.ui.h:33
-#, fuzzy
-msgid "Always use Xfce default applications"
-msgstr "Uvek koristi aplikaciju koju operativni sistem nudi"
-
-#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Pitaj za statusnu poruku pri:"
 
-#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
 msgid "Audio / Video"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:33
 msgid "Audio input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Audio output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:38
-#, fuzzy
-msgid "Autodetect on every Gajim startup"
-msgstr "Po_veži se prilikom pokretanja Gajima"
-
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:35
 msgid "Chat message:"
 msgstr "Poruka razgovora:"
 
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:36
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Proveri po startovanju da li je Gajim podrazumevani džaber klijent"
 
-#: ../data/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:37
 #, fuzzy
 msgid "Composing only"
 msgstr "Sastavljanje"
 
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:38
 msgid "Configure color and font of the interface"
 msgstr "Konfigurisanje boje i fonta interfejsa"
 
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Poruka razgovora:"
 
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Ime kontakta"
 
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:41
 msgid "Custom"
 msgstr "Korisnički"
 
-#: ../data/gui/preferences_window.ui.h:46
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Detached roster with chat grouped by account"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Detached roster with detached chats"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:45
 msgid "Detached roster with single chat"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
-#: ../src/config.py:671
+#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
+#: ../src/config.py:665
 msgid "Disabled"
 msgstr "Onemogućeno"
 
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:47
 msgid "Display _activity of contacts in roster"
 msgstr "Prikaži aktivnosti kontakata na listi"
 
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:48
 msgid "Display _extra email details"
 msgstr "Prikaži dodatne e-mejl detalje"
 
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:49
 #, fuzzy
 msgid "Display _location of contacts in roster"
 msgstr "Prikaži _raspoloženja kontakata na listi"
 
-#: ../data/gui/preferences_window.ui.h:54
+#: ../data/gui/preferences_window.ui.h:50
 msgid "Display _tunes of contacts in roster"
 msgstr "Prikaži _pesme kontakata na listi"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display a_vatars of contacts in roster"
 msgstr "Prikaži _avatare kontakata na listi"
 
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display m_ood of contacts in roster"
 msgstr "Prikaži _raspoloženja kontakata na listi"
 
-#: ../data/gui/preferences_window.ui.h:57
+#: ../data/gui/preferences_window.ui.h:53
 msgid "Display status _messages of contacts in roster"
 msgstr "Prikaži statusne poruke kontakata na listi"
 
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:54
 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 "
@@ -1895,7 +2102,7 @@ msgstr ""
 "sa kontaktom. Ovde možete odrediti koja stanja razgovora će se prikazivati u "
 "prozorima razgovora."
 
-#: ../data/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:55
 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 "
@@ -1905,7 +2112,7 @@ msgstr ""
 "sa kontaktom. Ovde možete odrediti koja stanja razgovora će se slati drugoj "
 "osobi."
 
-#: ../data/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:56
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1913,11 +2120,11 @@ msgstr ""
 "Gajim će Vas obavestiti o kontaktima koji su se upravo odjavili sa iskačućim "
 "prozorom u donjem desnom uglu ekrana"
 
-#: ../data/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:58
 msgid "Hide all buttons in chat windows"
 msgstr "Sakrij svu dugmad u prozoru razgovora"
 
-#: ../data/gui/preferences_window.ui.h:63
+#: ../data/gui/preferences_window.ui.h:59
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1925,7 +2132,7 @@ msgstr ""
 "Ako je označena, Gajim će dozvoliti drugima da pogledaju koji operativni "
 "sistem koristite"
 
-#: ../data/gui/preferences_window.ui.h:64
+#: ../data/gui/preferences_window.ui.h:60
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1933,14 +2140,14 @@ msgstr ""
 "Ako je označena, Gajim će ujedno uključiti i informacije o pošiljaocu novih "
 "e-mejlova"
 
-#: ../data/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:61
 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/gui/preferences_window.ui.h:66
+#: ../data/gui/preferences_window.ui.h:62
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1948,7 +2155,7 @@ msgstr ""
 "Ako je označena, Gajim će promeniti status u Nedostupan kada računar još "
 "duže nije u upotrebi"
 
-#: ../data/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1956,7 +2163,7 @@ msgstr ""
 "Ako je označena, Gajim će prikazivati avatare kontakata u listi kontakata i "
 "u grupnim razgovorima"
 
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1964,13 +2171,13 @@ msgstr ""
 "Ako je označena, Gajim će prikazivati statusne poruke kontakata ispod imena "
 "kontakta u listi kontakata i u grupnim razgovorima"
 
-#: ../data/gui/preferences_window.ui.h:69
+#: ../data/gui/preferences_window.ui.h:65
 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/gui/preferences_window.ui.h:70
+#: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the location of contacts in the roster window"
@@ -1978,20 +2185,20 @@ msgstr ""
 "Ako je označena, Gajim će prikazivati raspoloženje kontakata u listi "
 "kontakata"
 
-#: ../data/gui/preferences_window.ui.h:71
+#: ../data/gui/preferences_window.ui.h:67
 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/gui/preferences_window.ui.h:72
+#: ../data/gui/preferences_window.ui.h:68
 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/gui/preferences_window.ui.h:73
+#: ../data/gui/preferences_window.ui.h:69
 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 "
@@ -2002,7 +2209,7 @@ msgstr ""
 "polje za unos, podrazumevani jezik će biti korišćen za ovaj kontakt ili "
 "grupni razgovor."
 
-#: ../data/gui/preferences_window.ui.h:74
+#: ../data/gui/preferences_window.ui.h:70
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -2011,7 +2218,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/gui/preferences_window.ui.h:75
+#: ../data/gui/preferences_window.ui.h:71
 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 "
@@ -2021,7 +2228,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/gui/preferences_window.ui.h:76
+#: ../data/gui/preferences_window.ui.h:72
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -2029,7 +2236,7 @@ msgstr ""
 "Ako je označena, Gajim će prikazati poruku kada se primi novi e-mejl preko "
 "GMail-amejlova"
 
-#: ../data/gui/preferences_window.ui.h:77
+#: ../data/gui/preferences_window.ui.h:73
 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, "
@@ -2038,7 +2245,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/gui/preferences_window.ui.h:78
+#: ../data/gui/preferences_window.ui.h:74
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -2046,7 +2253,7 @@ msgstr ""
 "Ako je označena, Gajim neće pitati za statusnu poruku. Već postavljena "
 "podrazumevana poruka će biti korišćena."
 
-#: ../data/gui/preferences_window.ui.h:79
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2054,45 +2261,45 @@ msgstr ""
 "Ako nije onemogućeno, Gajim će zameniti ascii smajlije kao npr. ':)' sa "
 "ekvivalentnim animiranim ili statičnim grafičkim smajlijima"
 
-#: ../data/gui/preferences_window.ui.h:80
+#: ../data/gui/preferences_window.ui.h:76
 msgid "Log _encrypted chat session"
 msgstr "Upisuj u dnevnik Å¡ifrovane sesije razgovora"
 
-#: ../data/gui/preferences_window.ui.h:81
+#: ../data/gui/preferences_window.ui.h:77
 msgid "Ma_ke message windows compact"
 msgstr "Načini prozor poruke kompaktnim"
 
-#: ../data/gui/preferences_window.ui.h:82
+#: ../data/gui/preferences_window.ui.h:78
 msgid "Ma_nage..."
 msgstr "Pode_si..."
 
-#: ../data/gui/preferences_window.ui.h:83
+#: ../data/gui/preferences_window.ui.h:79
 #, fuzzy
 msgid "Never"
 msgstr "Server"
 
-#: ../data/gui/preferences_window.ui.h:84
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Notifications"
 msgstr "Obaveštenja"
 
-#: ../data/gui/preferences_window.ui.h:85
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Notify me about contacts that sign _in"
 msgstr "Obavesti me o kontaktima koji se _prijave"
 
-#: ../data/gui/preferences_window.ui.h:86
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Notify me about contacts that sign _out"
 msgstr "Obavesti me o kontaktima koji se _odjave"
 
-#: ../data/gui/preferences_window.ui.h:87
+#: ../data/gui/preferences_window.ui.h:83
 #, fuzzy
 msgid "Notify me about it"
 msgstr "Obavesti me o kontaktima koji se _odjave"
 
-#: ../data/gui/preferences_window.ui.h:88
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notify on new _GMail email"
 msgstr "Obavesti me o novopristigloj Gmail e-mejl pošti"
 
-#: ../data/gui/preferences_window.ui.h:89
+#: ../data/gui/preferences_window.ui.h:85
 #, fuzzy
 msgid "Only when pending events"
 msgstr ""
@@ -2100,55 +2307,56 @@ msgstr ""
 "Samo za događaje na čekanju\n"
 "Uvek"
 
-#: ../data/gui/preferences_window.ui.h:90
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Personal Events"
 msgstr "Lični događaji"
 
-#: ../data/gui/preferences_window.ui.h:91
+#: ../data/gui/preferences_window.ui.h:87
 msgid "Play _sounds"
 msgstr "Puštaj zvukove"
 
-#: ../data/gui/preferences_window.ui.h:92
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Pop it up"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:93
+#: ../data/gui/preferences_window.ui.h:89
 msgid "Preferences"
 msgstr "Podešavanja"
 
-#: ../data/gui/preferences_window.ui.h:94
+#: ../data/gui/preferences_window.ui.h:90
 msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:96
+#: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
 msgid "STUN server:"
 msgstr "Server:"
 
-#: ../data/gui/preferences_window.ui.h:97
+#: ../data/gui/preferences_window.ui.h:93
+#, fuzzy
+msgid "Show notification area icon:"
+msgstr "Notification-daemon"
+
+#: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
 msgid "Show only in roster"
 msgstr "Prikaži događaj u listi kontakata"
 
-#: ../data/gui/preferences_window.ui.h:98
-msgid "Show systray:"
-msgstr "Prikaži u sistemskoj kaseti:"
-
-#: ../data/gui/preferences_window.ui.h:99
+#: ../data/gui/preferences_window.ui.h:95
 msgid "Sign _in"
 msgstr "Prijavljivanju"
 
-#: ../data/gui/preferences_window.ui.h:100
+#: ../data/gui/preferences_window.ui.h:96
 msgid "Sign _out"
 msgstr "Odjavljivanju"
 
-#: ../data/gui/preferences_window.ui.h:101
+#: ../data/gui/preferences_window.ui.h:97
 msgid "Single window for everything"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:102
+#: ../data/gui/preferences_window.ui.h:98
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2156,27 +2364,27 @@ msgstr ""
 "Neke poruke mogu uključivati bogati sadržaj (formatiranje, boje itd.). Ako "
 "je označeno, Gajim će samo prikazivati sirovi tekst poruke."
 
-#: ../data/gui/preferences_window.ui.h:103
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sort contacts by status"
 msgstr "Sortiraj kontakte po statusu"
 
-#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
 msgid "Status"
 msgstr "Status"
 
-#: ../data/gui/preferences_window.ui.h:105
+#: ../data/gui/preferences_window.ui.h:101
 msgid "Status _iconset:"
 msgstr "Skup statusnih ikona:"
 
-#: ../data/gui/preferences_window.ui.h:106
+#: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Stil"
 
-#: ../data/gui/preferences_window.ui.h:107
+#: ../data/gui/preferences_window.ui.h:103
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/gui/preferences_window.ui.h:108
+#: ../data/gui/preferences_window.ui.h:104
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2188,7 +2396,7 @@ msgstr ""
 "$S će biti zamenjeno prethodnom statusnom porukom\n"
 "$T će biti zamenjeno sa vremenom odsutnosti"
 
-#: ../data/gui/preferences_window.ui.h:111
+#: ../data/gui/preferences_window.ui.h:107
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2200,121 +2408,126 @@ msgstr ""
 "$S će biti zamenjeno prethodnom statusnom porukom\n"
 "$T će biti zamenjeno sa vremenom nedostupnosti"
 
-#: ../data/gui/preferences_window.ui.h:114
+#: ../data/gui/preferences_window.ui.h:110
 msgid "Use _transports icons"
 msgstr "Koristi ikone za _transporte"
 
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:111
+#, fuzzy
+msgid "Use default applications"
+msgstr "Uvek koristi aplikaciju koju operativni sistem nudi"
+
+#: ../data/gui/preferences_window.ui.h:112
 msgid "Use system _default"
 msgstr "Koristi sistemski podrazumevano"
 
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:113
 msgid "Video framerate"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:117
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Video input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:118
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Video output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:119
+#: ../data/gui/preferences_window.ui.h:116
 msgid "Video size"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:120
+#: ../data/gui/preferences_window.ui.h:117
 msgid "When new event is received:"
 msgstr "Kada se primi novi događaj:"
 
-#: ../data/gui/preferences_window.ui.h:121
+#: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
 msgid "Your message:"
 msgstr "Poruka greške: %s"
 
-#: ../data/gui/preferences_window.ui.h:122
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your nickname:"
 msgstr "Nadimak:"
 
-#: ../data/gui/preferences_window.ui.h:123
+#: ../data/gui/preferences_window.ui.h:120
 msgid "_Away after:"
 msgstr "Autom_atski odsutan posle:"
 
-#: ../data/gui/preferences_window.ui.h:124
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Internet pregledač:"
 
-#: ../data/gui/preferences_window.ui.h:125
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Display chat state notifications:"
 msgstr "_Prikazana obaveštenja o stanju razgovora:"
 
-#: ../data/gui/preferences_window.ui.h:126
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Emoticons:"
 msgstr "_Smajliji:"
 
-#: ../data/gui/preferences_window.ui.h:127
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_File manager:"
 msgstr "_Pregledač datoteka:"
 
-#: ../data/gui/preferences_window.ui.h:128
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_Highlight misspelled words"
 msgstr "_Oboji pogrešno napisane reči"
 
-#: ../data/gui/preferences_window.ui.h:129
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignoriši događaje od kontakata koji nisu na listi"
 
-#: ../data/gui/preferences_window.ui.h:130
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignoriši bogato formatirani sadržaj u pristiglim porukama"
 
-#: ../data/gui/preferences_window.ui.h:131
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Log status changes of contacts"
 msgstr "_Zapisuj u dnevnik statusne promene kontakata"
 
-#: ../data/gui/preferences_window.ui.h:132
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Mail client:"
 msgstr "_E-mejl klijent:"
 
-#: ../data/gui/preferences_window.ui.h:133
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Not available after:"
 msgstr "Automatski _nedostupan nakon:"
 
-#: ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Open..."
 msgstr "_Otvori..."
 
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Reset to Default Colors"
 msgstr "_Ponovo učitaj podrazumevane boje"
 
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Send chat state notifications:"
 msgstr "Pošalji obaveštenja o stanju razgovora:"
 
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Status message:"
 msgstr "_Statusna poruka:"
 
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_URL highlight:"
 msgstr "URL osvetljavanje:"
 
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_Window behavior:"
 msgstr "Ponašanje prozora:"
 
-#: ../data/gui/preferences_window.ui.h:140
+#: ../data/gui/preferences_window.ui.h:137
 msgid "in _group chats"
 msgstr "u _grupnim razgovorima"
 
-#: ../data/gui/preferences_window.ui.h:141
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _roster"
 msgstr "u _listi kontakata"
 
-#: ../data/gui/preferences_window.ui.h:142
+#: ../data/gui/preferences_window.ui.h:139
 msgid "minutes"
 msgstr "minuta"
 
@@ -2366,7 +2579,7 @@ msgstr "Džaber ID"
 msgid "Order:"
 msgstr "Poredak:"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3436
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
 msgid "Privacy List"
 msgstr "Lista privatnosti"
 
@@ -2577,8 +2790,8 @@ msgstr "Ukloni nalog i iz Gajima i sa servera"
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5492 ../src/roster_window.py:5622
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
+#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
 msgid "_Remove"
 msgstr "_Ukloni"
 
@@ -2624,56 +2837,60 @@ msgid "Help online"
 msgstr "Pomoć sa interneta"
 
 #: ../data/gui/roster_window.ui.h:8
+msgid "P_lugins"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:9
 msgid "Profile, A_vatar"
 msgstr "Profil, A_vatar"
 
-#: ../data/gui/roster_window.ui.h:9
+#: ../data/gui/roster_window.ui.h:10
 msgid "Show Only _Active Contacts"
 msgstr "Prikaži samo _aktivne kontakte"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
 msgid "Show Trans_ports"
 msgstr "Prikaži trans_porte"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
 msgid "Show _Offline Contacts"
 msgstr "Prikaži kontakte koji nisu na vezi"
 
-#: ../data/gui/roster_window.ui.h:12 ../src/statusicon.py:326
+#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
 msgid "Show _Roster"
 msgstr "_Prikaži listu kontakata"
 
-#: ../data/gui/roster_window.ui.h:13
+#: ../data/gui/roster_window.ui.h:14
 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/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
 #: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Akcije"
 
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
 msgid "_Contents"
 msgstr "_Sadržaj"
 
-#: ../data/gui/roster_window.ui.h:18 ../src/disco.py:1502
+#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
 msgid "_Edit"
 msgstr "_Izmeni"
 
-#: ../data/gui/roster_window.ui.h:19
+#: ../data/gui/roster_window.ui.h:20
 msgid "_FAQ"
 msgstr "_ÄŒPP"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Help"
 msgstr "_Pomoć"
 
-#: ../data/gui/roster_window.ui.h:22
+#: ../data/gui/roster_window.ui.h:23
 msgid "_Send Single Message..."
 msgstr "Pošalji jednu _poruku..."
 
-#: ../data/gui/roster_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:25
 msgid "_View"
 msgstr "_Prikaz"
 
@@ -2690,11 +2907,11 @@ msgid "_Add contact"
 msgstr "Dodaj _kontakt"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5634
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
 msgid "_Information"
 msgstr "Informacije"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1353
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
 msgid "_Search"
 msgstr "_Pretraga"
 
@@ -2714,10 +2931,6 @@ msgstr "Registruj se na"
 msgid "_Cancel"
 msgstr "_Odustani"
 
-#: ../data/gui/single_message_window.ui.h:2
-msgid "From:"
-msgstr "Od:"
-
 #: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Odgovori na ovu poruku"
@@ -2734,10 +2947,6 @@ msgstr "Pošalji poruku"
 msgid "Send message and close window"
 msgstr "Pošalji poruku i zatvori prozor"
 
-#: ../data/gui/single_message_window.ui.h:7
-msgid "Subject:"
-msgstr "Tema:"
-
 #: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Za:"
@@ -2945,25 +3154,35 @@ msgstr "Gajim Brze Poruke"
 msgid "Jabber IM Client"
 msgstr "Džaber IM Klijent"
 
-#: ../src/adhoc_commands.py:314
+#: ../src/adhoc_commands.py:323
 msgid "Cancel confirmation"
 msgstr "Poništi odobravanje"
 
-#: ../src/adhoc_commands.py:315
+#: ../src/adhoc_commands.py:324
 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:351 ../src/adhoc_commands.py:374
+#: ../src/adhoc_commands.py:370
+#, fuzzy
+msgid "Invalid Form"
+msgstr "Neispravna soba"
+
+#: ../src/adhoc_commands.py:371
+#, fuzzy
+msgid "The form is not filled correctly."
+msgstr "Nadimak sadrži nedozvoljene karaktere."
+
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
 msgid "Service sent malformed data"
 msgstr "Servis je poslao loše podatke"
 
-#: ../src/adhoc_commands.py:360
+#: ../src/adhoc_commands.py:399
 msgid "Service changed the session identifier."
 msgstr "Servis je izmenio identifikator sesije."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:471
+#: ../src/adhoc_commands.py:513
 msgid "Service returned an error."
 msgstr "Servis je vratio grešku."
 
@@ -2988,7 +3207,7 @@ msgstr "Ceo broj"
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:945
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
 msgid "Color"
 msgstr "Boja"
 
@@ -3026,186 +3245,186 @@ msgstr[2] "Primili ste nove unose (%(count)d nije prikazano):"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "English"
 msgstr "Engleski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Belarusian"
 msgstr "Beloruski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Bulgarian"
 msgstr "Bugarski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Breton"
 msgstr "Bretanski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Czech"
 msgstr "Češki"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "German"
 msgstr "Nemački"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Greek"
 msgstr "Grčki"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "British"
 msgstr "Britanski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Spanish"
 msgstr "Å panski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Basque"
 msgstr "Baskijski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "French"
 msgstr "Francuski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Italian"
 msgstr "Italijanski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian (b)"
 msgstr "Norveški (b)"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Dutch"
 msgstr "Holandski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian"
 msgstr "Norveški"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Polish"
 msgstr "Poljski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Portuguese"
 msgstr "Portugalski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Brazilian Portuguese"
 msgstr "Brazilski portugalski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Russian"
 msgstr "Ruski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Serbian"
 msgstr "Srpski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Slovak"
 msgstr "Slovački"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Swedish"
 msgstr "Å vedski"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Chinese (Ch)"
 msgstr "Kineski (Ch)"
 
-#: ../src/chat_control.py:479
+#: ../src/chat_control.py:496
 msgid "Spelling language"
 msgstr "Jezik za pravopis"
 
 #. we are not connected
-#: ../src/chat_control.py:511 ../src/chat_control.py:720
+#: ../src/chat_control.py:528 ../src/chat_control.py:737
 msgid "A connection is not available"
 msgstr "Veza nije dostupna"
 
-#: ../src/chat_control.py:512 ../src/chat_control.py:721
+#: ../src/chat_control.py:529 ../src/chat_control.py:738
 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:927
+#: ../src/chat_control.py:944
 msgid "Underline"
 msgstr "Podvučeno"
 
-#: ../src/chat_control.py:928
+#: ../src/chat_control.py:945
 msgid "Strike"
 msgstr "Precrtano"
 
-#: ../src/chat_control.py:951
+#: ../src/chat_control.py:968
 msgid "Font"
 msgstr "Font"
 
-#: ../src/chat_control.py:960
+#: ../src/chat_control.py:977
 msgid "Clear formating"
 msgstr "Očisti formatiranje"
 
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1055
 msgid "Really send file?"
 msgstr "Stvarno pošalji datoteku?"
 
-#: ../src/chat_control.py:1039
+#: ../src/chat_control.py:1056
 #, 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:1503 ../src/chat_control.py:1987
+#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
 msgid "GPG encryption enabled"
 msgstr "GPG enkripcija omogućena"
 
 #. Add to roster
-#: ../src/chat_control.py:1528 ../src/common/contacts.py:158
+#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
 #: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:245 ../src/dialogs.py:1064 ../src/dialogs.py:2078
-#: ../src/dialogs.py:2107 ../src/gui_interface.py:674
+#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
+#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
 #: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1610 ../src/roster_window.py:1612
-#: ../src/roster_window.py:1942 ../src/roster_window.py:3289
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
+#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
+#: ../src/roster_window.py:3382
 msgid "Not in Roster"
 msgstr "Nije na listi kontakata"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1575
 msgid "This contact does not support file transfer."
 msgstr "Ovak kontakt ne podržava prenos datoteka."
 
-#: ../src/chat_control.py:1561
+#: ../src/chat_control.py:1578
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 "Morate znati pravi džaber ID kontakta da biste mu/joj poslali datoteku."
 
-#: ../src/chat_control.py:1656
+#: ../src/chat_control.py:1677
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:1869
 #, 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:1967 ../src/dialogs.py:4866
+#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
 msgid "No GPG key assigned"
 msgstr "Nema dodeljenog GPG ključa"
 
-#: ../src/chat_control.py:1968
+#: ../src/chat_control.py:1991
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3213,50 +3432,50 @@ msgstr ""
 "Nijedan GPG ključ nije dodaljen ovom kontaktu. Ne možete šifrovati poruke sa "
 "GPG-om."
 
-#: ../src/chat_control.py:1977
+#: ../src/chat_control.py:2000
 msgid "GPG encryption disabled"
 msgstr "GPG enkripcija onemogućena"
 
-#: ../src/chat_control.py:2003
+#: ../src/chat_control.py:2026
 msgid "Session WILL be logged"
 msgstr "Sesija ĆE biti pamćena"
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:2028
 msgid "Session WILL NOT be logged"
 msgstr "Sesija NEĆE biti pamćena"
 
 #. encryption %s active
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is"
 msgstr "je"
 
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is NOT"
 msgstr "NIJE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will"
 msgstr "će"
 
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will NOT"
 msgstr "NEĆE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2051
 msgid "and authenticated"
 msgstr "i prijavljeni"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2032
+#: ../src/chat_control.py:2055
 msgid "and NOT authenticated"
 msgstr "i NEprijavljeni"
 
 #. 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:2039
+#: ../src/chat_control.py:2062
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3265,48 +3484,57 @@ msgstr ""
 "%(type)s Å¡ifrovanje %(status)s aktivan %(authenticated)s.\n"
 "Vaša sesija razgovora %(logged)s biti pamćena."
 
-#: ../src/chat_control.py:2182
+#: ../src/chat_control.py:2205
 msgid "Session negotiation cancelled"
 msgstr "Uspostavljanje sesije prekinuto"
 
-#: ../src/chat_control.py:2191
+#: ../src/chat_control.py:2215
+msgid "This session WILL be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2217
+#, fuzzy
+msgid "This session WILL NOT be archived on server"
+msgstr "Sesija NEĆE biti pamćena"
+
+#: ../src/chat_control.py:2226
 msgid "This session is encrypted"
 msgstr "Ova sesija je Å¡ifrovana"
 
-#: ../src/chat_control.py:2194
+#: ../src/chat_control.py:2229
 msgid " and WILL be logged"
 msgstr "i BIĆE pamćena"
 
-#: ../src/chat_control.py:2196
+#: ../src/chat_control.py:2231
 msgid " and WILL NOT be logged"
 msgstr "i NEĆE biti pamćena"
 
-#: ../src/chat_control.py:2201
+#: ../src/chat_control.py:2236
 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:2203
+#: ../src/chat_control.py:2238
 msgid "E2E encryption disabled"
 msgstr "E2E enkripcija onemogućena"
 
-#: ../src/chat_control.py:2241 ../src/chat_control.py:2254
+#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
 msgid "The following message was NOT encrypted"
 msgstr "Sledeća poruka NIJE bila šifrovana"
 
-#: ../src/chat_control.py:2247
+#: ../src/chat_control.py:2288
 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:2519
+#: ../src/chat_control.py:2566
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "\"%s\" Vam je upravo poslao poruku"
 
-#: ../src/chat_control.py:2520
+#: ../src/chat_control.py:2567
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3314,15 +3542,13 @@ msgstr ""
 "Ako zatvorite ovaj jezičak, a istorijat razgovora nije omogućen, ova poruka "
 "će biti izgubljena."
 
-#: ../src/chat_control.py:2663 ../src/common/connection_handlers.py:1635
-#: ../src/common/connection_handlers.py:1758
-#: ../src/common/connection_handlers.py:1960
-#: ../src/common/connection_handlers.py:2110 ../src/common/connection.py:452
+#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
 #: ../src/gajim.py:159 ../src/session.py:138
 msgid "Database Error"
 msgstr "Greška sa bazom podataka"
 
-#: ../src/chat_control.py:2664
+#: ../src/chat_control.py:2714
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3331,7 +3557,7 @@ 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:2906
+#: ../src/chat_control.py:2962
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s je sada %(status)s"
@@ -3345,28 +3571,28 @@ msgstr "kreiram bazu dnevnika"
 msgid "creating cache database"
 msgstr "kreiram bazu dnevnika"
 
-#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
-#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
-#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
-#: ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
 #, 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:275 ../src/common/check_paths.py:282
-#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
-#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
-#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:333
+#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
+#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
+#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
 msgid "Gajim will now exit"
 msgstr "Gajim će se sada završiti"
 
-#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
+#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
 #, 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:342
+#: ../src/common/check_paths.py:351
 #, python-format
 msgid "creating %s directory"
 msgstr "kreiram fasciklu %s"
@@ -3430,9 +3656,9 @@ msgstr "Odaberite grupne razgovore koje želite da napustite"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:801
-#: ../src/roster_window.py:1614 ../src/roster_window.py:1616
-#: ../src/roster_window.py:5251
+#: ../src/common/helpers.py:57 ../src/roster_window.py:815
+#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
+#: ../src/roster_window.py:5323
 msgid "Groupchats"
 msgstr "Grupni razgovori"
 
@@ -3495,7 +3721,9 @@ msgstr ""
 "nedostupnosti"
 
 #: ../src/common/config.py:88
-msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+#, fuzzy
+msgid ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 "Kada prikazati ikonicu u sistemskoj kaseti. Može biti 'never', 'on_event', "
 "'always'."
@@ -3547,9 +3775,9 @@ msgstr ""
 "Lista (odvojena blanko znakovima) redova (naloga i grupa) koji su otvoreni."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:501
-#: ../src/common/optparser.py:290 ../src/common/optparser.py:486
-#: ../src/common/optparser.py:520 ../src/gui_interface.py:3370
+#: ../src/common/config.py:106 ../src/common/config.py:505
+#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
+#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
 msgid "default"
 msgstr "podrazumevano"
 
@@ -3773,7 +4001,8 @@ 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:197
-msgid "Notify of events in the system trayicon."
+#, fuzzy
+msgid "Notify of events in the notification area."
 msgstr "Obavesti me o svim događajima u ikoni sistemske kasete."
 
 #: ../src/common/config.py:203
@@ -3811,9 +4040,10 @@ msgstr ""
 "razgovorima"
 
 #: ../src/common/config.py:221
+#, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
+"setting is taken into account only if notification icon is used."
 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."
@@ -4086,9 +4316,10 @@ msgstr ""
 "sklanjaju."
 
 #: ../src/common/config.py:270
+#, fuzzy
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
-"systray icon."
+"notification icon."
 msgstr ""
 "Ako je istinito, prozor obaveštenja od servisa obaveštenja će biti zakačen "
 "za sistemsku kasetu."
@@ -4286,11 +4517,15 @@ msgstr ""
 msgid "Message that is sent to contacts you want to add"
 msgstr "Molimo Vas ispunite podatke za kontakt koga želite dodati"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:374
+msgid "Last time we syncronized with logs from server."
+msgstr ""
+
+#: ../src/common/config.py:436
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Da li je OpenPGP omogućen za ovaj kontakt?"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4298,101 +4533,108 @@ msgstr ""
 "Da li Gajim treba automatski da započne šifrovanu vezu sa ovim kontaktom "
 "kada je moguće?"
 
-#: ../src/common/config.py:437 ../src/common/config.py:440
+#: ../src/common/config.py:438 ../src/common/config.py:441
 msgid "Language for which we want to check misspelled words"
 msgstr "Jezik u kome želite proveravati neispravno napisane reči"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:447
 msgid "all or space separated status"
 msgstr "sve ili razmakom odvojen status"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:448
 msgid "'yes', 'no', or 'both'"
 msgstr "'da', 'ne', ili 'oboje'"
 
-#: ../src/common/config.py:448 ../src/common/config.py:450
-#: ../src/common/config.py:451 ../src/common/config.py:454
-#: ../src/common/config.py:455
+#: ../src/common/config.py:449 ../src/common/config.py:451
+#: ../src/common/config.py:452 ../src/common/config.py:455
+#: ../src/common/config.py:456
 msgid "'yes', 'no' or ''"
 msgstr "'da', 'ne' ili ''"
 
-#: ../src/common/config.py:461 ../src/common/pep.py:157
+#: ../src/common/config.py:460
+msgid ""
+"State whether plugins should be activated on exit (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
+msgstr ""
+
+#: ../src/common/config.py:465 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Spavam"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back soon"
 msgstr "Vraćam se brzo"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back in some minutes."
 msgstr "Vraćam se za par minuta."
 
-#: ../src/common/config.py:463 ../src/common/pep.py:127
+#: ../src/common/config.py:467 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Jedem"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:467
 msgid "I'm eating, so leave me a message."
 msgstr "Jedem, ostavite poruku."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "I'm watching a movie."
 msgstr "Gledam film."
 
-#: ../src/common/config.py:465 ../src/common/pep.py:186
+#: ../src/common/config.py:469 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Radim."
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:469
 msgid "I'm working."
 msgstr "Radim."
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "I'm on the phone."
 msgstr "Telefoniram."
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "Out"
 msgstr "Napolju"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "I'm out enjoying life."
 msgstr "Napolju sam, uživam u životu."
 
-#: ../src/common/config.py:478
+#: ../src/common/config.py:482
 msgid "I'm available."
 msgstr "Dostupan sam."
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:483
 msgid "I'm free for chat."
 msgstr "Slobodan sam za razgovor."
 
-#: ../src/common/config.py:480 ../src/config.py:1600
+#: ../src/common/config.py:484 ../src/config.py:1600
 msgid "Be right back."
 msgstr "Odmah se vraćam."
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:485
 msgid "I'm not available."
 msgstr "Nedostupan sam."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:486
 msgid "Do not disturb."
 msgstr "Ne smetaj."
 
-#: ../src/common/config.py:483 ../src/common/config.py:484
+#: ../src/common/config.py:487 ../src/common/config.py:488
 msgid "Bye!"
 msgstr "Pozdrav!"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:498
 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."
@@ -4401,88 +4643,84 @@ msgstr ""
 "muc_highlight_words, ili kada neka poruka grupnog razgovora sadrži Vaš "
 "nadimak."
 
-#: ../src/common/config.py:495
+#: ../src/common/config.py:499
 msgid "Sound to play when any MUC message arrives."
 msgstr "Zvuk koji će se pustiti kada stigne neka MUC poruka."
 
-#: ../src/common/config.py:504 ../src/common/optparser.py:304
+#: ../src/common/config.py:508 ../src/common/optparser.py:308
 msgid "green"
 msgstr "zelena"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:290
+#: ../src/common/config.py:512 ../src/common/optparser.py:294
 msgid "grocery"
 msgstr "namirnice"
 
-#: ../src/common/config.py:512
+#: ../src/common/config.py:516
 msgid "human"
 msgstr "ljudska"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:520
 msgid "marine"
 msgstr "morska"
 
-#: ../src/common/connection_handlers.py:84
+#: ../src/common/connection_handlers.py:94
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Nije moguće učitavanje modula idle"
 
-#: ../src/common/connection_handlers.py:117
+#: ../src/common/connection_handlers.py:127
 #, 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:124
+#: ../src/common/connection_handlers.py:134
 msgid "Registration succeeded"
 msgstr "Registracija uspešna"
 
-#: ../src/common/connection_handlers.py:125
+#: ../src/common/connection_handlers.py:135
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registracija sa agentom %s uspešna"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 msgid "Registration failed"
 msgstr "Registracija neuspela"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 "Registracija sa agentom %(agent)s neuspela uz grešku %(error)s: %(error_msg)s"
 
-#: ../src/common/connection_handlers.py:445
-#: ../src/common/connection_handlers.py:1633
-#: ../src/common/connection_handlers.py:1756
-#: ../src/common/connection_handlers.py:1957
-#: ../src/common/connection_handlers.py:2108 ../src/common/connection.py:449
+#: ../src/common/connection_handlers.py:466
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
 #: ../src/gajim.py:341
 msgid "Disk Write Error"
 msgstr "Greška pri upisu na disk"
 
-#: ../src/common/connection_handlers.py:678 ../src/common/connection.py:1472
+#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
 msgid "Invisibility not supported"
 msgstr "Nevidljivost nije podržana"
 
-#: ../src/common/connection_handlers.py:679 ../src/common/connection.py:1473
+#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Nalog %s ne podržava nevidljivost."
 
-#: ../src/common/connection_handlers.py:1446 ../src/common/connection.py:253
-#: ../src/config.py:2091 ../src/config.py:2100 ../src/config.py:2168
-#: ../src/config.py:3560 ../src/dataforms_widget.py:597 ../src/dialogs.py:2931
+#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
+#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
+#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
 msgid "Invalid Jabber ID"
 msgstr "Neispravan džaber ID"
 
-#: ../src/common/connection_handlers.py:1447
+#: ../src/common/connection_handlers.py:1405
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr "Poruka od neispravnog džaber ID-a, ignorisana je."
 
-#: ../src/common/connection_handlers.py:1636
-#: ../src/common/connection_handlers.py:1759
-#: ../src/common/connection_handlers.py:1961
-#: ../src/common/connection_handlers.py:2111 ../src/common/connection.py:453
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
 #: ../src/gajim.py:160 ../src/session.py:139
 #, python-format
 msgid ""
@@ -4493,90 +4731,6 @@ msgstr ""
 "(pogledajte http://trac.gajim.org/wiki/DatabaseBackup) ili  uklonite (sav "
 "istorijat poruka će biti izgubljen)."
 
-#: ../src/common/connection_handlers.py:1805
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Nedozvoljen nadimak: %s "
-
-#: ../src/common/connection_handlers.py:1902
-#: ../src/common/connection_handlers.py:1911
-#: ../src/common/connection_handlers.py:1918
-#: ../src/common/connection_handlers.py:1922
-#: ../src/common/connection_handlers.py:1926
-#: ../src/common/connection_handlers.py:1931 ../src/gui_interface.py:139
-msgid "Unable to join group chat"
-msgstr "Nije moguće pridružiti se grupnom razgovoru"
-
-#: ../src/common/connection_handlers.py:1903
-#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr "Dostignut najveći broj korisnika za %s"
-
-#: ../src/common/connection_handlers.py:1912
-#, python-format
-msgid "You are banned from group chat %s."
-msgstr "Zabranjen Vam je pristup ovom grupnom razgovoru %s."
-
-#: ../src/common/connection_handlers.py:1919
-#, python-format
-msgid "Group chat %s does not exist."
-msgstr "Grupni razgovor.%s ne postoji."
-
-#: ../src/common/connection_handlers.py:1923
-msgid "Group chat creation is restricted."
-msgstr "Stvaranje grupnih razgovora Vam nije dozvoljeno."
-
-#: ../src/common/connection_handlers.py:1927
-#, 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:1932
-#, 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:1976
-msgid "Room has been destroyed"
-msgstr "Soba grupnog razgovora je uništena"
-
-#: ../src/common/connection_handlers.py:1984
-#, 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:2020
-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:2041
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "sada ste pretplaćeni na %s"
-
-#: ../src/common/connection_handlers.py:2043
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "zahtev za ukidanje pretplate od kontakta %s"
-
-#: ../src/common/connection_handlers.py:2045
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "sada Vam je ukinuta pretplata od kontakta %s"
-
-#: ../src/common/connection_handlers.py:2240
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"Džaber ID %s ne poštuje RFC pravila. Neće biti dodat na Vašu listu "
-"kontakata. Upotrebite alate kao Å¡to je http://jru.jabberstudio.org/ da biste "
-"ga uklonili"
-
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr "Nisam uspeo da uzmem sertifikat izdavača"
@@ -4705,27 +4859,27 @@ msgstr "Upotreba ključa ne uključuje potpisivanje sertifikata"
 msgid "Application verification failure"
 msgstr "Verifikacija aplikacije neuspela"
 
-#: ../src/common/connection.py:254 ../src/dialogs.py:2932
+#: ../src/common/connection.py:256 ../src/dialogs.py:2948
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Nije moguće poslati poruku za %s, ovaj džaber ID nije ispravan."
 
-#: ../src/common/connection.py:276
+#: ../src/common/connection.py:278
 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:279
+#: ../src/common/connection.py:281
 #, 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:331
+#: ../src/common/connection.py:333
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Ova poruka je *Å¡ifrovana* (Pogledajte :XEP:`27`]"
 
-#: ../src/common/connection.py:439
+#: ../src/common/connection.py:441
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4734,76 +4888,76 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:807
+#: ../src/common/connection.py:809
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Izgubljena veza sa računom \"%s\""
 
-#: ../src/common/connection.py:808
+#: ../src/common/connection.py:810
 msgid "Reconnect manually."
 msgstr "Ponovo se povežite ručno."
 
-#: ../src/common/connection.py:820
+#: ../src/common/connection.py:822
 #, 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:854
+#: ../src/common/connection.py:856
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s je ponudio drugačiju formu za registraciju"
 
-#: ../src/common/connection.py:867
+#: ../src/common/connection.py:869
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Nepoznata SSL greška: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:882
+#: ../src/common/connection.py:884
 msgid "Invalid answer"
 msgstr "Neispravan odgovor"
 
-#: ../src/common/connection.py:883
+#: ../src/common/connection.py:885
 #, 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:1165 ../src/common/connection.py:1294
-#: ../src/common/connection.py:1784
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
+#: ../src/common/connection.py:1792
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Veza sa \"%s\" nije moguća"
 
-#: ../src/common/connection.py:1166 ../src/gui_interface.py:755
+#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
 msgid "Check your connection or try again later."
 msgstr "Proverite Vašu konekciju ili pokušajte kasnije."
 
-#: ../src/common/connection.py:1171
+#: ../src/common/connection.py:1173
 #, python-format
 msgid "Server replied: %s"
 msgstr "Server je odgovorio: %s"
 
-#: ../src/common/connection.py:1184
+#: ../src/common/connection.py:1186
 msgid "Connection to proxy failed"
 msgstr "Veza sa proksijem prekinuta"
 
-#: ../src/common/connection.py:1215 ../src/common/connection.py:1274
+#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Veza sa %s nije moguća"
 
-#: ../src/common/connection.py:1216 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
 #, 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:1241
+#: ../src/common/connection.py:1243
 #, 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:1244
+#: ../src/common/connection.py:1246
 #, python-format
 msgid ""
 "\n"
@@ -4812,7 +4966,7 @@ msgstr ""
 "\n"
 "SSL greška: <b>%s</b>"
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1248
 #, python-format
 msgid ""
 "\n"
@@ -4821,24 +4975,24 @@ msgstr ""
 "\n"
 "Nepoznata SSL greška: %d"
 
-#: ../src/common/connection.py:1295
+#: ../src/common/connection.py:1297
 msgid "Check your connection or try again later"
 msgstr "Proverite Vašu konekciju ili pokušajte kasnije"
 
-#: ../src/common/connection.py:1324
+#: ../src/common/connection.py:1329
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Prijavljivanje sa \"%s\" neuspešno"
 
-#: ../src/common/connection.py:1326
+#: ../src/common/connection.py:1331
 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:1395
+#: ../src/common/connection.py:1400
 msgid "Error while removing privacy list"
 msgstr "Greška prilikom uklanjanja lista privatnosti"
 
-#: ../src/common/connection.py:1396
+#: ../src/common/connection.py:1401
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4847,39 +5001,39 @@ 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:1650
+#: ../src/common/connection.py:1658
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Poslati kontakti: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1653
+#: ../src/common/connection.py:1661
 msgid "Sent contacts:"
 msgstr "Poslati kontakti:"
 
-#: ../src/common/connection.py:1799 ../src/common/connection.py:1822
+#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
 msgid "Not fetched because of invisible status"
 msgstr "Nije dohvaćeno zbog statusa nevidljivosti"
 
-#: ../src/common/connection.py:2254
+#: ../src/common/connection.py:2262
 msgid "Unregister failed"
 msgstr "Odjava registracije neuspela"
 
-#: ../src/common/connection.py:2255
+#: ../src/common/connection.py:2263
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr "Odjava registracije sa serverom %(server)s neuspela: %(error)s"
 
 #: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:674
+#: ../src/gui_interface.py:551
 msgid "Observers"
 msgstr "Posmatrači"
 
 #: ../src/common/contacts.py:139 ../src/common/contacts.py:366
 #: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1499 ../src/gui_interface.py:424
-#: ../src/roster_window.py:840 ../src/roster_window.py:1525
-#: ../src/roster_window.py:1606 ../src/roster_window.py:1608
-#: ../src/roster_window.py:1769
+#: ../src/disco.py:1517 ../src/roster_window.py:854
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
+#: ../src/roster_window.py:2466
 msgid "Transports"
 msgstr "Prenosi"
 
@@ -5106,203 +5260,219 @@ msgstr "Kraj nedelje"
 msgid "Weekend!"
 msgstr "Vikend!"
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:148
+msgid "Username must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:153
 msgid "Invalid character in username."
 msgstr "Neispravan karakter u korisničkom imenu."
 
-#: ../src/common/helpers.py:156
-msgid "Server address required."
-msgstr "Potrebna je adresa servera."
+#: ../src/common/helpers.py:159
+msgid "Server must be between 1 and 1023 chars"
+msgstr ""
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 msgid "Invalid character in hostname."
 msgstr "Neispravan karakter u imenu hosta."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:166
+msgid "Server address required."
+msgstr "Potrebna je adresa servera."
+
+#: ../src/common/helpers.py:170
+msgid "Resource must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:175
 msgid "Invalid character in resource."
 msgstr "Neispravan karakter u resursu."
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:215
 msgid "_Busy"
 msgstr "_Zauzet"
 
-#: ../src/common/helpers.py:211 ../src/tooltips.py:195
+#: ../src/common/helpers.py:217 ../src/tooltips.py:195
 msgid "Busy"
 msgstr "Zauzet"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:220
 msgid "_Not Available"
 msgstr "_Nedostupan"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:225
 msgid "_Free for Chat"
 msgstr "_Slobodan za razgovor"
 
-#: ../src/common/helpers.py:221 ../src/tooltips.py:191
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Free for Chat"
 msgstr "Slobodan za razgovor"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:230
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?status prenosa:Pauziran"
 
-#: ../src/common/helpers.py:226 ../src/tooltips.py:189
+#: ../src/common/helpers.py:232 ../src/tooltips.py:189
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?status prenosa:Pauziran"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:234
 msgid "Connecting"
 msgstr "Povezivanje"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:237
 msgid "A_way"
 msgstr "O_dsutan"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:242
 msgid "_Offline"
 msgstr "_Nije na vezi"
 
-#: ../src/common/helpers.py:238 ../src/tooltips.py:199
+#: ../src/common/helpers.py:244 ../src/tooltips.py:199
 msgid "Offline"
 msgstr "Nije na vezi"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:247
 msgid "_Invisible"
 msgstr "_Nevidljiv"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:253
 msgid "?contact has status:Unknown"
 msgstr "?kontakt ima status:Nepoznat"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:255
 msgid "?contact has status:Has errors"
 msgstr "?kontakt ima status:Postoje greške"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:260
 msgid "?Subscription we already have:None"
 msgstr "?Trenutna pretplata:Nijedna"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:262
 msgid "To"
 msgstr "Za"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
+msgid "From"
+msgstr "Od"
+
+#: ../src/common/helpers.py:266
 msgid "Both"
 msgstr "Oboje"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:274
 msgid "?Ask (for Subscription):None"
 msgstr "?Pitaj (za pretplatu):Nijedna"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:276
 msgid "Subscribe"
 msgstr "Pretplatite se"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:285
 msgid "?Group Chat Contact Role:None"
 msgstr "?Uloga kontakta u grupnom razgovoru:Nikakva"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:288
 msgid "Moderators"
 msgstr "Moderatori"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:290
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:293
 msgid "Participants"
 msgstr "Učesnici"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:295
 msgid "Participant"
 msgstr "Učesnik"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:298
 msgid "Visitors"
 msgstr "Posjetitelji"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:300
 msgid "Visitor"
 msgstr "Posetilac"
 
-#: ../src/common/helpers.py:300 ../src/tooltips.py:210
+#: ../src/common/helpers.py:306 ../src/tooltips.py:210
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Vezanost kontakta u grupnom razogovru:Nikakva"
 
-#: ../src/common/helpers.py:302 ../src/tooltips.py:216
+#: ../src/common/helpers.py:308 ../src/tooltips.py:216
 msgid "Owner"
 msgstr "Vlasnik"
 
-#: ../src/common/helpers.py:304 ../src/tooltips.py:214
+#: ../src/common/helpers.py:310 ../src/tooltips.py:214
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:212
+#: ../src/common/helpers.py:312 ../src/tooltips.py:212
 msgid "Member"
 msgstr "ÄŒlan"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:351
 msgid "is paying attention to the conversation"
 msgstr "sluša konverzaciju"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:353
 msgid "is doing something else"
 msgstr "radi nešto drugo"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:355
 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:352
+#: ../src/common/helpers.py:358
 msgid "paused composing a message"
 msgstr "pauza pri pisanju poruke"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:360
 msgid "has closed the chat window or tab"
 msgstr "je zatvorio/zatvorila prozor ili jezičak razgovora"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:619
+#: ../src/common/helpers.py:625
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:622
+#: ../src/common/helpers.py:628
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:626
+#: ../src/common/helpers.py:632
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:629
+#: ../src/common/helpers.py:635
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:633
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:636
+#: ../src/common/helpers.py:642
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:645
 #, python-format
 msgid "%s B"
 msgstr "%s B"
@@ -5347,12 +5517,12 @@ msgstr "Gajim - %s"
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:111
+#: ../src/common/jingle_rtp.py:107
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Konfiguracija sobe"
 
-#: ../src/common/jingle_rtp.py:112
+#: ../src/common/jingle_rtp.py:108
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5364,30 +5534,30 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:209
+#: ../src/common/jingle_rtp.py:205
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:210
+#: ../src/common/jingle_rtp.py:206
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Poruka greške: %s"
 
-#: ../src/common/jingle_rtp.py:336
+#: ../src/common/jingle_rtp.py:335
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:339
+#: ../src/common/jingle_rtp.py:338
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:382
+#: ../src/common/jingle_rtp.py:381
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:390
+#: ../src/common/jingle_rtp.py:389
 msgid "video output"
 msgstr ""
 
@@ -5464,11 +5634,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "greška: ne mogu otvoriti %s za čitanje"
 
-#: ../src/common/optparser.py:299 ../src/common/optparser.py:300
+#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
 msgid "cyan"
 msgstr "cijan"
 
-#: ../src/common/optparser.py:379
+#: ../src/common/optparser.py:383
 msgid "migrating logs database to indices"
 msgstr "prebacujem bazu dnevnika u indekse"
 
@@ -6140,18 +6310,18 @@ msgstr ""
 "Možda već imate pokrenutu instancu Gajima. Prenos datoteka će biti prekinut."
 
 #. we're not english
-#: ../src/common/stanza_session.py:303
+#: ../src/common/stanza_session.py:423
 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_zeroconf.py:178
+#: ../src/common/zeroconf/connection_zeroconf.py:181
 msgid "Avahi error"
 msgstr "Avahi greška"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:179
+#: ../src/common/zeroconf/connection_zeroconf.py:182
 #, python-format
 msgid ""
 "%s\n"
@@ -6160,44 +6330,44 @@ msgstr ""
 "%s\n"
 "Poruke lokalne mreže možda neće raditi kako treba."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:190
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Proverite da li je Avahi ili Bonjour instaliran."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:199
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Could not start local service"
 msgstr "Nije moguće pokrenuti lokalni servis"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Ne mogu se povezati na port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-#: ../src/common/zeroconf/connection_zeroconf.py:283
-#: ../src/common/zeroconf/connection_zeroconf.py:294
-#: ../src/common/zeroconf/connection_zeroconf.py:308
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:286
+#: ../src/common/zeroconf/connection_zeroconf.py:297
+#: ../src/common/zeroconf/connection_zeroconf.py:311
 msgid "Please check if avahi-daemon is running."
 msgstr "Molimo proverite da li je avahi-demon pokrenut."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:282
-#: ../src/common/zeroconf/connection_zeroconf.py:293
-#: ../src/common/zeroconf/connection_zeroconf.py:307
+#: ../src/common/zeroconf/connection_zeroconf.py:285
+#: ../src/common/zeroconf/connection_zeroconf.py:296
+#: ../src/common/zeroconf/connection_zeroconf.py:310
 #, 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:325
+#: ../src/common/zeroconf/connection_zeroconf.py:328
 msgid "Your message could not be sent."
 msgstr "Vaša poruka nije mogla biti poslata."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:335
+#: ../src/common/zeroconf/connection_zeroconf.py:338
 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:360
+#: ../src/common/zeroconf/connection_zeroconf.py:363
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6217,16 +6387,16 @@ msgstr "Podrazumevana poruka"
 msgid "Enabled"
 msgstr "Omogućen"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3078
+#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
 msgid "Default"
 msgstr "Podrazumevano"
 
-#: ../src/config.py:739 ../src/dialogs.py:1395
+#: ../src/config.py:733 ../src/dialogs.py:1409
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Rečnik za jezik %s nije dostupan"
 
-#: ../src/config.py:740
+#: ../src/config.py:734
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6244,9 +6414,9 @@ msgid "status message text"
 msgstr "tekst statusne poruke"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2383 ../src/dialogs.py:2449
-#: ../src/dialogs.py:3215 ../src/disco.py:866 ../src/disco.py:1726
-#: ../src/disco.py:2030 ../src/history_window.py:90
+#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
+#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
+#: ../src/disco.py:2048 ../src/history_window.py:90
 msgid "Name"
 msgstr "Ime"
 
@@ -6282,7 +6452,7 @@ msgstr ""
 "Prozori svih razgovora i grupnih razgovora će biti zatvoreni. Želite li da "
 "nastavite?"
 
-#: ../src/config.py:1976 ../src/config.py:2509 ../src/config.py:2545
+#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
 msgid "You are currently connected to the server"
 msgstr "Trenutno ste spojeni na server"
 
@@ -6318,131 +6488,131 @@ msgstr "Ime naloga ne može biti prazno."
 msgid "Account name cannot contain spaces."
 msgstr "Ime naloga ne može da sadrži beline."
 
-#: ../src/config.py:2072
+#: ../src/config.py:2074
 msgid "Rename Account"
 msgstr "Preimenuj nalog"
 
-#: ../src/config.py:2073
+#: ../src/config.py:2075
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Unesite novo ime za nalog%s"
 
-#: ../src/config.py:2101
+#: ../src/config.py:2103
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Džaber ID mora biti oblika \"korisnik@server\"."
 
-#: ../src/config.py:2318 ../src/config.py:3606
+#: ../src/config.py:2320 ../src/config.py:3623
 msgid "Invalid entry"
 msgstr "Neispravan unos"
 
-#: ../src/config.py:2319 ../src/config.py:3607
+#: ../src/config.py:2321 ../src/config.py:3624
 msgid "Custom port must be a port number."
 msgstr "Vaš port mora biti broj porta."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2342
 msgid "Failed to get secret keys"
 msgstr "Neuspelo uzimanje tajnih ključeva"
 
-#: ../src/config.py:2341
+#: ../src/config.py:2343
 msgid "There is no OpenPGP secret key available."
 msgstr "Nema dostupnih OpenPGP tajnih ključeva."
 
-#: ../src/config.py:2375
+#: ../src/config.py:2377
 msgid "OpenPGP Key Selection"
 msgstr "Odabir OpenPGP Ključeva"
 
-#: ../src/config.py:2376
+#: ../src/config.py:2378
 msgid "Choose your OpenPGP key"
 msgstr "Odaberite Vaš OpenPGP ključ"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2385
 msgid "No such account available"
 msgstr "Nije dostupan takav nalog"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2386
 msgid "You must create your account before editing your personal information."
 msgstr "Morate napraviti Vaš nalog pre izmena ličnih informacija."
 
-#: ../src/config.py:2391 ../src/dialogs.py:2136 ../src/dialogs.py:2371
-#: ../src/dialogs.py:2557 ../src/disco.py:511 ../src/profile_window.py:339
+#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
+#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
 msgid "You are not connected to the server"
 msgstr "Niste povezani na server"
 
-#: ../src/config.py:2392
+#: ../src/config.py:2394
 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:2396
+#: ../src/config.py:2398
 msgid "Your server doesn't support Vcard"
 msgstr "Vaš server ne podržava Vcard"
 
-#: ../src/config.py:2397
+#: ../src/config.py:2399
 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:2510 ../src/config.py:2546
+#: ../src/config.py:2512 ../src/config.py:2548
 msgid "To disable the account, you must be disconnected."
 msgstr "Da biste onemogućili nalog, morate biti raskačeni."
 
-#: ../src/config.py:2515
+#: ../src/config.py:2517
 msgid "Account Local already exists."
 msgstr "Račun lokal već postoji."
 
-#: ../src/config.py:2516
+#: ../src/config.py:2518
 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:2673
+#: ../src/config.py:2675
 #, python-format
 msgid "Edit %s"
 msgstr "Izmeni %s"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2677
 #, python-format
 msgid "Register to %s"
 msgstr "Registruj se na %s"
 
 #. list at the beginning
-#: ../src/config.py:2711
+#: ../src/config.py:2713
 msgid "Ban List"
 msgstr "Lista zabrana"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2714
 msgid "Member List"
 msgstr "Lista članova"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2714
 msgid "Owner List"
 msgstr "Lista vlasnika"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2715
 msgid "Administrator List"
 msgstr "Lista administratora"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2763 ../src/disco.py:873 ../src/history_manager.py:201
+#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
 msgid "JID"
 msgstr "DŽID"
 
-#: ../src/config.py:2773
+#: ../src/config.py:2789
 msgid "Reason"
 msgstr "Razlog"
 
-#: ../src/config.py:2780
+#: ../src/config.py:2796
 msgid "Nick"
 msgstr "Nadimak"
 
-#: ../src/config.py:2786
+#: ../src/config.py:2802
 msgid "Role"
 msgstr "Uloga"
 
-#: ../src/config.py:2813
+#: ../src/config.py:2829
 msgid "Banning..."
 msgstr "Zabrana..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2815
+#: ../src/config.py:2831
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6450,11 +6620,11 @@ msgstr ""
 "<b>Koga želite zabraniti?</b>\n"
 "\n"
 
-#: ../src/config.py:2817
+#: ../src/config.py:2833
 msgid "Adding Member..."
 msgstr "Dodavanje člana..."
 
-#: ../src/config.py:2818
+#: ../src/config.py:2834
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6462,11 +6632,11 @@ msgstr ""
 "<b>Koga želite da postavite članom?</b>\n"
 "\n"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2836
 msgid "Adding Owner..."
 msgstr "Dodavanje vlasnika..."
 
-#: ../src/config.py:2821
+#: ../src/config.py:2837
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6474,11 +6644,11 @@ msgstr ""
 "<b>Koga želite da postavite za vlasnika?</b>\n"
 "\n"
 
-#: ../src/config.py:2823
+#: ../src/config.py:2839
 msgid "Adding Administrator..."
 msgstr "Dodavanje administratora..."
 
-#: ../src/config.py:2824
+#: ../src/config.py:2840
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6486,7 +6656,7 @@ msgstr ""
 "<b>Koga želite da postavite za administratora?</b>\n"
 "\n"
 
-#: ../src/config.py:2825
+#: ../src/config.py:2841
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6502,110 +6672,110 @@ 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:2926
+#: ../src/config.py:2943
 #, python-format
 msgid "Removing %s account"
 msgstr "Uklanjanje računa %s"
 
-#: ../src/config.py:2941
+#: ../src/config.py:2958
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Smajliji isključeni"
 
-#: ../src/config.py:2942
+#: ../src/config.py:2959
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2955 ../src/gui_interface.py:1132
-#: ../src/gui_interface.py:1243
+#: ../src/config.py:2972 ../src/gui_interface.py:311
+#: ../src/gui_interface.py:1048
 msgid "Password Required"
 msgstr "Lozinka zahtevana"
 
-#: ../src/config.py:2956 ../src/gui_interface.py:1223
+#: ../src/config.py:2973 ../src/gui_interface.py:1028
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Unesite Vašu lozinku za račun %s"
 
-#: ../src/config.py:2957 ../src/gui_interface.py:1243
+#: ../src/config.py:2974 ../src/gui_interface.py:1048
 msgid "Save password"
 msgstr "Sačuvaj lozinku"
 
-#: ../src/config.py:2967
+#: ../src/config.py:2984
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Račun \"%s\" je povezan na server"
 
-#: ../src/config.py:2968
+#: ../src/config.py:2985
 msgid "If you remove it, the connection will be lost."
 msgstr "Ukoliko ga uklonite, veza će biti izgubljena."
 
-#: ../src/config.py:2982
+#: ../src/config.py:2999
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Veza sa proksijem prekinuta"
 
-#: ../src/config.py:2983
+#: ../src/config.py:3000
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Šta želite da uradite?"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3001
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Ukloni nalog samo iz Gajima"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3002
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3078
+#: ../src/config.py:3095
 msgid "?print_status:All"
 msgstr "?ispis statusa:Sve"
 
-#: ../src/config.py:3079
+#: ../src/config.py:3096
 msgid "Enter and leave only"
 msgstr "Samo ući i napustiti"
 
-#: ../src/config.py:3080
+#: ../src/config.py:3097
 msgid "?print_status:None"
 msgstr "?print_status:None"
 
-#: ../src/config.py:3150
+#: ../src/config.py:3167
 msgid "New Group Chat"
 msgstr "Novi grupni razgovor"
 
-#: ../src/config.py:3183
+#: ../src/config.py:3200
 msgid "This bookmark has invalid data"
 msgstr "Ovaj marker ima neispravne podatke"
 
-#: ../src/config.py:3184
+#: ../src/config.py:3201
 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."
 
 #. invalid char
-#: ../src/config.py:3302 ../src/dialogs.py:1934
+#: ../src/config.py:3319 ../src/dialogs.py:1950
 msgid "Invalid nickname"
 msgstr "Neispravan nadimak"
 
-#: ../src/config.py:3303 ../src/config.py:3317 ../src/config.py:3331
+#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
 msgid "Character not allowed"
 msgstr "Karakter nije dozvoljen"
 
-#: ../src/config.py:3316 ../src/config.py:3582
+#: ../src/config.py:3333 ../src/config.py:3599
 msgid "Invalid server"
 msgstr "Neispravan server"
 
-#: ../src/config.py:3330
+#: ../src/config.py:3347
 msgid "Invalid room"
 msgstr "Neispravna soba"
 
-#: ../src/config.py:3498
+#: ../src/config.py:3515
 msgid "Account has been added successfully"
 msgstr "Nalog je uspešno dodat"
 
-#: ../src/config.py:3499 ../src/config.py:3505
+#: ../src/config.py:3516 ../src/config.py:3522
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menu item under the Edit menu from the main "
@@ -6615,32 +6785,32 @@ msgstr ""
 "ili kasnije, klikom na stavku menija Nalozi pod menijem Uredi iz glavnog "
 "prozora."
 
-#: ../src/config.py:3504
+#: ../src/config.py:3521
 msgid "Your new account has been created successfully"
 msgstr "Vaš novi nalog je uspešno napravljen"
 
-#: ../src/config.py:3543
+#: ../src/config.py:3560
 msgid "Invalid username"
 msgstr "Neispravno korisničko ime"
 
-#: ../src/config.py:3545
+#: ../src/config.py:3562
 msgid "You must provide a username to configure this account."
 msgstr "Morate upisati korisničko ime da biste konfigurisali ovaj nalog."
 
-#: ../src/config.py:3583
+#: ../src/config.py:3600
 msgid "Please provide a server on which you want to register."
 msgstr "Molimo odredite server na kome želite da se registrujete."
 
-#: ../src/config.py:3639 ../src/gui_interface.py:1904
+#: ../src/config.py:3656 ../src/gui_interface.py:1693
 msgid "Certificate Already in File"
 msgstr "Sertifikat je već u datoteci"
 
-#: ../src/config.py:3640 ../src/gui_interface.py:1905
+#: ../src/config.py:3657 ../src/gui_interface.py:1694
 #, 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:3717
+#: ../src/config.py:3734
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6655,7 +6825,7 @@ msgstr ""
 "SSL greška: %(error)s\n"
 "Da li i dalje želite da se povežete na ovaj server?"
 
-#: ../src/config.py:3723 ../src/gui_interface.py:1932
+#: ../src/config.py:3740 ../src/gui_interface.py:1721
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6666,63 +6836,72 @@ msgstr ""
 "SHA1 otisak ovog sertifikata:\n"
 "%s"
 
-#: ../src/config.py:3755 ../src/config.py:3789
+#: ../src/config.py:3772 ../src/config.py:3806
 msgid "An error occurred during account creation"
 msgstr "Pojavila se greška pri kreiranju naloga"
 
-#: ../src/config.py:3854
+#: ../src/config.py:3871
 msgid "Account name is in use"
 msgstr "Ime naloga je već upotrebljeno"
 
-#: ../src/config.py:3855
+#: ../src/config.py:3872
 msgid "You already have an account using this name."
 msgstr "Već imate nalog sa tim imenom."
 
-#: ../src/config.py:4009
+#: ../src/config.py:3991
+msgid "PEP node was not removed"
+msgstr "PEP čvor nije uklonjen"
+
+#: ../src/config.py:3992
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr "PEP čvor %(node)s nije uklonjen: %(message)s"
+
+#: ../src/config.py:4036
 msgid "Active"
 msgstr "Aktivno"
 
-#: ../src/config.py:4017
+#: ../src/config.py:4044
 msgid "Event"
 msgstr "događaj"
 
-#: ../src/config.py:4052
+#: ../src/config.py:4079
 msgid "First Message Received"
 msgstr "Primljena Prva Poruka"
 
-#: ../src/config.py:4053
+#: ../src/config.py:4080
 msgid "Next Message Received Focused"
 msgstr "Sledeća Primljena Poruka Fokusirana"
 
-#: ../src/config.py:4055
+#: ../src/config.py:4082
 msgid "Next Message Received Unfocused"
 msgstr "Sledeća Primljena Poruka Nefokusirana"
 
-#: ../src/config.py:4056
+#: ../src/config.py:4083
 msgid "Contact Connected"
 msgstr "Kontakt Na Vezi"
 
-#: ../src/config.py:4057
+#: ../src/config.py:4084
 msgid "Contact Disconnected"
 msgstr "Kontakt Otišao Sa Veze"
 
-#: ../src/config.py:4058
+#: ../src/config.py:4085
 msgid "Message Sent"
 msgstr "Poruka Poslata"
 
-#: ../src/config.py:4059
+#: ../src/config.py:4086
 msgid "Group Chat Message Highlight"
 msgstr "Bojenje Poruka Sa Grupnog Razgovora"
 
-#: ../src/config.py:4060
+#: ../src/config.py:4087
 msgid "Group Chat Message Received"
 msgstr "Primljena Poruka Sa Grupnog Razgovora"
 
-#: ../src/config.py:4061
+#: ../src/config.py:4088
 msgid "GMail Email Received"
 msgstr "Primljen Gmail e-mejl"
 
-#: ../src/conversation_textview.py:600
+#: ../src/conversation_textview.py:601
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6732,7 +6911,7 @@ msgstr ""
 "stigla na drugi kraj. Ako ova ikona ostane ovako \n"
 "dugo vremena, verovatno je da se poruka izgubila."
 
-#: ../src/conversation_textview.py:619
+#: ../src/conversation_textview.py:620
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6740,44 +6919,44 @@ 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:739
+#: ../src/conversation_textview.py:740
 msgid "_Quote"
 msgstr "_Citat"
 
-#: ../src/conversation_textview.py:746
+#: ../src/conversation_textview.py:747
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Akcije za nalog \"%s\""
 
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Read _Wikipedia Article"
 msgstr "Pročitajte članak na _Vikipediji"
 
-#: ../src/conversation_textview.py:763
+#: ../src/conversation_textview.py:765
 msgid "Look it up in _Dictionary"
 msgstr "Potraži u Rečniku"
 
-#: ../src/conversation_textview.py:780
+#: ../src/conversation_textview.py:782
 #, 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:793
+#: ../src/conversation_textview.py:795
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL-u Veb pretrage nedostaje \"%s\""
 
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 msgid "Web _Search for it"
 msgstr "_Pretraži Veb"
 
-#: ../src/conversation_textview.py:802
+#: ../src/conversation_textview.py:804
 msgid "Open as _Link"
 msgstr "Otvori kao _Vezu"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1296
+#: ../src/conversation_textview.py:1298
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6786,186 +6965,191 @@ msgstr[1] "Juče"
 msgstr[2] "Juče"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1344 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
 
-#: ../src/dataforms_widget.py:544
+#: ../src/dataforms_widget.py:545
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Nije moguće učitavanje modula idle"
 
-#: ../src/dataforms_widget.py:546
+#: ../src/dataforms_widget.py:547
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Nevidljivost nije podržana"
 
-#: ../src/dataforms_widget.py:601
+#: ../src/dataforms_widget.py:562
+msgid "This field is required"
+msgstr ""
+
+#: ../src/dataforms_widget.py:607
 msgid "Jabber ID already in list"
 msgstr "Džaber ID već u listi kontakata"
 
-#: ../src/dataforms_widget.py:602
+#: ../src/dataforms_widget.py:608
 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:613
+#: ../src/dataforms_widget.py:619
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:616 ../src/dataforms_widget.py:618
+#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Ime kontakta: <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Džaber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:195
 msgid "Group"
 msgstr "Grupa"
 
-#: ../src/dialogs.py:201
+#: ../src/dialogs.py:202
 msgid "In the group"
 msgstr "U grupi"
 
-#: ../src/dialogs.py:292
+#: ../src/dialogs.py:293
 msgid "KeyID"
 msgstr "ID Ključa"
 
-#: ../src/dialogs.py:297
+#: ../src/dialogs.py:298
 msgid "Contact name"
 msgstr "Ime kontakta"
 
-#: ../src/dialogs.py:469
+#: ../src/dialogs.py:470
 msgid "Set Mood"
 msgstr "Postavi raspoloženje"
 
-#: ../src/dialogs.py:589
+#: ../src/dialogs.py:590
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Statusna poruka"
 
-#: ../src/dialogs.py:603
+#: ../src/dialogs.py:604
 msgid "Status Message"
 msgstr "Statusna poruka"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:794
 msgid "Overwrite Status Message?"
 msgstr "Prepiši statusnu poruku?"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:795
 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:802
+#: ../src/dialogs.py:803
 msgid "Save as Preset Status Message"
 msgstr "Snimi kao već postavljenu statusnu poruku"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:804
 msgid "Please type a name for this status message"
 msgstr "Molimo unesite ime za ovu statusnu poruku"
 
-#: ../src/dialogs.py:831
+#: ../src/dialogs.py:832
 msgid "AIM Address:"
 msgstr "AIM adresa:"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:833
 msgid "GG Number:"
 msgstr "GG Broj:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:834
 msgid "ICQ Number:"
 msgstr "ICQ Broj:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:835
 msgid "MSN Address:"
 msgstr "MSN adresa:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:836
 msgid "Yahoo! Address:"
 msgstr "Yahoo! adresa:"
 
-#: ../src/dialogs.py:872
+#: ../src/dialogs.py:873
 #, 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:875
+#: ../src/dialogs.py:876
 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:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
+#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
+#: ../src/dialogs.py:3464
 msgid "Invalid User ID"
 msgstr "Neispravan korisnički ID"
 
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1052
 msgid "The user ID must not contain a resource."
 msgstr "ID korisnika ne sme sadržavati resurs."
 
-#: ../src/dialogs.py:1051
+#: ../src/dialogs.py:1057
 msgid "You cannot add yourself to your roster."
 msgstr "Ne možete dodati sebe u Vašu listu kontakata."
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1071
 msgid "Contact already in roster"
 msgstr "Kontakt je već u listi"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1072
 msgid "This contact is already listed in your roster."
 msgstr "Kontakt je već u listi kontakata."
 
-#: ../src/dialogs.py:1112
+#: ../src/dialogs.py:1118
 msgid "User ID:"
 msgstr "ID korisnika:"
 
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1189
 msgid "A GTK+ jabber client"
 msgstr "GTK+ džaber klijent"
 
-#: ../src/dialogs.py:1176
+#: ../src/dialogs.py:1190
 msgid "GTK+ Version:"
 msgstr "GTK+ verzija:"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1191
 msgid "PyGTK Version:"
 msgstr "PyGTK verzija:"
 
-#: ../src/dialogs.py:1187
+#: ../src/dialogs.py:1201
 msgid "Current Developers:"
 msgstr "Trenutni programeri:"
 
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1203
 msgid "Past Developers:"
 msgstr "Prošli programeri:"
 
-#: ../src/dialogs.py:1195
+#: ../src/dialogs.py:1209
 msgid "THANKS:"
 msgstr "ZAHVALNICE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1215
 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:1213
+#: ../src/dialogs.py:1227
 msgid "translator-credits"
 msgstr "B. Kokanović. <branko.kokanovic@gmail.com>"
 
-#: ../src/dialogs.py:1396
+#: ../src/dialogs.py:1410
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6978,100 +7162,100 @@ msgstr ""
 "\n"
 "Osvetljavanje loše napisanih reči neće biti u upotrebi"
 
-#: ../src/dialogs.py:1935 ../src/dialogs.py:2322
+#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
 msgid "The nickname has not allowed characters."
 msgstr "Nadimak sadrži nedozvoljene karaktere."
 
-#: ../src/dialogs.py:2053
+#: ../src/dialogs.py:2069
 #, 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:2056
+#: ../src/dialogs.py:2072
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Zahtev pretplate od %s"
 
-#: ../src/dialogs.py:2131 ../src/gui_interface.py:2672
+#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Već ste u grupnom razgovoru %s"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2153
 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:2178
+#: ../src/dialogs.py:2194
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Pridružite se grupnom razgovoru preko naloga %s"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2325
 msgid "Invalid Account"
 msgstr "Neispravan nalog"
 
-#: ../src/dialogs.py:2310
+#: ../src/dialogs.py:2326
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Morate odabrati nalog sa koga želite da uđete u sobu."
 
-#: ../src/dialogs.py:2321
+#: ../src/dialogs.py:2337
 msgid "Invalid Nickname"
 msgstr "Neispravan nadimak"
 
-#: ../src/dialogs.py:2326 ../src/dialogs.py:2332
-#: ../src/groupchat_control.py:1832
+#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
+#: ../src/groupchat_control.py:1847
 msgid "Invalid group chat Jabber ID"
 msgstr "Neispravan Džaber ID grupnog razgovora"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2343
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "Džaber ID grupnog razgovora ima nedozvoljene znake."
 
-#: ../src/dialogs.py:2333 ../src/groupchat_control.py:1833
+#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Džaber ID grupnog razgovora ima nedozvoljene znake."
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2356
 msgid "This is not a group chat"
 msgstr "Ovo nije grupni razgovor"
 
-#: ../src/dialogs.py:2341
+#: ../src/dialogs.py:2357
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s nije ime grupnog razgovora."
 
-#: ../src/dialogs.py:2372
+#: ../src/dialogs.py:2388
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bez veze, nije moguće sinhronizovati kontakte."
 
-#: ../src/dialogs.py:2386
+#: ../src/dialogs.py:2402
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2421
+#: ../src/dialogs.py:2437
 msgid "This account is not connected to the server"
 msgstr "Ovaj nalog nije povezan na server"
 
-#: ../src/dialogs.py:2422
+#: ../src/dialogs.py:2438
 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:2446
+#: ../src/dialogs.py:2462
 msgid "Synchronise"
 msgstr "Sinhronizuj"
 
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2523
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Započni razgovor sa razunom %s"
 
-#: ../src/dialogs.py:2509
+#: ../src/dialogs.py:2525
 msgid "Start Chat"
 msgstr "Započni razgovor"
 
-#: ../src/dialogs.py:2510
+#: ../src/dialogs.py:2526
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7080,168 +7264,168 @@ msgstr ""
 "poslati poruku:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2536 ../src/dialogs.py:2917 ../src/dialogs.py:3129
+#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
 msgid "Connection not available"
 msgstr "Veza nije dostupna"
 
-#: ../src/dialogs.py:2537 ../src/dialogs.py:2918 ../src/dialogs.py:3130
+#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Molimo potvrdite da ste spojeni na \"%s\"."
 
-#: ../src/dialogs.py:2546 ../src/dialogs.py:2549
+#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
 msgid "Invalid JID"
 msgstr "Neispravan džaber ID"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2565
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nije moguće razložiti \"%s\"."
 
-#: ../src/dialogs.py:2558
+#: ../src/dialogs.py:2574
 msgid "Without a connection, you can not change your password."
 msgstr "Bez veze nije moguća promena lozinke."
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "Invalid password"
 msgstr "Neispravna lozinka"
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "You must enter a password."
 msgstr "Morate da unesete lozinku"
 
-#: ../src/dialogs.py:2581
+#: ../src/dialogs.py:2597
 msgid "Passwords do not match"
 msgstr "Lozinke se ne poklapaju"
 
-#: ../src/dialogs.py:2582
+#: ../src/dialogs.py:2598
 msgid "The passwords typed in both fields must be identical."
 msgstr "Lozinke upisane u oba polja moraju biti identične."
 
 #. default value
-#: ../src/dialogs.py:2619 ../src/notify.py:247 ../src/notify.py:473
+#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
 msgid "Contact Signed In"
 msgstr "Kontakt je na vezi"
 
-#: ../src/dialogs.py:2621 ../src/notify.py:255 ../src/notify.py:475
+#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
 msgid "Contact Signed Out"
 msgstr "Kontakt je otišao sa veze"
 
 #. chat message
-#: ../src/dialogs.py:2623 ../src/notify.py:277 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
 msgid "New Message"
 msgstr "Nova Poruka"
 
 #. single message
-#: ../src/dialogs.py:2623 ../src/notify.py:259 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
 msgid "New Single Message"
 msgstr "Nova Samostalna Poruka"
 
 #. private message
-#: ../src/dialogs.py:2624 ../src/notify.py:265 ../src/notify.py:478
+#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
 msgid "New Private Message"
 msgstr "Nova Privatna Poruka"
 
-#: ../src/dialogs.py:2624 ../src/gui_interface.py:1358 ../src/notify.py:487
+#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
 msgid "New E-mail"
 msgstr "Novi E-mejl"
 
-#: ../src/dialogs.py:2626 ../src/gui_interface.py:1420 ../src/notify.py:480
+#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
 msgid "File Transfer Request"
 msgstr "Zahtev za prenosom datoteke"
 
-#: ../src/dialogs.py:2628 ../src/gui_interface.py:1320
-#: ../src/gui_interface.py:1389 ../src/notify.py:482
+#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
+#: ../src/gui_interface.py:1186 ../src/notify.py:482
 msgid "File Transfer Error"
 msgstr "Greška pri prenosu datoteke"
 
-#: ../src/dialogs.py:2630 ../src/gui_interface.py:1466
-#: ../src/gui_interface.py:1489 ../src/gui_interface.py:1506
+#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
+#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
 #: ../src/notify.py:484
 msgid "File Transfer Completed"
 msgstr "Prenos datoteke završen"
 
-#: ../src/dialogs.py:2631 ../src/gui_interface.py:1469 ../src/notify.py:485
+#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
 msgid "File Transfer Stopped"
 msgstr "Prenos datoteke zaustavljen"
 
-#: ../src/dialogs.py:2633 ../src/gui_interface.py:1152 ../src/notify.py:489
+#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
 msgid "Groupchat Invitation"
 msgstr "Poziv na grupni razgovor"
 
-#: ../src/dialogs.py:2635 ../src/notify.py:239 ../src/notify.py:491
+#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
 msgid "Contact Changed Status"
 msgstr "Kontakt promenio status"
 
-#: ../src/dialogs.py:2836
+#: ../src/dialogs.py:2852
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Samostalna poruka koristeći nalog %s"
 
-#: ../src/dialogs.py:2838
+#: ../src/dialogs.py:2854
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Samostalna poruka na nalogu %s"
 
-#: ../src/dialogs.py:2840
+#: ../src/dialogs.py:2856
 msgid "Single Message"
 msgstr "Samostalna Poruka"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2843
+#: ../src/dialogs.py:2859
 #, python-format
 msgid "Send %s"
 msgstr "Poslate %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:2882
 #, python-format
 msgid "Received %s"
 msgstr "Primljene %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2889
+#: ../src/dialogs.py:2905
 #, 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:2968
+#: ../src/dialogs.py:2984
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:2985
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s piše:\n"
 
-#: ../src/dialogs.py:3028
+#: ../src/dialogs.py:3044
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konzola za %s"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3046
 msgid "XML Console"
 msgstr "XML Konzola"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "add"
 msgstr "Tužan"
 
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "modify"
 msgstr "Izmenite"
 
-#: ../src/dialogs.py:3160
+#: ../src/dialogs.py:3176
 #, fuzzy
 msgid "remove"
 msgstr "_Ukloni"
 
-#: ../src/dialogs.py:3188
+#: ../src/dialogs.py:3204
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7249,155 +7433,189 @@ msgid ""
 msgstr "<b>%s</b> želi da <b>%s</b> neke kontakte u listu vaših kontakata."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3204 ../src/dialogs.py:3250
+#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
 msgid "Add"
 msgstr "Dodate"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3206 ../src/dialogs.py:3281
+#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
 msgid "Modify"
 msgstr "Izmenite"
 
-#: ../src/dialogs.py:3212
+#: ../src/dialogs.py:3228
 msgid "Jabber ID"
 msgstr "Džaber ID"
 
-#: ../src/dialogs.py:3218
+#: ../src/dialogs.py:3234
 msgid "Groups"
 msgstr "Grupe"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3342
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s je predložio da vas dodam u listu mojih kontakata."
 
-#: ../src/dialogs.py:3340
+#: ../src/dialogs.py:3356
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "Dodaj _kontakt"
 
-#: ../src/dialogs.py:3377
+#: ../src/dialogs.py:3393
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Uklanja kontakt sa liste"
 
-#: ../src/dialogs.py:3430
+#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#, python-format
+msgid "Archiving Preferences for %s"
+msgstr ""
+
+#: ../src/dialogs.py:3473
+#, fuzzy
+msgid "Invalid expire value"
+msgstr "Neispravano ime servera"
+
+#: ../src/dialogs.py:3474
+msgid "Expire must be a valid positive integer."
+msgstr ""
+
+#: ../src/dialogs.py:3521
+msgid "There is an error with the form"
+msgstr ""
+
+#: ../src/dialogs.py:3732
+#, fuzzy
+msgid "There is an error"
+msgstr "Servis je vratio grešku."
+
+#: ../src/dialogs.py:3796
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista privatnosti <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3434
+#: ../src/dialogs.py:3800
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista privatnosti za %s"
 
-#: ../src/dialogs.py:3490
+#: ../src/dialogs.py:3856
 #, 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:3495
+#: ../src/dialogs.py:3861
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Redosled: %(order)s, akcija: %(action)s"
 
-#: ../src/dialogs.py:3539
+#: ../src/dialogs.py:3905
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Izmeni pravilo</b>"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:4016
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dodaj pravilo</b>"
 
-#: ../src/dialogs.py:3750
+#: ../src/dialogs.py:4116
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Lista privatnosti za %s"
 
-#: ../src/dialogs.py:3752
+#: ../src/dialogs.py:4118
 msgid "Privacy Lists"
 msgstr "Lista privatnosti"
 
-#: ../src/dialogs.py:3822
+#: ../src/dialogs.py:4188
 msgid "Invalid List Name"
 msgstr "Neispravno ime liste"
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4189
 msgid "You must enter a name to create a privacy list."
 msgstr "Morate uneti ime za kreiranje liste privatnosti"
 
-#: ../src/dialogs.py:3855
+#: ../src/dialogs.py:4221
 msgid "You are invited to a groupchat"
 msgstr "Pozvani ste u grupni razgovor"
 
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4224
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact Vas je pozvao na razgovor"
 
-#: ../src/dialogs.py:3860
+#: ../src/dialogs.py:4226
 #, 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:3868
+#: ../src/dialogs.py:4234
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentar: %s"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4236
 msgid "Do you want to accept the invitation?"
 msgstr "Da li želite da prihvatite ovu pozivnicu?"
 
-#: ../src/dialogs.py:3932
+#: ../src/dialogs.py:4298
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:3942 ../src/dialogs.py:3985 ../src/dialogs.py:4041
+#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
+#: ../src/dialogs.py:4495
 msgid "All files"
 msgstr "Sve datoteke"
 
-#: ../src/dialogs.py:3947
+#: ../src/dialogs.py:4313
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:3975
+#: ../src/dialogs.py:4341
 msgid "Choose Sound"
 msgstr "Odaberite zvuk"
 
-#: ../src/dialogs.py:3990
+#: ../src/dialogs.py:4356
 msgid "Wav Sounds"
 msgstr "Wav Zvukovi"
 
-#: ../src/dialogs.py:4028
+#: ../src/dialogs.py:4394
 msgid "Choose Image"
 msgstr "Odaberite sliku"
 
-#: ../src/dialogs.py:4046
+#: ../src/dialogs.py:4412
 msgid "Images"
 msgstr "Slike"
 
-#: ../src/dialogs.py:4113
+#: ../src/dialogs.py:4482
+#, fuzzy
+msgid "Choose Archive"
+msgstr "Odaberite sliku"
+
+#: ../src/dialogs.py:4500
+#, fuzzy
+msgid "Zip files"
+msgstr "Sve datoteke"
+
+#: ../src/dialogs.py:4525
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kad %s postane:"
 
-#: ../src/dialogs.py:4115
+#: ../src/dialogs.py:4527
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dodavanje posebnog obaveštenja za %s"
 
-#: ../src/dialogs.py:4190
+#: ../src/dialogs.py:4602
 msgid "Condition"
 msgstr "Uslov"
 
-#: ../src/dialogs.py:4310
+#: ../src/dialogs.py:4722
 msgid "when I am "
 msgstr "kada sam "
 
-#: ../src/dialogs.py:4786
+#: ../src/dialogs.py:5198
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7408,19 +7626,19 @@ msgstr ""
 "\n"
 "Kratka Autentikaciona Niska ove sesije je: <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4789
+#: ../src/dialogs.py:5201
 msgid "You have already verified this contact's identity."
 msgstr "Već ste potvrdili identitet ovog kontakta."
 
-#: ../src/dialogs.py:4795 ../src/dialogs.py:4879
+#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
 msgid "Contact's identity verified"
 msgstr "Identitet kontakta potvrđen"
 
-#: ../src/dialogs.py:4801
+#: ../src/dialogs.py:5213
 msgid "Verify again..."
 msgstr "Potvrdite ponovo..."
 
-#: ../src/dialogs.py:4806
+#: ../src/dialogs.py:5218
 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 "
@@ -7430,19 +7648,19 @@ msgstr ""
 "poruke ili da Vam šalju poruke, morate potvrditi njihov identitet klikajući "
 "dugme ispod."
 
-#: ../src/dialogs.py:4809 ../src/dialogs.py:4860 ../src/dialogs.py:4873
+#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
 msgid "Contact's identity NOT verified"
 msgstr "Identitet kontakta NIJE potvrđen"
 
-#: ../src/dialogs.py:4814
+#: ../src/dialogs.py:5226
 msgid "Verify..."
 msgstr "Potvrdi..."
 
-#: ../src/dialogs.py:4825
+#: ../src/dialogs.py:5237
 msgid "Have you verified the contact's identity?"
 msgstr "Da li ste proverili identitet kontakta?"
 
-#: ../src/dialogs.py:4826
+#: ../src/dialogs.py:5238
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7456,23 +7674,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:4827
+#: ../src/dialogs.py:5239
 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:4861
+#: ../src/dialogs.py:5273
 #, 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:4867
+#: ../src/dialogs.py:5279
 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:4874
+#: ../src/dialogs.py:5286
 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."
@@ -7481,7 +7699,7 @@ msgstr ""
 "da poruke <b>ne mogu</b> biti šifrovane. Upotrebite Vašeg GPG klijenta da "
 "date poverenje ovom ključu."
 
-#: ../src/dialogs.py:4880
+#: ../src/dialogs.py:5292
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7489,19 +7707,19 @@ msgstr ""
 "GPG ključ je dodeljen ovom kontaktu i Vi verujete ovom ključu tako da će "
 "poruke biti Å¡ifrovane."
 
-#: ../src/dialogs.py:4945
+#: ../src/dialogs.py:5357
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4947
+#: ../src/dialogs.py:5359
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4949
+#: ../src/dialogs.py:5361
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4953
+#: ../src/dialogs.py:5365
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7517,24 +7735,24 @@ msgstr "Ostali"
 msgid "Conference"
 msgstr "Konferencija"
 
-#: ../src/disco.py:512
+#: ../src/disco.py:513
 msgid "Without a connection, you can not browse available services"
 msgstr "Bez uspostavljene veze, ne možete razgledati dostupne usluge"
 
-#: ../src/disco.py:589
+#: ../src/disco.py:600
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Otkrivanje usluga sa naloga %s"
 
-#: ../src/disco.py:591
+#: ../src/disco.py:602
 msgid "Service Discovery"
 msgstr "Otkrivanje Usluga"
 
-#: ../src/disco.py:741
+#: ../src/disco.py:758
 msgid "The service could not be found"
 msgstr "Usluga ne može biti nađena"
 
-#: ../src/disco.py:742
+#: ../src/disco.py:759
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7542,95 +7760,95 @@ msgstr ""
 "Na navedenoj adresi nema usuga, ili nema odgovora. Proverite adresu i "
 "pokušajte ponovo."
 
-#: ../src/disco.py:746 ../src/disco.py:1082
+#: ../src/disco.py:763 ../src/disco.py:1100
 msgid "The service is not browsable"
 msgstr "Usluge nisu pretražive"
 
-#: ../src/disco.py:747
+#: ../src/disco.py:764
 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:786 ../src/disco.py:796
+#: ../src/disco.py:804 ../src/disco.py:814
 msgid "Invalid Server Name"
 msgstr "Neispravano ime servera"
 
-#: ../src/disco.py:850
+#: ../src/disco.py:868
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Pretražujem %(address)s koristeći nalog %(account)s"
 
-#: ../src/disco.py:894
+#: ../src/disco.py:912
 msgid "_Browse"
 msgstr "_Pregled"
 
-#: ../src/disco.py:1083
+#: ../src/disco.py:1101
 msgid "This service does not contain any items to browse."
 msgstr "Ova usluga ne sadrži elemente za pretragu"
 
-#: ../src/disco.py:1323
+#: ../src/disco.py:1341
 msgid "_Execute Command"
 msgstr "_Izvrši naredbu"
 
-#: ../src/disco.py:1333 ../src/disco.py:1504
+#: ../src/disco.py:1351 ../src/disco.py:1522
 msgid "Re_gister"
 msgstr "Re_gistracija"
 
-#: ../src/disco.py:1545
+#: ../src/disco.py:1563
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skeniranje %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1736
+#: ../src/disco.py:1754
 msgid "Users"
 msgstr "Korisnici"
 
 #. Description column
-#: ../src/disco.py:1744
+#: ../src/disco.py:1762
 msgid "Description"
 msgstr "Opis"
 
 #. Id column
-#: ../src/disco.py:1752
+#: ../src/disco.py:1770
 msgid "Id"
 msgstr "Identifikacija"
 
-#: ../src/disco.py:1817 ../src/gui_interface.py:3182
+#: ../src/disco.py:1835 ../src/gui_interface.py:2995
 msgid "Bookmark already set"
 msgstr "Marker je već postavljen"
 
-#: ../src/disco.py:1818 ../src/gui_interface.py:3183
+#: ../src/disco.py:1836 ../src/gui_interface.py:2996
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Grupni razgovor \"%s\" je već markiran."
 
-#: ../src/disco.py:1827 ../src/gui_interface.py:3197
+#: ../src/disco.py:1845 ../src/gui_interface.py:3010
 msgid "Bookmark has been added successfully"
 msgstr "Marker uspešno dodat"
 
-#: ../src/disco.py:1828 ../src/gui_interface.py:3198
+#: ../src/disco.py:1846 ../src/gui_interface.py:3011
 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:2039
+#: ../src/disco.py:2057
 msgid "Subscribed"
 msgstr "Pretplaćen"
 
-#: ../src/disco.py:2047
+#: ../src/disco.py:2065
 msgid "Node"
 msgstr "ÄŒvor"
 
-#: ../src/disco.py:2111
+#: ../src/disco.py:2129
 msgid "New post"
 msgstr "Nova objava"
 
-#: ../src/disco.py:2117
+#: ../src/disco.py:2135
 msgid "_Subscribe"
 msgstr "_Pretplati se"
 
-#: ../src/disco.py:2123
+#: ../src/disco.py:2141
 msgid "_Unsubscribe"
 msgstr "_Ukini pretplatu"
 
@@ -7803,17 +8021,19 @@ msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Pretvara LaTeX izraze između $$ $$."
 
 #: ../src/features_window.py:95
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
-"in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 "Zahteva texlive-latex-base, i dvipng. Morate podesiti'use_latex' na True u "
 "editoru naprednih podešavanja."
 
 #: ../src/features_window.py:96
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
+"You have to set 'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 "Zahteva texlive-latex-base i dvipng (sve iz MikTeX-a). Morate "
 "podesiti'use_latex' na True u editoru naprednih podešavanja."
@@ -7970,33 +8190,33 @@ msgstr "Opis: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s Vam želi poslati datoteku:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Nije moguće prepisati postojeću datoteku \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
 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:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 msgid "This file already exists"
 msgstr "Ova datoteka već postoji"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 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:369 ../src/gtkgui_helpers.py:914
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "U fasciklu \"%s\" nije moguće pisanje"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
 msgid "You do not have permission to create files in this directory."
 msgstr "Nemate privilegija za pisanje u ovoj fascikli"
 
@@ -8099,28 +8319,28 @@ msgstr ""
 "Jedna instanca Gajima izgleda već radi\n"
 "Svejedno želite pokrenuti?"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
 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:80
+#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
 msgid "command"
 msgstr "naredba"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "prikaži pomoć za komandu"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Prikazuje ili skriva prozor liste kontakata "
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
 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:93
+#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8128,6 +8348,13 @@ msgstr ""
 "Ispisuje listu svih kontakata sa liste kontakata. Svaki kontakt je u "
 "posebnoj liniji"
 
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
+#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
+#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
+#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
 #: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
 #: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
 #: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
@@ -8139,43 +8366,35 @@ msgstr ""
 msgid "account"
 msgstr "nalog"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "prikazuje samo kontakte sa ovog naloga"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Ispisuje listu registrovanih naloga"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
 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:109
+#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106
 #, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"accoun't previous status"
+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:110 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
-msgid "message"
-msgstr "poruka"
-
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "statusna poruka"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8184,43 +8403,20 @@ msgstr ""
 "svih naloga koji imaju uključenu opciju \"sinhronizacija sa globalnim "
 "statusom\""
 
-#: ../src/gajim-remote.py:117
-msgid "Changes the priority of account or accounts"
-msgstr "Menja status jednog ili više naloga"
-
-#: ../src/gajim-remote.py:119
-msgid "priority"
-msgstr "prioritet"
-
-#: ../src/gajim-remote.py:119
-msgid "priority you want to give to the account"
-msgstr "prioritet koji želite da date ovom nalogu"
-
-#: ../src/gajim-remote.py:121
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-msgstr ""
-"izmena prioriteta datog naloga. Ako nije određen, menja se status svih "
-"naloga koji imaju postavljenu opciju \"sinhronizacija sa globalnim statusom\""
-
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
 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:129
+#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "Džaber ID kontakta sa kojim želite razgovarati"
 
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
 #: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 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:134
-msgid "message content. The account must be specified or \"\""
-msgstr "sadržaj poruke. Nalog mora biti naznačen ili \"\""
-
-#: ../src/gajim-remote.py:139
+#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
 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 "
@@ -8230,29 +8426,34 @@ msgstr ""
 "želite postaviti samo 'nalog', bez 'OpenPGP ključ', samo postavite 'OpenPGP "
 "ključ' na ''."
 
+#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
 #: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "Džaber ID kontakta koji će primiti poruku"
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
+#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "sadržaj poruke"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "pgp ključ"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 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:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
+#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
 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:152
+#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
 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 "
@@ -8262,141 +8463,279 @@ msgstr ""
 "želite postaviti samo 'nalog', bez 'OpenPGP ključ', samo postavite 'OpenPGP "
 "ključ' na ''."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "tema"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "tema poruke"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
 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:168
+#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "Džaber ID sobe koja će primiti poruku"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Daje detaljne informacije o kontaktu"
 
+#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
+#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
 #: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
 #: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "Džaber ID kontakta"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Daje detaljne informacije o nalogu"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Ime naloga"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Å alje datoteku kontaktu"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "file"
 msgstr "datoteka"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Putanja do datoteke"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
 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:196
+#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Prikazuje sva podešavanja i njihove vrednosti"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Postavlja vrednost 'ključa' na 'vrednost'."
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "ključ=vrednost"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 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"
+"'ključ' je ime stavke podešavanja, 'vrednost' je vrednost na koju će se "
+"stavka postaviti"
+
+#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
+msgid "Deletes a preference item"
+msgstr "Briše stavku podešavanja"
+
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "key"
+msgstr "ključ"
+
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "name of the preference to be deleted"
+msgstr "ime stavke podešavanja koje će se brisati"
+
+#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+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-plugin.py:202 ../src/gajim-remote.py:218
+msgid "Removes contact from roster"
+msgstr "Uklanja kontakt sa liste"
+
+#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+msgid "Adds contact to roster"
+msgstr "Dodaje kontakt na listu"
+
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+msgid "Adds new contact to this account"
+msgstr "Dodaje novi kontakt ovom računu"
+
+#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+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-plugin.py:226
+#, fuzzy
+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-plugin.py:233 ../src/gajim-remote.py:249
+msgid "Returns number of unread messages"
+msgstr "Vraća broj nepročitanih poruka"
+
+#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+msgid "Opens 'Start Chat' dialog"
+msgstr "Otvara dijalog za započinjanje razgovora"
+
+#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+msgid "Starts chat, using this account"
+msgstr "Započinje razgovor, koristeći ovaj nalog"
+
+#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+msgid "Sends custom XML"
+msgstr "Šalje korisnički definisan XML"
+
+#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+msgid "XML to send"
+msgstr "XML za slanje"
+
+#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+"Nalog za koji će biti poslan xml ; ako nije određen, xml će biti poslat za "
+"sve naloge"
+
+#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
+msgid "Handle a xmpp:/ uri"
+msgstr "Upravlja xmpp:/ uri-jem"
+
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
+msgid "uri"
+msgstr "uri"
+
+#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+msgid "Join a MUC room"
+msgstr "Pridruži se novoj sobi"
+
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+msgid "room"
+msgstr "soba"
+
+#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+msgid "nick"
+msgstr "nadimak"
+
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+msgid "password"
+msgstr "lozinka"
+
+#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+msgid "Check if Gajim is running"
+msgstr "Molimo proverite da li je Gajim pokrenut"
+
+#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
+#: ../src/gajim-remote.py:300
+msgid "Shows or hides the ipython window"
+msgstr "Prikazuje ili skriva ipython prozor"
+
+#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+msgid "Missing argument \"contact_jid\""
+msgstr "Nedostaje argument \"contact_jid\""
+
+#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#, python-format
+msgid ""
+"'%s' is not in your roster.\n"
+"Please specify account for sending the message."
+msgstr ""
+"'%s' nije na Vašj listi.\n"
+"Molimo odredite nalog za slanje poruke."
 
-#: ../src/gajim-remote.py:207
-msgid "Deletes a preference item"
-msgstr "Briše stavku podešavanja"
+#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+msgid "You have no active account"
+msgstr "nemate aktivnih računa"
 
-#: ../src/gajim-remote.py:209
-msgid "key"
-msgstr "ključ"
+#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+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:209
-msgid "name of the preference to be deleted"
-msgstr "ime stavke podešavanja koje će se brisati"
+#: ../src/gajim-remote-plugin.py:412
+#, python-format
+msgid ""
+"Usage: %s %s %s \n"
+"\t %s"
+msgstr ""
 
-#: ../src/gajim-remote.py:213
-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-plugin.py:415 ../src/gajim-remote.py:435
+msgid "Arguments:"
+msgstr "Argumenti:"
 
-#: ../src/gajim-remote.py:218
-msgid "Removes contact from roster"
-msgstr "Uklanja kontakt sa liste"
+#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#, python-format
+msgid "%s not found"
+msgstr "%s nije pronađen"
 
-#: ../src/gajim-remote.py:227
-msgid "Adds contact to roster"
-msgstr "Dodaje kontakt na listu"
+#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
+#, python-format
+msgid ""
+"Usage: %s command [arguments]\n"
+"Command is one of:\n"
+msgstr ""
+"Korišćenje: %s naredba [argumenti]\n"
+"Naredba je jedna od:\n"
 
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "džid"
+#: ../src/gajim-remote-plugin.py:496
+#, fuzzy, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Previše argumenata\n"
+"Ukucajte \"%(basename)s help %(command)s\" za više informacija"
 
-#: ../src/gajim-remote.py:230
-msgid "Adds new contact to this account"
-msgstr "Dodaje novi kontakt ovom računu"
+#: ../src/gajim-remote-plugin.py:500
+#, fuzzy, python-format
+msgid ""
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Argument \"%(arg)s\" nije naveden. \n"
+"Ukucajte \"%(basename)s help %(command)s\" za više informacija"
 
-#: ../src/gajim-remote.py:235
-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-plugin.py:518 ../src/gajim-remote.py:540
+msgid "Wrong uri"
+msgstr "Loš uri"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:109
+#, fuzzy
 msgid ""
-"Returns current status message (the global one unless account is specified)"
-msgstr "Vraća trenutnu statusnu poruku (globalnu ako nije naznačen nalog)"
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
+msgstr ""
+"jedno od: nije na vezi, na vezi, priča, odsutan, produženo odsutan, ne "
+"uznemiravaj, nevidljiv"
 
-#: ../src/gajim-remote.py:249
-msgid "Returns number of unread messages"
-msgstr "Vraća broj nepročitanih poruka"
+#: ../src/gajim-remote.py:117
+msgid "Changes the priority of account or accounts"
+msgstr "Menja status jednog ili više naloga"
 
-#: ../src/gajim-remote.py:253
-msgid "Opens 'Start Chat' dialog"
-msgstr "Otvara dijalog za započinjanje razgovora"
+#: ../src/gajim-remote.py:119
+msgid "priority"
+msgstr "prioritet"
 
-#: ../src/gajim-remote.py:255
-msgid "Starts chat, using this account"
-msgstr "Započinje razgovor, koristeći ovaj nalog"
+#: ../src/gajim-remote.py:119
+msgid "priority you want to give to the account"
+msgstr "prioritet koji želite da date ovom nalogu"
 
-#: ../src/gajim-remote.py:259
-msgid "Sends custom XML"
-msgstr "Šalje korisnički definisan XML"
+#: ../src/gajim-remote.py:121
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"izmena prioriteta datog naloga. Ako nije određen, menja se status svih "
+"naloga koji imaju postavljenu opciju \"sinhronizacija sa globalnim statusom\""
 
-#: ../src/gajim-remote.py:261
-msgid "XML to send"
-msgstr "XML za slanje"
+#: ../src/gajim-remote.py:134
+msgid "message content. The account must be specified or \"\""
+msgstr "sadržaj poruke. Nalog mora biti naznačen ili \"\""
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:242
 msgid ""
-"Account in which the xml will be sent; if not specified, xml will be sent to "
-"all accounts"
-msgstr ""
-"Nalog za koji će biti poslan xml ; ako nije određen, xml će biti poslat za "
-"sve naloge"
+"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:268
 #, fuzzy
@@ -8417,14 +8756,6 @@ msgstr ""
 "Nalog za koji će biti poslan xml ; ako nije određen, xml će biti poslat za "
 "sve naloge"
 
-#: ../src/gajim-remote.py:277
-msgid "Handle a xmpp:/ uri"
-msgstr "Upravlja xmpp:/ uri-jem"
-
-#: ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "uri"
-
 #: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr "URI za upravljanje"
@@ -8437,30 +8768,14 @@ msgstr "Nalog u kome želite da upravljate njime"
 msgid "Message content"
 msgstr "Sadržaj poruke"
 
-#: ../src/gajim-remote.py:286
-msgid "Join a MUC room"
-msgstr "Pridruži se novoj sobi"
-
-#: ../src/gajim-remote.py:288
-msgid "room"
-msgstr "soba"
-
 #: ../src/gajim-remote.py:288
 msgid "Room JID"
 msgstr "Džaber ID sobe:"
 
-#: ../src/gajim-remote.py:289
-msgid "nick"
-msgstr "nadimak"
-
 #: ../src/gajim-remote.py:289
 msgid "Nickname to use"
 msgstr "Nadimak za korišćenje"
 
-#: ../src/gajim-remote.py:290
-msgid "password"
-msgstr "lozinka"
-
 #: ../src/gajim-remote.py:290
 msgid "Password to enter the room"
 msgstr "Lozinka za ulazak u sobu"
@@ -8469,35 +8784,6 @@ msgstr "Lozinka za ulazak u sobu"
 msgid "Account from which you want to enter the room"
 msgstr "Nalog sa koga želite da uđete u sobu"
 
-#: ../src/gajim-remote.py:296
-msgid "Check if Gajim is running"
-msgstr "Molimo proverite da li je Gajim pokrenut"
-
-#: ../src/gajim-remote.py:300
-msgid "Shows or hides the ipython window"
-msgstr "Prikazuje ili skriva ipython prozor"
-
-#: ../src/gajim-remote.py:327
-msgid "Missing argument \"contact_jid\""
-msgstr "Nedostaje argument \"contact_jid\""
-
-#: ../src/gajim-remote.py:348
-#, python-format
-msgid ""
-"'%s' is not in your roster.\n"
-"Please specify account for sending the message."
-msgstr ""
-"'%s' nije na Vašj listi.\n"
-"Molimo odredite nalog za slanje poruke."
-
-#: ../src/gajim-remote.py:351
-msgid "You have no active account"
-msgstr "nemate aktivnih računa"
-
-#: ../src/gajim-remote.py:404
-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:431
 #, python-format
 msgid ""
@@ -8507,24 +8793,6 @@ msgstr ""
 "Korišćenje: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:435
-msgid "Arguments:"
-msgstr "Argumenti:"
-
-#: ../src/gajim-remote.py:439
-#, python-format
-msgid "%s not found"
-msgstr "%s nije pronađen"
-
-#: ../src/gajim-remote.py:445
-#, python-format
-msgid ""
-"Usage: %s command [arguments]\n"
-"Command is one of:\n"
-msgstr ""
-"Korišćenje: %s naredba [argumenti]\n"
-"Naredba je jedna od:\n"
-
 #: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
@@ -8547,10 +8815,6 @@ msgstr ""
 msgid "No uri given"
 msgstr ""
 
-#: ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Loš uri"
-
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Tema"
@@ -8576,180 +8840,178 @@ msgstr "Ne možete izbrisati Vašu trenutnu temu"
 msgid "Please first choose another for your current theme."
 msgstr "Molimo Vas da prvo odaberete neku drugu temu."
 
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:170
 msgid "Sending private message failed"
 msgstr "Neuspešno slanje privatne poruke"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:171
+#: ../src/groupchat_control.py:172
 #, 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:455
 msgid "Insert Nickname"
 msgstr "Ubaci nadimak"
 
-#: ../src/groupchat_control.py:631
+#: ../src/groupchat_control.py:636
 msgid "Conversation with "
 msgstr "Razgovor sa "
 
-#: ../src/groupchat_control.py:633
+#: ../src/groupchat_control.py:638
 msgid "Continued conversation"
 msgstr "Nastavljeni razgovor"
 
-#. Can be a message (see handle_event_gc_config_change in
-#. gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1272 ../src/gui_interface.py:1080
+#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Svima prisutnima je dozvoljeno da vide vaš pun džaber ID"
 
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1286
 msgid "Room logging is enabled"
 msgstr "Logovanje sobe je omogućeno"
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1288
 msgid "A new room has been created"
 msgstr "Nova soba je napravljena"
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1291
 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:1287
+#: ../src/groupchat_control.py:1297
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s je izbačen: %(reason)s"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1300
 #, 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:1300
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s ima zabranu: %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1312
 #, 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:1314 ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
 #, python-format
 msgid "You are now known as %s"
 msgstr "Od sada ste poznati kao %s"
 
-#: ../src/groupchat_control.py:1330 ../src/gui_interface.py:919
+#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s je od sada poznat kao %(new_nick)s"
 
-#: ../src/groupchat_control.py:1372 ../src/groupchat_control.py:1377
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1392
 #, 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:1374
+#: ../src/groupchat_control.py:1383
 msgid "affiliation changed"
 msgstr "vezanost izmenjena"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1388
 msgid "room configuration changed to members-only"
 msgstr "konfiguracija sobe se promenila na \"samo članovi\""
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1394
 msgid "system shutdown"
 msgstr "gašenje sistema"
 
-#: ../src/groupchat_control.py:1470
+#: ../src/groupchat_control.py:1477
 #, 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:1474
+#: ../src/groupchat_control.py:1481
 #, 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:1489
+#: ../src/groupchat_control.py:1496
 #, 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:1493
+#: ../src/groupchat_control.py:1500
 #, 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:1522
+#: ../src/groupchat_control.py:1530
 #, python-format
 msgid "%s has left"
 msgstr "%s je otišao"
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1535
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s se pridružio grupnom razgovoru"
 
-#: ../src/groupchat_control.py:1529 ../src/gui_interface.py:946
+#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
 #: ../src/history_window.py:447 ../src/notify.py:234
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s je trenutno %(status)s"
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1774
 #, 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:1761
+#: ../src/groupchat_control.py:1776
 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:1765 ../src/gui_interface.py:1216
-#: ../src/gui_interface.py:1992 ../src/gui_interface.py:2029
-#: ../src/gui_interface.py:2064 ../src/message_window.py:224
-#: ../src/roster_window.py:2739 ../src/roster_window.py:3399
-#: ../src/roster_window.py:4123
+#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
+#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
+#: ../src/gui_interface.py:1853 ../src/message_window.py:224
+#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
+#: ../src/roster_window.py:4195
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Ne pitaj me više"
 
-#: ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:1814
 msgid "Changing Subject"
 msgstr "Promena Teme"
 
-#: ../src/groupchat_control.py:1800
+#: ../src/groupchat_control.py:1815
 msgid "Please specify the new subject:"
 msgstr "Molimo odredite novu temu:"
 
-#: ../src/groupchat_control.py:1807
+#: ../src/groupchat_control.py:1822
 msgid "Changing Nickname"
 msgstr "Promena nadimka"
 
-#: ../src/groupchat_control.py:1808
+#: ../src/groupchat_control.py:1823
 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:1839
+#: ../src/groupchat_control.py:1854
 #, python-format
 msgid "Destroying %s"
 msgstr "Uništavam %s"
 
-#: ../src/groupchat_control.py:1840
+#: ../src/groupchat_control.py:1855
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8757,22 +9019,22 @@ msgstr ""
 "Upravo ćete zauvek uništiti ovu sobu.\n"
 "Možete ispod napisati razlog:"
 
-#: ../src/groupchat_control.py:1842
+#: ../src/groupchat_control.py:1857
 msgid "You may also enter an alternate venue:"
 msgstr "Možete takođe uneti i alternativnu lokaciju:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2028
+#: ../src/groupchat_control.py:2046
 #, python-format
 msgid "Kicking %s"
 msgstr "Izbacujem %s"
 
-#: ../src/groupchat_control.py:2029 ../src/groupchat_control.py:2356
+#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
 msgid "You may specify a reason below:"
 msgstr "Možete navesti razlog ispod:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2355
+#: ../src/groupchat_control.py:2373
 #, python-format
 msgid "Banning %s"
 msgstr "Zabranjujem %s"
@@ -8796,55 +9058,64 @@ msgid "Details"
 msgstr "Detalji"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
+#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Greška: nije moguće otvoriti %s za čitanje"
 
-#: ../src/gtkgui_helpers.py:400
+#: ../src/gtkgui_helpers.py:404
 msgid "Error reading file:"
 msgstr "Greška pri čitanju datoteke:"
 
-#: ../src/gtkgui_helpers.py:403
+#: ../src/gtkgui_helpers.py:407
 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:444
+#: ../src/gtkgui_helpers.py:448
 #, 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:818
+#: ../src/gtkgui_helpers.py:822
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim nije Vaš podrazumevani džaber klijent"
 
-#: ../src/gtkgui_helpers.py:819
+#: ../src/gtkgui_helpers.py:823
 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:820
+#: ../src/gtkgui_helpers.py:824
 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:887
+#: ../src/gtkgui_helpers.py:891
 msgid "Extension not supported"
 msgstr "Ekstenzija nije podržana"
 
-#: ../src/gtkgui_helpers.py:888
+#: ../src/gtkgui_helpers.py:892
 #, 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:924
+#: ../src/gtkgui_helpers.py:928
 msgid "Save Image as..."
 msgstr "Snimi sliku kao..."
 
-#: ../src/gui_interface.py:140
+#. we are banned
+#. group chat does not exist
+#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
+#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
+#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
+#: ../src/gui_interface.py:348
+msgid "Unable to join group chat"
+msgstr "Nije moguće pridružiti se grupnom razgovoru"
+
+#: ../src/gui_interface.py:138
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8855,58 +9126,92 @@ msgstr ""
 "registrovan od strane nekog od učesnika.\n"
 "Molimo odredite drugi nadimak ispod:"
 
-#: ../src/gui_interface.py:143
+#: ../src/gui_interface.py:141
 msgid "Always use this nickname when there is a conflict"
 msgstr "Uvek koristi nadimak kada postoji konflikt"
 
-#: ../src/gui_interface.py:159
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Prihvatate li ovaj zahtev?"
 
-#: ../src/gui_interface.py:161
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Prihvatate li ovaj zahtev na nalogu %s?"
 
-#: ../src/gui_interface.py:164
+#: ../src/gui_interface.py:163
 #, 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/gui_interface.py:213 ../src/notify.py:493
+#: ../src/gui_interface.py:209 ../src/notify.py:493
 msgid "Connection Failed"
 msgstr "Veza prekinuta"
 
-#: ../src/gui_interface.py:606 ../src/gui_interface.py:610
+#: ../src/gui_interface.py:312
+#, 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/gui_interface.py:324
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr "Dostignut najveći broj korisnika za %s"
+
+#: ../src/gui_interface.py:333
+#, python-format
+msgid "You are banned from group chat %s."
+msgstr "Zabranjen Vam je pristup ovom grupnom razgovoru %s."
+
+#: ../src/gui_interface.py:338
+#, python-format
+msgid "Group chat %s does not exist."
+msgstr "Grupni razgovor.%s ne postoji."
+
+#: ../src/gui_interface.py:341
+msgid "Group chat creation is restricted."
+msgstr "Stvaranje grupnih razgovora Vam nije dozvoljeno."
+
+#: ../src/gui_interface.py:344
+#, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Morate koristiti Vaš registrovani nadimak u grupnom razgovoru %s."
+
+#: ../src/gui_interface.py:349
+#, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Niste u listi članova grupnog razgovora %s."
+
+#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Greška %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:621 ../src/gui_interface.py:636
+#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "greška prilikom slanja %(message)s ( %(error)s )"
 
-#: ../src/gui_interface.py:663 ../src/notify.py:495
+#: ../src/gui_interface.py:540 ../src/notify.py:495
 msgid "Subscription request"
 msgstr "Zahtev za pretplatom"
 
-#: ../src/gui_interface.py:688
+#: ../src/gui_interface.py:565
 msgid "Authorization accepted"
 msgstr "Autorizacija prihvaćena"
 
-#: ../src/gui_interface.py:689
+#: ../src/gui_interface.py:566
 #, 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/gui_interface.py:702
+#: ../src/gui_interface.py:579
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" je ukinuo pretplatu na njega"
 
-#: ../src/gui_interface.py:703
+#: ../src/gui_interface.py:580
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8914,61 +9219,56 @@ msgstr ""
 "Uvek ćete ga/je videti kao da nije na vezi.\n"
 "Da li želite da ga/je uklonite sa liste kontakata?"
 
-#: ../src/gui_interface.py:727 ../src/notify.py:497
+#: ../src/gui_interface.py:604 ../src/notify.py:497
 msgid "Unsubscribed"
 msgstr "Ukinuta pretplata"
 
-#: ../src/gui_interface.py:754
+#: ../src/gui_interface.py:631
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt sa \"%s\" se ne može uspostaviti"
 
-#: ../src/gui_interface.py:1015
+#: ../src/gui_interface.py:859
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s je postavio temu na %(subject)s"
 
-#: ../src/gui_interface.py:1083
+#: ../src/gui_interface.py:926
 msgid "Room now shows unavailable member"
 msgstr "Soba sada prikazuje nedostupne članove"
 
-#: ../src/gui_interface.py:1085
+#: ../src/gui_interface.py:928
 msgid "room now does not show unavailable members"
 msgstr "soba sada ne prikazuje nedostupne članove"
 
-#: ../src/gui_interface.py:1087
+#: ../src/gui_interface.py:930
 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/gui_interface.py:1091
+#: ../src/gui_interface.py:934
 msgid "Room logging is now enabled"
 msgstr "Logovanje u sobi je sada omogućeno"
 
-#: ../src/gui_interface.py:1093
+#: ../src/gui_interface.py:936
 msgid "Room logging is now disabled"
 msgstr "Logovanje u sobi je sada onemogućeno"
 
-#: ../src/gui_interface.py:1095
+#: ../src/gui_interface.py:938
 msgid "Room is now non-anonymous"
 msgstr "Soba sada više nije anonimna"
 
-#: ../src/gui_interface.py:1098
+#: ../src/gui_interface.py:941
 msgid "Room is now semi-anonymous"
 msgstr "Soba je sada polu anonimna"
 
-#: ../src/gui_interface.py:1101
+#: ../src/gui_interface.py:944
 msgid "Room is now fully-anonymous"
 msgstr "Soba je sada potpuno anonimna"
 
-#: ../src/gui_interface.py:1133
-#, 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/gui_interface.py:1180
+#: ../src/gui_interface.py:985
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -8976,23 +9276,23 @@ msgstr ""
 "Konfigurisali ste Gajim da koristi GPG agenta, ali ne postoji GPG agent koji "
 "radi ili je vratio lošu frazu lozinke.\n"
 
-#: ../src/gui_interface.py:1182 ../src/gui_interface.py:1189
+#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Trenutno ste povezani bez OpenPGP ključa."
 
-#: ../src/gui_interface.py:1184
+#: ../src/gui_interface.py:989
 msgid "Your passphrase is incorrect"
 msgstr "Vaša lozinka nije tačna"
 
-#: ../src/gui_interface.py:1188
+#: ../src/gui_interface.py:993
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "OpenGPG lozinka nije tačna"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid "GPG key not trusted"
 msgstr "GPG ključ nije od poverenja"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
@@ -9000,7 +9300,7 @@ msgstr ""
 "GPG ključ koji se koristi za šifrovanje nije od poverenja. Da li zaista "
 "želite da šifrujete ovu poruku?"
 
-#: ../src/gui_interface.py:1226
+#: ../src/gui_interface.py:1031
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not                 correctly started "
@@ -9009,12 +9309,12 @@ msgstr ""
 "Gnome Keyring je instaliran, ali nije \t\t\t\tpravilno pokrenut (promenljive "
 "okruženja verovatno nisu \t\t\tpravilno podešene)"
 
-#: ../src/gui_interface.py:1330
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Novi e-mejl za %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1332
+#: ../src/gui_interface.py:1133
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -9022,7 +9322,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/gui_interface.py:1345
+#: ../src/gui_interface.py:1146
 #, python-format
 msgid ""
 "\n"
@@ -9037,42 +9337,42 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1418
+#: ../src/gui_interface.py:1215
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s Vam želi poslati datoteku."
 
-#: ../src/gui_interface.py:1455 ../src/roster_window.py:1856
+#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
 msgid "Remote contact stopped transfer"
 msgstr "Udaljeni kontakt je prekinuo prenos"
 
-#: ../src/gui_interface.py:1458 ../src/roster_window.py:1858
+#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
 msgid "Error opening file"
 msgstr "Greška pri otvaranju datoteke"
 
-#: ../src/gui_interface.py:1490
+#: ../src/gui_interface.py:1287
 #, 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/gui_interface.py:1494
+#: ../src/gui_interface.py:1291
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Prenos datoteke %(filename)s od kontakta %(name)s je zaustavljen."
 
-#: ../src/gui_interface.py:1507
+#: ../src/gui_interface.py:1304
 #, 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/gui_interface.py:1511
+#: ../src/gui_interface.py:1308
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Prenos %(filename)s za kontakt %(name)s je zaustavljen. "
 
-#: ../src/gui_interface.py:1623
+#: ../src/gui_interface.py:1426
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -9081,36 +9381,36 @@ msgstr ""
 "Ne mogu da dešifrujem poruku od kontakta %s\n"
 "Možda je promenjena."
 
-#: ../src/gui_interface.py:1630
+#: ../src/gui_interface.py:1433
 msgid "Unable to decrypt message"
 msgstr "Ne mogu da dešifrujem poruku"
 
-#: ../src/gui_interface.py:1702
+#: ../src/gui_interface.py:1505
 msgid "Username Conflict"
 msgstr "Konflikt korisničkog imena"
 
-#: ../src/gui_interface.py:1703
+#: ../src/gui_interface.py:1506
 msgid "Please type a new username for your local account"
 msgstr "Molimo Vas unesite novo korisničko ime za Vaš lokalni nalog"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1519
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gui_interface.py:1729
+#: ../src/gui_interface.py:1532
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gui_interface.py:1740
+#: ../src/gui_interface.py:1543
 msgid "Error."
 msgstr "Greška."
 
-#: ../src/gui_interface.py:1768
+#: ../src/gui_interface.py:1556
 msgid "Resource Conflict"
 msgstr "Konflikt resursa"
 
-#: ../src/gui_interface.py:1769
+#: ../src/gui_interface.py:1557
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -9119,21 +9419,21 @@ msgstr ""
 "novo ime resursa"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1816
+#: ../src/gui_interface.py:1604
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s Vam želi poslati datoteku."
 
-#: ../src/gui_interface.py:1819
+#: ../src/gui_interface.py:1607
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Zahtev za prenosom datoteke"
 
-#: ../src/gui_interface.py:1927
+#: ../src/gui_interface.py:1716
 msgid "Error verifying SSL certificate"
 msgstr "Greška pri verifikaciji SSL sertifikata"
 
-#: ../src/gui_interface.py:1928
+#: ../src/gui_interface.py:1717
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9144,15 +9444,15 @@ msgstr ""
 "servera:%(error)s\n"
 "Da li i dalje želite da se konektujete na ovaj server?"
 
-#: ../src/gui_interface.py:1936
+#: ../src/gui_interface.py:1725
 msgid "Ignore this error for this certificate."
 msgstr "Ignoriši ovu grešku za ovaj sertifikat."
 
-#: ../src/gui_interface.py:1956
+#: ../src/gui_interface.py:1745
 msgid "SSL certificate error"
 msgstr "Greška SSL sertifikata"
 
-#: ../src/gui_interface.py:1957
+#: ../src/gui_interface.py:1746
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9169,12 +9469,12 @@ msgstr ""
 "\n"
 "Da li i dalje želite da se konektujete i osvežite otisak ovog sertifikata?"
 
-#: ../src/gui_interface.py:1987 ../src/gui_interface.py:2024
-#: ../src/gui_interface.py:2060
+#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
+#: ../src/gui_interface.py:1849
 msgid "Insecure connection"
 msgstr "Nesigurna veza"
 
-#: ../src/gui_interface.py:1988
+#: ../src/gui_interface.py:1777
 #, fuzzy
 msgid ""
 "You are about to connect to the server with an insecure connection. This "
@@ -9184,12 +9484,12 @@ msgstr ""
 "Upravo ćete poslati lozinku preko nesigurne veze. Trebalo bi da instalirate "
 "PyOpenSSL da sprečite ovo. Da li želite da nastavite?"
 
-#: ../src/gui_interface.py:1991 ../src/gui_interface.py:2028
-#: ../src/gui_interface.py:2063
+#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
+#: ../src/gui_interface.py:1852
 msgid "Yes, I really want to connect insecurely"
 msgstr "Da, zaista želim da se konektujem nesigurnom vezom"
 
-#: ../src/gui_interface.py:2025
+#: ../src/gui_interface.py:1814
 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?"
@@ -9197,7 +9497,7 @@ msgstr ""
 "Upravo ćete poslati lozinku preko nesigurne veze. Trebalo bi da instalirate "
 "PyOpenSSL da sprečite ovo. Da li želite da nastavite?"
 
-#: ../src/gui_interface.py:2061
+#: ../src/gui_interface.py:1850
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9207,17 +9507,17 @@ msgstr ""
 "želite to da uradite?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2624 ../src/gui_interface.py:2647
+#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
 msgid "Emoticons disabled"
 msgstr "Smajliji isključeni"
 
-#: ../src/gui_interface.py:2625
+#: ../src/gui_interface.py:2423
 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/gui_interface.py:2648
+#: ../src/gui_interface.py:2446
 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 "
@@ -9227,40 +9527,40 @@ msgstr ""
 "emoticons.py datoteke. Pogledajte http://trac.gajim.org/wiki/Emoticons za "
 "više detalja."
 
-#: ../src/gui_interface.py:2679 ../src/roster_window.py:3560
+#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
 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/gui_interface.py:3058
+#: ../src/gui_interface.py:2871
 msgid "Could not save your settings and preferences"
 msgstr "Nije moguće čuvanje Vaših podešavanja"
 
-#: ../src/gui_interface.py:3592
+#: ../src/gui_interface.py:3411
 msgid "Passphrase Required"
 msgstr "Lozinka neophodna"
 
-#: ../src/gui_interface.py:3593
+#: ../src/gui_interface.py:3412
 #, 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/gui_interface.py:3607
+#: ../src/gui_interface.py:3426
 msgid "GPG key expired"
 msgstr "GPG ključ istekao"
 
-#: ../src/gui_interface.py:3608
+#: ../src/gui_interface.py:3427
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Vaš GPG ključ je istekao, bićete povezani sa %s bez OpenPGP-a."
 
 #. ask again
-#: ../src/gui_interface.py:3617
+#: ../src/gui_interface.py:3436
 msgid "Wrong Passphrase"
 msgstr "Neispravna lozinka"
 
-#: ../src/gui_interface.py:3618
+#: ../src/gui_interface.py:3437
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Molimo ponovo ukucajte Vašu GPG lozinku ili pritisnite Odustani"
 
@@ -9298,6 +9598,11 @@ msgstr "Nadimak"
 msgid "Message"
 msgstr "Poruka"
 
+#. holds subject
+#: ../src/history_manager.py:188 ../src/history_manager.py:219
+msgid "Subject"
+msgstr "Tema"
+
 #: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -9397,19 +9702,19 @@ msgstr "Zatvorićete nekoliko jezičaka"
 msgid "Do you really want to close them all?"
 msgstr "Da li zaista želite da ih sve zatvorite?"
 
-#: ../src/message_window.py:484
+#: ../src/message_window.py:485
 msgid "Chats"
 msgstr "Razgovori"
 
-#: ../src/message_window.py:486
+#: ../src/message_window.py:487
 msgid "Group Chats"
 msgstr "Grupni razgovori"
 
-#: ../src/message_window.py:488
+#: ../src/message_window.py:489
 msgid "Private Chats"
 msgstr "Privatni Razgovori"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:495
 msgid "Messages"
 msgstr "Poruke"
 
@@ -9465,56 +9770,56 @@ msgstr "Nova poruka od %(nickname)s"
 msgid "Ignore"
 msgstr "Ignoriši"
 
-#: ../src/profile_window.py:57
+#: ../src/profile_window.py:58
 msgid "Retrieving profile..."
 msgstr "Dohvatanje profila..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2935
+#: ../src/profile_window.py:111 ../src/roster_window.py:3001
 msgid "File is empty"
 msgstr "Datoteka je prazna"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2938
+#: ../src/profile_window.py:114 ../src/roster_window.py:3004
 msgid "File does not exist"
 msgstr "Datoteka ne postoji"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2940 ../src/roster_window.py:2951
+#: ../src/profile_window.py:128 ../src/profile_window.py:144
+#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
 msgid "Could not load image"
 msgstr "Ne mogu učitati sliku"
 
-#: ../src/profile_window.py:214
+#: ../src/profile_window.py:215
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Informacije kontakta"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:216
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Format: GGGG-MM-DD"
 
-#: ../src/profile_window.py:269
+#: ../src/profile_window.py:270
 msgid "Information received"
 msgstr "Informacije primljene"
 
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:341
 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:353
+#: ../src/profile_window.py:354
 msgid "Sending profile..."
 msgstr "Slanje profila..."
 
-#: ../src/profile_window.py:368
+#: ../src/profile_window.py:369
 msgid "Information NOT published"
 msgstr "Informacije NISU objavljene"
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:376
 msgid "vCard publication failed"
 msgstr "Publikacija vCard neuspela"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:377
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9522,51 +9827,51 @@ msgstr ""
 "Nastala je greška prilikom objavljivanja Vaših ličnih informacija, pokušajte "
 "ponovo kasnije."
 
-#: ../src/roster_window.py:256 ../src/roster_window.py:1012
+#: ../src/roster_window.py:262 ../src/roster_window.py:1026
 msgid "Merged accounts"
 msgstr "Spojeni nalozi"
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1942
 msgid "Authorization has been sent"
 msgstr "Autorizacija poslata"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1943
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Sada će kontakt \"%s\" znati Vaš status."
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1966
 msgid "Subscription request has been sent"
 msgstr "Zahtev za pretplatom poslat"
 
-#: ../src/roster_window.py:1944
+#: ../src/roster_window.py:1967
 #, 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:1958
+#: ../src/roster_window.py:1981
 msgid "Authorization has been removed"
 msgstr "Autorizacija uklonjena"
 
-#: ../src/roster_window.py:1959
+#: ../src/roster_window.py:1982
 #, 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:1986
+#: ../src/roster_window.py:2009
 msgid "GPG is not usable"
 msgstr "GPG nije upotrebljiv"
 
-#: ../src/roster_window.py:1987
+#: ../src/roster_window.py:2010
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Povezaćete se na %s bez OpenPGP ključa."
 
-#: ../src/roster_window.py:2199 ../src/roster_window.py:3496
+#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
 msgid "You are participating in one or more group chats"
 msgstr "Učestvujete u jednom ili više grupnih razgovora"
 
-#: ../src/roster_window.py:2200 ../src/roster_window.py:3497
+#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9574,38 +9879,38 @@ 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:2226
+#: ../src/roster_window.py:2249
 msgid "desync'ed"
 msgstr "desinhronizovan"
 
-#: ../src/roster_window.py:2288
+#: ../src/roster_window.py:2311
 msgid "Really quit Gajim?"
 msgstr "Stvarno zatvoriti Gajim?"
 
-#: ../src/roster_window.py:2289
+#: ../src/roster_window.py:2312
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Jeste li sigurni da želite zatvoriti Gajim?"
 
-#: ../src/roster_window.py:2290
+#: ../src/roster_window.py:2313
 msgid "Always close Gajim"
 msgstr "Uvek zatvori Gajim"
 
-#: ../src/roster_window.py:2373
+#: ../src/roster_window.py:2396
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Prekini prenos datoteke"
 
-#: ../src/roster_window.py:2374
+#: ../src/roster_window.py:2397
 msgid ""
-"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2405 ../src/roster_window.py:2653
+#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
 msgid "You have unread messages"
 msgstr "Imate nepročitanih poruka"
 
-#: ../src/roster_window.py:2406
+#: ../src/roster_window.py:2429
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9613,16 +9918,16 @@ msgstr ""
 "Poruke će biti dostupne za čitanje i kasnije ako imate omogućen istorijat i "
 "taj kontakt u listi."
 
-#: ../src/roster_window.py:2654
+#: ../src/roster_window.py:2720
 msgid "You must read them before removing this transport."
 msgstr "Morate ih pročitati pre uklanjanja ovog transporta."
 
-#: ../src/roster_window.py:2657
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" će biti uklonjen"
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2724
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9630,11 +9935,11 @@ msgstr ""
 "Nećete više biti u mogućnosti da razmenjujete poruke sa kontkatima sa ovog "
 "transporta."
 
-#: ../src/roster_window.py:2661
+#: ../src/roster_window.py:2727
 msgid "Transports will be removed"
 msgstr "Transport će biti uklonjen"
 
-#: ../src/roster_window.py:2666
+#: ../src/roster_window.py:2732
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9643,12 +9948,12 @@ msgstr ""
 "Nećete više biti u mogućnosti da razmenjujete poruke sa kontkatima sa ovih "
 "transporta: %s"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2800
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "Upravo ćete blokirati kontakt. Jeste li sigurni da želite da nastavite?"
 
-#: ../src/roster_window.py:2736
+#: ../src/roster_window.py:2802
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -9657,56 +9962,56 @@ msgstr ""
 "Å¡alje."
 
 #. it's jid
-#: ../src/roster_window.py:2827
+#: ../src/roster_window.py:2893
 msgid "Rename Contact"
 msgstr "Preimenuj kontakt"
 
-#: ../src/roster_window.py:2828
+#: ../src/roster_window.py:2894
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Unesite novi nadimak za kontakt %s"
 
-#: ../src/roster_window.py:2835
+#: ../src/roster_window.py:2901
 msgid "Rename Group"
 msgstr "Preimenuj grupu"
 
-#: ../src/roster_window.py:2836
+#: ../src/roster_window.py:2902
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Unesite novo ime za grupu %s"
 
-#: ../src/roster_window.py:2881
+#: ../src/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Ukloni grupu"
 
-#: ../src/roster_window.py:2882
+#: ../src/roster_window.py:2948
 #, 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:2883
+#: ../src/roster_window.py:2949
 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:2922
+#: ../src/roster_window.py:2988
 msgid "Assign OpenPGP Key"
 msgstr "Pridruži OpenPGP Ključ"
 
-#: ../src/roster_window.py:2923
+#: ../src/roster_window.py:2989
 msgid "Select a key to apply to the contact"
 msgstr "Odaberite ključ za pridruživanje kontaktu"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3372
 #, 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:3308
+#: ../src/roster_window.py:3374
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr "Upravo ćete ukloniti \"%(name)s\" (%(jid)s) iz vaše liste kontakata.\n"
 
-#: ../src/roster_window.py:3313
+#: ../src/roster_window.py:3379
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9715,11 +10020,11 @@ msgstr ""
 "ta osoba uvek videti kao da niste na vezi."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3319
+#: ../src/roster_window.py:3385
 msgid "Do you want to continue?"
 msgstr "Da li želite da nastavite?"
 
-#: ../src/roster_window.py:3323
+#: ../src/roster_window.py:3389
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9727,16 +10032,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:3326
+#: ../src/roster_window.py:3392
 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:3330
+#: ../src/roster_window.py:3396
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakti će biti uklonjeni sa Vaše liste kontakata"
 
-#: ../src/roster_window.py:3335
+#: ../src/roster_window.py:3401
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9746,7 +10051,7 @@ msgstr ""
 "ujedno uklanjate i odobrenje pto znači da će Vas te osobe uvek videti kao da "
 "niste na vezi."
 
-#: ../src/roster_window.py:3393
+#: ../src/roster_window.py:3459
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want  to continue?"
@@ -9754,7 +10059,7 @@ msgstr ""
 "Upravo ćete poslati prilagođen status. Jeste li sigurni da želite da "
 "nastavite?"
 
-#: ../src/roster_window.py:3395
+#: ../src/roster_window.py:3461
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -9763,21 +10068,21 @@ msgstr ""
 "Kontakt će vas privremeno videti kao %(status)s, ali samo dok ne promenite "
 "status. Onda će videti globalni status."
 
-#: ../src/roster_window.py:3414
+#: ../src/roster_window.py:3480
 msgid "No account available"
 msgstr "Nema dostupnih naloga"
 
-#: ../src/roster_window.py:3415
+#: ../src/roster_window.py:3481
 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:4023
+#: ../src/roster_window.py:4095
 msgid "Metacontacts storage not supported by your server"
 msgstr "Čuvanje pseudokontakata nije podržano od strane Vašeg servera"
 
-#: ../src/roster_window.py:4025
+#: ../src/roster_window.py:4097
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9785,13 +10090,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:4117
+#: ../src/roster_window.py:4189
 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:4119
+#: ../src/roster_window.py:4191
 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 "
@@ -9801,11 +10106,11 @@ msgstr ""
 "Generalno, oni se koriste kada ista osoba ima nekoliko Džaber naloga ili "
 "transportnih naloga."
 
-#: ../src/roster_window.py:4234
+#: ../src/roster_window.py:4306
 msgid "Invalid file URI:"
 msgstr "Neispravan URI datoteke:"
 
-#: ../src/roster_window.py:4246
+#: ../src/roster_window.py:4318
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9813,12 +10118,12 @@ 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:4361
+#: ../src/roster_window.py:4433
 #, python-format
 msgid "Send %s to %s"
 msgstr "Pošalji %s za %s"
 
-#: ../src/roster_window.py:4367
+#: ../src/roster_window.py:4439
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Napravi metakontakte od %s i %s"
@@ -9828,143 +10133,143 @@ msgstr "Napravi metakontakte od %s i %s"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4816 ../src/roster_window.py:4889
-#: ../src/roster_window.py:4898 ../src/statusicon.py:246
-#: ../src/statusicon.py:293 ../src/statusicon.py:299
+#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
+#: ../src/roster_window.py:4970 ../src/statusicon.py:263
+#: ../src/statusicon.py:310 ../src/statusicon.py:316
 #, python-format
 msgid "using account %s"
 msgstr "koristeći račun %s"
 
 #. add
-#: ../src/roster_window.py:4905
+#: ../src/roster_window.py:4977
 #, python-format
 msgid "to %s account"
 msgstr "na %s nalog"
 
 #. disco
-#: ../src/roster_window.py:4910
+#: ../src/roster_window.py:4982
 #, python-format
 msgid "using %s account"
 msgstr "koristeći %s račun"
 
-#: ../src/roster_window.py:4948 ../src/statusicon.py:309
+#: ../src/roster_window.py:5020 ../src/statusicon.py:326
 msgid "_Manage Bookmarks..."
 msgstr "Upravljanje _markerima..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4968
+#: ../src/roster_window.py:5040
 #, python-format
 msgid "of account %s"
 msgstr "naloga %s"
 
-#: ../src/roster_window.py:5009
+#: ../src/roster_window.py:5081
 #, python-format
 msgid "for account %s"
 msgstr "za nalog %s"
 
-#: ../src/roster_window.py:5069 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
 msgid "_Change Status Message"
 msgstr "_Izmeni statusnu poruku"
 
-#: ../src/roster_window.py:5102
+#: ../src/roster_window.py:5174
 msgid "Publish Tune"
 msgstr "Objavi pesmu"
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5176
 #, fuzzy
 msgid "Publish Location"
 msgstr "Objavi pesmu"
 
-#: ../src/roster_window.py:5107
+#: ../src/roster_window.py:5179
 msgid "Configure Services..."
 msgstr "Konfiguriši servise..."
 
-#: ../src/roster_window.py:5252
+#: ../src/roster_window.py:5324
 msgid "_Maximize All"
 msgstr "_Uvećaj sve"
 
-#: ../src/roster_window.py:5262 ../src/roster_window.py:5436
+#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
 msgid "Send Group M_essage"
 msgstr "P_ošalji grupnu poruku"
 
-#: ../src/roster_window.py:5270
+#: ../src/roster_window.py:5342
 msgid "To all users"
 msgstr "Svim korisnicima"
 
-#: ../src/roster_window.py:5274
+#: ../src/roster_window.py:5346
 msgid "To all online users"
 msgstr "Svim korisnicima na vezi"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5456
+#: ../src/roster_window.py:5528
 msgid "_Manage Contacts"
 msgstr "_Upravljanje kontaktima"
 
 #. Edit Groups
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5537
 msgid "Edit _Groups"
 msgstr "Izmeni _grupe"
 
 #. Send single message
-#: ../src/roster_window.py:5520
+#: ../src/roster_window.py:5592
 msgid "Send Single Message"
 msgstr "Pošalji jednu poruku"
 
 #. Execute Command
-#: ../src/roster_window.py:5567
+#: ../src/roster_window.py:5639
 msgid "Execute Command..."
 msgstr "Izvrši naredbu..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5577
+#: ../src/roster_window.py:5649
 msgid "_Manage Transport"
 msgstr "_Upravljanje transportima"
 
 #. Modify Transport
-#: ../src/roster_window.py:5586
+#: ../src/roster_window.py:5658
 msgid "_Modify Transport"
 msgstr "_Izmeni transport"
 
 #. Rename
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5668
 msgid "_Rename"
 msgstr "_Preimenuj"
 
-#: ../src/roster_window.py:5656
+#: ../src/roster_window.py:5728
 msgid "_Maximize"
 msgstr "_Uvećaj"
 
-#: ../src/roster_window.py:5665
+#: ../src/roster_window.py:5737
 msgid "_Reconnect"
 msgstr "U_loguj se ponovo"
 
-#: ../src/roster_window.py:5672
+#: ../src/roster_window.py:5744
 msgid "_Disconnect"
 msgstr "_Izloguj se"
 
 #. History manager
-#: ../src/roster_window.py:5754
+#: ../src/roster_window.py:5833
 msgid "History Manager"
 msgstr "Upravnik istorijatom"
 
-#: ../src/roster_window.py:5765
+#: ../src/roster_window.py:5844
 msgid "_Join New Group Chat"
 msgstr "_Pridruživanje novom grupnom razgovoru"
 
-#: ../src/roster_window.py:5938
+#: ../src/roster_window.py:6019
 msgid "Change Status Message..."
 msgstr "Promeni statusnu poruku..."
 
-#: ../src/search_window.py:94
+#: ../src/search_window.py:105
 msgid "Waiting for results"
 msgstr "ÄŒekam na rezultate"
 
-#: ../src/search_window.py:132 ../src/search_window.py:210
+#: ../src/search_window.py:143 ../src/search_window.py:220
 msgid "Error in received dataform"
 msgstr "Greška u primanju forme za podatke"
 
 #. No result
-#: ../src/search_window.py:166 ../src/search_window.py:202
+#: ../src/search_window.py:177 ../src/search_window.py:212
 msgid "No result"
 msgstr "Nema rezultata"
 
@@ -9977,14 +10282,15 @@ msgstr "Greška pri upisu na disk"
 msgid "Subject: %s"
 msgstr "Tema: %s"
 
-#: ../src/session.py:433 ../src/session.py:468
+#: ../src/session.py:447 ../src/session.py:491
 msgid "Confirm these session options"
 msgstr "Potvrdi ove opcije sesije"
 
-#: ../src/session.py:435
+#: ../src/session.py:448
 #, fuzzy, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
+"The remote client wants '\n"
+"                            'to negotiate an session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -9996,7 +10302,7 @@ msgstr ""
 "\n"
 "\tDa li su ove stavke prihvatljive?"
 
-#: ../src/session.py:469
+#: ../src/session.py:492
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10011,16 +10317,16 @@ msgstr ""
 "\n"
 "Nastaviti sa sesijom?"
 
-#: ../src/statusicon.py:210
+#: ../src/statusicon.py:227
 msgid "_Change Status Message..."
 msgstr "_Promeni statusnu poruku..."
 
-#: ../src/statusicon.py:322
+#: ../src/statusicon.py:339
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "u _listi kontakata"
 
-#: ../src/statusicon.py:333
+#: ../src/statusicon.py:350
 msgid "Hide this menu"
 msgstr "Sakrij ovaj meni"
 
@@ -10159,32 +10465,32 @@ msgstr ""
 "Ovaj servis nije mogao odgovoriti sa detaljnim informacijama.\n"
 "Najverovatnije je zastareo ili u kvaru"
 
-#: ../src/vcard.py:251
+#: ../src/vcard.py:265
 msgid "?Client:Unknown"
 msgstr "?Klijent:Nepoznat"
 
-#: ../src/vcard.py:253
+#: ../src/vcard.py:267
 msgid "?OS:Unknown"
 msgstr "?OS:Nepoznat"
 
-#: ../src/vcard.py:274
+#: ../src/vcard.py:288
 msgid "?Time:Unknown"
 msgstr "?Vreme:Nepoznato"
 
-#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
+#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:345
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:349
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Vezanost:</b>"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:357
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10192,7 +10498,7 @@ msgstr ""
 "Ovaj kontakt je zainteresovan za informacije o Vašem prisustvu, ali Vas ne "
 "zanimaju informacije o njegovom/njenom prisustvu."
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:359
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10200,13 +10506,13 @@ msgstr ""
 "Vi ste zainteresovani za informacije o prisustvu nekog kontakta, ali njega/"
 "nju ne zanima Vaše prisustvo"
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:361
 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:349
+#: ../src/vcard.py:363
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10214,26 +10520,70 @@ msgstr ""
 "Ne interesuje Vas prisutnost kontakta, niti Vaša prisutnost interesuje njega/"
 "nju"
 
-#: ../src/vcard.py:356
+#: ../src/vcard.py:370
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Čekate odgovor kontakta o Vašem zahtevu za pretplatom"
 
-#: ../src/vcard.py:358
+#: ../src/vcard.py:372
 msgid "There is no pending subscription request."
 msgstr "Nema zahteva za pretplatom na čekanju."
 
-#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
+#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
 msgid " resource with priority "
 msgstr " resurs sa prioritetom "
 
-#~ msgid "_Available"
-#~ msgstr "_Dostupan"
+#~ msgid "@"
+#~ msgstr "@"
+
+#~ msgid "_Disable showing event in systray"
+#~ msgstr "_Onemogući prikazivanje događaja u sistemskoj kaseti"
+
+#~ msgid "_Show event in systray"
+#~ msgstr "Prikaži događaj u sistemskoj kaseti"
+
+#, fuzzy
+#~ msgid "Always use GNOME default applications"
+#~ msgstr "Uvek koristi aplikaciju koju operativni sistem nudi"
+
+#, fuzzy
+#~ msgid "Always use Xfce default applications"
+#~ msgstr "Uvek koristi aplikaciju koju operativni sistem nudi"
+
+#, fuzzy
+#~ msgid "Autodetect on every Gajim startup"
+#~ msgstr "Po_veži se prilikom pokretanja Gajima"
+
+#~ msgid "Show systray:"
+#~ msgstr "Prikaži u sistemskoj kaseti:"
+
+#~ msgid "Nickname not allowed: %s"
+#~ msgstr "Nedozvoljen nadimak: %s "
+
+#~ msgid "Room has been destroyed"
+#~ msgstr "Soba grupnog razgovora je uništena"
+
+#~ msgid "You can join this room instead: %s"
+#~ msgstr "Možete se priključiti sobi %s umesto ove"
+
+#~ msgid "I would like to add you to my roster."
+#~ msgstr "Želeo bih da te dodam na moju listu kontakata."
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "sada ste pretplaćeni na %s"
 
-#~ msgid "PEP node was not removed"
-#~ msgstr "PEP čvor nije uklonjen"
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "zahtev za ukidanje pretplate od kontakta %s"
 
-#~ msgid "PEP node %(node)s was not removed: %(message)s"
-#~ msgstr "PEP čvor %(node)s nije uklonjen: %(message)s"
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "sada Vam je ukinuta pretplata od kontakta %s"
+
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "Džaber ID %s ne poštuje RFC pravila. Neće biti dodat na Vašu listu "
+#~ "kontakata. Upotrebite alate kao Å¡to je http://jru.jabberstudio.org/ da "
+#~ "biste ga uklonili"
 
 #~ msgid "Account Modification"
 #~ msgstr "Izmena naloga"
@@ -10343,40 +10693,9 @@ msgstr " resurs sa prioritetom "
 #~ msgid "gtk-delete"
 #~ msgstr "gtk-delete"
 
-#~ msgid "Add this contact to roster (Ctrl+D)"
-#~ msgstr "Dodaj ovaj kontakt na listu (Ctrl+D)"
-
-#~ msgid "Bookmark this room (Ctrl+B)"
-#~ msgstr "_Markiraj ovu sobu (Ctrl+B)"
-
-#~ msgid "Browse the chat history (Ctrl+H)"
-#~ msgstr "Pregledaj istorijat razgovora (Ctrl+H)"
-
-#~ msgid "Change the room's subject (Alt+T)"
-#~ msgstr "Promeni temu sobe (Alt+T)"
-
-#~ msgid "Change your nickname (Ctrl+N)"
-#~ msgstr "Promeni nadimak (Ctrl+N)"
-
-#~ msgid "Invite contacts to the conversation (Ctrl+G)"
-#~ msgstr "Pozovi kontakte u konverzaciju (Ctrl+G)"
-
 #~ msgid "Send a file (Ctrl+F)"
 #~ msgstr "Pošalji datoteku (Ctrl+F)"
 
-#~ msgid "Show a list of emoticons (Alt+M)"
-#~ msgstr "Prikaži listu smajlija (Alt+M)"
-
-#~ msgid "Show a list of formattings"
-#~ msgstr "Prikaži listu formatiranja"
-
-#, fuzzy
-#~ msgid "Show a menu of advanced functions (Alt+D)"
-#~ msgstr "Prikaži meni naprednih funkcija (Alt+A)"
-
-#~ msgid "Show the contact's profile (Ctrl+I)"
-#~ msgstr "Prikaži profil kontakta (Ctrl+I)"
-
 #~ msgid ""
 #~ "All chat states\n"
 #~ "Composing only\n"
@@ -10435,9 +10754,6 @@ msgstr " resurs sa prioritetom "
 #~ msgid "gtk-cancel"
 #~ msgstr "gtk-cancel"
 
-#~ msgid "_Preferences"
-#~ msgstr "_Podešavanja"
-
 #~ msgid "_Quit"
 #~ msgstr "_Izlaz"
 
@@ -10729,9 +11045,6 @@ msgstr " resurs sa prioritetom "
 #~ "Zahteva python-gnome2-extras ili kompajliranje gtkspell modula iz Gajim "
 #~ "izvornog koda."
 
-#~ msgid "Notification-daemon"
-#~ msgstr "Notification-daemon"
-
 #~ msgid "Idle"
 #~ msgstr "U stanju mirovanja"
 
diff --git a/po/sv.po b/po/sv.po
index 9f625724e46bff01ebdbd9edb4a5b525b33634fd..a990979b72293f773123e118aaa50d1b4657d8aa 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,11 +5,15 @@
 # Oscar Hellström <oscar@oscarh.net>, 2005.
 # Daniel Nylander <po@danielnylander.se>, 2007, 2009.
 #
+#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 11:28+0200\n"
+"POT-Creation-Date: 2010-10-01 20:39+0200\n"
 "PO-Revision-Date: 2009-10-29 10:21+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -27,7 +31,7 @@ msgstr "GÃ¥ in i _gruppchatt..."
 msgid "_Add Contact..."
 msgstr "_Lägg till kontakt..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:17
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
 msgid "_Discover Services"
 msgstr "_Upptäck tjänster"
 
@@ -47,7 +51,7 @@ msgstr "_Öppna Gmail-inkorg"
 msgid "_Personal Events"
 msgstr "_Personliga händelser"
 
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:23
+#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
 msgid "_Start Chat..."
 msgstr "_Starta chatt..."
 
@@ -79,10 +83,6 @@ msgid "<b>Please select a server</b>"
 msgstr "<b>Välj en server</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid "@"
-msgstr "@"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
@@ -90,64 +90,64 @@ msgstr ""
 "Lägg till detta certifikat till listan över pålitliga certifikat.\n"
 "SHA1-fingeravtryck för certifikatet:\n"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:10
 msgid "Anon_ymous authentication"
 msgstr "Anon_ym autentisering"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Connect when I press Finish"
 msgstr "Anslut när jag trycker på Färdigställ"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Kontoskaparen"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "I already have an account I want to _use"
 msgstr "Jag har redan ett konto som _jag vill använda"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I want to _register for a new account"
 msgstr "Jag vill _registrera ett nytt konto"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:16
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 #: ../data/gui/accounts_window.ui.h:28
 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/gui/account_creation_wizard_window.ui.h:17
+#: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Hantera..."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:18
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
 #: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2263 ../src/config.py:2342
-#: ../src/config.py:2355 ../src/config.py:3596 ../src/config.py:3671
-#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513
-#: ../src/dialogs.py:526 ../src/roster_window.py:2890
-#: ../src/roster_window.py:2896 ../src/roster_window.py:2901
+#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
+#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
+#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
+#: ../src/dialogs.py:527 ../src/roster_window.py:2956
+#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
 msgid "None"
 msgstr "Ingen"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:19
+#: ../data/gui/account_creation_wizard_window.ui.h:18
 msgid "Prox_y:"
 msgstr "Prox_yserver:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #: ../data/gui/accounts_window.ui.h:48
 msgid "Save pass_word"
 msgstr "Spara lösen_ord"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:21
+#: ../data/gui/account_creation_wizard_window.ui.h:20
 msgid "Set my profile when I connect"
 msgstr "Ställ in min profil när jag ansluter"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:22
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Use custom hostname/port"
 msgstr "Använd anpassat värdnamn/port"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:23
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -155,34 +155,34 @@ msgstr ""
 "Du behöver ha ett konto för att kunna ansluta till\n"
 "Jabber-nätverket."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-#: ../data/gui/roster_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:16
 msgid "_Advanced"
 msgstr "_Avancerat"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:25
 msgid "_Finish"
 msgstr "F_ärdigställ"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:27
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Hostname:"
 msgstr "_Värdnamn:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #: ../data/gui/accounts_window.ui.h:62
 msgid "_Jabber ID:"
 msgstr "_Jabber-ID:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:28
 #: ../data/gui/accounts_window.ui.h:64
 msgid "_Password:"
 msgstr "_Lösenord:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:29
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:31
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Server:"
 msgstr "_Server:"
 
@@ -291,17 +291,17 @@ msgstr "Förnamn:"
 #. No configured account
 #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
 #: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592
-#: ../src/notify.py:608
+#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
+#: ../src/notify.py:616
 msgid "Gajim"
 msgstr "Gajim"
 
 #. FIXME: Ugly workaround.
 #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
 #. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:61
-#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121
-#: ../src/roster_window.py:2832 ../src/roster_window.py:5379
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
+#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
 msgid "General"
 msgstr "Allmänt"
 
@@ -360,7 +360,7 @@ msgstr "Information om dig, som den är sparad på servern"
 
 #: ../data/gui/accounts_window.ui.h:35
 #: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:830
+#: ../src/dialogs.py:831
 msgid "Jabber ID:"
 msgstr "Jabber-ID:"
 
@@ -374,7 +374,7 @@ msgid "Mer_ge accounts"
 msgstr "Sa_mmanfoga konton"
 
 #: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2356
+#: ../src/config.py:2358
 msgid "No key selected"
 msgstr "Ingen nyckel vald"
 
@@ -401,7 +401,7 @@ msgid "Priority will change automatically according to your status."
 msgstr "Prioritet kommer att ändras automatiskt beroende på din status."
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5329
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
 msgid "Re_name"
 msgstr "Byt _namn"
 
@@ -627,40 +627,45 @@ msgid "Deletes Message of the Day"
 msgstr "Tar bort dagens meddelande"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
+#, fuzzy
+msgid "Edit Archi_ving Preferences"
+msgstr "_Inställningar"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Edit _Privacy Lists..."
 msgstr "Redigera _integritetslistor..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sends a message to users currently connected to this server"
 msgstr ""
 "Skickar ett meddelande till användare som för närvarande är anslutna till "
 "denna server"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Set MOTD..."
 msgstr "Ange MOTD..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Ställer in dagens meddelande"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Show _XML Console"
 msgstr "Visa _XML-konsoll"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "Update MOTD..."
 msgstr "Uppdatera MOTD..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "Uppdaterar dagens meddelande"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:11
 msgid "_Administrator"
 msgstr "_Administratör"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:11
+#: ../data/gui/advanced_menuitem_menu.ui.h:12
 msgid "_Send Server Message..."
 msgstr "_Skicka servermeddelande..."
 
@@ -694,7 +699,7 @@ msgid "All statuses"
 msgstr "Alla statusar"
 
 #: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:233
+#: ../src/common/commands.py:106 ../src/common/helpers.py:239
 #: ../src/tooltips.py:193
 msgid "Away"
 msgstr "Frånvarande"
@@ -747,7 +752,7 @@ msgid "Have "
 msgstr "Har "
 
 #: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:249
 msgid "Invisible"
 msgstr "Osynlig"
 
@@ -756,7 +761,7 @@ msgid "Launch a command"
 msgstr "Kör ett kommando"
 
 #: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:216 ../src/tooltips.py:197
+#: ../src/common/helpers.py:222 ../src/tooltips.py:197
 msgid "Not Available"
 msgstr "Inte tillgänglig"
 
@@ -801,12 +806,13 @@ msgid "_Disable existing sound for this event"
 msgstr "_Inaktivera befintligt ljud för denna händelse"
 
 #: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in roster"
+#, fuzzy
+msgid "_Disable showing event in notification area"
 msgstr "_Inaktivera visning av händelser i kontaktlista"
 
 #: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in systray"
-msgstr "_Inaktivera visning av händelser i notifieringsyta"
+msgid "_Disable showing event in roster"
+msgstr "_Inaktivera visning av händelser i kontaktlista"
 
 #: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
@@ -817,12 +823,13 @@ msgid "_Open chat window with user"
 msgstr "_Öppna chattfönster med användare"
 
 #: ../data/gui/advanced_notifications_window.ui.h:35
-msgid "_Show event in roster"
+#, fuzzy
+msgid "_Show event in notification area"
 msgstr "_Visa händelse i kontaktlista"
 
 #: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in systray"
-msgstr "_Visa händelse i notifieringsytan"
+msgid "_Show event in roster"
+msgstr "_Visa händelse i kontaktlista"
 
 #: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
@@ -850,6 +857,45 @@ msgstr "Grupper"
 msgid "when I'm in"
 msgstr "när jag är i"
 
+#: ../data/gui/archiving_preferences_window.ui.h:1
+msgid "<i>Method Auto</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "<i>Method Local</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:3
+msgid "<i>Method Manual</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:4
+#, fuzzy
+msgid "Auto"
+msgstr "Anslut automatiskt"
+
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Concede"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "Forbid"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:7
+#, fuzzy
+msgid "No"
+msgstr "Ingen"
+
+#: ../data/gui/archiving_preferences_window.ui.h:8
+#, fuzzy
+msgid "Prefer"
+msgstr "Inställningar"
+
+#: ../data/gui/archiving_preferences_window.ui.h:9
+msgid "Yes"
+msgstr ""
+
 #: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr ""
@@ -876,8 +922,8 @@ msgstr "Blockerade kontakter"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5348
-#: ../src/roster_window.py:5476 ../src/roster_window.py:5609
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
+#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
 msgid "_Unblock"
 msgstr "A_vblockera"
 
@@ -965,7 +1011,7 @@ msgid "_Start Chat"
 msgstr "_Starta chatt"
 
 #. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4184
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
 msgid "#"
 msgstr "#"
 
@@ -1013,13 +1059,50 @@ msgstr ""
 msgid "9"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:13
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Lägg till denna kontakt till kontaktlistan (Ctrl+D)"
+
 #: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Bläddra i chatthistoriken (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:15
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Bjud in kontakter till konversationen (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Visa en lista över känsloikoner (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
+msgid "Show a list of formattings"
+msgstr "Visa en lista över formateringar"
+
+#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Visa en meny över avancerade funktioner (Alt+A)"
+
+#: ../data/gui/chat_control.ui.h:19
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr "Visa kontaktens profil (Ctrl+I)"
+
+#: ../data/gui/chat_control.ui.h:20
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:21
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
 #: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Skicka"
 
-#: ../data/gui/chat_control.ui.h:15 ../data/gui/groupchat_control.ui.h:3
+#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
 msgid "label"
 msgstr ""
 
@@ -1070,8 +1153,8 @@ msgstr "Redigera _grupper..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5284
-#: ../src/roster_window.py:5444
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
+#: ../src/roster_window.py:5516
 msgid "In_vite to"
 msgstr "Bjud _in till"
 
@@ -1083,8 +1166,8 @@ msgstr "Bjud in _kontakter"
 msgid "Remo_ve"
 msgstr "Ta _bort"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5294
-#: ../src/roster_window.py:5533
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
+#: ../src/roster_window.py:5605
 msgid "Send Cus_tom Status"
 msgstr "Skicka a_npassad status"
 
@@ -1117,8 +1200,8 @@ msgid "_Allow him/her to see my status"
 msgstr "_Tillåt henne/honom att se min status"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5482 ../src/roster_window.py:5612
+#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
+#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
 msgid "_Block"
 msgstr "_Blockera"
 
@@ -1128,8 +1211,8 @@ msgstr "_Förbjud henne/honom att se min status"
 
 #: ../data/gui/contact_context_menu.ui.h:20
 #: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:21
-#: ../src/roster_window.py:5683
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
+#: ../src/roster_window.py:5755
 msgid "_History"
 msgstr "_Historik"
 
@@ -1263,7 +1346,7 @@ msgstr "<b>Flikfärger för chattstatus</b>"
 msgid "Account row"
 msgstr "Konto"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:925
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
 msgid "Bold"
 msgstr "Fet"
 
@@ -1302,7 +1385,7 @@ msgstr "Grupp"
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:926
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
 msgid "Italic"
 msgstr "Kursiv"
 
@@ -1350,7 +1433,7 @@ msgstr "Byt _ämne..."
 msgid "Configure _Room..."
 msgstr "Konfigurera _rum..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1782
+#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
 msgid "_Bookmark"
 msgstr "_Bokmärk"
 
@@ -1411,19 +1494,31 @@ msgstr "_Skicka privat meddelande"
 msgid "_Voice"
 msgstr "_Röst"
 
+#: ../data/gui/groupchat_control.ui.h:1
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Bokmärk detta rum (Ctrl+B)"
+
+#: ../data/gui/groupchat_control.ui.h:3
+msgid "Change the room's subject (Alt+T)"
+msgstr "Ändra rummets ärende (Alt+T)"
+
+#: ../data/gui/groupchat_control.ui.h:4
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Ändra ditt smeknamn (Ctrl+N)"
+
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Skapa ny post"
 
-#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
-msgid "From"
-msgstr "Från"
+#: ../data/gui/groups_post_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:2
+msgid "From:"
+msgstr "Från:"
 
-#. holds subject
-#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
-#: ../src/history_manager.py:219
-msgid "Subject"
-msgstr "Ämne"
+#: ../data/gui/groups_post_window.ui.h:3
+#: ../data/gui/single_message_window.ui.h:7
+msgid "Subject:"
+msgstr "Ämne:"
 
 #: ../data/gui/history_manager.ui.h:1
 msgid ""
@@ -1440,8 +1535,8 @@ msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Välkommen till Gajims hanterare för historikloggar</b></big>"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3208
-#: ../src/dialogs.py:3305
+#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
+#: ../src/dialogs.py:3321
 msgid "Delete"
 msgstr "Ta bort"
 
@@ -1499,12 +1594,75 @@ msgstr "Sök:"
 msgid "_Log conversation history"
 msgstr "_Logga konversationshistorik"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
+msgid "approve"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:2
+msgid "body"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:3
+msgid "concede"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:4
+msgid "expire"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:5
+msgid "false"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:6
+msgid "forbid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:7
+#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+msgid "jid"
+msgstr "JID"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:8
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
+#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
+msgid "message"
+msgstr "meddelande"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
+msgid "oppose"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
+#, fuzzy
+msgid "otr"
+msgstr "Het"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:11
+msgid "prefer"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:12
+msgid "require"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:13
+msgid "save"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:14
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
 msgid "Bro_wse Rooms"
 msgstr "_Bläddra"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2180
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
 msgid "Join Group Chat"
 msgstr "GÃ¥ in i gruppchatt"
 
@@ -1542,8 +1700,8 @@ msgstr "Server:"
 msgid "_Bookmark this room"
 msgstr "Bokmärk detta rum (Ctrl+B)"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1341
-#: ../src/disco.py:1786
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../src/disco.py:1804
 msgid "_Join"
 msgstr "_GÃ¥ in i"
 
@@ -1647,6 +1805,75 @@ msgstr "_Användarnamn:"
 msgid "Passphrase"
 msgstr "Lösenfras"
 
+#: ../data/gui/plugins_window.ui.h:1
+msgid "&lt;empty&gt;"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:2
+msgid "<empty>"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:3
+#, fuzzy
+msgid "Authors:"
+msgstr "Au_ktorisera"
+
+#: ../data/gui/plugins_window.ui.h:4
+#, fuzzy
+msgid "Available"
+msgstr "_Tillgänglig"
+
+#: ../data/gui/plugins_window.ui.h:5
+#, fuzzy
+msgid "Configure"
+msgstr "_Konfigurera"
+
+#: ../data/gui/plugins_window.ui.h:6
+#, fuzzy
+msgid "Descrition:"
+msgstr "Beskrivning: "
+
+#: ../data/gui/plugins_window.ui.h:7
+#, fuzzy
+msgid "Homepage:"
+msgstr "<b>Webbplats:</b>"
+
+#: ../data/gui/plugins_window.ui.h:8
+msgid "Install"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:9
+#, fuzzy
+msgid "Installed"
+msgstr "Avstannad"
+
+#: ../data/gui/plugins_window.ui.h:10
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:11
+msgid "Plugins"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:12
+msgid "Uninstall"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:13
+#, fuzzy
+msgid "Version:"
+msgstr "GTK+ version:"
+
+#: ../data/gui/plugins_window.ui.h:14
+msgid "button"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:15
+msgid "homepage url"
+msgstr ""
+
 #: ../data/gui/popup_notification_window.ui.h:1
 #, fuzzy
 msgid "Event Type"
@@ -1775,123 +2002,103 @@ msgid "Always"
 msgstr "Frånvarande"
 
 #: ../data/gui/preferences_window.ui.h:31
-#, fuzzy
-msgid "Always use GNOME default applications"
-msgstr "Använd alltid OS/X standardprogram"
-
-#: ../data/gui/preferences_window.ui.h:32
-#, fuzzy
-msgid "Always use KDE default applications"
-msgstr "Använd alltid OS/X standardprogram"
-
-#: ../data/gui/preferences_window.ui.h:33
-#, fuzzy
-msgid "Always use Xfce default applications"
-msgstr "Använd alltid OS/X standardprogram"
-
-#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Fråga efter statusmeddelande när jag:"
 
-#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
 msgid "Audio / Video"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:33
 msgid "Audio input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Audio output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:38
-#, fuzzy
-msgid "Autodetect on every Gajim startup"
-msgstr "A_nslut vid start av Gajim"
-
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:35
 msgid "Chat message:"
 msgstr "Chattmeddelande:"
 
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:36
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Kontrollera vid uppstart om Gajim är _standardklient för Jabber"
 
-#: ../data/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:37
 #, fuzzy
 msgid "Composing only"
 msgstr "Skriver"
 
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:38
 msgid "Configure color and font of the interface"
 msgstr "Konfigurera färger och typsnitt för gränssnittet"
 
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Chattmeddelande:"
 
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Kontaktnamn"
 
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:41
 msgid "Custom"
 msgstr "Anpassad"
 
-#: ../data/gui/preferences_window.ui.h:46
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Detached roster with chat grouped by account"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Detached roster with detached chats"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:45
 msgid "Detached roster with single chat"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
-#: ../src/config.py:671
+#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
+#: ../src/config.py:665
 msgid "Disabled"
 msgstr "Avstängd"
 
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:47
 msgid "Display _activity of contacts in roster"
 msgstr "Visa _aktivitet för kontakter i kontaktlista"
 
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:48
 msgid "Display _extra email details"
 msgstr "Visa _extra e-postdetaljer"
 
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:49
 #, fuzzy
 msgid "Display _location of contacts in roster"
 msgstr "Visa _humör för kontakter i kontaktlista"
 
-#: ../data/gui/preferences_window.ui.h:54
+#: ../data/gui/preferences_window.ui.h:50
 msgid "Display _tunes of contacts in roster"
 msgstr "Visa _låtar för kontakter i kontaktlista"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display a_vatars of contacts in roster"
 msgstr "Visa a_vatarer för kontakter i kontaktlista"
 
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display m_ood of contacts in roster"
 msgstr "Visa _humör för kontakter i kontaktlista"
 
-#: ../data/gui/preferences_window.ui.h:57
+#: ../data/gui/preferences_window.ui.h:53
 msgid "Display status _messages of contacts in roster"
 msgstr "Visa status_meddelanden för kontakter i kontaktlista"
 
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:54
 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 "
@@ -1901,7 +2108,7 @@ msgstr ""
 "som du har med en kontakt. Här kan du ange vilka chattstatusar som du vill "
 "visa i chattfönster."
 
-#: ../data/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:55
 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 "
@@ -1911,7 +2118,7 @@ msgstr ""
 "som du har med en kontakt. Här kan du ange vilka chattstatusar som du vill "
 "skicka till den andra parten."
 
-#: ../data/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:56
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1919,11 +2126,11 @@ msgstr ""
 "Gajim kommer att notifiera dig via ett popupfönster i nedre högra hörnet av "
 "skärmen om kontakter som just loggat ut"
 
-#: ../data/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:58
 msgid "Hide all buttons in chat windows"
 msgstr "Dölj alla knappar i chattfönster"
 
-#: ../data/gui/preferences_window.ui.h:63
+#: ../data/gui/preferences_window.ui.h:59
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1931,7 +2138,7 @@ msgstr ""
 "Om kryssad kommer Gajim att tillåta andra att detektera operativsystemet som "
 "du använder"
 
-#: ../data/gui/preferences_window.ui.h:64
+#: ../data/gui/preferences_window.ui.h:60
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1939,19 +2146,19 @@ msgstr ""
 "Om kryssad kommer Gajim även att inkludera information om avsändaren av den "
 "nya e-posten"
 
-#: ../data/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:61
 #, fuzzy
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr "Om ibockad kommer Gajim också att ha en aktivitetsfältsikon"
 
-#: ../data/gui/preferences_window.ui.h:66
+#: ../data/gui/preferences_window.ui.h:62
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1959,7 +2166,7 @@ msgstr ""
 "Om kryssad kommer Gajim att visa avatarer för kontakter i kontaktfönster och "
 "gruppchattar"
 
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1967,7 +2174,7 @@ msgstr ""
 "Om kryssad kommer Gajim att visa statusmeddelanden för kontakter under "
 "kontaktens namn i kontaktfönster och gruppchattar"
 
-#: ../data/gui/preferences_window.ui.h:69
+#: ../data/gui/preferences_window.ui.h:65
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -1975,7 +2182,7 @@ msgstr ""
 "Om kryssad kommer Gajim att visa kontakters avatarer i register- och "
 "gruppchattsfönstren"
 
-#: ../data/gui/preferences_window.ui.h:70
+#: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the location of contacts in the roster window"
@@ -1983,7 +2190,7 @@ msgstr ""
 "Om kryssad kommer Gajim att visa kontakters avatarer i register- och "
 "gruppchattsfönstren"
 
-#: ../data/gui/preferences_window.ui.h:71
+#: ../data/gui/preferences_window.ui.h:67
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -1991,7 +2198,7 @@ msgstr ""
 "Om kryssad kommer Gajim att visa kontakters avatarer i register- och "
 "gruppchattsfönstren"
 
-#: ../data/gui/preferences_window.ui.h:72
+#: ../data/gui/preferences_window.ui.h:68
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -1999,14 +2206,14 @@ msgstr ""
 "Om kryssad kommer Gajim att visa kontakters avatarer i register- och "
 "gruppchattsfönstren"
 
-#: ../data/gui/preferences_window.ui.h:73
+#: ../data/gui/preferences_window.ui.h:69
 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/gui/preferences_window.ui.h:74
+#: ../data/gui/preferences_window.ui.h:70
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -2017,14 +2224,14 @@ msgstr ""
 "irriterar dig. Använd med förstånd, för det blockerar alla meddelanden från "
 "alla kontakter som inte finns i ditt register"
 
-#: ../data/gui/preferences_window.ui.h:75
+#: ../data/gui/preferences_window.ui.h:71
 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/gui/preferences_window.ui.h:76
+#: ../data/gui/preferences_window.ui.h:72
 #, fuzzy
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
@@ -2033,7 +2240,7 @@ msgstr ""
 "Om kryssad kommer Gajim också inkludera information om vem som skickade den "
 "nya e-posten"
 
-#: ../data/gui/preferences_window.ui.h:77
+#: ../data/gui/preferences_window.ui.h:73
 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, "
@@ -2043,13 +2250,13 @@ msgstr ""
 "en kontakt från MSN kommer att ha motsvarade MSN-ikon för tillgänglig, "
 "frånvarande, upptagen, osv...)"
 
-#: ../data/gui/preferences_window.ui.h:78
+#: ../data/gui/preferences_window.ui.h:74
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:79
+#: ../data/gui/preferences_window.ui.h:75
 #, fuzzy
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
@@ -2058,45 +2265,45 @@ msgstr ""
 "Om inte avstängd kommer Gajim ersätta ascii-smilies som \":)\" med "
 "motsvarande animerade eller statiska grafiska känsloikoner"
 
-#: ../data/gui/preferences_window.ui.h:80
+#: ../data/gui/preferences_window.ui.h:76
 msgid "Log _encrypted chat session"
 msgstr "Logga kr_ypterad chattsession"
 
-#: ../data/gui/preferences_window.ui.h:81
+#: ../data/gui/preferences_window.ui.h:77
 msgid "Ma_ke message windows compact"
 msgstr "_Gör meddelandefönstren kompakta"
 
-#: ../data/gui/preferences_window.ui.h:82
+#: ../data/gui/preferences_window.ui.h:78
 msgid "Ma_nage..."
 msgstr "Ha_ntera..."
 
-#: ../data/gui/preferences_window.ui.h:83
+#: ../data/gui/preferences_window.ui.h:79
 #, fuzzy
 msgid "Never"
 msgstr "_Aldrig"
 
-#: ../data/gui/preferences_window.ui.h:84
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Notifications"
 msgstr "Notifieringar"
 
-#: ../data/gui/preferences_window.ui.h:85
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Notify me about contacts that sign _in"
 msgstr "Notifiera mig om kontakter som loggar _in"
 
-#: ../data/gui/preferences_window.ui.h:86
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Notify me about contacts that sign _out"
 msgstr "Notifiera mig om kontakter som loggar _ut"
 
-#: ../data/gui/preferences_window.ui.h:87
+#: ../data/gui/preferences_window.ui.h:83
 #, fuzzy
 msgid "Notify me about it"
 msgstr "_Notifiera mig om det"
 
-#: ../data/gui/preferences_window.ui.h:88
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notify on new _GMail email"
 msgstr "Notifiera vid ny _Gmail-e-post"
 
-#: ../data/gui/preferences_window.ui.h:89
+#: ../data/gui/preferences_window.ui.h:85
 #, fuzzy
 msgid "Only when pending events"
 msgstr ""
@@ -2104,56 +2311,57 @@ msgstr ""
 "Endast vid väntande händelser\n"
 "Alltid"
 
-#: ../data/gui/preferences_window.ui.h:90
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Personal Events"
 msgstr "Personliga händelser"
 
-#: ../data/gui/preferences_window.ui.h:91
+#: ../data/gui/preferences_window.ui.h:87
 msgid "Play _sounds"
 msgstr "Spela _upp ljud"
 
-#: ../data/gui/preferences_window.ui.h:92
+#: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
 msgid "Pop it up"
 msgstr "_Öppna det"
 
-#: ../data/gui/preferences_window.ui.h:93
+#: ../data/gui/preferences_window.ui.h:89
 msgid "Preferences"
 msgstr "Inställningar"
 
-#: ../data/gui/preferences_window.ui.h:94
+#: ../data/gui/preferences_window.ui.h:90
 msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:96
+#: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
 msgid "STUN server:"
 msgstr "Server:"
 
-#: ../data/gui/preferences_window.ui.h:97
+#: ../data/gui/preferences_window.ui.h:93
+#, fuzzy
+msgid "Show notification area icon:"
+msgstr "Använd _aktivitetsfältet (aka. notifieringsyta)"
+
+#: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
 msgid "Show only in roster"
 msgstr "Visa enbart i _registret"
 
-#: ../data/gui/preferences_window.ui.h:98
-msgid "Show systray:"
-msgstr "Visa i notifieringsyta:"
-
-#: ../data/gui/preferences_window.ui.h:99
+#: ../data/gui/preferences_window.ui.h:95
 msgid "Sign _in"
 msgstr "Loggar _in"
 
-#: ../data/gui/preferences_window.ui.h:100
+#: ../data/gui/preferences_window.ui.h:96
 msgid "Sign _out"
 msgstr "Loggar _ut"
 
-#: ../data/gui/preferences_window.ui.h:101
+#: ../data/gui/preferences_window.ui.h:97
 msgid "Single window for everything"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:102
+#: ../data/gui/preferences_window.ui.h:98
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2161,27 +2369,27 @@ msgstr ""
 "Vissa meddelanden kan innehålla textformatering (formatering, färger etc). "
 "Om kryssad kommer Gajim att endast visa rå meddelandetext."
 
-#: ../data/gui/preferences_window.ui.h:103
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sort contacts by status"
 msgstr "Sortera kontakter efter status"
 
-#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
 msgid "Status"
 msgstr "Status"
 
-#: ../data/gui/preferences_window.ui.h:105
+#: ../data/gui/preferences_window.ui.h:101
 msgid "Status _iconset:"
 msgstr "Status_ikoner:"
 
-#: ../data/gui/preferences_window.ui.h:106
+#: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Stil"
 
-#: ../data/gui/preferences_window.ui.h:107
+#: ../data/gui/preferences_window.ui.h:103
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/gui/preferences_window.ui.h:108
+#: ../data/gui/preferences_window.ui.h:104
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2189,7 +2397,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:111
+#: ../data/gui/preferences_window.ui.h:107
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2197,121 +2405,126 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:114
+#: ../data/gui/preferences_window.ui.h:110
 msgid "Use _transports icons"
 msgstr "Använd _transporternas ikoner"
 
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:111
+#, fuzzy
+msgid "Use default applications"
+msgstr "Använd alltid OS/X standardprogram"
+
+#: ../data/gui/preferences_window.ui.h:112
 msgid "Use system _default"
 msgstr "Använd systemets _standard"
 
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:113
 msgid "Video framerate"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:117
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Video input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:118
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Video output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:119
+#: ../data/gui/preferences_window.ui.h:116
 msgid "Video size"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:120
+#: ../data/gui/preferences_window.ui.h:117
 msgid "When new event is received:"
 msgstr "När ny händelse tas emot:"
 
-#: ../data/gui/preferences_window.ui.h:121
+#: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
 msgid "Your message:"
 msgstr "Felmeddelande: %s"
 
-#: ../data/gui/preferences_window.ui.h:122
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your nickname:"
 msgstr "För_e smeknamn:"
 
-#: ../data/gui/preferences_window.ui.h:123
+#: ../data/gui/preferences_window.ui.h:120
 msgid "_Away after:"
 msgstr "_Frånvarande efter:"
 
-#: ../data/gui/preferences_window.ui.h:124
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Webbläsare:"
 
-#: ../data/gui/preferences_window.ui.h:125
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Display chat state notifications:"
 msgstr "Visa _notifieringar för chattstatus:"
 
-#: ../data/gui/preferences_window.ui.h:126
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Emoticons:"
 msgstr "_Känsloikoner:"
 
-#: ../data/gui/preferences_window.ui.h:127
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_File manager:"
 msgstr "_Filhanterare:"
 
-#: ../data/gui/preferences_window.ui.h:128
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_Highlight misspelled words"
 msgstr "_Markera felstavade ord"
 
-#: ../data/gui/preferences_window.ui.h:129
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorera händelser från kontakter som inte finns i kontaktlistan"
 
-#: ../data/gui/preferences_window.ui.h:130
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignorera textformatering i inkommande meddelanden"
 
-#: ../data/gui/preferences_window.ui.h:131
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Log status changes of contacts"
 msgstr "_Logga statusändringar för kontakter"
 
-#: ../data/gui/preferences_window.ui.h:132
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Mail client:"
 msgstr "_E-postklient:"
 
-#: ../data/gui/preferences_window.ui.h:133
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Not available after:"
 msgstr "_Inte tillgänglig efter:"
 
-#: ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Open..."
 msgstr "_Öppna..."
 
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Reset to Default Colors"
 msgstr "_Återställ till standardfärger"
 
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Send chat state notifications:"
 msgstr "_Skicka notifieringar för chattstatus:"
 
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Status message:"
 msgstr "_Statusmeddelande:"
 
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_Window behavior:"
 msgstr "_Fönsterbeteende:"
 
-#: ../data/gui/preferences_window.ui.h:140
+#: ../data/gui/preferences_window.ui.h:137
 msgid "in _group chats"
 msgstr "i _gruppchattar"
 
-#: ../data/gui/preferences_window.ui.h:141
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _roster"
 msgstr "i _kontaktlista"
 
-#: ../data/gui/preferences_window.ui.h:142
+#: ../data/gui/preferences_window.ui.h:139
 msgid "minutes"
 msgstr "minuter"
 
@@ -2364,7 +2577,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Ordning:"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3436
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
 msgid "Privacy List"
 msgstr "Integritetslista"
 
@@ -2575,8 +2788,8 @@ msgstr "Ta bort kontot från Gajim och från _servern"
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5492 ../src/roster_window.py:5622
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
+#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
 msgid "_Remove"
 msgstr "Ta _bort"
 
@@ -2622,56 +2835,60 @@ msgid "Help online"
 msgstr "Hjälp på nätet"
 
 #: ../data/gui/roster_window.ui.h:8
+msgid "P_lugins"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:9
 msgid "Profile, A_vatar"
 msgstr "Profil, a_vatar"
 
-#: ../data/gui/roster_window.ui.h:9
+#: ../data/gui/roster_window.ui.h:10
 msgid "Show Only _Active Contacts"
 msgstr "Visa endast _aktiva kontakter"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
 msgid "Show Trans_ports"
 msgstr "Visa _transporter"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
 msgid "Show _Offline Contacts"
 msgstr "Visa frånkopplade _kontakter"
 
-#: ../data/gui/roster_window.ui.h:12 ../src/statusicon.py:326
+#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
 msgid "Show _Roster"
 msgstr "Visa _kontaktlista"
 
-#: ../data/gui/roster_window.ui.h:13
+#: ../data/gui/roster_window.ui.h:14
 msgid "_Accounts"
 msgstr "K_onton"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
 #: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Åtgärder"
 
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
 msgid "_Contents"
 msgstr "_Innehåll"
 
-#: ../data/gui/roster_window.ui.h:18 ../src/disco.py:1502
+#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
 msgid "_Edit"
 msgstr "R_edigera"
 
-#: ../data/gui/roster_window.ui.h:19
+#: ../data/gui/roster_window.ui.h:20
 msgid "_FAQ"
 msgstr "_Frågor och svar"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: ../data/gui/roster_window.ui.h:22
+#: ../data/gui/roster_window.ui.h:23
 msgid "_Send Single Message..."
 msgstr "Skicka ett _meddelande..."
 
-#: ../data/gui/roster_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:25
 msgid "_View"
 msgstr "_Visa"
 
@@ -2688,11 +2905,11 @@ msgid "_Add contact"
 msgstr "_Lägg till kontakt"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5634
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
 msgid "_Information"
 msgstr "_Information"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1353
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
 msgid "_Search"
 msgstr "_Sök"
 
@@ -2712,10 +2929,6 @@ msgstr "Registrera hos"
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../data/gui/single_message_window.ui.h:2
-msgid "From:"
-msgstr "Från:"
-
 #: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Svara på detta meddelande"
@@ -2732,10 +2945,6 @@ msgstr "Skicka meddelande"
 msgid "Send message and close window"
 msgstr "Skicka meddelande och stäng fönster"
 
-#: ../data/gui/single_message_window.ui.h:7
-msgid "Subject:"
-msgstr "Ämne:"
-
 #: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Till:"
@@ -2946,25 +3155,35 @@ msgstr "Snabbmeddelandeklienten Gajim"
 msgid "Jabber IM Client"
 msgstr "Jabber-snabbmeddelandeklient"
 
-#: ../src/adhoc_commands.py:314
+#: ../src/adhoc_commands.py:323
 msgid "Cancel confirmation"
 msgstr "Avbryt bekräftelse"
 
-#: ../src/adhoc_commands.py:315
+#: ../src/adhoc_commands.py:324
 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:351 ../src/adhoc_commands.py:374
+#: ../src/adhoc_commands.py:370
+#, fuzzy
+msgid "Invalid Form"
+msgstr "Ogiltigt rum"
+
+#: ../src/adhoc_commands.py:371
+#, fuzzy
+msgid "The form is not filled correctly."
+msgstr "Smeknamnet innehåller icke-tillåtna tecken."
+
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:360
+#: ../src/adhoc_commands.py:399
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:471
+#: ../src/adhoc_commands.py:513
 msgid "Service returned an error."
 msgstr "Tjänsten returnerade ett fel."
 
@@ -2989,7 +3208,7 @@ msgstr "Heltal"
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:945
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
 msgid "Color"
 msgstr "Färg"
 
@@ -3026,186 +3245,186 @@ msgstr[1] ""
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "English"
 msgstr "engelska"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Belarusian"
 msgstr "vitryska"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Bulgarian"
 msgstr "bulgariska"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Breton"
 msgstr "bretonska"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Czech"
 msgstr "tjeckiska"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "German"
 msgstr "tyska"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Greek"
 msgstr "grekiska"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "British"
 msgstr "brittiska"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Esperanto"
 msgstr "esperanto"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Spanish"
 msgstr "spanska"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Basque"
 msgstr "baskiska"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "French"
 msgstr "franska"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Croatian"
 msgstr "kroatiska"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Italian"
 msgstr "italienska"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian (b)"
 msgstr "norska (bokmål)"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Dutch"
 msgstr "nederländska"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian"
 msgstr "norska (nynorsk)"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Polish"
 msgstr "polska"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Portuguese"
 msgstr "portugisiska"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Brazilian Portuguese"
 msgstr "brasiliansk portugisiska"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Russian"
 msgstr "ryska"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Serbian"
 msgstr "serbiska"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Slovak"
 msgstr "slovakiska"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Swedish"
 msgstr "svenska"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Chinese (Ch)"
 msgstr "kinesiska"
 
-#: ../src/chat_control.py:479
+#: ../src/chat_control.py:496
 msgid "Spelling language"
 msgstr "Stavningsspråk"
 
 #. we are not connected
-#: ../src/chat_control.py:511 ../src/chat_control.py:720
+#: ../src/chat_control.py:528 ../src/chat_control.py:737
 msgid "A connection is not available"
 msgstr "En anslutning är inte tillgänglig"
 
-#: ../src/chat_control.py:512 ../src/chat_control.py:721
+#: ../src/chat_control.py:529 ../src/chat_control.py:738
 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:927
+#: ../src/chat_control.py:944
 msgid "Underline"
 msgstr "Understruken"
 
-#: ../src/chat_control.py:928
+#: ../src/chat_control.py:945
 msgid "Strike"
 msgstr "Genomstruken"
 
-#: ../src/chat_control.py:951
+#: ../src/chat_control.py:968
 msgid "Font"
 msgstr "Typsnitt"
 
-#: ../src/chat_control.py:960
+#: ../src/chat_control.py:977
 msgid "Clear formating"
 msgstr "Ingen formatering"
 
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1055
 msgid "Really send file?"
 msgstr "Verkligen skicka filen?"
 
-#: ../src/chat_control.py:1039
+#: ../src/chat_control.py:1056
 #, 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:1503 ../src/chat_control.py:1987
+#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
 msgid "GPG encryption enabled"
 msgstr "GPG-kryptering aktiverad"
 
 #. Add to roster
-#: ../src/chat_control.py:1528 ../src/common/contacts.py:158
+#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
 #: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:245 ../src/dialogs.py:1064 ../src/dialogs.py:2078
-#: ../src/dialogs.py:2107 ../src/gui_interface.py:674
+#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
+#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
 #: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1610 ../src/roster_window.py:1612
-#: ../src/roster_window.py:1942 ../src/roster_window.py:3289
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
+#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
+#: ../src/roster_window.py:3382
 msgid "Not in Roster"
 msgstr "Inte i kontaktlista"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1575
 msgid "This contact does not support file transfer."
 msgstr "Denna kontakt har inte stöd för filöverföringar."
 
-#: ../src/chat_control.py:1561
+#: ../src/chat_control.py:1578
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1656
+#: ../src/chat_control.py:1677
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:1869
 #, 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:1967 ../src/dialogs.py:4866
+#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
 msgid "No GPG key assigned"
 msgstr "Ingen GPG-nyckel tilldelad"
 
-#: ../src/chat_control.py:1968
+#: ../src/chat_control.py:1991
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3213,50 +3432,50 @@ msgstr ""
 "Ingen GPG-nyckel har tilldelats denna kontakt. Därför kan du inte kryptera "
 "meddelanden med GPG."
 
-#: ../src/chat_control.py:1977
+#: ../src/chat_control.py:2000
 msgid "GPG encryption disabled"
 msgstr "GPG-kryptering inaktiverad"
 
-#: ../src/chat_control.py:2003
+#: ../src/chat_control.py:2026
 msgid "Session WILL be logged"
 msgstr "Sessionen KOMMER att loggas"
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:2028
 msgid "Session WILL NOT be logged"
 msgstr "Sessionen KOMMER INTE att loggas"
 
 #. encryption %s active
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is"
 msgstr "är"
 
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is NOT"
 msgstr "är INTE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will"
 msgstr "kommer"
 
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will NOT"
 msgstr "kommer INTE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2051
 msgid "and authenticated"
 msgstr "och autentiserad"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2032
+#: ../src/chat_control.py:2055
 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:2039
+#: ../src/chat_control.py:2062
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3265,23 +3484,32 @@ msgstr ""
 "%(type)s-kryptering %(status)s aktiv %(authenticated)s.\n"
 "Din chattsession %(logged)s att loggas."
 
-#: ../src/chat_control.py:2182
+#: ../src/chat_control.py:2205
 msgid "Session negotiation cancelled"
 msgstr "Sessionsförhandlingen avbröts"
 
-#: ../src/chat_control.py:2191
+#: ../src/chat_control.py:2215
+msgid "This session WILL be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2217
+#, fuzzy
+msgid "This session WILL NOT be archived on server"
+msgstr "Sessionen KOMMER INTE att loggas"
+
+#: ../src/chat_control.py:2226
 msgid "This session is encrypted"
 msgstr "Denna session är krypterad"
 
-#: ../src/chat_control.py:2194
+#: ../src/chat_control.py:2229
 msgid " and WILL be logged"
 msgstr " och KOMMER att loggas"
 
-#: ../src/chat_control.py:2196
+#: ../src/chat_control.py:2231
 msgid " and WILL NOT be logged"
 msgstr " och KOMMER INTE att loggas"
 
-#: ../src/chat_control.py:2201
+#: ../src/chat_control.py:2236
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3289,25 +3517,25 @@ msgstr ""
 "Fjärrkontaktens identitet har inte verifierats. Klicka på sköldknappen för "
 "mer information."
 
-#: ../src/chat_control.py:2203
+#: ../src/chat_control.py:2238
 msgid "E2E encryption disabled"
 msgstr "E2E-kryptering inaktiverad"
 
-#: ../src/chat_control.py:2241 ../src/chat_control.py:2254
+#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
 msgid "The following message was NOT encrypted"
 msgstr "Följande meddelande var INTE krypterat"
 
-#: ../src/chat_control.py:2247
+#: ../src/chat_control.py:2288
 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:2519
+#: ../src/chat_control.py:2566
 #, 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:2520
+#: ../src/chat_control.py:2567
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3315,15 +3543,13 @@ msgstr ""
 "Om du stänger den här fliken och har historik inaktiverad så kommer "
 "meddelandet att förloras."
 
-#: ../src/chat_control.py:2663 ../src/common/connection_handlers.py:1635
-#: ../src/common/connection_handlers.py:1758
-#: ../src/common/connection_handlers.py:1960
-#: ../src/common/connection_handlers.py:2110 ../src/common/connection.py:452
+#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
 #: ../src/gajim.py:159 ../src/session.py:138
 msgid "Database Error"
 msgstr "Databasfel"
 
-#: ../src/chat_control.py:2664
+#: ../src/chat_control.py:2714
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3332,7 +3558,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:2906
+#: ../src/chat_control.py:2962
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s är nu %(status)s"
@@ -3346,28 +3572,28 @@ msgstr "skapar loggdatabas"
 msgid "creating cache database"
 msgstr "skapar loggdatabas"
 
-#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
-#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
-#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
-#: ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
 #, 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:275 ../src/common/check_paths.py:282
-#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
-#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
-#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:333
+#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
+#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
+#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
 msgid "Gajim will now exit"
 msgstr "Gajim kommer nu att avslutas"
 
-#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
+#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
 #, 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:342
+#: ../src/common/check_paths.py:351
 #, python-format
 msgid "creating %s directory"
 msgstr "skapar katalogen %s"
@@ -3431,9 +3657,9 @@ msgstr "Välj de gruppchattar som du vill lämna"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:801
-#: ../src/roster_window.py:1614 ../src/roster_window.py:1616
-#: ../src/roster_window.py:5251
+#: ../src/common/helpers.py:57 ../src/roster_window.py:815
+#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
+#: ../src/roster_window.py:5323
 msgid "Groupchats"
 msgstr "Gruppchattar"
 
@@ -3492,7 +3718,8 @@ msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
 #: ../src/common/config.py:88
-msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgid ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
 #: ../src/common/config.py:93
@@ -3546,9 +3773,9 @@ msgid ""
 msgstr ""
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:501
-#: ../src/common/optparser.py:290 ../src/common/optparser.py:486
-#: ../src/common/optparser.py:520 ../src/gui_interface.py:3370
+#: ../src/common/config.py:106 ../src/common/config.py:505
+#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
+#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
 msgid "default"
 msgstr "standard"
 
@@ -3760,7 +3987,7 @@ msgstr "IEC-standarden säger: KiB = 1024 byte, KB = 1000 byte."
 
 #: ../src/common/config.py:197
 #, fuzzy
-msgid "Notify of events in the system trayicon."
+msgid "Notify of events in the notification area."
 msgstr "Notifiera om händelser in systemets statusikon."
 
 #: ../src/common/config.py:203
@@ -3796,9 +4023,10 @@ msgid ""
 msgstr "En semikolonseparerad lista av ord som blir upplysta i gruppchatt."
 
 #: ../src/common/config.py:221
+#, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
+"setting is taken into account only if notification icon is used."
 msgstr ""
 "Om sant så avslutas Gajim när fönsterhanterarens X-knapp klickas. Denna "
 "inställning behandlas endast när aktivitetsfältsikonen används."
@@ -4049,7 +4277,7 @@ msgstr ""
 #: ../src/common/config.py:270
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
-"systray icon."
+"notification icon."
 msgstr ""
 
 #: ../src/common/config.py:271
@@ -4221,11 +4449,15 @@ msgstr ""
 msgid "Message that is sent to contacts you want to add"
 msgstr "Fyll i informationen om kontakten du vill lägga till"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:374
+msgid "Last time we syncronized with logs from server."
+msgstr ""
+
+#: ../src/common/config.py:436
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Är OpenPGP aktiverat för denna kontakt?"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4233,101 +4465,108 @@ msgstr ""
 "Ska Gajim automatiskt starta en krypterad session med denna kontakt om "
 "möjligt?"
 
-#: ../src/common/config.py:437 ../src/common/config.py:440
+#: ../src/common/config.py:438 ../src/common/config.py:441
 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:446
+#: ../src/common/config.py:447
 msgid "all or space separated status"
 msgstr "alla eller mellanslagsseparerad status"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:448
 msgid "'yes', 'no', or 'both'"
 msgstr "\"yes\", \"no\" eller \"both\""
 
-#: ../src/common/config.py:448 ../src/common/config.py:450
-#: ../src/common/config.py:451 ../src/common/config.py:454
-#: ../src/common/config.py:455
+#: ../src/common/config.py:449 ../src/common/config.py:451
+#: ../src/common/config.py:452 ../src/common/config.py:455
+#: ../src/common/config.py:456
 msgid "'yes', 'no' or ''"
 msgstr "\"yes\", \"no\" eller \"\""
 
-#: ../src/common/config.py:461 ../src/common/pep.py:157
+#: ../src/common/config.py:460
+msgid ""
+"State whether plugins should be activated on exit (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
+msgstr ""
+
+#: ../src/common/config.py:465 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back soon"
 msgstr "Snart tillbaka"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back in some minutes."
 msgstr "Tillbaka om några minuter."
 
-#: ../src/common/config.py:463 ../src/common/pep.py:127
+#: ../src/common/config.py:467 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Äter"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:467
 msgid "I'm eating, so leave me a message."
 msgstr "Jag äter, lämna ett meddelande."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "I'm watching a movie."
 msgstr "Jag tittar på film."
 
-#: ../src/common/config.py:465 ../src/common/pep.py:186
+#: ../src/common/config.py:469 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Arbetar"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:469
 msgid "I'm working."
 msgstr "Jag arbetar."
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "I'm on the phone."
 msgstr "Jag pratar i telefon."
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "Out"
 msgstr "Ute"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "I'm out enjoying life."
 msgstr "Jag är ute och njuter av livet."
 
-#: ../src/common/config.py:478
+#: ../src/common/config.py:482
 msgid "I'm available."
 msgstr "Jag är tillgänglig."
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:483
 msgid "I'm free for chat."
 msgstr "Jag är ledig för chatt."
 
-#: ../src/common/config.py:480 ../src/config.py:1600
+#: ../src/common/config.py:484 ../src/config.py:1600
 msgid "Be right back."
 msgstr "Strax tillbaka."
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:485
 msgid "I'm not available."
 msgstr "Jag är inte tillgänglig."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:486
 msgid "Do not disturb."
 msgstr "Stör inte."
 
-#: ../src/common/config.py:483 ../src/common/config.py:484
+#: ../src/common/config.py:487 ../src/common/config.py:488
 msgid "Bye!"
 msgstr "Hejdå!"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:498
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -4336,184 +4575,94 @@ 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:495
+#: ../src/common/config.py:499
 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:504 ../src/common/optparser.py:304
+#: ../src/common/config.py:508 ../src/common/optparser.py:308
 msgid "green"
 msgstr "green"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:290
+#: ../src/common/config.py:512 ../src/common/optparser.py:294
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:512
+#: ../src/common/config.py:516
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:520
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:84
+#: ../src/common/connection_handlers.py:94
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Kunde inte läsa in idle-modul"
 
-#: ../src/common/connection_handlers.py:117
+#: ../src/common/connection_handlers.py:127
 #, 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:124
+#: ../src/common/connection_handlers.py:134
 msgid "Registration succeeded"
 msgstr "Registreringen lyckades"
 
-#: ../src/common/connection_handlers.py:125
+#: ../src/common/connection_handlers.py:135
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registrering med agenten %s lyckades"
 
-#: ../src/common/connection_handlers.py:133
-msgid "Registration failed"
-msgstr "Registreringen misslyckades"
-
-#: ../src/common/connection_handlers.py:133
-#, python-format
-msgid ""
-"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
-msgstr ""
-"Registrering med agenten %(agent)s misslyckades med fel %(error)s: "
-"%(error_msg)s"
-
-#: ../src/common/connection_handlers.py:445
-#: ../src/common/connection_handlers.py:1633
-#: ../src/common/connection_handlers.py:1756
-#: ../src/common/connection_handlers.py:1957
-#: ../src/common/connection_handlers.py:2108 ../src/common/connection.py:449
-#: ../src/gajim.py:341
-msgid "Disk Write Error"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:678 ../src/common/connection.py:1472
-msgid "Invisibility not supported"
-msgstr "Osynlighet stöds inte"
-
-#: ../src/common/connection_handlers.py:679 ../src/common/connection.py:1473
-#, python-format
-msgid "Account %s doesn't support invisibility."
-msgstr "Kontot %s saknar stöd för osynlighet."
-
-#: ../src/common/connection_handlers.py:1446 ../src/common/connection.py:253
-#: ../src/config.py:2091 ../src/config.py:2100 ../src/config.py:2168
-#: ../src/config.py:3560 ../src/dataforms_widget.py:597 ../src/dialogs.py:2931
-msgid "Invalid Jabber ID"
-msgstr "Ogiltigt Jabber-ID"
-
-#: ../src/common/connection_handlers.py:1447
-msgid "A message from a non-valid JID arrived, it has been ignored."
-msgstr ""
-
-#: ../src/common/connection_handlers.py:1636
-#: ../src/common/connection_handlers.py:1759
-#: ../src/common/connection_handlers.py:1961
-#: ../src/common/connection_handlers.py:2111 ../src/common/connection.py:453
-#: ../src/gajim.py:160 ../src/session.py:139
-#, 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 ""
-"Databasfilen (%s) kan inte läsas. Försök att reparera den (se http://trac."
-"gajim.org/wiki/DatabaseBackup) eller ta bort den (alla historik kommer att "
-"förloras)."
-
-#: ../src/common/connection_handlers.py:1805
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Smeknamnet tillåts inte: %s"
-
-#: ../src/common/connection_handlers.py:1902
-#: ../src/common/connection_handlers.py:1911
-#: ../src/common/connection_handlers.py:1918
-#: ../src/common/connection_handlers.py:1922
-#: ../src/common/connection_handlers.py:1926
-#: ../src/common/connection_handlers.py:1931 ../src/gui_interface.py:139
-msgid "Unable to join group chat"
-msgstr "Kunde inte gå in i gruppchatt"
-
-#: ../src/common/connection_handlers.py:1903
-#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:1912
-#, python-format
-msgid "You are banned from group chat %s."
-msgstr "Du är bannlyst från gruppchatten %s."
-
-#: ../src/common/connection_handlers.py:1919
-#, python-format
-msgid "Group chat %s does not exist."
-msgstr "Gruppchatten %s finns inte."
-
-#: ../src/common/connection_handlers.py:1923
-#, fuzzy
-msgid "Group chat creation is restricted."
-msgstr "Möjligheten att skapa rum är begränsad."
-
-#: ../src/common/connection_handlers.py:1927
-#, python-format
-msgid "Your registered nickname must be used in group chat %s."
-msgstr "Ditt registrerade smeknamn måste användas i gruppchatten %s."
-
-#: ../src/common/connection_handlers.py:1932
-#, 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:1976
-#, fuzzy
-msgid "Room has been destroyed"
-msgstr "Auktorisering har tagits bort"
+#: ../src/common/connection_handlers.py:143
+msgid "Registration failed"
+msgstr "Registreringen misslyckades"
 
-#: ../src/common/connection_handlers.py:1984
+#: ../src/common/connection_handlers.py:143
 #, python-format
-msgid "You can join this room instead: %s"
-msgstr "Du kan gå in i detta rum istället: %s"
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
+"Registrering med agenten %(agent)s misslyckades med fel %(error)s: "
+"%(error_msg)s"
 
-#: ../src/common/connection_handlers.py:2020
-msgid "I would like to add you to my roster."
-msgstr "Jag skulle vilja lägga till dig i min kontaktlista."
+#: ../src/common/connection_handlers.py:466
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
+#: ../src/gajim.py:341
+msgid "Disk Write Error"
+msgstr ""
 
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2041
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "vi prenumererar nu på %s"
+#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
+msgid "Invisibility not supported"
+msgstr "Osynlighet stöds inte"
 
-#: ../src/common/connection_handlers.py:2043
+#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
 #, python-format
-msgid "unsubscribe request from %s"
-msgstr "avprenumerationsförfrågan från %s"
+msgid "Account %s doesn't support invisibility."
+msgstr "Kontot %s saknar stöd för osynlighet."
 
-#: ../src/common/connection_handlers.py:2045
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "vi prenumererar inte längre på %s"
+#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
+#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
+#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
+msgid "Invalid Jabber ID"
+msgstr "Ogiltigt Jabber-ID"
+
+#: ../src/common/connection_handlers.py:1405
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr ""
 
-#: ../src/common/connection_handlers.py:2240
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
+#: ../src/gajim.py:160 ../src/session.py:139
 #, python-format
 msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
+"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 ""
-"JID %s följer inte RFC-standarden. Det kommer inte att läggas till din "
-"kontaktlista. Använd kontakthanteringsverktyg såsom http://jru.jabberstudio."
-"org/  för att ta bort det"
+"Databasfilen (%s) kan inte läsas. Försök att reparera den (se http://trac."
+"gajim.org/wiki/DatabaseBackup) eller ta bort den (alla historik kommer att "
+"förloras)."
 
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
@@ -4643,28 +4792,28 @@ msgstr "Nyckelanvändning inkluderar inte certifikatsignering"
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:254 ../src/dialogs.py:2932
+#: ../src/common/connection.py:256 ../src/dialogs.py:2948
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr ""
 "Det gick inte att skicka ett meddelande till %s, denna JID är inte giltig."
 
-#: ../src/common/connection.py:276
+#: ../src/common/connection.py:278
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:281
 #, 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:331
+#: ../src/common/connection.py:333
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Detta meddelande är *krypterat* (Se :XEP:`27`]"
 
-#: ../src/common/connection.py:439
+#: ../src/common/connection.py:441
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4673,78 +4822,78 @@ msgstr ""
 "Ämne: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:807
+#: ../src/common/connection.py:809
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Anslutningen med konto \"%s\" har brutits"
 
-#: ../src/common/connection.py:808
+#: ../src/common/connection.py:810
 msgid "Reconnect manually."
 msgstr "Ã…teranslut manuellt."
 
-#: ../src/common/connection.py:820
+#: ../src/common/connection.py:822
 #, 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:854
+#: ../src/common/connection.py:856
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Servern %s tillhandahöll ett annat registreringsformulär"
 
-#: ../src/common/connection.py:867
+#: ../src/common/connection.py:869
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Okänt SSL-fel: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:882
+#: ../src/common/connection.py:884
 msgid "Invalid answer"
 msgstr "Ogiltigt lösenord"
 
-#: ../src/common/connection.py:883
+#: ../src/common/connection.py:885
 #, 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:1165 ../src/common/connection.py:1294
-#: ../src/common/connection.py:1784
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
+#: ../src/common/connection.py:1792
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kunde inte ansluta till \"%s\""
 
-#: ../src/common/connection.py:1166 ../src/gui_interface.py:755
+#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
 msgid "Check your connection or try again later."
 msgstr "Kontrollera din anslutning eller försök igen senare."
 
-#: ../src/common/connection.py:1171
+#: ../src/common/connection.py:1173
 #, python-format
 msgid "Server replied: %s"
 msgstr "Servern svarade: %s"
 
-#: ../src/common/connection.py:1184
+#: ../src/common/connection.py:1186
 msgid "Connection to proxy failed"
 msgstr "Anslutning till proxyservern misslyckades"
 
-#: ../src/common/connection.py:1215 ../src/common/connection.py:1274
+#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Kunde inte ansluta till kontot %s"
 
-#: ../src/common/connection.py:1216 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
 #, 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:1241
+#: ../src/common/connection.py:1243
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1244
+#: ../src/common/connection.py:1246
 #, python-format
 msgid ""
 "\n"
@@ -4753,7 +4902,7 @@ msgstr ""
 "\n"
 "SSL-fel: <b>%s</b>"
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1248
 #, python-format
 msgid ""
 "\n"
@@ -4762,51 +4911,51 @@ msgstr ""
 "\n"
 "Okänt SSL-fel: %d"
 
-#: ../src/common/connection.py:1295
+#: ../src/common/connection.py:1297
 msgid "Check your connection or try again later"
 msgstr "Kontrollera din anslutning eller försök igen senare"
 
-#: ../src/common/connection.py:1324
+#: ../src/common/connection.py:1329
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentisering mot \"%s\" misslyckades"
 
-#: ../src/common/connection.py:1326
+#: ../src/common/connection.py:1331
 msgid "Please check your login and password for correctness."
 msgstr "Kontrollera ditt inloggningsnamn och lösenord."
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1400
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "problem vid sändning %s ( %s )"
 
-#: ../src/common/connection.py:1396
+#: ../src/common/connection.py:1401
 #, 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:1650
+#: ../src/common/connection.py:1658
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Skickade kontakt: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1653
+#: ../src/common/connection.py:1661
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Bjud in _kontakter"
 
-#: ../src/common/connection.py:1799 ../src/common/connection.py:1822
+#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
 msgid "Not fetched because of invisible status"
 msgstr "Inte hämtad på grund av osynlig status"
 
-#: ../src/common/connection.py:2254
+#: ../src/common/connection.py:2262
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Registreringen misslyckades"
 
-#: ../src/common/connection.py:2255
+#: ../src/common/connection.py:2263
 #, fuzzy, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
@@ -4814,16 +4963,16 @@ msgstr ""
 "%(error_msg)s"
 
 #: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:674
+#: ../src/gui_interface.py:551
 msgid "Observers"
 msgstr "Observerande"
 
 #: ../src/common/contacts.py:139 ../src/common/contacts.py:366
 #: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1499 ../src/gui_interface.py:424
-#: ../src/roster_window.py:840 ../src/roster_window.py:1525
-#: ../src/roster_window.py:1606 ../src/roster_window.py:1608
-#: ../src/roster_window.py:1769
+#: ../src/disco.py:1517 ../src/roster_window.py:854
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
+#: ../src/roster_window.py:2466
 msgid "Transports"
 msgstr "Transporter"
 
@@ -5045,204 +5194,220 @@ msgstr "Slutet av veckan"
 msgid "Weekend!"
 msgstr "Helg!"
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:148
+msgid "Username must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:153
 msgid "Invalid character in username."
 msgstr "Ogiltigt tecken i användarnamn"
 
-#: ../src/common/helpers.py:156
-msgid "Server address required."
-msgstr "Serveradress krävs."
+#: ../src/common/helpers.py:159
+msgid "Server must be between 1 and 1023 chars"
+msgstr ""
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 msgid "Invalid character in hostname."
 msgstr "Ogiltigt tecken i värdnamn."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:166
+msgid "Server address required."
+msgstr "Serveradress krävs."
+
+#: ../src/common/helpers.py:170
+msgid "Resource must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:175
 msgid "Invalid character in resource."
 msgstr "Ogiltigt tecken i resurs."
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:215
 msgid "_Busy"
 msgstr "_Upptagen"
 
-#: ../src/common/helpers.py:211 ../src/tooltips.py:195
+#: ../src/common/helpers.py:217 ../src/tooltips.py:195
 msgid "Busy"
 msgstr "Upptagen"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:220
 msgid "_Not Available"
 msgstr "_Inte tillgänglig"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:225
 msgid "_Free for Chat"
 msgstr "_Ledig för chatt"
 
-#: ../src/common/helpers.py:221 ../src/tooltips.py:191
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Free for Chat"
 msgstr "Ledig för chatt"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:230
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?transfer status:Pausad"
 
-#: ../src/common/helpers.py:226 ../src/tooltips.py:189
+#: ../src/common/helpers.py:232 ../src/tooltips.py:189
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?transfer status:Pausad"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:234
 msgid "Connecting"
 msgstr "Ansluter"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:237
 msgid "A_way"
 msgstr "Fr_Ã¥nvarande"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:242
 msgid "_Offline"
 msgstr "_Frånkopplad"
 
-#: ../src/common/helpers.py:238 ../src/tooltips.py:199
+#: ../src/common/helpers.py:244 ../src/tooltips.py:199
 msgid "Offline"
 msgstr "Frånkopplad"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:247
 msgid "_Invisible"
 msgstr "_Osynlig"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:253
 msgid "?contact has status:Unknown"
 msgstr "?kontakt har status:Okänd"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:255
 msgid "?contact has status:Has errors"
 msgstr "?kontakt har status:Har fel"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:260
 msgid "?Subscription we already have:None"
 msgstr "?Prenumeration vi redan har:Ingen"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:262
 msgid "To"
 msgstr "Till"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
+msgid "From"
+msgstr "Från"
+
+#: ../src/common/helpers.py:266
 msgid "Both"
 msgstr "BÃ¥da"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:274
 msgid "?Ask (for Subscription):None"
 msgstr "?Fråga (för prenumeration):Ingen"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:276
 msgid "Subscribe"
 msgstr "Prenumerera"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:285
 msgid "?Group Chat Contact Role:None"
 msgstr "?Gruppchatt kontaktroll:Ingen"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:288
 msgid "Moderators"
 msgstr "Moderatorer"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:290
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:293
 msgid "Participants"
 msgstr "Deltagare"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:295
 msgid "Participant"
 msgstr "Deltagare"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:298
 msgid "Visitors"
 msgstr "Besökare"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:300
 msgid "Visitor"
 msgstr "Besökare"
 
-#: ../src/common/helpers.py:300 ../src/tooltips.py:210
+#: ../src/common/helpers.py:306 ../src/tooltips.py:210
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Gruppchatt kontaktroll:Ingen"
 
-#: ../src/common/helpers.py:302 ../src/tooltips.py:216
+#: ../src/common/helpers.py:308 ../src/tooltips.py:216
 msgid "Owner"
 msgstr "Ägare"
 
-#: ../src/common/helpers.py:304 ../src/tooltips.py:214
+#: ../src/common/helpers.py:310 ../src/tooltips.py:214
 msgid "Administrator"
 msgstr "Administratör"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:212
+#: ../src/common/helpers.py:312 ../src/tooltips.py:212
 msgid "Member"
 msgstr "Medlem"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:351
 msgid "is paying attention to the conversation"
 msgstr "uppmärksammar konversationen"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:353
 msgid "is doing something else"
 msgstr "gör något annat"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:355
 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:352
+#: ../src/common/helpers.py:358
 msgid "paused composing a message"
 msgstr "tog en paus i skrivandet"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:360
 msgid "has closed the chat window or tab"
 msgstr "har stängt chattfönstret eller fliken"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:619
+#: ../src/common/helpers.py:625
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:622
+#: ../src/common/helpers.py:628
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:626
+#: ../src/common/helpers.py:632
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:629
+#: ../src/common/helpers.py:635
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:633
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:636
+#: ../src/common/helpers.py:642
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:645
 #, python-format
 msgid "%s B"
 msgstr "%s B"
@@ -5285,12 +5450,12 @@ msgstr "Gajim - %s"
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:111
+#: ../src/common/jingle_rtp.py:107
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Rumkonfiguration"
 
-#: ../src/common/jingle_rtp.py:112
+#: ../src/common/jingle_rtp.py:108
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5302,30 +5467,30 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:209
+#: ../src/common/jingle_rtp.py:205
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:210
+#: ../src/common/jingle_rtp.py:206
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Felmeddelande: %s"
 
-#: ../src/common/jingle_rtp.py:336
+#: ../src/common/jingle_rtp.py:335
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:339
+#: ../src/common/jingle_rtp.py:338
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:382
+#: ../src/common/jingle_rtp.py:381
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:390
+#: ../src/common/jingle_rtp.py:389
 msgid "video output"
 msgstr ""
 
@@ -5402,11 +5567,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "fel: kan inte öppna %s för läsning"
 
-#: ../src/common/optparser.py:299 ../src/common/optparser.py:300
+#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:379
+#: ../src/common/optparser.py:383
 msgid "migrating logs database to indices"
 msgstr "migrerar loggdatabas till index"
 
@@ -6081,7 +6246,7 @@ msgstr ""
 "Du kanske har en annan Gajiminstans igång. Filöverföringen kommer stängas."
 
 #. we're not english
-#: ../src/common/stanza_session.py:303
+#: ../src/common/stanza_session.py:423
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6089,11 +6254,11 @@ msgstr ""
 "[Detta är en del av en krypterad session. Om du ser detta meddelande så har "
 "någonting gått fel.]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:178
+#: ../src/common/zeroconf/connection_zeroconf.py:181
 msgid "Avahi error"
 msgstr "Avahifel"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:179
+#: ../src/common/zeroconf/connection_zeroconf.py:182
 #, python-format
 msgid ""
 "%s\n"
@@ -6102,44 +6267,44 @@ msgstr ""
 "%s\n"
 "Link-local-meddelanden kanske inte fungerar korrekt."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:190
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Kontrollera om Avahi eller Bonjour är installerat."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:199
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Could not start local service"
 msgstr "Kunde inte starta lokal tjänst"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Kunde inte binda till port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-#: ../src/common/zeroconf/connection_zeroconf.py:283
-#: ../src/common/zeroconf/connection_zeroconf.py:294
-#: ../src/common/zeroconf/connection_zeroconf.py:308
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:286
+#: ../src/common/zeroconf/connection_zeroconf.py:297
+#: ../src/common/zeroconf/connection_zeroconf.py:311
 msgid "Please check if avahi-daemon is running."
 msgstr "Kontrollera om avahi-daemon körs."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:282
-#: ../src/common/zeroconf/connection_zeroconf.py:293
-#: ../src/common/zeroconf/connection_zeroconf.py:307
+#: ../src/common/zeroconf/connection_zeroconf.py:285
+#: ../src/common/zeroconf/connection_zeroconf.py:296
+#: ../src/common/zeroconf/connection_zeroconf.py:310
 #, 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:325
+#: ../src/common/zeroconf/connection_zeroconf.py:328
 msgid "Your message could not be sent."
 msgstr "Ditt meddelande kunde inte skickas."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:335
+#: ../src/common/zeroconf/connection_zeroconf.py:338
 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:360
+#: ../src/common/zeroconf/connection_zeroconf.py:363
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6159,16 +6324,16 @@ msgstr "Standardmeddelande"
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3078
+#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:739 ../src/dialogs.py:1395
+#: ../src/config.py:733 ../src/dialogs.py:1409
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Ordbok för språket %s inte tillgängligt"
 
-#: ../src/config.py:740
+#: ../src/config.py:734
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6186,9 +6351,9 @@ msgid "status message text"
 msgstr "text för statusmeddelande"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2383 ../src/dialogs.py:2449
-#: ../src/dialogs.py:3215 ../src/disco.py:866 ../src/disco.py:1726
-#: ../src/disco.py:2030 ../src/history_window.py:90
+#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
+#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
+#: ../src/disco.py:2048 ../src/history_window.py:90
 msgid "Name"
 msgstr "Namn"
 
@@ -6221,7 +6386,7 @@ msgstr "Du har öppnat chatt i kontot %s"
 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:1976 ../src/config.py:2509 ../src/config.py:2545
+#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
 msgid "You are currently connected to the server"
 msgstr "Du är för närvarande ansluten till servern"
 
@@ -6256,134 +6421,134 @@ msgstr "Kontonamnet kan inte vara tomt."
 msgid "Account name cannot contain spaces."
 msgstr "Kontonamnet kan inte innehålla mellanslag."
 
-#: ../src/config.py:2072
+#: ../src/config.py:2074
 msgid "Rename Account"
 msgstr "Byt namn på konto"
 
-#: ../src/config.py:2073
+#: ../src/config.py:2075
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Ange ett nytt namn för kontot %s"
 
-#: ../src/config.py:2101
+#: ../src/config.py:2103
 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:2318 ../src/config.py:3606
+#: ../src/config.py:2320 ../src/config.py:3623
 msgid "Invalid entry"
 msgstr "Ogiltig post"
 
-#: ../src/config.py:2319 ../src/config.py:3607
+#: ../src/config.py:2321 ../src/config.py:3624
 msgid "Custom port must be a port number."
 msgstr "Inställd port måste vara ett portnummer."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2342
 msgid "Failed to get secret keys"
 msgstr "Lyckades inte hämta hemliga nycklar"
 
-#: ../src/config.py:2341
+#: ../src/config.py:2343
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Det uppstod problem när dina hemliga OpenPGP-nycklar skulle hämtas."
 
-#: ../src/config.py:2375
+#: ../src/config.py:2377
 msgid "OpenPGP Key Selection"
 msgstr "Val av OpenPGP-nyckel"
 
-#: ../src/config.py:2376
+#: ../src/config.py:2378
 msgid "Choose your OpenPGP key"
 msgstr "Välj din OpenPGP-nyckel"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2385
 msgid "No such account available"
 msgstr "Inget sådant konto tillgängligt"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2386
 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:2391 ../src/dialogs.py:2136 ../src/dialogs.py:2371
-#: ../src/dialogs.py:2557 ../src/disco.py:511 ../src/profile_window.py:339
+#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
+#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
 msgid "You are not connected to the server"
 msgstr "Du är inte ansluten till servern"
 
-#: ../src/config.py:2392
+#: ../src/config.py:2394
 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:2396
+#: ../src/config.py:2398
 msgid "Your server doesn't support Vcard"
 msgstr "Din server saknar stöd för Vcard"
 
-#: ../src/config.py:2397
+#: ../src/config.py:2399
 msgid "Your server can't save your personal information."
 msgstr "Din server kan inte spara din personliga information."
 
-#: ../src/config.py:2510 ../src/config.py:2546
+#: ../src/config.py:2512 ../src/config.py:2548
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "För att ändra kontonamnet måste du vara frånkopplad"
 
-#: ../src/config.py:2515
+#: ../src/config.py:2517
 msgid "Account Local already exists."
 msgstr "Kontot Local används redan."
 
-#: ../src/config.py:2516
+#: ../src/config.py:2518
 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:2673
+#: ../src/config.py:2675
 #, python-format
 msgid "Edit %s"
 msgstr "Redigera %s"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2677
 #, python-format
 msgid "Register to %s"
 msgstr "Registrera till %s"
 
 #. list at the beginning
-#: ../src/config.py:2711
+#: ../src/config.py:2713
 msgid "Ban List"
 msgstr "Bannlista"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2714
 msgid "Member List"
 msgstr "Medlemslista"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2714
 msgid "Owner List"
 msgstr "Ägarlista"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2715
 msgid "Administrator List"
 msgstr "Administratörslista"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2763 ../src/disco.py:873 ../src/history_manager.py:201
+#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2773
+#: ../src/config.py:2789
 msgid "Reason"
 msgstr "Anledning"
 
-#: ../src/config.py:2780
+#: ../src/config.py:2796
 msgid "Nick"
 msgstr "Smeknamn"
 
-#: ../src/config.py:2786
+#: ../src/config.py:2802
 msgid "Role"
 msgstr "Roll"
 
-#: ../src/config.py:2813
+#: ../src/config.py:2829
 msgid "Banning..."
 msgstr "Bannlyser..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2815
+#: ../src/config.py:2831
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6391,11 +6556,11 @@ msgstr ""
 "<b>Vem vill du bannlysa?</b>\n"
 "\n"
 
-#: ../src/config.py:2817
+#: ../src/config.py:2833
 msgid "Adding Member..."
 msgstr "Lägger till medlem..."
 
-#: ../src/config.py:2818
+#: ../src/config.py:2834
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6403,11 +6568,11 @@ msgstr ""
 "<b>Vem vill du göra till medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2836
 msgid "Adding Owner..."
 msgstr "Lägger till ägare..."
 
-#: ../src/config.py:2821
+#: ../src/config.py:2837
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6415,11 +6580,11 @@ msgstr ""
 "<b>Vem vill du göra till ägare?</b>\n"
 "\n"
 
-#: ../src/config.py:2823
+#: ../src/config.py:2839
 msgid "Adding Administrator..."
 msgstr "Lägger till administratör..."
 
-#: ../src/config.py:2824
+#: ../src/config.py:2840
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6427,7 +6592,7 @@ msgstr ""
 "<b>Vem vill du göra till administratör?</b>\n"
 "\n"
 
-#: ../src/config.py:2825
+#: ../src/config.py:2841
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6443,83 +6608,83 @@ 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:2926
+#: ../src/config.py:2943
 #, python-format
 msgid "Removing %s account"
 msgstr "Tar bort %s konto"
 
-#: ../src/config.py:2941
+#: ../src/config.py:2958
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Känsloikoner inaktiverade"
 
-#: ../src/config.py:2942
+#: ../src/config.py:2959
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2955 ../src/gui_interface.py:1132
-#: ../src/gui_interface.py:1243
+#: ../src/config.py:2972 ../src/gui_interface.py:311
+#: ../src/gui_interface.py:1048
 msgid "Password Required"
 msgstr "Lösenord krävs"
 
-#: ../src/config.py:2956 ../src/gui_interface.py:1223
+#: ../src/config.py:2973 ../src/gui_interface.py:1028
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Ange ditt lösenord för kontot %s"
 
-#: ../src/config.py:2957 ../src/gui_interface.py:1243
+#: ../src/config.py:2974 ../src/gui_interface.py:1048
 msgid "Save password"
 msgstr "Spara lösenord"
 
-#: ../src/config.py:2967
+#: ../src/config.py:2984
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" är anslutet till servern"
 
-#: ../src/config.py:2968
+#: ../src/config.py:2985
 msgid "If you remove it, the connection will be lost."
 msgstr "Om du tar bort det kommer anslutningen att förloras."
 
-#: ../src/config.py:2982
+#: ../src/config.py:2999
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Anslutning till proxyservern misslyckades"
 
-#: ../src/config.py:2983
+#: ../src/config.py:3000
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Vad vill du göra?"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3001
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Ta bort kontot _endast från Gajim"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3002
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3078
+#: ../src/config.py:3095
 msgid "?print_status:All"
 msgstr "?print_status:Alla"
 
-#: ../src/config.py:3079
+#: ../src/config.py:3096
 msgid "Enter and leave only"
 msgstr "In- och utgång enbart"
 
-#: ../src/config.py:3080
+#: ../src/config.py:3097
 msgid "?print_status:None"
 msgstr "?print_status:Ingen"
 
-#: ../src/config.py:3150
+#: ../src/config.py:3167
 msgid "New Group Chat"
 msgstr "Ny gruppchatt"
 
-#: ../src/config.py:3183
+#: ../src/config.py:3200
 msgid "This bookmark has invalid data"
 msgstr "Det här bokmärket har ogiltig data"
 
-#: ../src/config.py:3184
+#: ../src/config.py:3201
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6527,27 +6692,27 @@ msgstr ""
 "bokmärket."
 
 #. invalid char
-#: ../src/config.py:3302 ../src/dialogs.py:1934
+#: ../src/config.py:3319 ../src/dialogs.py:1950
 msgid "Invalid nickname"
 msgstr "Ogiltigt smeknamn"
 
-#: ../src/config.py:3303 ../src/config.py:3317 ../src/config.py:3331
+#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
 msgid "Character not allowed"
 msgstr "Tecknet tillåts inte"
 
-#: ../src/config.py:3316 ../src/config.py:3582
+#: ../src/config.py:3333 ../src/config.py:3599
 msgid "Invalid server"
 msgstr "Ogiltig server"
 
-#: ../src/config.py:3330
+#: ../src/config.py:3347
 msgid "Invalid room"
 msgstr "Ogiltigt rum"
 
-#: ../src/config.py:3498
+#: ../src/config.py:3515
 msgid "Account has been added successfully"
 msgstr "Kontot har lagts till"
 
-#: ../src/config.py:3499 ../src/config.py:3505
+#: ../src/config.py:3516 ../src/config.py:3522
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6557,33 +6722,33 @@ 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:3504
+#: ../src/config.py:3521
 msgid "Your new account has been created successfully"
 msgstr "Ditt nya konto har skapats"
 
-#: ../src/config.py:3543
+#: ../src/config.py:3560
 msgid "Invalid username"
 msgstr "Ogiltigt användarnamn"
 
-#: ../src/config.py:3545
+#: ../src/config.py:3562
 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:3583
+#: ../src/config.py:3600
 msgid "Please provide a server on which you want to register."
 msgstr "Ange en server på vilken du vill registrera."
 
-#: ../src/config.py:3639 ../src/gui_interface.py:1904
+#: ../src/config.py:3656 ../src/gui_interface.py:1693
 msgid "Certificate Already in File"
 msgstr "Certifikatet finns redan i filen"
 
-#: ../src/config.py:3640 ../src/gui_interface.py:1905
+#: ../src/config.py:3657 ../src/gui_interface.py:1694
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 "Detta certifikat finns redan i filen %s så det har inte lagts till igen."
 
-#: ../src/config.py:3717
+#: ../src/config.py:3734
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6598,7 +6763,7 @@ msgstr ""
 "SSL-fel: %(error)s\n"
 "Vill du fortfarande ansluta till denna server?"
 
-#: ../src/config.py:3723 ../src/gui_interface.py:1932
+#: ../src/config.py:3740 ../src/gui_interface.py:1721
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6609,70 +6774,79 @@ msgstr ""
 "SHA1-fingeravtryck för certifikatet:\n"
 "%s"
 
-#: ../src/config.py:3755 ../src/config.py:3789
+#: ../src/config.py:3772 ../src/config.py:3806
 msgid "An error occurred during account creation"
 msgstr "Ett fel uppstod när kontot skapades"
 
-#: ../src/config.py:3854
+#: ../src/config.py:3871
 msgid "Account name is in use"
 msgstr "Kontonamnet används redan"
 
-#: ../src/config.py:3855
+#: ../src/config.py:3872
 msgid "You already have an account using this name."
 msgstr "Du har redan ett konto med det namnet."
 
-#: ../src/config.py:4009
+#: ../src/config.py:3991
+msgid "PEP node was not removed"
+msgstr "PEP-noden togs inte bort"
+
+#: ../src/config.py:3992
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr "PEP-noden %(node)s blev inte borttagen: %(message)s"
+
+#: ../src/config.py:4036
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:4017
+#: ../src/config.py:4044
 msgid "Event"
 msgstr "Händelse"
 
-#: ../src/config.py:4052
+#: ../src/config.py:4079
 msgid "First Message Received"
 msgstr "Första meddelandet mottaget"
 
-#: ../src/config.py:4053
+#: ../src/config.py:4080
 msgid "Next Message Received Focused"
 msgstr "Nästa meddelande blev fokuserat"
 
-#: ../src/config.py:4055
+#: ../src/config.py:4082
 msgid "Next Message Received Unfocused"
 msgstr "Nästa meddelande blev ofokuserat"
 
-#: ../src/config.py:4056
+#: ../src/config.py:4083
 msgid "Contact Connected"
 msgstr "Kontakt loggade in"
 
-#: ../src/config.py:4057
+#: ../src/config.py:4084
 msgid "Contact Disconnected"
 msgstr "Kontakt loggade ut"
 
-#: ../src/config.py:4058
+#: ../src/config.py:4085
 msgid "Message Sent"
 msgstr "Meddelande skickat"
 
-#: ../src/config.py:4059
+#: ../src/config.py:4086
 msgid "Group Chat Message Highlight"
 msgstr "Meddelande markerat i gruppchatt"
 
-#: ../src/config.py:4060
+#: ../src/config.py:4087
 msgid "Group Chat Message Received"
 msgstr "Meddelande mottaget i gruppchatt"
 
-#: ../src/config.py:4061
+#: ../src/config.py:4088
 msgid "GMail Email Received"
 msgstr "E-post mottaget på GMail"
 
-#: ../src/conversation_textview.py:600
+#: ../src/conversation_textview.py:601
 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:619
+#: ../src/conversation_textview.py:620
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6680,45 +6854,45 @@ msgstr ""
 "Texten under denna linje är vad som har sagts\n"
 "sedan du senast hade fokus på denna gruppchatt"
 
-#: ../src/conversation_textview.py:739
+#: ../src/conversation_textview.py:740
 #, fuzzy
 msgid "_Quote"
 msgstr "A_vsluta"
 
-#: ../src/conversation_textview.py:746
+#: ../src/conversation_textview.py:747
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Åtgärder för \"%s\""
 
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Read _Wikipedia Article"
 msgstr "Läs _Wikipedia Artikel"
 
-#: ../src/conversation_textview.py:763
+#: ../src/conversation_textview.py:765
 msgid "Look it up in _Dictionary"
 msgstr "Kolla upp det i _Uppslagsbok"
 
-#: ../src/conversation_textview.py:780
+#: ../src/conversation_textview.py:782
 #, 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:793
+#: ../src/conversation_textview.py:795
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL för webbsökning saknar ett \"%s\""
 
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 msgid "Web _Search for it"
 msgstr "_Sök på webben efter det"
 
-#: ../src/conversation_textview.py:802
+#: ../src/conversation_textview.py:804
 msgid "Open as _Link"
 msgstr "Öppna som _länk"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1296
+#: ../src/conversation_textview.py:1298
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6726,180 +6900,185 @@ msgstr[0] "Igår"
 msgstr[1] "Igår"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1344 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Ämne: %s\n"
 
-#: ../src/dataforms_widget.py:544
+#: ../src/dataforms_widget.py:545
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Kunde inte läsa in idle-modul"
 
-#: ../src/dataforms_widget.py:546
+#: ../src/dataforms_widget.py:547
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Osynlighet stöds inte"
 
-#: ../src/dataforms_widget.py:601
+#: ../src/dataforms_widget.py:562
+msgid "This field is required"
+msgstr ""
+
+#: ../src/dataforms_widget.py:607
 msgid "Jabber ID already in list"
 msgstr "Jabber-ID finns redan i listan"
 
-#: ../src/dataforms_widget.py:602
+#: ../src/dataforms_widget.py:608
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:613
+#: ../src/dataforms_widget.py:619
 msgid "new@jabber.id"
 msgstr "ny@jabber.id"
 
-#: ../src/dataforms_widget.py:616 ../src/dataforms_widget.py:618
+#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "ny%d@jabber.id"
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktens namn: <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber-ID: <i>%s</i>"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:195
 msgid "Group"
 msgstr "Grupp"
 
-#: ../src/dialogs.py:201
+#: ../src/dialogs.py:202
 msgid "In the group"
 msgstr "I gruppen"
 
-#: ../src/dialogs.py:292
+#: ../src/dialogs.py:293
 msgid "KeyID"
 msgstr "Nyckel-ID"
 
-#: ../src/dialogs.py:297
+#: ../src/dialogs.py:298
 msgid "Contact name"
 msgstr "Kontaktnamn"
 
-#: ../src/dialogs.py:469
+#: ../src/dialogs.py:470
 msgid "Set Mood"
 msgstr "Ange humör"
 
-#: ../src/dialogs.py:589
+#: ../src/dialogs.py:590
 #, python-format
 msgid "%s Status Message"
 msgstr "Statusmeddelande för %s"
 
-#: ../src/dialogs.py:603
+#: ../src/dialogs.py:604
 msgid "Status Message"
 msgstr "Statusmeddelande"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:794
 msgid "Overwrite Status Message?"
 msgstr "Skriv över statusmeddelande?"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:795
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Detta namn används redan. Vill du skriva över detta statusmeddelande?"
 
-#: ../src/dialogs.py:802
+#: ../src/dialogs.py:803
 msgid "Save as Preset Status Message"
 msgstr "Spara som Valbart Statusmeddelande"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:804
 msgid "Please type a name for this status message"
 msgstr "Ange ett namn för detta statusmeddelande"
 
-#: ../src/dialogs.py:831
+#: ../src/dialogs.py:832
 msgid "AIM Address:"
 msgstr "AIM-adress:"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:833
 msgid "GG Number:"
 msgstr "GG-nummer:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:834
 msgid "ICQ Number:"
 msgstr "ICQ-nummer:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:835
 msgid "MSN Address:"
 msgstr "MSN-adress:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:836
 msgid "Yahoo! Address:"
 msgstr "Yahoo!-adress:"
 
-#: ../src/dialogs.py:872
+#: ../src/dialogs.py:873
 #, 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:875
+#: ../src/dialogs.py:876
 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:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
+#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
+#: ../src/dialogs.py:3464
 msgid "Invalid User ID"
 msgstr "Ogiltigt Jabber-ID"
 
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1052
 msgid "The user ID must not contain a resource."
 msgstr "Användarens ID får inte innehålla en resurs."
 
-#: ../src/dialogs.py:1051
+#: ../src/dialogs.py:1057
 msgid "You cannot add yourself to your roster."
 msgstr "Du kan inte lägga till dig själv i din kontaktlista."
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1071
 msgid "Contact already in roster"
 msgstr "Kontakten finns redan i kontaktlistan"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1072
 msgid "This contact is already listed in your roster."
 msgstr "Denna kontakt finns redan i din kontaktlista."
 
-#: ../src/dialogs.py:1112
+#: ../src/dialogs.py:1118
 msgid "User ID:"
 msgstr "Användar-id:"
 
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1189
 msgid "A GTK+ jabber client"
 msgstr "En GTK+ jabberklient"
 
-#: ../src/dialogs.py:1176
+#: ../src/dialogs.py:1190
 msgid "GTK+ Version:"
 msgstr "GTK+ version:"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1191
 msgid "PyGTK Version:"
 msgstr "PyGTK version:"
 
-#: ../src/dialogs.py:1187
+#: ../src/dialogs.py:1201
 msgid "Current Developers:"
 msgstr "Nuvarande utvecklare:"
 
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1203
 msgid "Past Developers:"
 msgstr "Tidigare utvecklare:"
 
-#: ../src/dialogs.py:1195
+#: ../src/dialogs.py:1209
 msgid "THANKS:"
 msgstr "TACK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1215
 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:1213
+#: ../src/dialogs.py:1227
 msgid "translator-credits"
 msgstr ""
 "Daniel Nylander <po@danielnylander.se>\n"
@@ -6909,7 +7088,7 @@ msgstr ""
 "Skicka synpunkter på översättningen till\n"
 "<tp-sv@listor.tp-sv.se>."
 
-#: ../src/dialogs.py:1396
+#: ../src/dialogs.py:1410
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6922,104 +7101,104 @@ msgstr ""
 "\n"
 "Markeringsfunktionen för felstavade ord kommer inte att användas"
 
-#: ../src/dialogs.py:1935 ../src/dialogs.py:2322
+#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
 msgid "The nickname has not allowed characters."
 msgstr "Smeknamnet innehåller icke-tillåtna tecken."
 
-#: ../src/dialogs.py:2053
+#: ../src/dialogs.py:2069
 #, 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:2056
+#: ../src/dialogs.py:2072
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Prenumerationsförfrågan från %s"
 
-#: ../src/dialogs.py:2131 ../src/gui_interface.py:2672
+#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Du är redan i gruppchatten %s"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2153
 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:2178
+#: ../src/dialogs.py:2194
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Anslut till gruppchatt med konto %s"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2325
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Ogiltigt kontonamn"
 
-#: ../src/dialogs.py:2310
+#: ../src/dialogs.py:2326
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Konto från vilket du vill gå in i rummet"
 
-#: ../src/dialogs.py:2321
+#: ../src/dialogs.py:2337
 msgid "Invalid Nickname"
 msgstr "Ogiltigt smeknamn"
 
-#: ../src/dialogs.py:2326 ../src/dialogs.py:2332
-#: ../src/groupchat_control.py:1832
+#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
+#: ../src/groupchat_control.py:1847
 #, fuzzy
 msgid "Invalid group chat Jabber ID"
 msgstr "Ogiltigt Jabber-ID"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2343
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "Rums- eller servernamnet innehåller icke tillåtna tecken."
 
-#: ../src/dialogs.py:2333 ../src/groupchat_control.py:1833
+#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
 #, fuzzy
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Rums- eller servernamnet innehåller icke tillåtna tecken."
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2356
 msgid "This is not a group chat"
 msgstr "Det här är ingen gruppchatt"
 
-#: ../src/dialogs.py:2341
+#: ../src/dialogs.py:2357
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s är inte namnet på en gruppchatt."
 
-#: ../src/dialogs.py:2372
+#: ../src/dialogs.py:2388
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Du kan inte synkronisera dina kontakter utan en anslutning."
 
-#: ../src/dialogs.py:2386
+#: ../src/dialogs.py:2402
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2421
+#: ../src/dialogs.py:2437
 msgid "This account is not connected to the server"
 msgstr "Detta konto är inte anslutet till servern"
 
-#: ../src/dialogs.py:2422
+#: ../src/dialogs.py:2438
 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:2446
+#: ../src/dialogs.py:2462
 msgid "Synchronise"
 msgstr "Synkronisera"
 
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2523
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Starta Chatt med konto %s"
 
-#: ../src/dialogs.py:2509
+#: ../src/dialogs.py:2525
 msgid "Start Chat"
 msgstr "Starta Chatt"
 
-#: ../src/dialogs.py:2510
+#: ../src/dialogs.py:2526
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7028,168 +7207,168 @@ msgstr ""
 "skicka ett chattmeddelande till:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2536 ../src/dialogs.py:2917 ../src/dialogs.py:3129
+#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
 msgid "Connection not available"
 msgstr "Anslutningen är inte tillgänglig"
 
-#: ../src/dialogs.py:2537 ../src/dialogs.py:2918 ../src/dialogs.py:3130
+#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Kontrollera att du är ansluten med \"%s\"."
 
-#: ../src/dialogs.py:2546 ../src/dialogs.py:2549
+#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
 msgid "Invalid JID"
 msgstr "Ogiltigt JID"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2565
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kunde inte tolka \"%s\"."
 
-#: ../src/dialogs.py:2558
+#: ../src/dialogs.py:2574
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan inte ändra ditt lösenord utan en anslutning."
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "Invalid password"
 msgstr "Ogiltigt lösenord"
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "You must enter a password."
 msgstr "Du måste skriva in ett lösenord."
 
-#: ../src/dialogs.py:2581
+#: ../src/dialogs.py:2597
 msgid "Passwords do not match"
 msgstr "Lösenorden stämmer inte överens"
 
-#: ../src/dialogs.py:2582
+#: ../src/dialogs.py:2598
 msgid "The passwords typed in both fields must be identical."
 msgstr "Lösenorden skrivna i båda fälten måste vara identiska."
 
 #. default value
-#: ../src/dialogs.py:2619 ../src/notify.py:247 ../src/notify.py:473
+#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
 msgid "Contact Signed In"
 msgstr "Kontakten loggade in"
 
-#: ../src/dialogs.py:2621 ../src/notify.py:255 ../src/notify.py:475
+#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
 msgid "Contact Signed Out"
 msgstr "Kontakt Loggade Ut"
 
 #. chat message
-#: ../src/dialogs.py:2623 ../src/notify.py:277 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
 msgid "New Message"
 msgstr "Nytt Meddelande"
 
 #. single message
-#: ../src/dialogs.py:2623 ../src/notify.py:259 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
 msgid "New Single Message"
 msgstr "Nytt Enstaka Meddelande"
 
 #. private message
-#: ../src/dialogs.py:2624 ../src/notify.py:265 ../src/notify.py:478
+#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
 msgid "New Private Message"
 msgstr "Skicka Privat Meddelande"
 
-#: ../src/dialogs.py:2624 ../src/gui_interface.py:1358 ../src/notify.py:487
+#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: ../src/dialogs.py:2626 ../src/gui_interface.py:1420 ../src/notify.py:480
+#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
 msgid "File Transfer Request"
 msgstr "Förfrågan om Filöverföring"
 
-#: ../src/dialogs.py:2628 ../src/gui_interface.py:1320
-#: ../src/gui_interface.py:1389 ../src/notify.py:482
+#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
+#: ../src/gui_interface.py:1186 ../src/notify.py:482
 msgid "File Transfer Error"
 msgstr "Fel i Filöverföring"
 
-#: ../src/dialogs.py:2630 ../src/gui_interface.py:1466
-#: ../src/gui_interface.py:1489 ../src/gui_interface.py:1506
+#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
+#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
 #: ../src/notify.py:484
 msgid "File Transfer Completed"
 msgstr "Filöverföring Klar"
 
-#: ../src/dialogs.py:2631 ../src/gui_interface.py:1469 ../src/notify.py:485
+#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
 msgid "File Transfer Stopped"
 msgstr "Filöverföring Stoppad"
 
-#: ../src/dialogs.py:2633 ../src/gui_interface.py:1152 ../src/notify.py:489
+#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
 msgid "Groupchat Invitation"
 msgstr "Inbjudan till Gruppchatt"
 
-#: ../src/dialogs.py:2635 ../src/notify.py:239 ../src/notify.py:491
+#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
 msgid "Contact Changed Status"
 msgstr "Kontakten ändrade status"
 
-#: ../src/dialogs.py:2836
+#: ../src/dialogs.py:2852
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Ett meddelande med kontot %s"
 
-#: ../src/dialogs.py:2838
+#: ../src/dialogs.py:2854
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Ett meddelande i kontot %s"
 
-#: ../src/dialogs.py:2840
+#: ../src/dialogs.py:2856
 msgid "Single Message"
 msgstr "Enstaka meddelande"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2843
+#: ../src/dialogs.py:2859
 #, python-format
 msgid "Send %s"
 msgstr "Skicka %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:2882
 #, python-format
 msgid "Received %s"
 msgstr "Mottog %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2889
+#: ../src/dialogs.py:2905
 #, 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:2968
+#: ../src/dialogs.py:2984
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:2985
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:3028
+#: ../src/dialogs.py:3044
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML-konsol för %s"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3046
 msgid "XML Console"
 msgstr "XML-konsol"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "add"
 msgstr "Ledsen"
 
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "modify"
 msgstr "Ändra"
 
-#: ../src/dialogs.py:3160
+#: ../src/dialogs.py:3176
 #, fuzzy
 msgid "remove"
 msgstr "Ta _bort"
 
-#: ../src/dialogs.py:3188
+#: ../src/dialogs.py:3204
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7197,155 +7376,189 @@ msgid ""
 msgstr "<b>%s</b> vill att du <b>%s</b> några kontakter i din kontaktlista."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3204 ../src/dialogs.py:3250
+#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
 msgid "Add"
 msgstr "Lägg till"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3206 ../src/dialogs.py:3281
+#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
 msgid "Modify"
 msgstr "Ändra"
 
-#: ../src/dialogs.py:3212
+#: ../src/dialogs.py:3228
 msgid "Jabber ID"
 msgstr "Jabber-ID"
 
-#: ../src/dialogs.py:3218
+#: ../src/dialogs.py:3234
 msgid "Groups"
 msgstr "Grupper"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3342
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s föreslog att lägga till dig i min kontaktlista."
 
-#: ../src/dialogs.py:3340
+#: ../src/dialogs.py:3356
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "_Lägg till kontakt"
 
-#: ../src/dialogs.py:3377
+#: ../src/dialogs.py:3393
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Ta bort en kontakt från kontaktlista"
 
-#: ../src/dialogs.py:3430
+#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#, python-format
+msgid "Archiving Preferences for %s"
+msgstr ""
+
+#: ../src/dialogs.py:3473
+#, fuzzy
+msgid "Invalid expire value"
+msgstr "Ogiltigt servernamn"
+
+#: ../src/dialogs.py:3474
+msgid "Expire must be a valid positive integer."
+msgstr ""
+
+#: ../src/dialogs.py:3521
+msgid "There is an error with the form"
+msgstr ""
+
+#: ../src/dialogs.py:3732
+#, fuzzy
+msgid "There is an error"
+msgstr "Tjänsten returnerade ett fel."
+
+#: ../src/dialogs.py:3796
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privat identitetslista <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3434
+#: ../src/dialogs.py:3800
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privat integritetslista för %s"
 
-#: ../src/dialogs.py:3490
+#: ../src/dialogs.py:3856
 #, 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:3495
+#: ../src/dialogs.py:3861
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordning: %(order)s, åtgärd: %(action)s"
 
-#: ../src/dialogs.py:3539
+#: ../src/dialogs.py:3905
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Redigera en regel</b>"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:4016
 msgid "<b>Add a rule</b>"
 msgstr "<b>Lägg till en regel</b>"
 
-#: ../src/dialogs.py:3750
+#: ../src/dialogs.py:4116
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privata integritetslistor för %s"
 
-#: ../src/dialogs.py:3752
+#: ../src/dialogs.py:4118
 msgid "Privacy Lists"
 msgstr "Integritetslistor"
 
-#: ../src/dialogs.py:3822
+#: ../src/dialogs.py:4188
 msgid "Invalid List Name"
 msgstr "Ogiltigt listnamn"
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4189
 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:3855
+#: ../src/dialogs.py:4221
 msgid "You are invited to a groupchat"
 msgstr "Du är inbjuden till en gruppchatt"
 
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4224
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact har bjudit in dig till en diskussion"
 
-#: ../src/dialogs.py:3860
+#: ../src/dialogs.py:4226
 #, 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:3868
+#: ../src/dialogs.py:4234
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4236
 msgid "Do you want to accept the invitation?"
 msgstr "Vill du acceptera inbjudan?"
 
-#: ../src/dialogs.py:3932
+#: ../src/dialogs.py:4298
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:3942 ../src/dialogs.py:3985 ../src/dialogs.py:4041
+#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
+#: ../src/dialogs.py:4495
 msgid "All files"
 msgstr "Alla filer"
 
-#: ../src/dialogs.py:3947
+#: ../src/dialogs.py:4313
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:3975
+#: ../src/dialogs.py:4341
 msgid "Choose Sound"
 msgstr "Välj ljud"
 
-#: ../src/dialogs.py:3990
+#: ../src/dialogs.py:4356
 msgid "Wav Sounds"
 msgstr "Wav-ljud"
 
-#: ../src/dialogs.py:4028
+#: ../src/dialogs.py:4394
 msgid "Choose Image"
 msgstr "Välj Bild"
 
-#: ../src/dialogs.py:4046
+#: ../src/dialogs.py:4412
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:4113
+#: ../src/dialogs.py:4482
+#, fuzzy
+msgid "Choose Archive"
+msgstr "Välj Bild"
+
+#: ../src/dialogs.py:4500
+#, fuzzy
+msgid "Zip files"
+msgstr "Alla filer"
+
+#: ../src/dialogs.py:4525
 #, python-format
 msgid "When %s becomes:"
 msgstr "När %s blir:"
 
-#: ../src/dialogs.py:4115
+#: ../src/dialogs.py:4527
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Lägger Till Speciellt Meddelande För %s"
 
-#: ../src/dialogs.py:4190
+#: ../src/dialogs.py:4602
 msgid "Condition"
 msgstr "Villkor"
 
-#: ../src/dialogs.py:4310
+#: ../src/dialogs.py:4722
 msgid "when I am "
 msgstr "när jag är "
 
-#: ../src/dialogs.py:4786
+#: ../src/dialogs.py:5198
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7356,38 +7569,38 @@ msgstr ""
 "\n"
 "Denna sessions Short Authentication String är <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4789
+#: ../src/dialogs.py:5201
 msgid "You have already verified this contact's identity."
 msgstr "Du har redan verifierat identiteten för denna kontakt."
 
-#: ../src/dialogs.py:4795 ../src/dialogs.py:4879
+#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
 msgid "Contact's identity verified"
 msgstr "Kontaktens identitet är verifierad"
 
-#: ../src/dialogs.py:4801
+#: ../src/dialogs.py:5213
 msgid "Verify again..."
 msgstr "Verifiera igen..."
 
-#: ../src/dialogs.py:4806
+#: ../src/dialogs.py:5218
 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:4809 ../src/dialogs.py:4860 ../src/dialogs.py:4873
+#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktens identitet är INTE verifierad"
 
-#: ../src/dialogs.py:4814
+#: ../src/dialogs.py:5226
 msgid "Verify..."
 msgstr "Verifiera..."
 
-#: ../src/dialogs.py:4825
+#: ../src/dialogs.py:5237
 msgid "Have you verified the contact's identity?"
 msgstr "Har du verifierat kontaktens identitet?"
 
-#: ../src/dialogs.py:4826
+#: ../src/dialogs.py:5238
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7397,44 +7610,44 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4827
+#: ../src/dialogs.py:5239
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4861
+#: ../src/dialogs.py:5273
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4867
+#: ../src/dialogs.py:5279
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4874
+#: ../src/dialogs.py:5286
 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:4880
+#: ../src/dialogs.py:5292
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:4945
+#: ../src/dialogs.py:5357
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4947
+#: ../src/dialogs.py:5359
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4949
+#: ../src/dialogs.py:5361
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4953
+#: ../src/dialogs.py:5365
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7450,24 +7663,24 @@ msgstr "Andra"
 msgid "Conference"
 msgstr "Konferens"
 
-#: ../src/disco.py:512
+#: ../src/disco.py:513
 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:589
+#: ../src/disco.py:600
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Söker tjänster med konto %s"
 
-#: ../src/disco.py:591
+#: ../src/disco.py:602
 msgid "Service Discovery"
 msgstr "Tjänstefinnare"
 
-#: ../src/disco.py:741
+#: ../src/disco.py:758
 msgid "The service could not be found"
 msgstr "Denna tjänst kunde inte hittas"
 
-#: ../src/disco.py:742
+#: ../src/disco.py:759
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7475,93 +7688,93 @@ msgstr ""
 "Adressen du angav är ingen tjänstadress eller så svarar inte tjänsten. "
 "Kontrollera adressen och försök igen."
 
-#: ../src/disco.py:746 ../src/disco.py:1082
+#: ../src/disco.py:763 ../src/disco.py:1100
 msgid "The service is not browsable"
 msgstr "Tjänst är inte bläddringsbar"
 
-#: ../src/disco.py:747
+#: ../src/disco.py:764
 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:786 ../src/disco.py:796
+#: ../src/disco.py:804 ../src/disco.py:814
 msgid "Invalid Server Name"
 msgstr "Ogiltigt servernamn"
 
-#: ../src/disco.py:850
+#: ../src/disco.py:868
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Bläddrar i %(address)s med kontot %(account)s"
 
-#: ../src/disco.py:894
+#: ../src/disco.py:912
 msgid "_Browse"
 msgstr "_Bläddra"
 
-#: ../src/disco.py:1083
+#: ../src/disco.py:1101
 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:1323
+#: ../src/disco.py:1341
 msgid "_Execute Command"
 msgstr "_Kör kommando"
 
-#: ../src/disco.py:1333 ../src/disco.py:1504
+#: ../src/disco.py:1351 ../src/disco.py:1522
 msgid "Re_gister"
 msgstr "Re_gistrera"
 
-#: ../src/disco.py:1545
+#: ../src/disco.py:1563
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Söker av %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1736
+#: ../src/disco.py:1754
 msgid "Users"
 msgstr "Användare"
 
 #. Description column
-#: ../src/disco.py:1744
+#: ../src/disco.py:1762
 msgid "Description"
 msgstr "Beskrivning"
 
 #. Id column
-#: ../src/disco.py:1752
+#: ../src/disco.py:1770
 msgid "Id"
 msgstr "ID"
 
-#: ../src/disco.py:1817 ../src/gui_interface.py:3182
+#: ../src/disco.py:1835 ../src/gui_interface.py:2995
 msgid "Bookmark already set"
 msgstr "Bokmärke finns redan"
 
-#: ../src/disco.py:1818 ../src/gui_interface.py:3183
+#: ../src/disco.py:1836 ../src/gui_interface.py:2996
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Gruppchatten \"%s\" finns redan i dina bokmärken."
 
-#: ../src/disco.py:1827 ../src/gui_interface.py:3197
+#: ../src/disco.py:1845 ../src/gui_interface.py:3010
 msgid "Bookmark has been added successfully"
 msgstr "Bokmärket har lagts till"
 
-#: ../src/disco.py:1828 ../src/gui_interface.py:3198
+#: ../src/disco.py:1846 ../src/gui_interface.py:3011
 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:2039
+#: ../src/disco.py:2057
 msgid "Subscribed"
 msgstr "Prenumererar"
 
-#: ../src/disco.py:2047
+#: ../src/disco.py:2065
 msgid "Node"
 msgstr "Nod"
 
-#: ../src/disco.py:2111
+#: ../src/disco.py:2129
 msgid "New post"
 msgstr "Ny post"
 
-#: ../src/disco.py:2117
+#: ../src/disco.py:2135
 msgid "_Subscribe"
 msgstr "_Prenumerera"
 
-#: ../src/disco.py:2123
+#: ../src/disco.py:2141
 msgid "_Unsubscribe"
 msgstr "Säg _upp prenumeration"
 
@@ -7731,17 +7944,19 @@ msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Transformera LaTeX-uttryck mellan $$ $$."
 
 #: ../src/features_window.py:95
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
-"in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 "Kräver texlive-latex-base och dvipng. Du måste ställa in \"use_latex\" till "
 "True i avancerad konfiguration."
 
 #: ../src/features_window.py:96
+#, fuzzy
 msgid ""
-"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
+"You have to set 'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 "Kräver texlive-latex-base och dvipng (Allt finns i MikTeX). Du måste ställa "
 "in \"use_latex\" till True i avancerad konfiguration."
@@ -7899,12 +8114,12 @@ msgstr "Beskrivning: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s vill skicka en fil till dig:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Kan inte skriva över befintliga filen \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -7912,22 +8127,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:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 msgid "This file already exists"
 msgstr "Den här filen finns redan"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 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:369 ../src/gtkgui_helpers.py:914
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Katalogen \"%s\" är inte skrivbar"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
 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."
 
@@ -8029,29 +8244,29 @@ msgstr ""
 "En annan instans of Gajim verkar redan vara igång\n"
 "Starta ändå?"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
 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:80
+#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
 msgid "command"
 msgstr "kommando"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "visar hjälp för kommando"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Visar eller döljer kontaktlistan"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
 #, 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:93
+#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8059,6 +8274,13 @@ msgstr ""
 "Skriver ut en lista över alla kontakter i kontaktlistan. Varje kontakt "
 "hamnar på en egen rad"
 
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
+#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
+#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
+#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
 #: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
 #: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
 #: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
@@ -8070,41 +8292,33 @@ msgstr ""
 msgid "account"
 msgstr "konto"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "visa bara kontakter för det givna kontot"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Skriver ut en lista över registrerade konton"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
 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:109
+#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106
 #, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"accoun't previous status"
+msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "en av: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
-msgid "message"
-msgstr "meddelande"
-
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "statusmeddelande"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8112,48 +8326,21 @@ 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:117
-#, fuzzy
-msgid "Changes the priority of account or accounts"
-msgstr "Ändrar status för konto eller konton"
-
-#: ../src/gajim-remote.py:119
-#, fuzzy
-msgid "priority"
-msgstr "Priori_tet:"
-
-#: ../src/gajim-remote.py:119
-#, fuzzy
-msgid "priority you want to give to the account"
-msgstr "Jag vill _registrera ett nytt konto"
-
-#: ../src/gajim-remote.py:121
-#, fuzzy
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-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:127
+#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
 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:129
+#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID för kontakten som du vill chatta med"
 
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
 #: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 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:134
-msgid "message content. The account must be specified or \"\""
-msgstr ""
-
-#: ../src/gajim-remote.py:139
+#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -8164,30 +8351,35 @@ msgstr ""
 "konto är valfria. Om du vill sätta bara \"konto\", utan \"OpenPGP-nyckel\", "
 "sätt bara \"OpenPGP-nyckel\" till \"\"."
 
+#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
 #: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID för kontakten som kommer ta emot meddelandet"
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
+#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "meddelandeinnehåll"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "pgp-nyckel"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "om specificerat kommer meddelandet bli krypterat med den här publika nyckeln"
 
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
+#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "om specificerat kommer meddelandet bli skickat genom det här kontot"
 
-#: ../src/gajim-remote.py:152
+#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -8198,108 +8390,282 @@ msgstr ""
 "konto är valfria. Om du vill sätta bara \"konto\", utan \"OpenPGP-nyckel\", "
 "sätt bara \"OpenPGP-nyckel\" till \"\"."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "ämne"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "meddelandeämne"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Skickar nytt meddelande till en gruppchatt som du gått in i."
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "JID för rummet som kommer ta emot meddelandet"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Hämta detaljerad information om kontakt"
 
+#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
+#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
 #: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
 #: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID för kontakten"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Hämtar detaljerad information för kontakt"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Namn för kontot"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Skicka fil till en kontakt"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "file"
 msgstr "fil"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Sökväg"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "om specificerat kommer filen bli skickad genom det här kontot"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Listar alla inställningar och deras värden"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sätter värdet av \"nyckel\" till \"värde\"."
 
-#: ../src/gajim-remote.py:202
-msgid "key=value"
-msgstr "nyckel=värde"
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+msgid "key=value"
+msgstr "nyckel=värde"
+
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+msgid "'key' is the name of the preference, 'value' is the value to set it to"
+msgstr ""
+"\"nyckel\" är namnet på inställningen, \"värde\" är värdet att sätta den till"
+
+#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
+msgid "Deletes a preference item"
+msgstr "Tar bort en inställning"
+
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "key"
+msgstr "nyckel"
+
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "name of the preference to be deleted"
+msgstr "namnet på inställningen som skall tas bort"
+
+#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+msgid "Writes the current state of Gajim preferences to the .config file"
+msgstr "Skriver Gajims nuvarande inställningar till .config-filen"
+
+#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
+msgid "Removes contact from roster"
+msgstr "Ta bort en kontakt från kontaktlista"
+
+#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+msgid "Adds contact to roster"
+msgstr "Lägger till en kontakt till kontaktlistan"
+
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+msgid "Adds new contact to this account"
+msgstr "Lägger till ny kontakt till detta kontot"
+
+#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+msgid "Returns current status (the global one unless account is specified)"
+msgstr ""
+"Returnerar nuvarande status (global status om inget konto specificerats)"
+
+#: ../src/gajim-remote-plugin.py:226
+#, fuzzy
+msgid ""
+"Returns current status message(the global one unless account is specified)"
+msgstr ""
+"Returnerar nuvarande statusmeddelande (det globala om inget konto "
+"specificerats)"
+
+#: ../src/gajim-remote-plugin.py:233 ../src/gajim-remote.py:249
+msgid "Returns number of unread messages"
+msgstr "Returnerar antalet olästa meddelanden"
+
+#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+msgid "Opens 'Start Chat' dialog"
+msgstr "Öppnar \"Starta chatt\" dialogen"
+
+#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+msgid "Starts chat, using this account"
+msgstr "Startar chatt, med detta kontot"
+
+#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+msgid "Sends custom XML"
+msgstr "Skickar anpassad XML"
+
+#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+msgid "XML to send"
+msgstr "XML att skicka"
+
+#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+"Konto för vilket XML kommer skickas. Om du inte specificerat kommer XML "
+"skickas till alla konton"
+
+#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
+msgid "Handle a xmpp:/ uri"
+msgstr "Hantera en xmpp:/ URI"
+
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
+msgid "uri"
+msgstr "URI"
+
+#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+msgid "Join a MUC room"
+msgstr "GÃ¥ in i ett MUC-rum"
+
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+msgid "room"
+msgstr "rum"
+
+#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+msgid "nick"
+msgstr "smeknamn"
+
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+msgid "password"
+msgstr "lösenord"
+
+#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+msgid "Check if Gajim is running"
+msgstr "Kontrollera om Gajim är igång"
+
+#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
+#: ../src/gajim-remote.py:300
+msgid "Shows or hides the ipython window"
+msgstr "Visar eller döljer ipython-fönstret"
+
+#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+msgid "Missing argument \"contact_jid\""
+msgstr "Saknar argument \"contact_jid\""
+
+#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#, python-format
+msgid ""
+"'%s' is not in your roster.\n"
+"Please specify account for sending the message."
+msgstr ""
+"\"%s\" finns inte i din kontaktlista.\n"
+"Ange konto för att skicka meddelandet."
+
+#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+msgid "You have no active account"
+msgstr "Du har inget aktivt konto"
+
+#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+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-plugin.py:412
+#, python-format
+msgid ""
+"Usage: %s %s %s \n"
+"\t %s"
+msgstr ""
+"Användning: %s %s %s \n"
+"\t %s"
+
+#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+msgid "Arguments:"
+msgstr "Parametrar:"
+
+#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#, python-format
+msgid "%s not found"
+msgstr "%s kunde inte hittas"
 
-#: ../src/gajim-remote.py:202
-msgid "'key' is the name of the preference, 'value' is the value to set it to"
+#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
+#, python-format
+msgid ""
+"Usage: %s command [arguments]\n"
+"Command is one of:\n"
 msgstr ""
-"\"nyckel\" är namnet på inställningen, \"värde\" är värdet att sätta den till"
+"Användning: %s kommando [parametrar]\n"
+"Kommando är en av:\n"
 
-#: ../src/gajim-remote.py:207
-msgid "Deletes a preference item"
-msgstr "Tar bort en inställning"
+#: ../src/gajim-remote-plugin.py:496
+#, fuzzy, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"För många argument. \n"
+"Skriv \"%(basename)s help %(command)s\" för mer information"
 
-#: ../src/gajim-remote.py:209
-msgid "key"
-msgstr "nyckel"
+#: ../src/gajim-remote-plugin.py:500
+#, fuzzy, python-format
+msgid ""
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Argumentet \"%(arg)s\" är inte angivet. \n"
+"Skriv \"%(basename)s help %(command)s\" för mer info"
 
-#: ../src/gajim-remote.py:209
-msgid "name of the preference to be deleted"
-msgstr "namnet på inställningen som skall tas bort"
+#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
+msgid "Wrong uri"
+msgstr "Felaktig uri"
 
-#: ../src/gajim-remote.py:213
-msgid "Writes the current state of Gajim preferences to the .config file"
-msgstr "Skriver Gajims nuvarande inställningar till .config-filen"
+#: ../src/gajim-remote.py:109
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
+msgstr "en av: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:218
-msgid "Removes contact from roster"
-msgstr "Ta bort en kontakt från kontaktlista"
+#: ../src/gajim-remote.py:117
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Ändrar status för konto eller konton"
 
-#: ../src/gajim-remote.py:227
-msgid "Adds contact to roster"
-msgstr "Lägger till en kontakt till kontaktlistan"
+#: ../src/gajim-remote.py:119
+#, fuzzy
+msgid "priority"
+msgstr "Priori_tet:"
 
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "JID"
+#: ../src/gajim-remote.py:119
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Jag vill _registrera ett nytt konto"
 
-#: ../src/gajim-remote.py:230
-msgid "Adds new contact to this account"
-msgstr "Lägger till ny kontakt till detta kontot"
+#: ../src/gajim-remote.py:121
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+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:235
-msgid "Returns current status (the global one unless account is specified)"
+#: ../src/gajim-remote.py:134
+msgid "message content. The account must be specified or \"\""
 msgstr ""
-"Returnerar nuvarande status (global status om inget konto specificerats)"
 
 #: ../src/gajim-remote.py:242
 msgid ""
@@ -8308,34 +8674,6 @@ msgstr ""
 "Returnerar nuvarande statusmeddelande (det globala om inget konto "
 "specificerats)"
 
-#: ../src/gajim-remote.py:249
-msgid "Returns number of unread messages"
-msgstr "Returnerar antalet olästa meddelanden"
-
-#: ../src/gajim-remote.py:253
-msgid "Opens 'Start Chat' dialog"
-msgstr "Öppnar \"Starta chatt\" dialogen"
-
-#: ../src/gajim-remote.py:255
-msgid "Starts chat, using this account"
-msgstr "Startar chatt, med detta kontot"
-
-#: ../src/gajim-remote.py:259
-msgid "Sends custom XML"
-msgstr "Skickar anpassad XML"
-
-#: ../src/gajim-remote.py:261
-msgid "XML to send"
-msgstr "XML att skicka"
-
-#: ../src/gajim-remote.py:262
-msgid ""
-"Account in which the xml will be sent; if not specified, xml will be sent to "
-"all accounts"
-msgstr ""
-"Konto för vilket XML kommer skickas. Om du inte specificerat kommer XML "
-"skickas till alla konton"
-
 #: ../src/gajim-remote.py:268
 #, fuzzy
 msgid "Change the avatar"
@@ -8355,14 +8693,6 @@ msgstr ""
 "Konto för vilket XML kommer skickas. Om du inte specificerat kommer XML "
 "skickas till alla konton"
 
-#: ../src/gajim-remote.py:277
-msgid "Handle a xmpp:/ uri"
-msgstr "Hantera en xmpp:/ URI"
-
-#: ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "URI"
-
 #: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr "URI att hantera"
@@ -8375,30 +8705,14 @@ msgstr "Konto i vilket du vill hanterare den"
 msgid "Message content"
 msgstr "Meddelandeinnehåll"
 
-#: ../src/gajim-remote.py:286
-msgid "Join a MUC room"
-msgstr "GÃ¥ in i ett MUC-rum"
-
-#: ../src/gajim-remote.py:288
-msgid "room"
-msgstr "rum"
-
 #: ../src/gajim-remote.py:288
 msgid "Room JID"
 msgstr "Rummets JID"
 
-#: ../src/gajim-remote.py:289
-msgid "nick"
-msgstr "smeknamn"
-
 #: ../src/gajim-remote.py:289
 msgid "Nickname to use"
 msgstr "Smeknamn att använda"
 
-#: ../src/gajim-remote.py:290
-msgid "password"
-msgstr "lösenord"
-
 #: ../src/gajim-remote.py:290
 msgid "Password to enter the room"
 msgstr "Lösenord för att gå in i rummet"
@@ -8407,37 +8721,6 @@ msgstr "Lösenord för att gå in i rummet"
 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:296
-msgid "Check if Gajim is running"
-msgstr "Kontrollera om Gajim är igång"
-
-#: ../src/gajim-remote.py:300
-msgid "Shows or hides the ipython window"
-msgstr "Visar eller döljer ipython-fönstret"
-
-#: ../src/gajim-remote.py:327
-msgid "Missing argument \"contact_jid\""
-msgstr "Saknar argument \"contact_jid\""
-
-#: ../src/gajim-remote.py:348
-#, python-format
-msgid ""
-"'%s' is not in your roster.\n"
-"Please specify account for sending the message."
-msgstr ""
-"\"%s\" finns inte i din kontaktlista.\n"
-"Ange konto för att skicka meddelandet."
-
-#: ../src/gajim-remote.py:351
-msgid "You have no active account"
-msgstr "Du har inget aktivt konto"
-
-#: ../src/gajim-remote.py:404
-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:431
 #, python-format
 msgid ""
@@ -8447,24 +8730,6 @@ msgstr ""
 "Användning: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:435
-msgid "Arguments:"
-msgstr "Parametrar:"
-
-#: ../src/gajim-remote.py:439
-#, python-format
-msgid "%s not found"
-msgstr "%s kunde inte hittas"
-
-#: ../src/gajim-remote.py:445
-#, python-format
-msgid ""
-"Usage: %s command [arguments]\n"
-"Command is one of:\n"
-msgstr ""
-"Användning: %s kommando [parametrar]\n"
-"Kommando är en av:\n"
-
 #: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
@@ -8487,10 +8752,6 @@ msgstr ""
 msgid "No uri given"
 msgstr ""
 
-#: ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Felaktig uri"
-
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Tema"
@@ -8516,202 +8777,200 @@ msgstr "Du kan inte ta bort ditt nuvarande tema"
 msgid "Please first choose another for your current theme."
 msgstr "Välj först ett annat för ditt aktuella tema."
 
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:170
 msgid "Sending private message failed"
 msgstr "Skicka privat meddelande misslyckades"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:171
+#: ../src/groupchat_control.py:172
 #, python-format
 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:450
+#: ../src/groupchat_control.py:455
 msgid "Insert Nickname"
 msgstr "Infoga smeknamn"
 
-#: ../src/groupchat_control.py:631
+#: ../src/groupchat_control.py:636
 msgid "Conversation with "
 msgstr "Konversation med "
 
-#: ../src/groupchat_control.py:633
+#: ../src/groupchat_control.py:638
 msgid "Continued conversation"
 msgstr "Fortsatt konversation"
 
-#. Can be a message (see handle_event_gc_config_change in
-#. gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1272 ../src/gui_interface.py:1080
+#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1286
 msgid "Room logging is enabled"
 msgstr "Rumsloggning är aktiverad"
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1288
 msgid "A new room has been created"
 msgstr "Ett nytt rum har skapats"
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1291
 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:1287
+#: ../src/groupchat_control.py:1297
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blivit sparkad: %(reason)s"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1300
 #, 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:1300
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s har blivit bannlyst: %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1312
 #, 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:1314 ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du är nu känd som %s"
 
-#: ../src/groupchat_control.py:1330 ../src/gui_interface.py:919
+#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s är nu känd som %(new_nick)s"
 
-#: ../src/groupchat_control.py:1372 ../src/groupchat_control.py:1377
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1392
 #, 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:1374
+#: ../src/groupchat_control.py:1383
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Anknytning: "
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1388
 msgid "room configuration changed to members-only"
 msgstr "rumskonfigurationen har ändrats till members-only"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1394
 msgid "system shutdown"
 msgstr "systemet stängs av"
 
-#: ../src/groupchat_control.py:1470
+#: ../src/groupchat_control.py:1477
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1474
+#: ../src/groupchat_control.py:1481
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1489
+#: ../src/groupchat_control.py:1496
 #, 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:1493
+#: ../src/groupchat_control.py:1500
 #, 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:1522
+#: ../src/groupchat_control.py:1530
 #, python-format
 msgid "%s has left"
 msgstr "%s har lämnat"
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1535
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s har gått in i gruppchatten"
 
-#: ../src/groupchat_control.py:1529 ../src/gui_interface.py:946
+#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
 #: ../src/history_window.py:447 ../src/notify.py:234
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s är nu %(status)s"
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1774
 #, 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:1761
+#: ../src/groupchat_control.py:1776
 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:1765 ../src/gui_interface.py:1216
-#: ../src/gui_interface.py:1992 ../src/gui_interface.py:2029
-#: ../src/gui_interface.py:2064 ../src/message_window.py:224
-#: ../src/roster_window.py:2739 ../src/roster_window.py:3399
-#: ../src/roster_window.py:4123
+#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
+#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
+#: ../src/gui_interface.py:1853 ../src/message_window.py:224
+#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
+#: ../src/roster_window.py:4195
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "Fråga mig i_nte igen"
 
-#: ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:1814
 msgid "Changing Subject"
 msgstr "Ändrar Ämne"
 
-#: ../src/groupchat_control.py:1800
+#: ../src/groupchat_control.py:1815
 msgid "Please specify the new subject:"
 msgstr "Ange det nya ämnet:"
 
-#: ../src/groupchat_control.py:1807
+#: ../src/groupchat_control.py:1822
 msgid "Changing Nickname"
 msgstr "Byter Smeknamn"
 
-#: ../src/groupchat_control.py:1808
+#: ../src/groupchat_control.py:1823
 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:1839
+#: ../src/groupchat_control.py:1854
 #, python-format
 msgid "Destroying %s"
 msgstr "Förstör %s"
 
-#: ../src/groupchat_control.py:1840
+#: ../src/groupchat_control.py:1855
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1842
+#: ../src/groupchat_control.py:1857
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2028
+#: ../src/groupchat_control.py:2046
 #, python-format
 msgid "Kicking %s"
 msgstr "Sparkar %s"
 
-#: ../src/groupchat_control.py:2029 ../src/groupchat_control.py:2356
+#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
 msgid "You may specify a reason below:"
 msgstr "Du kan ange en orsak här under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2355
+#: ../src/groupchat_control.py:2373
 #, python-format
 msgid "Banning %s"
 msgstr "Bannlyser %s"
@@ -8737,54 +8996,63 @@ msgid "Details"
 msgstr "Detaljer"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
+#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Fel: kan inte öppna %s för läsning"
 
-#: ../src/gtkgui_helpers.py:400
+#: ../src/gtkgui_helpers.py:404
 msgid "Error reading file:"
 msgstr "Fel vid läsning av fil:"
 
-#: ../src/gtkgui_helpers.py:403
+#: ../src/gtkgui_helpers.py:407
 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:444
+#: ../src/gtkgui_helpers.py:448
 #, 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:818
+#: ../src/gtkgui_helpers.py:822
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim är inte standardklient för Jabber"
 
-#: ../src/gtkgui_helpers.py:819
+#: ../src/gtkgui_helpers.py:823
 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:820
+#: ../src/gtkgui_helpers.py:824
 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:887
+#: ../src/gtkgui_helpers.py:891
 msgid "Extension not supported"
 msgstr "Utökning stöds inte"
 
-#: ../src/gtkgui_helpers.py:888
+#: ../src/gtkgui_helpers.py:892
 #, 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:924
+#: ../src/gtkgui_helpers.py:928
 msgid "Save Image as..."
 msgstr "Spara bild som..."
 
-#: ../src/gui_interface.py:140
+#. we are banned
+#. group chat does not exist
+#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
+#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
+#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
+#: ../src/gui_interface.py:348
+msgid "Unable to join group chat"
+msgstr "Kunde inte gå in i gruppchatt"
+
+#: ../src/gui_interface.py:138
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8795,58 +9063,93 @@ msgstr ""
 "av\n"
 "en annan deltagare. Ange ett annat smeknamn nedan:"
 
-#: ../src/gui_interface.py:143
+#: ../src/gui_interface.py:141
 msgid "Always use this nickname when there is a conflict"
 msgstr "Använd alltid detta smeknamn när det finns en konflikt"
 
-#: ../src/gui_interface.py:159
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Accepterar du den här förfrågan?"
 
-#: ../src/gui_interface.py:161
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Accepterar du den här begäran på kontot %s?"
 
-#: ../src/gui_interface.py:164
+#: ../src/gui_interface.py:163
 #, 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/gui_interface.py:213 ../src/notify.py:493
+#: ../src/gui_interface.py:209 ../src/notify.py:493
 msgid "Connection Failed"
 msgstr "Anslutningsfel"
 
-#: ../src/gui_interface.py:606 ../src/gui_interface.py:610
+#: ../src/gui_interface.py:312
+#, 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/gui_interface.py:324
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/gui_interface.py:333
+#, python-format
+msgid "You are banned from group chat %s."
+msgstr "Du är bannlyst från gruppchatten %s."
+
+#: ../src/gui_interface.py:338
+#, python-format
+msgid "Group chat %s does not exist."
+msgstr "Gruppchatten %s finns inte."
+
+#: ../src/gui_interface.py:341
+#, fuzzy
+msgid "Group chat creation is restricted."
+msgstr "Möjligheten att skapa rum är begränsad."
+
+#: ../src/gui_interface.py:344
+#, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Ditt registrerade smeknamn måste användas i gruppchatten %s."
+
+#: ../src/gui_interface.py:349
+#, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Du är inte med i medlemslistan i gruppchatten %s."
+
+#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Fel %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:621 ../src/gui_interface.py:636
+#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "fel vid sändning av %(message)s ( %(error)s )"
 
-#: ../src/gui_interface.py:663 ../src/notify.py:495
+#: ../src/gui_interface.py:540 ../src/notify.py:495
 msgid "Subscription request"
 msgstr "Prenumerationsbegäran"
 
-#: ../src/gui_interface.py:688
+#: ../src/gui_interface.py:565
 msgid "Authorization accepted"
 msgstr "Auktorisering accepterad"
 
-#: ../src/gui_interface.py:689
+#: ../src/gui_interface.py:566
 #, 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/gui_interface.py:702
+#: ../src/gui_interface.py:579
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakten \"%s\" tog bort prenumerationen från dig"
 
-#: ../src/gui_interface.py:703
+#: ../src/gui_interface.py:580
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8854,60 +9157,55 @@ 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/gui_interface.py:727 ../src/notify.py:497
+#: ../src/gui_interface.py:604 ../src/notify.py:497
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "Säg _upp prenumeration"
 
-#: ../src/gui_interface.py:754
+#: ../src/gui_interface.py:631
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan inte etableras"
 
-#: ../src/gui_interface.py:1015
+#: ../src/gui_interface.py:859
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s har ställt in ämnet till %(subject)s"
 
-#: ../src/gui_interface.py:1083
+#: ../src/gui_interface.py:926
 msgid "Room now shows unavailable member"
 msgstr "Rummet visar nu otillgängliga medlemmar"
 
-#: ../src/gui_interface.py:1085
+#: ../src/gui_interface.py:928
 msgid "room now does not show unavailable members"
 msgstr "rummet visar nu inga otillgängliga medlemmar"
 
-#: ../src/gui_interface.py:1087
+#: ../src/gui_interface.py:930
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:1091
+#: ../src/gui_interface.py:934
 msgid "Room logging is now enabled"
 msgstr "Rumsloggning är nu aktiverad"
 
-#: ../src/gui_interface.py:1093
+#: ../src/gui_interface.py:936
 msgid "Room logging is now disabled"
 msgstr "Rumsloggning är nu inaktiverad"
 
-#: ../src/gui_interface.py:1095
+#: ../src/gui_interface.py:938
 msgid "Room is now non-anonymous"
 msgstr "Rummet är nu icke-anonymt"
 
-#: ../src/gui_interface.py:1098
+#: ../src/gui_interface.py:941
 msgid "Room is now semi-anonymous"
 msgstr "Rummet är nu semi-anonymt"
 
-#: ../src/gui_interface.py:1101
+#: ../src/gui_interface.py:944
 msgid "Room is now fully-anonymous"
 msgstr "Rummet är nu fullständigt anonymt"
 
-#: ../src/gui_interface.py:1133
-#, 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/gui_interface.py:1180
+#: ../src/gui_interface.py:985
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -8915,24 +9213,24 @@ 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/gui_interface.py:1182 ../src/gui_interface.py:1189
+#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du är för närvarande ansluten utan din OpenPGP-nyckel."
 
-#: ../src/gui_interface.py:1184
+#: ../src/gui_interface.py:989
 msgid "Your passphrase is incorrect"
 msgstr "Din lösenfras är inkorrekt."
 
-#: ../src/gui_interface.py:1188
+#: ../src/gui_interface.py:993
 #, fuzzy
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Din lösenfras är inkorrekt."
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid "GPG key not trusted"
 msgstr "GPG-nyckeln är inte pålitlig"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
@@ -8940,7 +9238,7 @@ msgstr ""
 "GPG-nyckeln som används för att kryptera denna chatt är inte pålitlig. Vill "
 "du verkligen kryptera detta meddelande?"
 
-#: ../src/gui_interface.py:1226
+#: ../src/gui_interface.py:1031
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not                 correctly started "
@@ -8949,19 +9247,19 @@ msgstr ""
 "Gnome-nyckelring är installerat men inte \t\t\t\tkorrekt startad "
 "(miljövariabeln är förmodligen inte \t\t\t\tkorrekt inställd)"
 
-#: ../src/gui_interface.py:1330
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Ny e-post på %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1332
+#: ../src/gui_interface.py:1133
 #, 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/gui_interface.py:1345
+#: ../src/gui_interface.py:1146
 #, python-format
 msgid ""
 "\n"
@@ -8976,42 +9274,42 @@ msgstr ""
 "Ämne: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1418
+#: ../src/gui_interface.py:1215
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vill skicka en fil till dig."
 
-#: ../src/gui_interface.py:1455 ../src/roster_window.py:1856
+#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
 msgid "Remote contact stopped transfer"
 msgstr "Fjärrkontakten stoppade överföringen"
 
-#: ../src/gui_interface.py:1458 ../src/roster_window.py:1858
+#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
 msgid "Error opening file"
 msgstr "Fel vid öppnande av filen"
 
-#: ../src/gui_interface.py:1490
+#: ../src/gui_interface.py:1287
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "%(filename)s har mattagits från %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1494
+#: ../src/gui_interface.py:1291
 #, 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/gui_interface.py:1507
+#: ../src/gui_interface.py:1304
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "%(filename)s har skickats till %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1511
+#: ../src/gui_interface.py:1308
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Överföringen av %(filename)s till %(name)s har stannat."
 
-#: ../src/gui_interface.py:1623
+#: ../src/gui_interface.py:1426
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -9020,57 +9318,57 @@ msgstr ""
 "Kunde inte dekryptera meddelande från %s\n"
 "Det kan ha manipulerats."
 
-#: ../src/gui_interface.py:1630
+#: ../src/gui_interface.py:1433
 msgid "Unable to decrypt message"
 msgstr "Kunde inte dekryptera meddelande"
 
-#: ../src/gui_interface.py:1702
+#: ../src/gui_interface.py:1505
 msgid "Username Conflict"
 msgstr "Användarnamn-konflikt"
 
-#: ../src/gui_interface.py:1703
+#: ../src/gui_interface.py:1506
 msgid "Please type a new username for your local account"
 msgstr "Ange ett nytt användarnamn för ditt lokala konto"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1519
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gui_interface.py:1729
+#: ../src/gui_interface.py:1532
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gui_interface.py:1740
+#: ../src/gui_interface.py:1543
 msgid "Error."
 msgstr "Fel."
 
-#: ../src/gui_interface.py:1768
+#: ../src/gui_interface.py:1556
 msgid "Resource Conflict"
 msgstr "Resurskonflikt"
 
-#: ../src/gui_interface.py:1769
+#: ../src/gui_interface.py:1557
 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"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1816
+#: ../src/gui_interface.py:1604
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s vill skicka en fil till dig."
 
-#: ../src/gui_interface.py:1819
+#: ../src/gui_interface.py:1607
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Förfrågan om Filöverföring"
 
-#: ../src/gui_interface.py:1927
+#: ../src/gui_interface.py:1716
 msgid "Error verifying SSL certificate"
 msgstr "Fel vid verifiering av SSL-certifikat"
 
-#: ../src/gui_interface.py:1928
+#: ../src/gui_interface.py:1717
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9081,15 +9379,15 @@ msgstr ""
 "server: %(error)s\n"
 "Vill du fortfarande ansluta till denna server?"
 
-#: ../src/gui_interface.py:1936
+#: ../src/gui_interface.py:1725
 msgid "Ignore this error for this certificate."
 msgstr "Ignorera detta fel med certifikatet."
 
-#: ../src/gui_interface.py:1956
+#: ../src/gui_interface.py:1745
 msgid "SSL certificate error"
 msgstr "SSL-certifikatfel"
 
-#: ../src/gui_interface.py:1957
+#: ../src/gui_interface.py:1746
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9106,12 +9404,12 @@ msgstr ""
 "\n"
 "Vill du fortfarande ansluta och uppdatera fingeravtrycket för certifikatet?"
 
-#: ../src/gui_interface.py:1987 ../src/gui_interface.py:2024
-#: ../src/gui_interface.py:2060
+#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
+#: ../src/gui_interface.py:1849
 msgid "Insecure connection"
 msgstr "Osäker anslutning"
 
-#: ../src/gui_interface.py:1988
+#: ../src/gui_interface.py:1777
 #, fuzzy
 msgid ""
 "You are about to connect to the server with an insecure connection. This "
@@ -9122,12 +9420,12 @@ msgstr ""
 "installera PyOpenSSL för att förhindra det. Är du säker på att du vill "
 "skicka lösenordet?"
 
-#: ../src/gui_interface.py:1991 ../src/gui_interface.py:2028
-#: ../src/gui_interface.py:2063
+#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
+#: ../src/gui_interface.py:1852
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ja, jag vill verkligen ansluta på ett osäkert sätt"
 
-#: ../src/gui_interface.py:2025
+#: ../src/gui_interface.py:1814
 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?"
@@ -9136,7 +9434,7 @@ msgstr ""
 "installera PyOpenSSL för att förhindra det. Är du säker på att du vill "
 "skicka lösenordet?"
 
-#: ../src/gui_interface.py:2061
+#: ../src/gui_interface.py:1850
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9146,11 +9444,11 @@ msgstr ""
 "säker på att du vill göra det?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2624 ../src/gui_interface.py:2647
+#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
 msgid "Emoticons disabled"
 msgstr "Känsloikoner inaktiverade"
 
-#: ../src/gui_interface.py:2625
+#: ../src/gui_interface.py:2423
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -9158,7 +9456,7 @@ msgstr ""
 "Ditt konfigurerade känsloikontema hittades inte så känsloikoner har "
 "inaktiverats."
 
-#: ../src/gui_interface.py:2648
+#: ../src/gui_interface.py:2446
 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 "
@@ -9168,41 +9466,41 @@ msgstr ""
 "uppdatera formatet för filen emoticons.py. Se http://trac.gajim.org/wiki/"
 "Emoticons för mer information."
 
-#: ../src/gui_interface.py:2679 ../src/roster_window.py:3560
+#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
 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/gui_interface.py:3058
+#: ../src/gui_interface.py:2871
 msgid "Could not save your settings and preferences"
 msgstr "Kunde inte spara dina inställningar"
 
-#: ../src/gui_interface.py:3592
+#: ../src/gui_interface.py:3411
 msgid "Passphrase Required"
 msgstr "Lösenfras krävs"
 
-#: ../src/gui_interface.py:3593
+#: ../src/gui_interface.py:3412
 #, 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/gui_interface.py:3607
+#: ../src/gui_interface.py:3426
 msgid "GPG key expired"
 msgstr "GPG-nyckeln har gått ut"
 
-#: ../src/gui_interface.py:3608
+#: ../src/gui_interface.py:3427
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Din GPG-nyckel har gått ut. Du kommer anslutas till %s utan OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3617
+#: ../src/gui_interface.py:3436
 msgid "Wrong Passphrase"
 msgstr "Felaktig lösenfras"
 
-#: ../src/gui_interface.py:3618
+#: ../src/gui_interface.py:3437
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Ange ditt GPG-lösenord igen eller tryck på Avbryt."
 
@@ -9240,6 +9538,11 @@ msgstr "Smeknamn"
 msgid "Message"
 msgstr "Meddelande"
 
+#. holds subject
+#: ../src/history_manager.py:188 ../src/history_manager.py:219
+msgid "Subject"
+msgstr "Ämne"
+
 #: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -9335,19 +9638,19 @@ msgstr "Du är på väg att stänga flera flikar"
 msgid "Do you really want to close them all?"
 msgstr "Vill du verkligen stänga alla dem?"
 
-#: ../src/message_window.py:484
+#: ../src/message_window.py:485
 msgid "Chats"
 msgstr "Chattar"
 
-#: ../src/message_window.py:486
+#: ../src/message_window.py:487
 msgid "Group Chats"
 msgstr "Gruppchatt"
 
-#: ../src/message_window.py:488
+#: ../src/message_window.py:489
 msgid "Private Chats"
 msgstr "Privat Chatt"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:495
 msgid "Messages"
 msgstr "Meddelanden"
 
@@ -9403,56 +9706,56 @@ msgstr "Nytt meddelande från %(nickname)s"
 msgid "Ignore"
 msgstr "Ignorera"
 
-#: ../src/profile_window.py:57
+#: ../src/profile_window.py:58
 msgid "Retrieving profile..."
 msgstr "Hämtar profil..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2935
+#: ../src/profile_window.py:111 ../src/roster_window.py:3001
 msgid "File is empty"
 msgstr "Filen är tom"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2938
+#: ../src/profile_window.py:114 ../src/roster_window.py:3004
 msgid "File does not exist"
 msgstr "Filen finns inte"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2940 ../src/roster_window.py:2951
+#: ../src/profile_window.py:128 ../src/profile_window.py:144
+#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
 msgid "Could not load image"
 msgstr "Kunde inte läsa in bild"
 
-#: ../src/profile_window.py:214
+#: ../src/profile_window.py:215
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Kontaktinformation"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:216
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Format: Ã…Ã…Ã…Ã…-MM-DD"
 
-#: ../src/profile_window.py:269
+#: ../src/profile_window.py:270
 msgid "Information received"
 msgstr "Information togs emot"
 
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:341
 msgid "Without a connection you can not publish your contact information."
 msgstr "Du kan inte publicera din kontaktinformation utan en anslutning."
 
-#: ../src/profile_window.py:353
+#: ../src/profile_window.py:354
 msgid "Sending profile..."
 msgstr "Skickar profil..."
 
-#: ../src/profile_window.py:368
+#: ../src/profile_window.py:369
 msgid "Information NOT published"
 msgstr "Informationen INTE publicerad"
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:376
 msgid "vCard publication failed"
 msgstr "publicering av vCard misslyckades"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:377
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9460,53 +9763,53 @@ msgstr ""
 "Det uppstod ett fel vid publiceringen av er personliga information, försök "
 "igen senare."
 
-#: ../src/roster_window.py:256 ../src/roster_window.py:1012
+#: ../src/roster_window.py:262 ../src/roster_window.py:1026
 msgid "Merged accounts"
 msgstr "Sammanfoga konton"
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1942
 msgid "Authorization has been sent"
 msgstr "Auktorisering har sänts"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1943
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nu kommer \"%s\" veta din status."
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1966
 msgid "Subscription request has been sent"
 msgstr "Prenumerationsförfrågan har sänts"
 
-#: ../src/roster_window.py:1944
+#: ../src/roster_window.py:1967
 #, 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:1958
+#: ../src/roster_window.py:1981
 msgid "Authorization has been removed"
 msgstr "Auktorisering har tagits bort"
 
-#: ../src/roster_window.py:1959
+#: ../src/roster_window.py:1982
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nu kommer \"%s\" alltid se dig som offline."
 
-#: ../src/roster_window.py:1986
+#: ../src/roster_window.py:2009
 msgid "GPG is not usable"
 msgstr "GPG är inte användbar"
 
-#: ../src/roster_window.py:1987
+#: ../src/roster_window.py:2010
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Du kommer ansluta till %s utan OpenPGP."
 
-#: ../src/roster_window.py:2199 ../src/roster_window.py:3496
+#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
 msgid "You are participating in one or more group chats"
 msgstr "Du deltar i en eller flera guppchatter"
 
-#: ../src/roster_window.py:2200 ../src/roster_window.py:3497
+#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9514,38 +9817,38 @@ 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:2226
+#: ../src/roster_window.py:2249
 msgid "desync'ed"
 msgstr "inte i synk"
 
-#: ../src/roster_window.py:2288
+#: ../src/roster_window.py:2311
 msgid "Really quit Gajim?"
 msgstr "Verkligen avsluta Gajim?"
 
-#: ../src/roster_window.py:2289
+#: ../src/roster_window.py:2312
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Är du säker på att du vill avsluta Gajim?"
 
-#: ../src/roster_window.py:2290
+#: ../src/roster_window.py:2313
 msgid "Always close Gajim"
 msgstr "Stäng alltid Gajim"
 
-#: ../src/roster_window.py:2373
+#: ../src/roster_window.py:2396
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Avbryt filöverföring"
 
-#: ../src/roster_window.py:2374
+#: ../src/roster_window.py:2397
 msgid ""
-"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2405 ../src/roster_window.py:2653
+#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
 msgid "You have unread messages"
 msgstr "Du har olästa meddelanden"
 
-#: ../src/roster_window.py:2406
+#: ../src/roster_window.py:2429
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9553,16 +9856,16 @@ msgstr ""
 "Meddelanden kommer endast vara tillgängliga för läsning senare om du har "
 "historik aktiverat och kontakten finns i din kontaktlista."
 
-#: ../src/roster_window.py:2654
+#: ../src/roster_window.py:2720
 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:2657
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporten \"%s\" kommer tas bort"
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2724
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9570,11 +9873,11 @@ msgstr ""
 "Du kommer inte längre kunna ta emot eller skicka meddelanden till kontakter "
 "med denna transport."
 
-#: ../src/roster_window.py:2661
+#: ../src/roster_window.py:2727
 msgid "Transports will be removed"
 msgstr "Transporter kommer att tas bort"
 
-#: ../src/roster_window.py:2666
+#: ../src/roster_window.py:2732
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9583,70 +9886,70 @@ msgstr ""
 "Du kommer inte längre att kunna ta emot eller skicka meddelanden till "
 "kontakter från dessa transporter: %s"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2800
 #, fuzzy
 msgid "You are about to block a contact. 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:2736
+#: ../src/roster_window.py:2802
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2827
+#: ../src/roster_window.py:2893
 msgid "Rename Contact"
 msgstr "Byt namn på kontakt"
 
-#: ../src/roster_window.py:2828
+#: ../src/roster_window.py:2894
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Ange ett nytt smeknamn för kontakten %s"
 
-#: ../src/roster_window.py:2835
+#: ../src/roster_window.py:2901
 msgid "Rename Group"
 msgstr "Byt namn på grupp"
 
-#: ../src/roster_window.py:2836
+#: ../src/roster_window.py:2902
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Ange ett nytt namn för gruppen %s"
 
-#: ../src/roster_window.py:2881
+#: ../src/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Ta bort grupp"
 
-#: ../src/roster_window.py:2882
+#: ../src/roster_window.py:2948
 #, 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:2883
+#: ../src/roster_window.py:2949
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Ta även bort alla kontakter i denna grupp från din kontaktlista"
 
-#: ../src/roster_window.py:2922
+#: ../src/roster_window.py:2988
 msgid "Assign OpenPGP Key"
 msgstr "Tilldela OpenPGP-nyckel"
 
-#: ../src/roster_window.py:2923
+#: ../src/roster_window.py:2989
 msgid "Select a key to apply to the contact"
 msgstr "Välj en nyckel att tilldela kontakten"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3372
 #, 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:3308
+#: ../src/roster_window.py:3374
 #, 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:3313
+#: ../src/roster_window.py:3379
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9655,11 +9958,11 @@ msgstr ""
 "vilket resulterar i att kontakten kommer alltid se dig som frånkopplad."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3319
+#: ../src/roster_window.py:3385
 msgid "Do you want to continue?"
 msgstr "Vill du fortsätta?"
 
-#: ../src/roster_window.py:3323
+#: ../src/roster_window.py:3389
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9667,18 +9970,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:3326
+#: ../src/roster_window.py:3392
 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:3330
+#: ../src/roster_window.py:3396
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakter kommer att tas bort från din kontaktlista"
 
-#: ../src/roster_window.py:3335
+#: ../src/roster_window.py:3401
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9688,33 +9991,33 @@ msgstr ""
 "så kommer du även ta bort behörigheten vilket resulterar i att kontakten "
 "kommer alltid se dig som frånkopplad."
 
-#: ../src/roster_window.py:3393
+#: ../src/roster_window.py:3459
 #, fuzzy
 msgid ""
 "You are about to send a custom status. 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:3395
+#: ../src/roster_window.py:3461
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he or she will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3414
+#: ../src/roster_window.py:3480
 msgid "No account available"
 msgstr "Inget konto tillgängligt"
 
-#: ../src/roster_window.py:3415
+#: ../src/roster_window.py:3481
 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:4023
+#: ../src/roster_window.py:4095
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakter kan inte lagras på din server"
 
-#: ../src/roster_window.py:4025
+#: ../src/roster_window.py:4097
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9722,13 +10025,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:4117
+#: ../src/roster_window.py:4189
 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:4119
+#: ../src/roster_window.py:4191
 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 "
@@ -9738,24 +10041,24 @@ msgstr ""
 "Normalt sätt används det när en person har flera Jabberkonton eller "
 "transportkonton."
 
-#: ../src/roster_window.py:4234
+#: ../src/roster_window.py:4306
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Ogiltig Fil"
 
-#: ../src/roster_window.py:4246
+#: ../src/roster_window.py:4318
 #, 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:4361
+#: ../src/roster_window.py:4433
 #, python-format
 msgid "Send %s to %s"
 msgstr "Skicka %s till %s"
 
-#: ../src/roster_window.py:4367
+#: ../src/roster_window.py:4439
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Gör %s till en metakontakt för %s"
@@ -9765,144 +10068,144 @@ msgstr "Gör %s till en metakontakt för %s"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4816 ../src/roster_window.py:4889
-#: ../src/roster_window.py:4898 ../src/statusicon.py:246
-#: ../src/statusicon.py:293 ../src/statusicon.py:299
+#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
+#: ../src/roster_window.py:4970 ../src/statusicon.py:263
+#: ../src/statusicon.py:310 ../src/statusicon.py:316
 #, python-format
 msgid "using account %s"
 msgstr "använder kontot %s"
 
 #. add
-#: ../src/roster_window.py:4905
+#: ../src/roster_window.py:4977
 #, python-format
 msgid "to %s account"
 msgstr "till %s konto"
 
 #. disco
-#: ../src/roster_window.py:4910
+#: ../src/roster_window.py:4982
 #, python-format
 msgid "using %s account"
 msgstr "använder %s-kontot"
 
-#: ../src/roster_window.py:4948 ../src/statusicon.py:309
+#: ../src/roster_window.py:5020 ../src/statusicon.py:326
 msgid "_Manage Bookmarks..."
 msgstr "_Hantera bokmärken..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4968
+#: ../src/roster_window.py:5040
 #, python-format
 msgid "of account %s"
 msgstr "för kontot %s"
 
-#: ../src/roster_window.py:5009
+#: ../src/roster_window.py:5081
 #, python-format
 msgid "for account %s"
 msgstr "för kontot %s"
 
-#: ../src/roster_window.py:5069 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
 msgid "_Change Status Message"
 msgstr "_Ändra statusmeddelande"
 
-#: ../src/roster_window.py:5102
+#: ../src/roster_window.py:5174
 msgid "Publish Tune"
 msgstr "Publicera låt"
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5176
 #, fuzzy
 msgid "Publish Location"
 msgstr "Publicera låt"
 
-#: ../src/roster_window.py:5107
+#: ../src/roster_window.py:5179
 msgid "Configure Services..."
 msgstr "Konfigurera tjänster..."
 
-#: ../src/roster_window.py:5252
+#: ../src/roster_window.py:5324
 msgid "_Maximize All"
 msgstr "_Maximera alla"
 
-#: ../src/roster_window.py:5262 ../src/roster_window.py:5436
+#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
 msgid "Send Group M_essage"
 msgstr "Skicka gruppm_eddelande"
 
-#: ../src/roster_window.py:5270
+#: ../src/roster_window.py:5342
 msgid "To all users"
 msgstr "Till alla användare"
 
-#: ../src/roster_window.py:5274
+#: ../src/roster_window.py:5346
 msgid "To all online users"
 msgstr "Till alla anslutna användare"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5456
+#: ../src/roster_window.py:5528
 msgid "_Manage Contacts"
 msgstr "_Hantera kontakter"
 
 #. Edit Groups
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5537
 msgid "Edit _Groups"
 msgstr "Redigera _grupper"
 
 #. Send single message
-#: ../src/roster_window.py:5520
+#: ../src/roster_window.py:5592
 msgid "Send Single Message"
 msgstr "Skicka ett meddelande"
 
 #. Execute Command
-#: ../src/roster_window.py:5567
+#: ../src/roster_window.py:5639
 msgid "Execute Command..."
 msgstr "Kör kommando..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5577
+#: ../src/roster_window.py:5649
 msgid "_Manage Transport"
 msgstr "_Hantera transport"
 
 #. Modify Transport
-#: ../src/roster_window.py:5586
+#: ../src/roster_window.py:5658
 msgid "_Modify Transport"
 msgstr "_Ändra transport"
 
 #. Rename
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5668
 msgid "_Rename"
 msgstr "Byt _namn"
 
-#: ../src/roster_window.py:5656
+#: ../src/roster_window.py:5728
 msgid "_Maximize"
 msgstr "_Maximera"
 
-#: ../src/roster_window.py:5665
+#: ../src/roster_window.py:5737
 #, fuzzy
 msgid "_Reconnect"
 msgstr "_Koppla från"
 
-#: ../src/roster_window.py:5672
+#: ../src/roster_window.py:5744
 msgid "_Disconnect"
 msgstr "_Koppla från"
 
 #. History manager
-#: ../src/roster_window.py:5754
+#: ../src/roster_window.py:5833
 msgid "History Manager"
 msgstr "Historikhanterare"
 
-#: ../src/roster_window.py:5765
+#: ../src/roster_window.py:5844
 msgid "_Join New Group Chat"
 msgstr "_GÃ¥ in i ny gruppchatt"
 
-#: ../src/roster_window.py:5938
+#: ../src/roster_window.py:6019
 msgid "Change Status Message..."
 msgstr "Ändra statusmeddelande..."
 
-#: ../src/search_window.py:94
+#: ../src/search_window.py:105
 msgid "Waiting for results"
 msgstr "Väntar på resultat"
 
-#: ../src/search_window.py:132 ../src/search_window.py:210
+#: ../src/search_window.py:143 ../src/search_window.py:220
 msgid "Error in received dataform"
 msgstr ""
 
 #. No result
-#: ../src/search_window.py:166 ../src/search_window.py:202
+#: ../src/search_window.py:177 ../src/search_window.py:212
 msgid "No result"
 msgstr "Inga resultat"
 
@@ -9915,14 +10218,15 @@ msgstr ""
 msgid "Subject: %s"
 msgstr "Ämne: %s"
 
-#: ../src/session.py:433 ../src/session.py:468
+#: ../src/session.py:447 ../src/session.py:491
 msgid "Confirm these session options"
 msgstr "Bekräfta dessa sessionsalternativ"
 
-#: ../src/session.py:435
+#: ../src/session.py:448
 #, fuzzy, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
+"The remote client wants '\n"
+"                            'to negotiate an session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -9934,7 +10238,7 @@ msgstr ""
 "\n"
 "\tGodtar du dessa alternativ?"
 
-#: ../src/session.py:469
+#: ../src/session.py:492
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9949,16 +10253,16 @@ msgstr ""
 "\n"
 "Vill du fortsätta med sessionen?"
 
-#: ../src/statusicon.py:210
+#: ../src/statusicon.py:227
 msgid "_Change Status Message..."
 msgstr "_Byt Statusmeddelande..."
 
-#: ../src/statusicon.py:322
+#: ../src/statusicon.py:339
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "i _kontaktlista"
 
-#: ../src/statusicon.py:333
+#: ../src/statusicon.py:350
 msgid "Hide this menu"
 msgstr "Dölj denna meny"
 
@@ -10097,32 +10401,32 @@ msgstr ""
 "Denna tjänst kunde inte svara med detaljerad information.\n"
 "Tjänsten är antagligen föråldrad eller trasig."
 
-#: ../src/vcard.py:251
+#: ../src/vcard.py:265
 msgid "?Client:Unknown"
 msgstr "?Klient:Okänd"
 
-#: ../src/vcard.py:253
+#: ../src/vcard.py:267
 msgid "?OS:Unknown"
 msgstr "?OS:Okänt"
 
-#: ../src/vcard.py:274
+#: ../src/vcard.py:288
 msgid "?Time:Unknown"
 msgstr "?Tid:Okänd"
 
-#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
+#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
 #, python-format
 msgid "since %s"
 msgstr "sedan %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:345
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:349
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Tillhörighet:</b>"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:357
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10130,7 +10434,7 @@ msgstr ""
 "Denna kontakt är intresserad av din närvaroinformation, men du är inte "
 "intresserad av hans/hennes"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:359
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10138,38 +10442,83 @@ msgstr ""
 "Du är intresserad av denna kontakts närvaroinformation, men han/hon är inte "
 "intresserad av din"
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:361
 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:349
+#: ../src/vcard.py:363
 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:356
+#: ../src/vcard.py:370
 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:358
+#: ../src/vcard.py:372
 msgid "There is no pending subscription request."
 msgstr "Det finns inga väntande prenumerationsbegäran."
 
-#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
+#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
 msgid " resource with priority "
 msgstr " resurs med prioritet "
 
-#~ msgid "_Available"
-#~ msgstr "_Tillgänglig"
+#~ msgid "@"
+#~ msgstr "@"
+
+#~ msgid "_Disable showing event in systray"
+#~ msgstr "_Inaktivera visning av händelser i notifieringsyta"
+
+#~ msgid "_Show event in systray"
+#~ msgstr "_Visa händelse i notifieringsytan"
 
-#~ msgid "PEP node was not removed"
-#~ msgstr "PEP-noden togs inte bort"
+#, fuzzy
+#~ msgid "Always use GNOME default applications"
+#~ msgstr "Använd alltid OS/X standardprogram"
+
+#, fuzzy
+#~ msgid "Always use Xfce default applications"
+#~ msgstr "Använd alltid OS/X standardprogram"
+
+#, fuzzy
+#~ msgid "Autodetect on every Gajim startup"
+#~ msgstr "A_nslut vid start av Gajim"
+
+#~ msgid "Show systray:"
+#~ msgstr "Visa i notifieringsyta:"
+
+#~ msgid "Nickname not allowed: %s"
+#~ msgstr "Smeknamnet tillåts inte: %s"
+
+#, fuzzy
+#~ msgid "Room has been destroyed"
+#~ msgstr "Auktorisering har tagits bort"
+
+#~ msgid "You can join this room instead: %s"
+#~ msgstr "Du kan gå in i detta rum istället: %s"
+
+#~ msgid "I would like to add you to my roster."
+#~ msgstr "Jag skulle vilja lägga till dig i min kontaktlista."
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "vi prenumererar nu på %s"
 
-#~ msgid "PEP node %(node)s was not removed: %(message)s"
-#~ msgstr "PEP-noden %(node)s blev inte borttagen: %(message)s"
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "avprenumerationsförfrågan från %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "vi prenumererar inte längre på %s"
+
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "JID %s följer inte RFC-standarden. Det kommer inte att läggas till din "
+#~ "kontaktlista. Använd kontakthanteringsverktyg såsom http://jru."
+#~ "jabberstudio.org/  för att ta bort det"
 
 #~ msgid "Account Modification"
 #~ msgstr "Kontoändring"
@@ -10279,40 +10628,9 @@ msgstr " resurs med prioritet "
 #~ msgid "gtk-delete"
 #~ msgstr "Ta bort"
 
-#~ msgid "Add this contact to roster (Ctrl+D)"
-#~ msgstr "Lägg till denna kontakt till kontaktlistan (Ctrl+D)"
-
-#~ msgid "Bookmark this room (Ctrl+B)"
-#~ msgstr "Bokmärk detta rum (Ctrl+B)"
-
-#~ msgid "Browse the chat history (Ctrl+H)"
-#~ msgstr "Bläddra i chatthistoriken (Ctrl+H)"
-
-#~ msgid "Change the room's subject (Alt+T)"
-#~ msgstr "Ändra rummets ärende (Alt+T)"
-
-#~ msgid "Change your nickname (Ctrl+N)"
-#~ msgstr "Ändra ditt smeknamn (Ctrl+N)"
-
-#~ msgid "Invite contacts to the conversation (Ctrl+G)"
-#~ msgstr "Bjud in kontakter till konversationen (Ctrl+G)"
-
 #~ msgid "Send a file (Ctrl+F)"
 #~ msgstr "Skicka en fil (Ctrl+F)"
 
-#~ msgid "Show a list of emoticons (Alt+M)"
-#~ msgstr "Visa en lista över känsloikoner (Alt+M)"
-
-#~ msgid "Show a list of formattings"
-#~ msgstr "Visa en lista över formateringar"
-
-#, fuzzy
-#~ msgid "Show a menu of advanced functions (Alt+D)"
-#~ msgstr "Visa en meny över avancerade funktioner (Alt+A)"
-
-#~ msgid "Show the contact's profile (Ctrl+I)"
-#~ msgstr "Visa kontaktens profil (Ctrl+I)"
-
 #~ msgid ""
 #~ "All chat states\n"
 #~ "Composing only\n"
@@ -10372,9 +10690,6 @@ msgstr " resurs med prioritet "
 #~ msgid "gtk-cancel"
 #~ msgstr "Avbryt"
 
-#~ msgid "_Preferences"
-#~ msgstr "_Inställningar"
-
 #~ msgid "_Quit"
 #~ msgstr "A_vsluta"
 
@@ -10857,9 +11172,6 @@ msgstr " resurs med prioritet "
 #~ msgid "Treat all incoming messages as:"
 #~ msgstr "Behandla alla inkommande meddelanden som:"
 
-#~ msgid "Use t_rayicon (aka. notification area icon)"
-#~ msgstr "Använd _aktivitetsfältet (aka. notifieringsyta)"
-
 #~ msgid ""
 #~ "When a new event (message, file transfer request etc..) is received, the "
 #~ "following methods may be used to inform you about it. Please note that "
@@ -10982,13 +11294,6 @@ msgstr " resurs med prioritet "
 #~ msgid "Session Management support not available (missing gnome.ui module)"
 #~ msgstr "Session Management-stöd inte tillgängligt (saknar gnome.ui-modul)"
 
-#~ msgid ""
-#~ "Usage: %s %s %s \n"
-#~ "\t %s"
-#~ msgstr ""
-#~ "Användning: %s %s %s \n"
-#~ "\t %s"
-
 #~ msgid "Private Chat"
 #~ msgstr "Privat Chatt"
 
diff --git a/po/uk.po b/po/uk.po
index 1a2c4057d7eb3c8ab474fded82f7f9482edea647..0c052e9b834dc6b363ee1ec630aab399fc3d33a8 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -2,23 +2,28 @@
 # Ukrainian translations for Gajim - A Jabber Instant Messager package.
 # Copyright (C) 2008 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.
-# 
+#
 # Sergiy Yegorov <prapor@unixzone.org.ua>, 2009, 2010.
 # Yuri Chornoivan <yurchor@ukr.net>, 2008.
 # Sergiy Yegorov <syegorov@act.dp.ua>, 2010.
+#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: uk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 11:28+0200\n"
+"POT-Creation-Date: 2010-10-01 20:39+0200\n"
 "PO-Revision-Date: 2010-07-27 13:53+0300\n"
 "Last-Translator: Sergiy Yegorov <syegorov@act.dp.ua>\n"
 "Language-Team: Ukrainian <kde-i18n-doc@kde.org>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.0\n"
 
 #: ../data/gui/account_context_menu.ui.h:1 ../data/gui/roster_window.ui.h:7
@@ -29,7 +34,7 @@ msgstr "Приєднатись до _групової балачки"
 msgid "_Add Contact..."
 msgstr "_Додати контакт..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:17
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
 msgid "_Discover Services"
 msgstr "Ви_явити служби"
 
@@ -49,7 +54,7 @@ msgstr "Ві_дкрити «Вхідні» Gmail"
 msgid "_Personal Events"
 msgstr "_Особисті події"
 
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:23
+#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
 msgid "_Start Chat..."
 msgstr "_Почати балачку..."
 
@@ -81,10 +86,6 @@ msgid "<b>Please select a server</b>"
 msgstr "<b>Будь ласка, виберіть сервер</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid "@"
-msgstr "@"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
@@ -92,64 +93,66 @@ msgstr ""
 "Додати цей сертифікат до переліку довірених сертифікатів.\n"
 "SHA1 відбиток сертифікату:\n"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:10
 msgid "Anon_ymous authentication"
 msgstr "Анонімна авторизація"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Connect when I press Finish"
 msgstr "З'єднатись після натискання кнопки «Завершити»"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Майстер створення облікових записів"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "I already have an account I want to _use"
 msgstr "Я вже маю обліковий запис, який бажаю _використовувати"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I want to _register for a new account"
 msgstr "Я бажаю _зареєструвати новий обліковий запис"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:16
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 #: ../data/gui/accounts_window.ui.h:28
 msgid "If checked, Gajim will remember the password for this account"
-msgstr "Якщо буде позначено цей пункт, Gajim запам'ятає пароль цього облікового запису"
+msgstr ""
+"Якщо буде позначено цей пункт, Gajim запам'ятає пароль цього облікового "
+"запису"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:17
+#: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "Керування..."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:18
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
 #: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2263 ../src/config.py:2342
-#: ../src/config.py:2355 ../src/config.py:3596 ../src/config.py:3671
-#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513
-#: ../src/dialogs.py:526 ../src/roster_window.py:2890
-#: ../src/roster_window.py:2896 ../src/roster_window.py:2901
+#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
+#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
+#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
+#: ../src/dialogs.py:527 ../src/roster_window.py:2956
+#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
 msgid "None"
 msgstr "Немає"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:19
+#: ../data/gui/account_creation_wizard_window.ui.h:18
 msgid "Prox_y:"
 msgstr "Прокс_і:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #: ../data/gui/accounts_window.ui.h:48
 msgid "Save pass_word"
 msgstr "Зберегти _пароль"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:21
+#: ../data/gui/account_creation_wizard_window.ui.h:20
 msgid "Set my profile when I connect"
 msgstr "Налаштувати мій профіль після з’єднання"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:22
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Use custom hostname/port"
 msgstr "Використовувати інші вузол/порт"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:23
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -157,34 +160,34 @@ msgstr ""
 "Для з’єднання з мережею Jabber вам потрібен обліковий\n"
 "запис."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-#: ../data/gui/roster_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:16
 msgid "_Advanced"
 msgstr "Д_одатково"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:25
 msgid "_Finish"
 msgstr "_Завершити"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:27
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Hostname:"
 msgstr "Назва _вузла:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #: ../data/gui/accounts_window.ui.h:62
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:28
 #: ../data/gui/accounts_window.ui.h:64
 msgid "_Password:"
 msgstr "_Password:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:29
 msgid "_Port:"
 msgstr "_Порт:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:31
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Server:"
 msgstr "_Сервер:"
 
@@ -241,8 +244,12 @@ msgid "Chan_ge Password"
 msgstr "_Змінити пароль"
 
 #: ../data/gui/accounts_window.ui.h:14
-msgid "Check this so Gajim will ask you before sending your password over an insecure connection."
-msgstr "Позначте цей пункт, щоб Gajim запитував вас перед надсиланням пароля через незахищеним з’єднанням."
+msgid ""
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
+msgstr ""
+"Позначте цей пункт, щоб Gajim запитував вас перед надсиланням пароля через "
+"незахищеним з’єднанням."
 
 #: ../data/gui/accounts_window.ui.h:15
 msgid "Choose Client Cert"
@@ -258,7 +265,9 @@ msgstr "Натисніть. щоб змінити пароль цього обл
 
 #: ../data/gui/accounts_window.ui.h:18
 msgid "Click to request authorization to all contacts of another account"
-msgstr "Натисніть, щоб запитати уповноваження від усіх контактів іншого облікового запису"
+msgstr ""
+"Натисніть, щоб запитати уповноваження від усіх контактів іншого облікового "
+"запису"
 
 #: ../data/gui/accounts_window.ui.h:19
 msgid "Client certificate"
@@ -285,47 +294,69 @@ msgstr "Ім'я:"
 #. No configured account
 #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
 #: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592
-#: ../src/notify.py:608
+#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
+#: ../src/notify.py:616
 msgid "Gajim"
 msgstr "Gajim"
 
 #. FIXME: Ugly workaround.
-#. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to
-#. General)
+#. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
 #. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:61
-#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121
-#: ../src/roster_window.py:2832 ../src/roster_window.py:5379
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
+#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
 msgid "General"
 msgstr "Загальне"
 
 #: ../data/gui/accounts_window.ui.h:26
-msgid "If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working."
-msgstr "Якщо буде позначено цей пункт, Gajim також буде транслювати додаткові IP-адреси. окрім вашої, тому передавання файлів працюватиме з більшою ймовірністю."
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Якщо буде позначено цей пункт, Gajim також буде транслювати додаткові IP-"
+"адреси. окрім вашої, тому передавання файлів працюватиме з більшою "
+"ймовірністю."
 
 #: ../data/gui/accounts_window.ui.h:27
 msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Якщо буде позначено цей пункт, Gajim буде отримувати пароль від агента GPG, наприклад, seahorse."
+msgstr ""
+"Якщо буде позначено цей пункт, Gajim буде отримувати пароль від агента GPG, "
+"наприклад, seahorse."
 
 #: ../data/gui/accounts_window.ui.h:29
-msgid "If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection"
-msgstr "Якщо буде позначено цей пункт, Gajim надсилатиме порожні пакети для запобігання простою з'єднання (такий простій може призводити до від'єднання)"
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"Якщо буде позначено цей пункт, Gajim надсилатиме порожні пакети для "
+"запобігання простою з'єднання (такий простій може призводити до від'єднання)"
 
 #: ../data/gui/accounts_window.ui.h:30
-msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account"
-msgstr "Якщо буде позначено цей пункт, Gajim під час запуску буде автоматично намагатись з'єднатися з вказаним обліковим записом на сервері jabber"
+msgid ""
+"If checked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
+msgstr ""
+"Якщо буде позначено цей пункт, Gajim під час запуску буде автоматично "
+"намагатись з'єднатися з вказаним обліковим записом на сервері jabber"
 
 #: ../data/gui/accounts_window.ui.h:31
-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 accordingly"
-msgstr "Якщо буде позначено цей пункт, будь-яка зміна загального стану (керується спадним списком у нижній частині вікна реєстру) призведе до відповідних змін стану цього облікового запису"
+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 "
+"accordingly"
+msgstr ""
+"Якщо буде позначено цей пункт, будь-яка зміна загального стану (керується "
+"спадним списком у нижній частині вікна реєстру) призведе до відповідних змін "
+"стану цього облікового запису"
 
 #: ../data/gui/accounts_window.ui.h:32
 msgid ""
-"If the default port that is used for incoming messages is unfitting for your setup you can select another one here.\n"
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
 "You might consider to change possible firewall settings."
 msgstr ""
-"Якщо номер типового порту для вхідних повідомлень є неприйнятним для ваших налаштувань, ви можете налаштувати інший.\n"
+"Якщо номер типового порту для вхідних повідомлень є неприйнятним для ваших "
+"налаштувань, ви можете налаштувати інший.\n"
 "Можливо, вам також доведеться змінити параметри брандмауера."
 
 #: ../data/gui/accounts_window.ui.h:34
@@ -334,7 +365,7 @@ msgstr "Відомості про вас, які зберігаються на 
 
 #: ../data/gui/accounts_window.ui.h:35
 #: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:830
+#: ../src/dialogs.py:831
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -348,7 +379,7 @@ msgid "Mer_ge accounts"
 msgstr "Об’є_днати облікові записи"
 
 #: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2356
+#: ../src/config.py:2358
 msgid "No key selected"
 msgstr "Не обрано жодного ключа"
 
@@ -361,15 +392,21 @@ msgid "Priori_ty:"
 msgstr "Пріорите_т:"
 
 #: ../data/gui/accounts_window.ui.h:42
-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 client with the highest priority gets the events"
-msgstr "Пріоритет використовується для того, щоб визначити отримувача повідомлень від jabber-сервера, якщо з одним обліковим записом з’єднано декілька клієнтів. Повідомлення про події отримує клієнт з найвищим пріоритетом"
+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 "
+"client with the highest priority gets the events"
+msgstr ""
+"Пріоритет використовується для того, щоб визначити отримувача повідомлень "
+"від jabber-сервера, якщо з одним обліковим записом з’єднано декілька "
+"клієнтів. Повідомлення про події отримує клієнт з найвищим пріоритетом"
 
 #: ../data/gui/accounts_window.ui.h:43
 msgid "Priority will change automatically according to your status."
 msgstr "Пріоритет змінюватиметься залежно від вашого стану."
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5329
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
 msgid "Re_name"
 msgstr "Пере_йменувати"
 
@@ -378,8 +415,18 @@ msgid "Resour_ce:"
 msgstr "Ресур_с:"
 
 #: ../data/gui/accounts_window.ui.h:46
-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 same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)"
-msgstr "Ресурс буде надіслано до сервера Jabber для розділення одного JID на дві або більше частини, в залежності від кількості клієнтів під'єднаних до сервера з одним обліковим записом. Таким чином ви можете з'єднатись одночасно з обліковим записом з ресурсів «Домівка» або «Робота». Ресурс з найвищім пріоритетом буде отримувати усі повідомлення та події. (Див. нижче)"
+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 "
+"same server with the same account. So you might be connected in the same "
+"account with resource 'Home' and 'Work' at the same time. The resource which "
+"has the highest priority will get the events. (see below)"
+msgstr ""
+"Ресурс буде надіслано до сервера Jabber для розділення одного JID на дві або "
+"більше частини, в залежності від кількості клієнтів під'єднаних до сервера з "
+"одним обліковим записом. Таким чином ви можете з'єднатись одночасно з "
+"обліковим записом з ресурсів «Домівка» або «Робота». Ресурс з найвищім "
+"пріоритетом буде отримувати усі повідомлення та події. (Див. нижче)"
 
 #: ../data/gui/accounts_window.ui.h:47
 msgid "Save conversation _logs for all contacts"
@@ -562,7 +609,9 @@ msgstr "<b>Опис</b>"
 
 #: ../data/gui/advanced_configuration_window.ui.h:2
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
-msgstr "<b>ЗАУВАЖЕННЯ:</b> Ви маєте перезавантажити Gajim, щоб деякі з параметрів набули чинності"
+msgstr ""
+"<b>ЗАУВАЖЕННЯ:</b> Ви маєте перезавантажити Gajim, щоб деякі з параметрів "
+"набули чинності"
 
 #: ../data/gui/advanced_configuration_window.ui.h:3
 msgid "Advanced Configuration Editor"
@@ -581,38 +630,43 @@ msgid "Deletes Message of the Day"
 msgstr "Вилучає «Повідомлення дня»"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
+#, fuzzy
+msgid "Edit Archi_ving Preferences"
+msgstr "_Параметри"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Edit _Privacy Lists..."
 msgstr "Редагувати _списки конфіденційності..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sends a message to users currently connected to this server"
 msgstr "Надсилає повідомлення усім користувачам, з’єднаним з сервером"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Set MOTD..."
 msgstr "Встановити «Повідомлення дня»..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Встановлює «Повідомлення дня»"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Show _XML Console"
 msgstr "Показати _XML-консоль"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "Update MOTD..."
 msgstr "Оновити «Повідомлення дня»..."
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "Оновлює «Повідомлення дня»"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:11
 msgid "_Administrator"
 msgstr "_Адміністратор"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:11
+#: ../data/gui/advanced_menuitem_menu.ui.h:12
 msgid "_Send Server Message..."
 msgstr "_Надіслати серверне повідомлення..."
 
@@ -646,7 +700,7 @@ msgid "All statuses"
 msgstr "Усі стани"
 
 #: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:233
+#: ../src/common/commands.py:106 ../src/common/helpers.py:239
 #: ../src/tooltips.py:193
 msgid "Away"
 msgstr "Далеко"
@@ -692,7 +746,7 @@ msgid "Have "
 msgstr "Має "
 
 #: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:249
 msgid "Invisible"
 msgstr "Невидимка"
 
@@ -701,7 +755,7 @@ msgid "Launch a command"
 msgstr "Запустити команду"
 
 #: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:216 ../src/tooltips.py:197
+#: ../src/common/helpers.py:222 ../src/tooltips.py:197
 msgid "Not Available"
 msgstr "Дуже далеко"
 
@@ -726,8 +780,11 @@ msgid "When "
 msgstr "Якщо "
 
 #: ../data/gui/advanced_notifications_window.ui.h:27
-msgid "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr "_Задіяти UrgencyHint віконного менеджера, щоб змусити блимати позначку вікна балачки на панелі задач"
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
+msgstr ""
+"_Задіяти UrgencyHint віконного менеджера, щоб змусити блимати позначку вікна "
+"балачки на панелі задач"
 
 #: ../data/gui/advanced_notifications_window.ui.h:28
 msgid "_Disable auto opening chat window"
@@ -742,12 +799,13 @@ msgid "_Disable existing sound for this event"
 msgstr "_Вимкнути існуючі звукові повідомлення для цієї події"
 
 #: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in roster"
+#, fuzzy
+msgid "_Disable showing event in notification area"
 msgstr "_Вимкнути події появи у реєстрі"
 
 #: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in systray"
-msgstr "_Вимкнути події появи у системному лотку"
+msgid "_Disable showing event in roster"
+msgstr "_Вимкнути події появи у реєстрі"
 
 #: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
@@ -758,12 +816,13 @@ msgid "_Open chat window with user"
 msgstr "_Відкрити вікно балачки з користувачем"
 
 #: ../data/gui/advanced_notifications_window.ui.h:35
-msgid "_Show event in roster"
+#, fuzzy
+msgid "_Show event in notification area"
 msgstr "_Показати подію у реєстрі"
 
 #: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in systray"
-msgstr "_Показати подію у системному лотку"
+msgid "_Show event in roster"
+msgstr "_Показати подію у реєстрі"
 
 #: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
@@ -789,6 +848,45 @@ msgstr "груп(и)"
 msgid "when I'm in"
 msgstr "коли я у"
 
+#: ../data/gui/archiving_preferences_window.ui.h:1
+msgid "<i>Method Auto</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "<i>Method Local</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:3
+msgid "<i>Method Manual</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:4
+#, fuzzy
+msgid "Auto"
+msgstr "Автоматичне приєднання"
+
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Concede"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "Forbid"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:7
+#, fuzzy
+msgid "No"
+msgstr "Немає"
+
+#: ../data/gui/archiving_preferences_window.ui.h:8
+#, fuzzy
+msgid "Prefer"
+msgstr "Параметри"
+
+#: ../data/gui/archiving_preferences_window.ui.h:9
+msgid "Yes"
+msgstr ""
+
 #: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Запис:"
@@ -815,8 +913,8 @@ msgstr "Заблоковані контакти"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5348
-#: ../src/roster_window.py:5476 ../src/roster_window.py:5609
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
+#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
 msgid "_Unblock"
 msgstr "_Розблокувати"
 
@@ -904,7 +1002,7 @@ msgid "_Start Chat"
 msgstr "_Почати балачку"
 
 #. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4184
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
 msgid "#"
 msgstr "â„–"
 
@@ -952,14 +1050,49 @@ msgstr "8"
 msgid "9"
 msgstr "9"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is
-#. supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:13
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Додати цей контакт до реєстру (Ctrl+D)"
+
 #: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Переглянути журнал балачки (Ctrl+H)"
+
+#: ../data/gui/chat_control.ui.h:15
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Запросити контакти до спілкування (Ctrl+G)"
+
+#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Показати список емоційок (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
+msgid "Show a list of formattings"
+msgstr "Показати список інструментів форматування"
+
+#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "Показати меню додаткових можливостей (Alt+A)"
+
+#: ../data/gui/chat_control.ui.h:19
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr "Показати профіль контакту (Ctrl+I)"
+
+#: ../data/gui/chat_control.ui.h:20
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:21
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
 #: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "_Надіслати"
 
-#: ../data/gui/chat_control.ui.h:15 ../data/gui/groupchat_control.ui.h:3
+#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
 msgid "label"
 msgstr "мітка"
 
@@ -1009,8 +1142,8 @@ msgstr "Редагувати _групи..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5284
-#: ../src/roster_window.py:5444
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
+#: ../src/roster_window.py:5516
 msgid "In_vite to"
 msgstr "За_просити до"
 
@@ -1022,8 +1155,8 @@ msgstr "Запросити _контакти"
 msgid "Remo_ve"
 msgstr "В_илучити"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5294
-#: ../src/roster_window.py:5533
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
+#: ../src/roster_window.py:5605
 msgid "Send Cus_tom Status"
 msgstr "Надіслати не_типовий стан"
 
@@ -1056,8 +1189,8 @@ msgid "_Allow him/her to see my status"
 msgstr "_Дозволити йому/їй бачити мій стан"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5482 ../src/roster_window.py:5612
+#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
+#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
 msgid "_Block"
 msgstr "_Заблокувати"
 
@@ -1067,8 +1200,8 @@ msgstr "_Заборонити йому/їй бачити мій стан"
 
 #: ../data/gui/contact_context_menu.ui.h:20
 #: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:21
-#: ../src/roster_window.py:5683
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
+#: ../src/roster_window.py:5755
 msgid "_History"
 msgstr "_Журнал"
 
@@ -1161,8 +1294,12 @@ msgid "Shows a list of file transfers between you and others"
 msgstr "Показує список передавань файлів"
 
 #: ../data/gui/filetransfers.ui.h:11
-msgid "This action removes single file transfer from the list. If the transfer is active, it is first stopped and then removed"
-msgstr "За допомогою цього пункту можна вилучити окреме передавання файла зі списку. Якщо це передавання ще триває, його буде зупинено, а потім вже вилучено"
+msgid ""
+"This action removes single file transfer from the list. If the transfer is "
+"active, it is first stopped and then removed"
+msgstr ""
+"За допомогою цього пункту можна вилучити окреме передавання файла зі списку. "
+"Якщо це передавання ще триває, його буде зупинено, а потім вже вилучено"
 
 #: ../data/gui/filetransfers.ui.h:12
 msgid "When a file transfer is complete show a popup notification"
@@ -1196,7 +1333,7 @@ msgstr "<b>Кольори вкладки стану балачки</b>"
 msgid "Account row"
 msgstr "Стрічка облікового запису"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:925
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
 msgid "Bold"
 msgstr "Жирний"
 
@@ -1232,7 +1369,7 @@ msgstr "Стрічка групи"
 msgid "Inactive"
 msgstr "Неактивний"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:926
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
 msgid "Italic"
 msgstr "Курсив"
 
@@ -1280,7 +1417,7 @@ msgstr "Змінити _тему..."
 msgid "Configure _Room..."
 msgstr "Налаштувати _кімнату..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1782
+#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
 msgid "_Bookmark"
 msgstr "_Закладка"
 
@@ -1340,35 +1477,51 @@ msgstr "_Надіслати конфіденційне повідомлення"
 msgid "_Voice"
 msgstr "_Голос"
 
+#: ../data/gui/groupchat_control.ui.h:1
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Зробити закладку на цій кімнаті (Ctrl+B)"
+
+#: ../data/gui/groupchat_control.ui.h:3
+msgid "Change the room's subject (Alt+T)"
+msgstr "Змінити тему обговорення у кімнаті (Alt+T)"
+
+#: ../data/gui/groupchat_control.ui.h:4
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Змінити ваш псевдонім (Ctrl+N)"
+
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Створити нове повідомлення"
 
-#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
-msgid "From"
-msgstr "Від"
+#: ../data/gui/groups_post_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:2
+msgid "From:"
+msgstr "Від:"
 
-#. holds subject
-#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
-#: ../src/history_manager.py:219
-msgid "Subject"
-msgstr "Тема"
+#: ../data/gui/groups_post_window.ui.h:3
+#: ../data/gui/single_message_window.ui.h:7
+msgid "Subject:"
+msgstr "Тема:"
 
 #: ../data/gui/history_manager.ui.h:1
 msgid ""
 "<b>WARNING:</b>\n"
-"If you plan to do massive deletions, please make sure Gajim is not running. Generally avoid deletions with contacts you currently chat with."
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
 msgstr ""
 "<b>УВАГА:</b>\n"
-"Якщо ви плануєте масові вилучення, будь ласка, переконайтеся, що Gajim не запущено. Взагалі, уникайте вилучення контактів, з якими ви зараз спілкуєтеся."
+"Якщо ви плануєте масові вилучення, будь ласка, переконайтеся, що Gajim не "
+"запущено. Взагалі, уникайте вилучення контактів, з якими ви зараз "
+"спілкуєтеся."
 
 #: ../data/gui/history_manager.ui.h:3
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
-msgstr "<big><b>Ласкаво просимо до інструменту керування журналами Gajim</b></big>"
+msgstr ""
+"<big><b>Ласкаво просимо до інструменту керування журналами Gajim</b></big>"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3208
-#: ../src/dialogs.py:3305
+#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
+#: ../src/dialogs.py:3321
 msgid "Delete"
 msgstr "Вилучити"
 
@@ -1382,13 +1535,18 @@ msgstr "Інструмент керування журналами Gajim"
 
 #: ../data/gui/history_manager.ui.h:7
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for such functionality, use the history window instead.\n"
+"This log manager is not intended for log viewing. If you are looking for "
+"such functionality, use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left and/or search database from below."
+"Use this program to delete or export logs. You can select logs from the left "
+"and/or search database from below."
 msgstr ""
-"Цей інструмент керування журналом не призначено для перегляду журналу. Якщо вам потрібно переглянути журнал, скористайтеся вікном історії.\n"
+"Цей інструмент керування журналом не призначено для перегляду журналу. Якщо "
+"вам потрібно переглянути журнал, скористайтеся вікном історії.\n"
 "\n"
-"Цією програмою можна скористатися для вилучення або експорту журналів. У лівій частині вікна ви можете обрати журнали, пошук у базі даних можна виконати нижче."
+"Цією програмою можна скористатися для вилучення або експорту журналів. У "
+"лівій частині вікна ви можете обрати журнали, пошук у базі даних можна "
+"виконати нижче."
 
 #: ../data/gui/history_manager.ui.h:10
 msgid "_Search Database"
@@ -1419,11 +1577,75 @@ msgstr "Пошук:"
 msgid "_Log conversation history"
 msgstr "_Зберігати журнал спілкування"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
+msgid "approve"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:2
+#, fuzzy
+msgid "body"
+msgstr "всі"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:3
+msgid "concede"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:4
+msgid "expire"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:5
+msgid "false"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:6
+msgid "forbid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:7
+#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+msgid "jid"
+msgstr "jid"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:8
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
+#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
+msgid "message"
+msgstr "повідомлення"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
+msgid "oppose"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
+#, fuzzy
+msgid "otr"
+msgstr "Гарячий"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:11
+msgid "prefer"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:12
+msgid "require"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:13
+msgid "save"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:14
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/join_groupchat_window.ui.h:2
 msgid "Bro_wse Rooms"
 msgstr "_Перегляд кімнат"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2180
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
 msgid "Join Group Chat"
 msgstr "Приєднатись до групової балачки"
 
@@ -1459,8 +1681,8 @@ msgstr "Сервер:"
 msgid "_Bookmark this room"
 msgstr "Зробити закладку на цій кімнаті"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1341
-#: ../src/disco.py:1786
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../src/disco.py:1804
 msgid "_Join"
 msgstr "При_єднатися"
 
@@ -1470,7 +1692,9 @@ msgstr "Автоматичне приєднання"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:2
 msgid "If checked, Gajim will join this group chat on startup"
-msgstr "Якщо буде позначено цей пункт, Gajim буде приєднуватись до цієї групової балачки після запуску"
+msgstr ""
+"Якщо буде позначено цей пункт, Gajim буде приєднуватись до цієї групової "
+"балачки після запуску"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
@@ -1560,6 +1784,75 @@ msgstr "_Користувач:"
 msgid "Passphrase"
 msgstr "Пароль"
 
+#: ../data/gui/plugins_window.ui.h:1
+msgid "&lt;empty&gt;"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:2
+msgid "<empty>"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:3
+#, fuzzy
+msgid "Authors:"
+msgstr "_Уповноважити"
+
+#: ../data/gui/plugins_window.ui.h:4
+#, fuzzy
+msgid "Available"
+msgstr "_Доступний"
+
+#: ../data/gui/plugins_window.ui.h:5
+#, fuzzy
+msgid "Configure"
+msgstr "_Налаштувати..."
+
+#: ../data/gui/plugins_window.ui.h:6
+#, fuzzy
+msgid "Descrition:"
+msgstr "Опис: "
+
+#: ../data/gui/plugins_window.ui.h:7
+#, fuzzy
+msgid "Homepage:"
+msgstr "<b>Домашня сторінка:</b>"
+
+#: ../data/gui/plugins_window.ui.h:8
+msgid "Install"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:9
+#, fuzzy
+msgid "Installed"
+msgstr "Заблоковано"
+
+#: ../data/gui/plugins_window.ui.h:10
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:11
+msgid "Plugins"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:12
+msgid "Uninstall"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:13
+#, fuzzy
+msgid "Version:"
+msgstr "Версія GTK+:"
+
+#: ../data/gui/plugins_window.ui.h:14
+msgid "button"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:15
+msgid "homepage url"
+msgstr ""
+
 #: ../data/gui/popup_notification_window.ui.h:1
 msgid "Event Type"
 msgstr "Тип події"
@@ -1600,8 +1893,7 @@ msgstr "<b>Сповіщення про стан у балачці</b>"
 msgid "<b>Connection</b>"
 msgstr "<b>З’єднання</b>"
 
-#. a header for custom browser/client/file manager. so translate sth like:
-#. Custom Settings
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:10
 msgid "<b>Custom</b>"
 msgstr "<b>Нетипове</b>"
@@ -1668,7 +1960,8 @@ msgstr "Дозволити надсилання часу бездіяльнос
 
 #: ../data/gui/preferences_window.ui.h:28
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr "Дозволити сповіщення у разі встановленого стану в_ідійшов/зайнятий/тощо"
+msgstr ""
+"Дозволити сповіщення у разі встановленого стану в_ідійшов/зайнятий/тощо"
 
 #: ../data/gui/preferences_window.ui.h:29
 msgid "Allow sound when I'm _busy"
@@ -1679,255 +1972,330 @@ msgid "Always"
 msgstr "Завжди"
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Always use GNOME default applications"
-msgstr "Завжди використовувати типові програми GNOME"
-
-#: ../data/gui/preferences_window.ui.h:32
-msgid "Always use KDE default applications"
-msgstr "Завжди використовувати типові програми KDE"
-
-#: ../data/gui/preferences_window.ui.h:33
-msgid "Always use Xfce default applications"
-msgstr "Завжди використовувати типові програми Xfce"
-
-#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Запитувати щодо повідомлення про стан, якщо я:"
 
-#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
 msgid "Audio / Video"
 msgstr "Аудіо/Відео"
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:33
 msgid "Audio input device"
 msgstr "Пристрій введення звуку"
 
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Audio output device"
 msgstr "Пристрій відтворення звуку"
 
-#: ../data/gui/preferences_window.ui.h:38
-msgid "Autodetect on every Gajim startup"
-msgstr "Автоматично визначати при кожному старті Gajim"
-
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:35
 msgid "Chat message:"
 msgstr "Повідомлення балачки:"
 
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:36
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Перевіряти при запуску, чи є Gajim _типовим клієнтом Jabber"
 
-#: ../data/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:37
 msgid "Composing only"
 msgstr "Лише друк"
 
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:38
 msgid "Configure color and font of the interface"
 msgstr "Налаштувати шрифт та колір інтерфейсу"
 
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:39
 msgid "Contact's message:"
 msgstr "Повідомлення контакту:"
 
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:40
 msgid "Contact's nickname:"
 msgstr "Псевдонім контакту:"
 
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:41
 msgid "Custom"
 msgstr "Нетиповий"
 
-#: ../data/gui/preferences_window.ui.h:46
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Detached roster with chat grouped by account"
-msgstr "Відокремлений реєстр з балачками згуртованими відповідно облікових записів"
+msgstr ""
+"Відокремлений реєстр з балачками згуртованими відповідно облікових записів"
 
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Detached roster with chat grouped by type"
 msgstr "Відокремлений реєстр з балачками згуртованими відповідно типу"
 
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Detached roster with detached chats"
 msgstr "Відокремлений реєстр з окремими балачками"
 
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:45
 msgid "Detached roster with single chat"
 msgstr "Відокремлений реєстр з єдиним вікном балачок"
 
-#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
-#: ../src/config.py:671
+#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
+#: ../src/config.py:665
 msgid "Disabled"
 msgstr "Вимкнено"
 
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:47
 msgid "Display _activity of contacts in roster"
 msgstr "Показувати _заняття контактів у реєстрі"
 
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:48
 msgid "Display _extra email details"
 msgstr "Показати _подробиці щодо скриньки"
 
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:49
 msgid "Display _location of contacts in roster"
 msgstr "Показувати _положення контактів у реєстрі"
 
-#: ../data/gui/preferences_window.ui.h:54
+#: ../data/gui/preferences_window.ui.h:50
 msgid "Display _tunes of contacts in roster"
 msgstr "Показувати _музику контактів у реєстрі"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display a_vatars of contacts in roster"
 msgstr "Показувати _аватари контактів у реєстрі"
 
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display m_ood of contacts in roster"
 msgstr "Показувати _настрій контактів у реєстрі"
 
-#: ../data/gui/preferences_window.ui.h:57
+#: ../data/gui/preferences_window.ui.h:53
 msgid "Display status _messages of contacts in roster"
 msgstr "Показувати _повідомлення  про стан контактів з реєстру"
 
-#: ../data/gui/preferences_window.ui.h:58
-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 display in chat windows."
-msgstr "Gajim може надсилати і отримувати метаінформацію, пов'язану з розмовою, яку ви вели з контактом. Тут ви можете вказати стани, які ви бажаєте бачити у вікні розмови."
+#: ../data/gui/preferences_window.ui.h:54
+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 "
+"display in chat windows."
+msgstr ""
+"Gajim може надсилати і отримувати метаінформацію, пов'язану з розмовою, яку "
+"ви вели з контактом. Тут ви можете вказати стани, які ви бажаєте бачити у "
+"вікні розмови."
 
-#: ../data/gui/preferences_window.ui.h:59
-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 send to the other party."
-msgstr "Gajim може надсилати та отримувати метаінформацію пов'язану з вашим спілкуванням з контактом. Тут ви можете зазначити стани, які ви бажаєте надсилати іншому учаснику балачки."
+#: ../data/gui/preferences_window.ui.h:55
+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 "
+"send to the other party."
+msgstr ""
+"Gajim може надсилати та отримувати метаінформацію пов'язану з вашим "
+"спілкуванням з контактом. Тут ви можете зазначити стани, які ви бажаєте "
+"надсилати іншому учаснику балачки."
 
-#: ../data/gui/preferences_window.ui.h:60
-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/gui/preferences_window.ui.h:56
+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/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:58
 msgid "Hide all buttons in chat windows"
 msgstr "Сховати усі кнопки у вікнах балачок"
 
+#: ../data/gui/preferences_window.ui.h:59
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr ""
+"Якщо буде позначено цей пункт, Gajim дозволить іншим визначати, яку "
+"операційну систему ви використовуєте"
+
+#: ../data/gui/preferences_window.ui.h:60
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+"Якщо буде позначено цей пункт, Gajim буде також додавати інформацію про "
+"авторів листів"
+
+#: ../data/gui/preferences_window.ui.h:61
+msgid ""
+"If checked, Gajim will change status to Away when the computer is unused."
+msgstr ""
+"Якщо буде позначено цей пункт, Gajim буде змінювати стан на «Відсутній», "
+"якщо комп’ютер не використовуватиметься."
+
+#: ../data/gui/preferences_window.ui.h:62
+msgid ""
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
+msgstr ""
+"Якщо буде позначено цей пункт, Gajim змінюватиме стан на «Недоступний», якщо "
+"на комп’ютері не спостерігатиметься активності користувача довше, ніж"
+
 #: ../data/gui/preferences_window.ui.h:63
-msgid "If checked, Gajim will allow others to detect the operation system you are using"
-msgstr "Якщо буде позначено цей пункт, Gajim дозволить іншим визначати, яку операційну систему ви використовуєте"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Якщо буде позначено цей пункт, Gajim буде показувати аватари контактів у "
+"вікні реєстру і групових балачках"
 
 #: ../data/gui/preferences_window.ui.h:64
-msgid "If checked, Gajim will also include information about the sender of the new emails"
-msgstr "Якщо буде позначено цей пункт, Gajim буде також додавати інформацію про авторів листів"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
+msgstr ""
+"Якщо буде позначено цей пункт, Gajim буде показувати повідомлення про стан "
+"під ім'ям контакту у вікні реєстру і групових балачках"
 
 #: ../data/gui/preferences_window.ui.h:65
-msgid "If checked, Gajim will change status to Away when the computer is unused."
-msgstr "Якщо буде позначено цей пункт, Gajim буде змінювати стан на «Відсутній», якщо комп’ютер не використовуватиметься."
+msgid ""
+"If checked, Gajim will display the activity of contacts in the roster window"
+msgstr ""
+"Якщо буде позначено цей пункт, Gajim показуватиме рід занять контактів у "
+"вікні реєстру"
 
 #: ../data/gui/preferences_window.ui.h:66
-msgid "If checked, Gajim will change status to Not Available when the computer has not been used even longer"
-msgstr "Якщо буде позначено цей пункт, Gajim змінюватиме стан на «Недоступний», якщо на комп’ютері не спостерігатиметься активності користувача довше, ніж"
+msgid ""
+"If checked, Gajim will display the location of contacts in the roster window"
+msgstr ""
+"Якщо буде позначено цей пункт, Gajim показуватиме положення контактів у "
+"вікні реєстру"
 
 #: ../data/gui/preferences_window.ui.h:67
-msgid "If checked, Gajim will display avatars of contacts in roster window and in group chats"
-msgstr "Якщо буде позначено цей пункт, Gajim буде показувати аватари контактів у вікні реєстру і групових балачках"
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr ""
+"Якщо буде позначено цей пункт, Gajim показуватиме настрій контактів у вікні "
+"реєстру"
 
 #: ../data/gui/preferences_window.ui.h:68
-msgid "If checked, Gajim will display status messages of contacts under the contact name in roster window and in group chats"
-msgstr "Якщо буде позначено цей пункт, Gajim буде показувати повідомлення про стан під ім'ям контакту у вікні реєстру і групових балачках"
+msgid ""
+"If checked, Gajim will display the tunes of contacts in the roster window"
+msgstr ""
+"Якщо буде позначено цей пункт, Gajim показуватиме музику, яку слухають "
+"контакти у вікні реєстру"
 
 #: ../data/gui/preferences_window.ui.h:69
-msgid "If checked, Gajim will display the activity of contacts in the roster window"
-msgstr "Якщо буде позначено цей пункт, Gajim показуватиме рід занять контактів у вікні реєстру"
+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 ""
+"Якщо буде позначено цей пункт, Gajim позначатиме помилки правопису у полях "
+"для введення тексту вікон балачки. Якщо ви не вкажете явно мови за допомогою "
+"контекстного меню (клацання правою кнопкою миші), буде використано типову "
+"мову для контакту або групової балачки."
 
 #: ../data/gui/preferences_window.ui.h:70
-msgid "If checked, Gajim will display the location of contacts in the roster window"
-msgstr "Якщо буде позначено цей пункт, Gajim показуватиме положення контактів у вікні реєстру"
+msgid ""
+"If checked, Gajim will ignore incoming events from unauthorized contacts. "
+"Use with caution, because it blocks all messages from any contact that is "
+"not in the roster"
+msgstr ""
+"Якщо буде позначено цей пункт, Gajim ігноруватиме вхідні повідомлення про "
+"події від неуповноважених контактів. Вам слід бути обережним з цією "
+"можливістю, оскільки її за її використання всі повідомлення від контактів, "
+"яких немає у реєстрі, буде заблоковано."
 
 #: ../data/gui/preferences_window.ui.h:71
-msgid "If checked, Gajim will display the mood of contacts in the roster window"
-msgstr "Якщо буде позначено цей пункт, Gajim показуватиме настрій контактів у вікні реєстру"
+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 ""
+"Якщо буде позначено цей пункт, Gajim зберігатиме у журналі шифровані "
+"повідомлення. Будь ласка, пам’ятайте, що, якщо ви користуєтеся шифруванням "
+"E2E, ваш співрозмовник має погодитися на запис до журналу, інакше "
+"повідомлення не буде записано до журналу."
 
 #: ../data/gui/preferences_window.ui.h:72
-msgid "If checked, Gajim will display the tunes of contacts in the roster window"
-msgstr "Якщо буде позначено цей пункт, Gajim показуватиме музику, яку слухають контакти у вікні реєстру"
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"Якщо буде позначено цей пункт, Gajim показуватиме сповіщення про нові листи, "
+"отримані поштовою скринькою GMail"
 
 #: ../data/gui/preferences_window.ui.h:73
-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 "Якщо буде позначено цей пункт, Gajim позначатиме помилки правопису у полях для введення тексту вікон балачки. Якщо ви не вкажете явно мови за допомогою контекстного меню (клацання правою кнопкою миші), буде використано типову мову для контакту або групової балачки."
+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, "
+"etc...)"
+msgstr ""
+"Якщо буде позначено цей пункт, Gajim буде використовувати специфічні для "
+"протоколу піктограми станів. (Приклад: для контактів MSN будуть використані "
+"відповідні піктограми msn для станів «в мережі», «відсутній» тощо)"
 
 #: ../data/gui/preferences_window.ui.h:74
-msgid "If checked, Gajim will ignore incoming events from unauthorized contacts. Use with caution, because it blocks all messages from any contact that is not in the roster"
-msgstr "Якщо буде позначено цей пункт, Gajim ігноруватиме вхідні повідомлення про події від неуповноважених контактів. Вам слід бути обережним з цією можливістю, оскільки її за її використання всі повідомлення від контактів, яких немає у реєстрі, буде заблоковано."
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+msgstr ""
+"Якщо буде позначено цей пункт, Gajim не запитуватиме про повідомлення стану. "
+"Програма використовуватиме вказане типове повідомлення."
 
 #: ../data/gui/preferences_window.ui.h:75
-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 "Якщо буде позначено цей пункт, Gajim зберігатиме у журналі шифровані повідомлення. Будь ласка, пам’ятайте, що, якщо ви користуєтеся шифруванням E2E, ваш співрозмовник має погодитися на запис до журналу, інакше повідомлення не буде записано до журналу."
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Якщо цей пункт буде позначено, Gajim замінюватиме ascii-емоційки, наприклад, "
+"':)' відповідними статичними або анімованими емоційками"
 
 #: ../data/gui/preferences_window.ui.h:76
-msgid "If checked, Gajim will show a notification when a new e-mail is received via GMail"
-msgstr "Якщо буде позначено цей пункт, Gajim показуватиме сповіщення про нові листи, отримані поштовою скринькою GMail"
-
-#: ../data/gui/preferences_window.ui.h:77
-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, etc...)"
-msgstr "Якщо буде позначено цей пункт, Gajim буде використовувати специфічні для протоколу піктограми станів. (Приклад: для контактів MSN будуть використані відповідні піктограми msn для станів «в мережі», «відсутній» тощо)"
-
-#: ../data/gui/preferences_window.ui.h:78
-msgid "If enabled, Gajim will not ask for a status message. The specified default message will be used instead."
-msgstr "Якщо буде позначено цей пункт, Gajim не запитуватиме про повідомлення стану. Програма використовуватиме вказане типове повідомлення."
-
-#: ../data/gui/preferences_window.ui.h:79
-msgid "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons"
-msgstr "Якщо цей пункт буде позначено, Gajim замінюватиме ascii-емоційки, наприклад, ':)' відповідними статичними або анімованими емоційками"
-
-#: ../data/gui/preferences_window.ui.h:80
 msgid "Log _encrypted chat session"
 msgstr "Записувати до журналу _шифровані сеанси балачки"
 
-#: ../data/gui/preferences_window.ui.h:81
+#: ../data/gui/preferences_window.ui.h:77
 msgid "Ma_ke message windows compact"
 msgstr "У_щільнити компонування вікон повідомлень"
 
-#: ../data/gui/preferences_window.ui.h:82
+#: ../data/gui/preferences_window.ui.h:78
 msgid "Ma_nage..."
 msgstr "Ке_рування..."
 
-#: ../data/gui/preferences_window.ui.h:83
+#: ../data/gui/preferences_window.ui.h:79
 msgid "Never"
 msgstr "Ніколи"
 
-#: ../data/gui/preferences_window.ui.h:84
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Notifications"
 msgstr "Сповіщення"
 
-#: ../data/gui/preferences_window.ui.h:85
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Notify me about contacts that sign _in"
 msgstr "Сповіщати мене про в_хід контактів до мережі"
 
-#: ../data/gui/preferences_window.ui.h:86
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Notify me about contacts that sign _out"
 msgstr "Сповіщати мене про в_ихід контактів з мережі"
 
-#: ../data/gui/preferences_window.ui.h:87
+#: ../data/gui/preferences_window.ui.h:83
 msgid "Notify me about it"
 msgstr "Сповіщати мене про це"
 
-#: ../data/gui/preferences_window.ui.h:88
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notify on new _GMail email"
 msgstr "Сповіщати про нові листи _GMail"
 
-#: ../data/gui/preferences_window.ui.h:89
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Only when pending events"
 msgstr "Лише події, що очікують уваги"
 
-#: ../data/gui/preferences_window.ui.h:90
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Personal Events"
 msgstr "Особисті події"
 
-#: ../data/gui/preferences_window.ui.h:91
+#: ../data/gui/preferences_window.ui.h:87
 msgid "Play _sounds"
 msgstr "Відтворювати _звуки"
 
-#: ../data/gui/preferences_window.ui.h:92
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Pop it up"
 msgstr "Підняти це"
 
-#: ../data/gui/preferences_window.ui.h:93
+#: ../data/gui/preferences_window.ui.h:89
 msgid "Preferences"
 msgstr "Параметри"
 
-#: ../data/gui/preferences_window.ui.h:94
+#: ../data/gui/preferences_window.ui.h:90
 msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
@@ -1935,181 +2303,198 @@ msgstr ""
 "Ім’я серверу STUN. Якщо нічого не вказано\n"
 "Gajim спробує отримати значення з серверу."
 
-#: ../data/gui/preferences_window.ui.h:96
+#: ../data/gui/preferences_window.ui.h:92
 msgid "STUN server:"
 msgstr "Сервер STUN:"
 
-#: ../data/gui/preferences_window.ui.h:97
+#: ../data/gui/preferences_window.ui.h:93
+#, fuzzy
+msgid "Show notification area icon:"
+msgstr "Фонова служба сповіщення"
+
+#: ../data/gui/preferences_window.ui.h:94
 msgid "Show only in roster"
 msgstr "_Показати лише у реєстрі"
 
-#: ../data/gui/preferences_window.ui.h:98
-msgid "Show systray:"
-msgstr "_Показати подію у системному лотку"
-
-#: ../data/gui/preferences_window.ui.h:99
+#: ../data/gui/preferences_window.ui.h:95
 msgid "Sign _in"
 msgstr "Уві_йти"
 
-#: ../data/gui/preferences_window.ui.h:100
+#: ../data/gui/preferences_window.ui.h:96
 msgid "Sign _out"
 msgstr "Вий_ти"
 
-#: ../data/gui/preferences_window.ui.h:101
+#: ../data/gui/preferences_window.ui.h:97
 msgid "Single window for everything"
 msgstr "Єдине вікно для усього"
 
-#: ../data/gui/preferences_window.ui.h:102
-msgid "Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text."
-msgstr "У деяких повідомленнях може міститися текст з форматуванням (розташування тексту, кольори тощо). Якщо буде позначено цей пункт, Gajim показуватиме простий текст без форматування."
+#: ../data/gui/preferences_window.ui.h:98
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"У деяких повідомленнях може міститися текст з форматуванням (розташування "
+"тексту, кольори тощо). Якщо буде позначено цей пункт, Gajim показуватиме "
+"простий текст без форматування."
 
-#: ../data/gui/preferences_window.ui.h:103
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sort contacts by status"
 msgstr "Впорядкувати контакти за станом"
 
-#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
 msgid "Status"
 msgstr "Стан"
 
-#: ../data/gui/preferences_window.ui.h:105
+#: ../data/gui/preferences_window.ui.h:101
 msgid "Status _iconset:"
 msgstr "Набір _піктограм стану:"
 
-#: ../data/gui/preferences_window.ui.h:106
+#: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
 msgstr "Стиль"
 
-#: ../data/gui/preferences_window.ui.h:107
+#: ../data/gui/preferences_window.ui.h:103
 msgid "T_heme:"
 msgstr "Т_ема:"
 
-#: ../data/gui/preferences_window.ui.h:108
+#: ../data/gui/preferences_window.ui.h:104
 msgid ""
-"The auto away status message. If empty, Gajim will not change the current status message\n"
+"The auto away status message. If empty, Gajim will not change the current "
+"status message\n"
 "$S will be replaced by previous status message\n"
 "$T will be replaced by auto-away timeout"
-msgstr "Автоматичне повідомлення про відсутність. Якщо ви не вкажете тексту повідомлення, Gajim не змінюватиме поточного повідомлення про стан."
+msgstr ""
+"Автоматичне повідомлення про відсутність. Якщо ви не вкажете тексту "
+"повідомлення, Gajim не змінюватиме поточного повідомлення про стан."
 
-#: ../data/gui/preferences_window.ui.h:111
+#: ../data/gui/preferences_window.ui.h:107
 msgid ""
-"The auto not available status message. If empty, Gajim will not change the current status message\n"
+"The auto not available status message. If empty, Gajim will not change the "
+"current status message\n"
 "$S will be replaced by previous status message\n"
 "$T will be replaced by auto-not-available timeout"
-msgstr "Автоматичне повідомлення про недоступність. Якщо ви не вкажете тексту повідомлення, Gajim не змінюватиме поточного повідомлення про стан."
+msgstr ""
+"Автоматичне повідомлення про недоступність. Якщо ви не вкажете тексту "
+"повідомлення, Gajim не змінюватиме поточного повідомлення про стан."
 
-#: ../data/gui/preferences_window.ui.h:114
+#: ../data/gui/preferences_window.ui.h:110
 msgid "Use _transports icons"
 msgstr "Використовувати піктограми _транспортів"
 
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:111
+#, fuzzy
+msgid "Use default applications"
+msgstr "Завжди використовувати типові програми KDE"
+
+#: ../data/gui/preferences_window.ui.h:112
 msgid "Use system _default"
 msgstr "Використовувати _типове для системи"
 
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:113
 msgid "Video framerate"
 msgstr "Частота кадрів відео"
 
-#: ../data/gui/preferences_window.ui.h:117
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Video input device"
 msgstr "Пристрій введення відео"
 
-#: ../data/gui/preferences_window.ui.h:118
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Video output device"
 msgstr "Пристрій відтворення відео"
 
-#: ../data/gui/preferences_window.ui.h:119
+#: ../data/gui/preferences_window.ui.h:116
 msgid "Video size"
 msgstr "Розмір відео"
 
-#: ../data/gui/preferences_window.ui.h:120
+#: ../data/gui/preferences_window.ui.h:117
 msgid "When new event is received:"
 msgstr "Якщо отримано нову подію:"
 
-#: ../data/gui/preferences_window.ui.h:121
+#: ../data/gui/preferences_window.ui.h:118
 msgid "Your message:"
 msgstr "Ваше повідомлення:"
 
-#: ../data/gui/preferences_window.ui.h:122
+#: ../data/gui/preferences_window.ui.h:119
 msgid "Your nickname:"
 msgstr "Ваш псевдонім:"
 
-#: ../data/gui/preferences_window.ui.h:123
+#: ../data/gui/preferences_window.ui.h:120
 msgid "_Away after:"
 msgstr "«_Відсутній» через:"
 
-#: ../data/gui/preferences_window.ui.h:124
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "_Веб-переглядач:"
 
-#: ../data/gui/preferences_window.ui.h:125
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Display chat state notifications:"
 msgstr "_Показувати сповіщення стану балачки:"
 
-#: ../data/gui/preferences_window.ui.h:126
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Emoticons:"
 msgstr "_Емоційки:"
 
-#: ../data/gui/preferences_window.ui.h:127
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_File manager:"
 msgstr "_Менеджер файлів:"
 
-#: ../data/gui/preferences_window.ui.h:128
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_Highlight misspelled words"
 msgstr "_Виділяти слова з помилками"
 
-#: ../data/gui/preferences_window.ui.h:129
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ігнорувати події від контактів поза реєстром"
 
-#: ../data/gui/preferences_window.ui.h:130
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ігнорувати позначки форматування у вхідних повідомленнях"
 
-#: ../data/gui/preferences_window.ui.h:131
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Log status changes of contacts"
 msgstr "_Записувати зміни стану контактів"
 
-#: ../data/gui/preferences_window.ui.h:132
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Mail client:"
 msgstr "_Поштовий клієнт:"
 
-#: ../data/gui/preferences_window.ui.h:133
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Not available after:"
 msgstr "«_Не доступний» через:"
 
-#: ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Open..."
 msgstr "_Відкрити..."
 
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Reset to Default Colors"
 msgstr "В_ідновити типові кольори"
 
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Send chat state notifications:"
 msgstr "_Надсилати сповіщення про стан балачки:"
 
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Status message:"
 msgstr "_Повідомлення про стан:"
 
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_URL highlight:"
 msgstr "Вид_ілення адрес URL:"
 
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_Window behavior:"
 msgstr "Пов_едінка вікна:"
 
-#: ../data/gui/preferences_window.ui.h:140
+#: ../data/gui/preferences_window.ui.h:137
 msgid "in _group chats"
 msgstr "у _групових балачках"
 
-#: ../data/gui/preferences_window.ui.h:141
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _roster"
 msgstr "у _реєстрі"
 
-#: ../data/gui/preferences_window.ui.h:142
+#: ../data/gui/preferences_window.ui.h:139
 msgid "minutes"
 msgstr "хвилин"
 
@@ -2161,7 +2546,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Порядок:"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3436
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
 msgid "Privacy List"
 msgstr "Список конфіденційності"
 
@@ -2368,18 +2753,23 @@ msgstr "Вилучити обліковий запис з Gajim та з _сер
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5492 ../src/roster_window.py:5622
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
+#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
 msgid "_Remove"
 msgstr "В_илучити"
 
 #: ../data/gui/roster_item_exchange_window.ui.h:1
-msgid "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in your roster."
-msgstr "<b>someone@somewhere.com</b> бажає <b>додати</b> до вашого реєстру де-які контакти."
+msgid ""
+"<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
+"your roster."
+msgstr ""
+"<b>someone@somewhere.com</b> бажає <b>додати</b> до вашого реєстру де-які "
+"контакти."
 
 #: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
-msgstr "Тіло повідомлення <наразі не використовується, тому зазвичай приховане>"
+msgstr ""
+"Тіло повідомлення <наразі не використовується, тому зазвичай приховане>"
 
 #: ../data/gui/roster_item_exchange_window.ui.h:3
 msgid "Roster Item Exchange"
@@ -2411,57 +2801,60 @@ msgid "Help online"
 msgstr "Довідка у Тенетах"
 
 #: ../data/gui/roster_window.ui.h:8
+msgid "P_lugins"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:9
 msgid "Profile, A_vatar"
 msgstr "Профіль, _аватар"
 
-#: ../data/gui/roster_window.ui.h:9
+#: ../data/gui/roster_window.ui.h:10
 msgid "Show Only _Active Contacts"
 msgstr "Показувати лише _активні контакти"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
 msgid "Show Trans_ports"
 msgstr "Показувати транс_порти"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
 msgid "Show _Offline Contacts"
 msgstr "Показувати _від’єднані контакти"
 
-#: ../data/gui/roster_window.ui.h:12 ../src/statusicon.py:326
+#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
 msgid "Show _Roster"
 msgstr "Показати _реєстр"
 
-#: ../data/gui/roster_window.ui.h:13
+#: ../data/gui/roster_window.ui.h:14
 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/gui/roster_window.ui.h:14
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/roster_window.ui.h:15
 #: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Дії"
 
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
 msgid "_Contents"
 msgstr "_Вміст"
 
-#: ../data/gui/roster_window.ui.h:18 ../src/disco.py:1502
+#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
 msgid "_Edit"
 msgstr "_Правка"
 
-#: ../data/gui/roster_window.ui.h:19
+#: ../data/gui/roster_window.ui.h:20
 msgid "_FAQ"
 msgstr "_ЧаП"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Help"
 msgstr "_Довідка"
 
-#: ../data/gui/roster_window.ui.h:22
+#: ../data/gui/roster_window.ui.h:23
 msgid "_Send Single Message..."
 msgstr "_Надіслати окреме повідомлення..."
 
-#: ../data/gui/roster_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:25
 msgid "_View"
 msgstr "П_ерегляд"
 
@@ -2478,11 +2871,11 @@ msgid "_Add contact"
 msgstr "Дод_ати контакт"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5634
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
 msgid "_Information"
 msgstr "_Інформація"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1353
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
 msgid "_Search"
 msgstr "_Пошук"
 
@@ -2502,10 +2895,6 @@ msgstr "Зареєструватись на"
 msgid "_Cancel"
 msgstr "_Скасувати"
 
-#: ../data/gui/single_message_window.ui.h:2
-msgid "From:"
-msgstr "Від:"
-
 #: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Відповісти на це повідомлення"
@@ -2522,10 +2911,6 @@ msgstr "Надіслати повідомлення"
 msgid "Send message and close window"
 msgstr "Надіслати повідомлення і закрити вікно"
 
-#: ../data/gui/single_message_window.ui.h:7
-msgid "Subject:"
-msgstr "Тема:"
-
 #: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Кому:"
@@ -2544,11 +2929,17 @@ msgstr "_Уповноважити"
 
 #: ../data/gui/subscription_request_window.ui.h:2
 msgid "Authorize contact so he or she can know when you're connected"
-msgstr "Уповноважити контакт, щоб він або вона могли бачити, коли ви виходите на зв'язок."
+msgstr ""
+"Уповноважити контакт, щоб він або вона могли бачити, коли ви виходите на "
+"зв'язок."
 
 #: ../data/gui/subscription_request_window.ui.h:3
-msgid "Deny authorization from contact so he or she cannot know when you're connected"
-msgstr "Заборонити уповноваження контакту, щоб він або вона не могли бачити, коли ви виходите на зв'язок."
+msgid ""
+"Deny authorization from contact so he or she cannot know when you're "
+"connected"
+msgstr ""
+"Заборонити уповноваження контакту, щоб він або вона не могли бачити, коли ви "
+"виходите на зв'язок."
 
 #: ../data/gui/subscription_request_window.ui.h:4
 msgid "Subscription Request"
@@ -2685,9 +3076,7 @@ msgstr "Ховати станси присутності"
 msgid "Info/Query"
 msgstr "Інформація/Запит"
 
-#. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad
-#. idea unless you are sure your lang has this somehow else translated (NOTE:
-#. xml still will still say <iq in your language (of course))
+#. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
 #: ../data/gui/xml_console_window.ui.h:13
 msgid "_IQ"
 msgstr "_IQ"
@@ -2732,24 +3121,35 @@ msgstr "Програма для обміну миттєвими повідомл
 msgid "Jabber IM Client"
 msgstr "Клієнт служби миттєвих повідомлень Jabber"
 
-#: ../src/adhoc_commands.py:314
+#: ../src/adhoc_commands.py:323
 msgid "Cancel confirmation"
 msgstr "Скасувати підтвердження"
 
-#: ../src/adhoc_commands.py:315
-msgid "You are in process of executing command. Do you really want to cancel it?"
+#: ../src/adhoc_commands.py:324
+msgid ""
+"You are in process of executing command. Do you really want to cancel it?"
 msgstr "Зараз виконується команда. Ви справді бажаєте скасувати її виконання?"
 
-#: ../src/adhoc_commands.py:351 ../src/adhoc_commands.py:374
+#: ../src/adhoc_commands.py:370
+#, fuzzy
+msgid "Invalid Form"
+msgstr "Некоректна кімната"
+
+#: ../src/adhoc_commands.py:371
+#, fuzzy
+msgid "The form is not filled correctly."
+msgstr "У псевдонімі є недозволені символи."
+
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
 msgid "Service sent malformed data"
 msgstr "Служба надіслала неправильно форматовані дані"
 
-#: ../src/adhoc_commands.py:360
+#: ../src/adhoc_commands.py:399
 msgid "Service changed the session identifier."
 msgstr "Служба змінила ідентифікатор сеансу."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:471
+#: ../src/adhoc_commands.py:513
 msgid "Service returned an error."
 msgstr "Служба повернула повідомлення про помилку."
 
@@ -2774,7 +3174,7 @@ msgstr "Ціле число"
 msgid "Text"
 msgstr "Текст"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:945
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
 msgid "Color"
 msgstr "Колір"
 
@@ -2810,234 +3210,239 @@ msgstr[2] "Ви отримали нові записи (та %d не було п
 #. 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)
+#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "English"
 msgstr "Англійська"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Belarusian"
 msgstr "Білоруська"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Bulgarian"
 msgstr "Болгарська"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Breton"
 msgstr "Бретонська"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Czech"
 msgstr "Чеська"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "German"
 msgstr "Німецька"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Greek"
 msgstr "Грецька"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "British"
 msgstr "Британська англійська"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Esperanto"
 msgstr "Есперанто"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Spanish"
 msgstr "Іспанська"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Basque"
 msgstr "Баскська"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "French"
 msgstr "Французька"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Croatian"
 msgstr "Хорватська"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Italian"
 msgstr "Італійська"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian (b)"
 msgstr "Норвезька (b)"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Dutch"
 msgstr "Нідерландська"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Norwegian"
 msgstr "Норвезька"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Polish"
 msgstr "Польська"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Portuguese"
 msgstr "Португальська"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Brazilian Portuguese"
 msgstr "Бразильська португальська"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Russian"
 msgstr "Російська"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Serbian"
 msgstr "Сербська"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Slovak"
 msgstr "Словацька"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Swedish"
 msgstr "Шведська"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Chinese (Ch)"
 msgstr "Китайська (Ch)"
 
-#: ../src/chat_control.py:479
+#: ../src/chat_control.py:496
 msgid "Spelling language"
 msgstr "Мова перевірки правопису"
 
 #. we are not connected
-#: ../src/chat_control.py:511 ../src/chat_control.py:720
+#: ../src/chat_control.py:528 ../src/chat_control.py:737
 msgid "A connection is not available"
 msgstr "З'єднання недоступне"
 
-#: ../src/chat_control.py:512 ../src/chat_control.py:721
+#: ../src/chat_control.py:529 ../src/chat_control.py:738
 msgid "Your message can not be sent until you are connected."
 msgstr "Ваше повідомлення не може бути відправлене до встановлення з'єднання."
 
-#: ../src/chat_control.py:927
+#: ../src/chat_control.py:944
 msgid "Underline"
 msgstr "Підкреслити"
 
-#: ../src/chat_control.py:928
+#: ../src/chat_control.py:945
 msgid "Strike"
 msgstr "Перекреслити"
 
-#: ../src/chat_control.py:951
+#: ../src/chat_control.py:968
 msgid "Font"
 msgstr "Шрифт"
 
-#: ../src/chat_control.py:960
+#: ../src/chat_control.py:977
 msgid "Clear formating"
 msgstr "Зняти форматування"
 
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1055
 msgid "Really send file?"
 msgstr "Справді надіслати файл?"
 
-#: ../src/chat_control.py:1039
+#: ../src/chat_control.py:1056
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr "Якщо ви надішлете файл %s, він або вона дізнаються про ваш справжній ідентифікатор Jabber."
+msgstr ""
+"Якщо ви надішлете файл %s, він або вона дізнаються про ваш справжній "
+"ідентифікатор Jabber."
 
-#: ../src/chat_control.py:1503 ../src/chat_control.py:1987
+#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
 msgid "GPG encryption enabled"
 msgstr "Шифрування GPG увімкнено"
 
 #. Add to roster
-#: ../src/chat_control.py:1528 ../src/common/contacts.py:158
+#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
 #: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:245 ../src/dialogs.py:1064 ../src/dialogs.py:2078
-#: ../src/dialogs.py:2107 ../src/gui_interface.py:674
+#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
+#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
 #: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1610 ../src/roster_window.py:1612
-#: ../src/roster_window.py:1942 ../src/roster_window.py:3289
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
+#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
+#: ../src/roster_window.py:3382
 msgid "Not in Roster"
 msgstr "Немає у реєстрі"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1575
 msgid "This contact does not support file transfer."
 msgstr "Цей контакт не підтримує передавання файлів."
 
-#: ../src/chat_control.py:1561
+#: ../src/chat_control.py:1578
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr "Ви маєте знати справжній JID контакту, щоб надсилати йому чи їй файл."
 
-#: ../src/chat_control.py:1656
+#: ../src/chat_control.py:1677
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s стан : %(state)s, причина: %(reason)s"
 
-#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:1869
 #, 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:1967 ../src/dialogs.py:4866
+#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
 msgid "No GPG key assigned"
 msgstr "Немає ключа GPG"
 
-#: ../src/chat_control.py:1968
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages with GPG."
-msgstr "З цим контактом не пов’язано жодного ключа GPG. Отже ви не зможете шифрувати повідомлення за допомогою GPG."
+#: ../src/chat_control.py:1991
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+msgstr ""
+"З цим контактом не пов’язано жодного ключа GPG. Отже ви не зможете шифрувати "
+"повідомлення за допомогою GPG."
 
-#: ../src/chat_control.py:1977
+#: ../src/chat_control.py:2000
 msgid "GPG encryption disabled"
 msgstr "Шифрування GPG вимкнено"
 
-#: ../src/chat_control.py:2003
+#: ../src/chat_control.py:2026
 msgid "Session WILL be logged"
 msgstr "Сеанс БУДЕ записано до журналу"
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:2028
 msgid "Session WILL NOT be logged"
 msgstr "Сеанс НЕ БУДЕ записано до журналу"
 
 #. encryption %s active
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is"
 msgstr "Ñ”"
 
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is NOT"
 msgstr "НЕ є"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will"
 msgstr "буде"
 
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will NOT"
 msgstr "НЕ буде"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2051
 msgid "and authenticated"
 msgstr "і уповноваженим"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2032
+#: ../src/chat_control.py:2055
 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:2039
+#: ../src/chat_control.py:2062
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3046,62 +3451,81 @@ msgstr ""
 "Шифрування %(type)s %(status)s активним %(authenticated)s.\n"
 "Ваш сеанс балачки %(logged)s записано до журналу."
 
-#: ../src/chat_control.py:2182
+#: ../src/chat_control.py:2205
 msgid "Session negotiation cancelled"
 msgstr "Встановлення сеансу було скасовано"
 
-#: ../src/chat_control.py:2191
+#: ../src/chat_control.py:2215
+msgid "This session WILL be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2217
+#, fuzzy
+msgid "This session WILL NOT be archived on server"
+msgstr "Сеанс НЕ БУДЕ записано до журналу"
+
+#: ../src/chat_control.py:2226
 msgid "This session is encrypted"
 msgstr "Цей сеанс зашифровано"
 
-#: ../src/chat_control.py:2194
+#: ../src/chat_control.py:2229
 msgid " and WILL be logged"
 msgstr " і БУДЕ записано до журналу"
 
-#: ../src/chat_control.py:2196
+#: ../src/chat_control.py:2231
 msgid " and WILL NOT be logged"
 msgstr " і НЕ БУДЕ записано до журналу"
 
-#: ../src/chat_control.py:2201
-msgid "Remote contact's identity not verified. Click the shield button for more details."
-msgstr "Особу віддаленого контакту не було перевірено. Натисніть кнопку з щитом, щоб ознайомитися з подробицями."
+#: ../src/chat_control.py:2236
+msgid ""
+"Remote contact's identity not verified. Click the shield button for more "
+"details."
+msgstr ""
+"Особу віддаленого контакту не було перевірено. Натисніть кнопку з щитом, щоб "
+"ознайомитися з подробицями."
 
-#: ../src/chat_control.py:2203
+#: ../src/chat_control.py:2238
 msgid "E2E encryption disabled"
 msgstr "Шифрування E2E вимкнено"
 
-#: ../src/chat_control.py:2241 ../src/chat_control.py:2254
+#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
 msgid "The following message was NOT encrypted"
 msgstr "Наступне повідомлення НЕ було зашифровано"
 
-#: ../src/chat_control.py:2247
+#: ../src/chat_control.py:2288
 msgid "The following message was encrypted"
 msgstr "Наступне повідомлення було зашифровано"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2519
+#: ../src/chat_control.py:2566
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Ви щойно отримали нове повідомлення від «%s»"
 
-#: ../src/chat_control.py:2520
-msgid "If you close this tab and you have history disabled, this message will be lost."
-msgstr "Якщо ви закриєте вкладку, а журнал було вимкнено, це повідомлення буде втрачено."
+#: ../src/chat_control.py:2567
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Якщо ви закриєте вкладку, а журнал було вимкнено, це повідомлення буде "
+"втрачено."
 
-#: ../src/chat_control.py:2663 ../src/common/connection_handlers.py:1635
-#: ../src/common/connection_handlers.py:1758
-#: ../src/common/connection_handlers.py:1960
-#: ../src/common/connection_handlers.py:2110 ../src/common/connection.py:452
+#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
 #: ../src/gajim.py:159 ../src/session.py:138
 msgid "Database Error"
 msgstr "Помилка бази даних"
 
-#: ../src/chat_control.py:2664
+#: ../src/chat_control.py:2714
 #, python-format
-msgid "The database file (%s) cannot be read. Try to repair it or remove it (all history will be lost)."
-msgstr "Не вдалося прочитати файл бази даних (%s). Спробуйте виправити або вилучити його (всі записи журналу буде втрачено)."
+msgid ""
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
+"history will be lost)."
+msgstr ""
+"Не вдалося прочитати файл бази даних (%s). Спробуйте виправити або вилучити "
+"його (всі записи журналу буде втрачено)."
 
-#: ../src/chat_control.py:2906
+#: ../src/chat_control.py:2962
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s тепер %(status)s"
@@ -3114,28 +3538,28 @@ msgstr "створення бази даних журналів"
 msgid "creating cache database"
 msgstr "створення бази даних кешу"
 
-#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
-#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
-#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
-#: ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s є файлом, а має бути каталогом"
 
-#: ../src/common/check_paths.py:275 ../src/common/check_paths.py:282
-#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
-#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
-#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:333
+#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
+#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
+#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
 msgid "Gajim will now exit"
 msgstr "Зараз Gajim завершить роботу"
 
-#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
+#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s є каталогом, а має бути файлом"
 
-#: ../src/common/check_paths.py:342
+#: ../src/common/check_paths.py:351
 #, python-format
 msgid "creating %s directory"
 msgstr "створення каталогу %s"
@@ -3199,9 +3623,9 @@ msgstr "Оберіть групові балачки, які ви бажаєте
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:801
-#: ../src/roster_window.py:1614 ../src/roster_window.py:1616
-#: ../src/roster_window.py:5251
+#: ../src/common/helpers.py:57 ../src/roster_window.py:815
+#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
+#: ../src/roster_window.py:5323
 msgid "Groupchats"
 msgstr "Групові балачки"
 
@@ -3239,11 +3663,14 @@ msgstr "Час у хвилинах, за який ваш стан буде зм
 
 #: ../src/common/config.py:82
 msgid "$S (Away as a result of being idle more than $T min)"
-msgstr "$S (Позначено як «відсутній» через відсутність активності протягом $T хв)"
+msgstr ""
+"$S (Позначено як «відсутній» через відсутність активності протягом $T хв)"
 
 #: ../src/common/config.py:82
 msgid "$S will be replaced by current status message, $T by autoaway time."
-msgstr "$S буде замінено поточним повідомленням про стан, $T — часом автоматичного виявлення відсутності."
+msgstr ""
+"$S буде замінено поточним повідомленням про стан, $T — часом автоматичного "
+"виявлення відсутності."
 
 #: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
@@ -3251,15 +3678,22 @@ msgstr "Час у хвилинах, за який ваш стан буде зм
 
 #: ../src/common/config.py:85
 msgid "$S (Not available as a result of being idle more than $T min)"
-msgstr "$S (Позначено як «недоступний» через відсутність активності протягом $T хв)"
+msgstr ""
+"$S (Позначено як «недоступний» через відсутність активності протягом $T хв)"
 
 #: ../src/common/config.py:85
 msgid "$S will be replaced by current status message, $T by autoxa time."
-msgstr "$S буде замінено поточним повідомленням про стан, $T — часом автоматичного виявлення недоступності."
+msgstr ""
+"$S буде замінено поточним повідомленням про стан, $T — часом автоматичного "
+"виявлення недоступності."
 
 #: ../src/common/config.py:88
-msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
-msgstr "Коли показувати піктограму у лотку. Можливі варіанти ніколи (never), при події (on_event) та завжди (always)."
+#, fuzzy
+msgid ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+msgstr ""
+"Коли показувати піктограму у лотку. Можливі варіанти ніколи (never), при "
+"події (on_event) та завжди (always)."
 
 #: ../src/common/config.py:93
 msgid "Incoming nickname color."
@@ -3302,13 +3736,16 @@ msgid "Status message text font."
 msgstr "Шрифт тексту сповіщення про стан."
 
 #: ../src/common/config.py:105
-msgid "List (space separated) of rows (accounts and groups) that are collapsed."
-msgstr "Список (відокремлених комами) рядків (облікових записів і груп), які буде згорнуто."
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+"Список (відокремлених комами) рядків (облікових записів і груп), які буде "
+"згорнуто."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:501
-#: ../src/common/optparser.py:290 ../src/common/optparser.py:486
-#: ../src/common/optparser.py:520 ../src/gui_interface.py:3370
+#: ../src/common/config.py:106 ../src/common/config.py:505
+#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
+#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
 msgid "default"
 msgstr "типовий"
 
@@ -3327,32 +3764,64 @@ msgstr ""
 "'never' — ніколи не виводити час."
 
 #: ../src/common/config.py:114
-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 "Показувати час у балачках за допомогою Fuzzy Clock. Значення нечіткості може змінюватися у межах від 1 до 4, значення 0 вимикає нечіткий годинник. 1 — найточніше відображення часу, 4 — найменш точне. Цей параметр буде використано, лише якщо параметр print_time має значення 'sometimes'."
+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 ""
+"Показувати час у балачках за допомогою Fuzzy Clock. Значення нечіткості може "
+"змінюватися у межах від 1 до 4, значення 0 вимикає нечіткий годинник. 1 — "
+"найточніше відображення часу, 4 — найменш точне. Цей параметр буде "
+"використано, лише якщо параметр print_time має значення 'sometimes'."
 
 #: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Вважати пари символів * / _ символами форматування."
 
 #: ../src/common/config.py:118
-msgid "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr "Якщо має значення «True», не вилучати */_ . Наприклад, рядок *abc* вважатиметься рядком з напівжирним шрифтом після вилучення позначок * *."
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"Якщо має значення «True», не вилучати */_ . Наприклад, рядок *abc* "
+"вважатиметься рядком з напівжирним шрифтом після вилучення позначок * *."
 
 #: ../src/common/config.py:121
-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 "Використовує розмітку тексту ReStructured для надсилання HTML і форматування ascii, якщо його увімкнено. Правила синтаксису можна переглянути за адресою http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html (якщо бажаєте користуватися ними, встановіть docutils)"
+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 ""
+"Використовує розмітку тексту ReStructured для надсилання HTML і форматування "
+"ascii, якщо його увімкнено. Правила синтаксису можна переглянути за адресою "
+"http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html (якщо "
+"бажаєте користуватися ними, встановіть docutils)"
 
 #: ../src/common/config.py:130
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr "Символ, який буде додано після псевдоніма, якщо ви використовуєте автоматичне доповнення псевдоніма (tab) у груповій балачці."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Символ, який буде додано після псевдоніма, якщо ви використовуєте "
+"автоматичне доповнення псевдоніма (tab) у груповій балачці."
 
 #: ../src/common/config.py:131
-msgid "Character to propose to add after desired nickname when desired nickname is used by someone else in group chat."
-msgstr "Символ, який буде запропоновано додати після бажаного псевдоніма, якщо псевдонім буде використано кимось з групової балачки."
+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:159
-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 "За допомогою цього параметра ви зможете налаштувати часову позначку, яка показуватиметься під час спілкування. Наприклад, \"[%H:%M] \" відповідатиме \"[година:хвилина] \". Див. документацію з python щодо strftime, щоб дізнатися більше: http://docs.python.org/lib/module-time.html"
+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 ""
+"За допомогою цього параметра ви зможете налаштувати часову позначку, яка "
+"показуватиметься під час спілкування. Наприклад, \"[%H:%M] \" відповідатиме "
+"\"[година:хвилина] \". Див. документацію з python щодо strftime, щоб "
+"дізнатися більше: http://docs.python.org/lib/module-time.html"
 
 #: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
@@ -3363,36 +3832,55 @@ msgid "Characters that are printed after the nickname in conversations"
 msgstr "Символи, які буде показано після псевдонімів під час спілкування"
 
 #: ../src/common/config.py:164
-msgid "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
-msgstr "Вкажить команду для виконання при отриманні нової пошти, наприклад: /usr/bin/getmail -q"
+msgid ""
+"Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
+msgstr ""
+"Вкажить команду для виконання при отриманні нової пошти, наприклад: /usr/bin/"
+"getmail -q"
 
 #: ../src/common/config.py:166
 msgid "Add * and [n] in roster title?"
 msgstr "Додати * і [n] у заголовок реєстру?"
 
 #: ../src/common/config.py:167
-msgid "How many lines to remember from previous conversation when a chat tab/window is reopened."
-msgstr "Кількість рядків тесту, які слід запам’ятати з попереднього спілкування для показу під час повторного відкриття вкладки або вікна балачки."
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr ""
+"Кількість рядків тесту, які слід запам’ятати з попереднього спілкування для "
+"показу під час повторного відкриття вкладки або вікна балачки."
 
 #: ../src/common/config.py:168
 msgid "How many minutes should last lines from previous conversation last."
-msgstr "Проміжок часу у хвилинах, протягом якого слід зберігати рядки попередньої розмови"
+msgstr ""
+"Проміжок часу у хвилинах, протягом якого слід зберігати рядки попередньої "
+"розмови"
 
 #: ../src/common/config.py:169
 msgid "How many lines to request to server when entering a groupchat."
-msgstr "Як багато робити запитів до сервера при під’єднанні до групової балачки."
+msgstr ""
+"Як багато робити запитів до сервера при під’єднанні до групової балачки."
 
 #: ../src/common/config.py:170
 msgid "How many minutes back to request logs when a entering a groupchat."
 msgstr "За скільки хвилин запитувати журнал, при вході у групову балачку."
 
 #: ../src/common/config.py:171
-msgid "How many seconds to wait before trying to autorejoin to a conference you are being disconnected from. Set to 0 to disable autorejoining."
-msgstr "Скільки секунд очікувати перш ніж повторити спробу перепід’єднатись до конференції від якої вас було від’єднано. Встановіть 0 для блокування автоматичного перепід’єднання."
+msgid ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
+msgstr ""
+"Скільки секунд очікувати перш ніж повторити спробу перепід’єднатись до "
+"конференції від якої вас було від’єднано. Встановіть 0 для блокування "
+"автоматичного перепід’єднання."
 
 #: ../src/common/config.py:173
-msgid "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour)."
-msgstr "Надсилати повідомлення за Ctrl+Enter, а за допомогою Enter розривати рядок (типова поведінка клієнта Mirabilis ICQ)."
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Надсилати повідомлення за Ctrl+Enter, а за допомогою Enter розривати рядок "
+"(типова поведінка клієнта Mirabilis ICQ)."
 
 #: ../src/common/config.py:175
 msgid "How many lines to store for Ctrl+KeyUP."
@@ -3400,55 +3888,101 @@ msgstr "Кількість рядків, які слід зберігати дл
 
 #: ../src/common/config.py:178
 #, python-format
-msgid "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary."
-msgstr "Або нетипова адреса url з підрядком %s, де %s — слово або фраза, або 'WIKTIONARY' (це означає, що слід використовувати службу wiktionary)."
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"Або нетипова адреса url з підрядком %s, де %s — слово або фраза, або "
+"'WIKTIONARY' (це означає, що слід використовувати службу wiktionary)."
 
 #: ../src/common/config.py:181
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
-msgstr "Якщо позначено цей пункт, Gajim можна віддалено керувати за допомогою gajim-remote."
+msgstr ""
+"Якщо позначено цей пункт, Gajim можна віддалено керувати за допомогою gajim-"
+"remote."
 
 #: ../src/common/config.py:182
-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 False and they sync with global status) based upon the status of the network connection."
-msgstr "Якщо має значення «True», слідкувати за сигналами D-Bus від NetworkManager і змінювати стан облікових записів (якщо для них не встановлено значення параметра listen_to_network_manager рівне «False» і вони синхронізуються з загальним станом) згідно до стану мережевого з’єднання."
+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 "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+"Якщо має значення «True», слідкувати за сигналами D-Bus від NetworkManager і "
+"змінювати стан облікових записів (якщо для них не встановлено значення "
+"параметра listen_to_network_manager рівне «False» і вони синхронізуються з "
+"загальним станом) згідно до стану мережевого з’єднання."
 
 #: ../src/common/config.py:183
-msgid "Sent chat state notifications. Can be one of all, composing_only, disabled."
-msgstr "Надсилати сповіщення про стан балачки. Може мати значення all, composing_only, disabled."
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+"Надсилати сповіщення про стан балачки. Може мати значення all, "
+"composing_only, disabled."
 
 #: ../src/common/config.py:184
-msgid "Displayed chat state notifications in chat windows. Can be one of all, composing_only, disabled."
-msgstr "Тип сповіщень про стан балачки, які буде показано у вікнах балачки. Може мати значення all, composing_only, disabled."
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+"Тип сповіщень про стан балачки, які буде показано у вікнах балачки. Може "
+"мати значення all, composing_only, disabled."
 
 #: ../src/common/config.py:186
-msgid "When not printing time for every message (print_time==sometimes), print it every x minutes."
-msgstr "Якщо не вказано, що програма має виводити час для кожного з повідомлень (print_time==sometimes), виводити час кожні x хвилин."
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+"Якщо не вказано, що програма має виводити час для кожного з повідомлень "
+"(print_time==sometimes), виводити час кожні x хвилин."
 
 #: ../src/common/config.py:187
 msgid "Ask before closing a group chat tab/window."
 msgstr "Запитувати перед закриттям вкладки або вікна групової балачки."
 
 #: ../src/common/config.py:188
-msgid "Always ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Завжди запитувати про дію перед закриттям вікна або вкладки групової балачки, яку вказано у цьому відокремленому пробілами списку jid групових балачок."
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Завжди запитувати про дію перед закриттям вікна або вкладки групової "
+"балачки, яку вказано у цьому відокремленому пробілами списку jid групових "
+"балачок."
 
 #: ../src/common/config.py:189
-msgid "Never ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Ніколи не запитувати про дію перед закриттям вікна або вкладки групової балачки, яку вказано у цьому відокремленому пробілами списку jid групових балачок."
+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
-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 "Запитувати перед закриттям вікна розмови з вкладками, якщо це може призвести до втрати даних (діалог, приватний діалог, групова розмова що не може бути мінімізована)."
+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:193
-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 "Відокремлений комами список вузлів, який буде надіслано, окрім локальних інтерфейсів, для передавання файлів у випадку трансляції адрес або переспрямування портів."
+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:195
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Згідно до стандарту IEC: кіБ = 1024 байтам, кБ = 1000 байтам."
 
 #: ../src/common/config.py:197
-msgid "Notify of events in the system trayicon."
+#, fuzzy
+msgid "Notify of events in the notification area."
 msgstr "Сповіщати про події змінами піктограми лотка."
 
 #: ../src/common/config.py:203
@@ -3464,48 +3998,101 @@ msgid "Show close button in tab?"
 msgstr "Показувати кнопку закриття на вкладці?"
 
 #: ../src/common/config.py:206
-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 numbers are more secure, but take longer to calculate when you start a session."
-msgstr "Список груп modp, які буде використано для шифрування за Діффі-Гелманом, першою слід вказати групу з найвищим пріоритетом, групи у списку слід відокремлювати комами. Можливі значення: 1, 2, 5, 14, 15, 16, 17 і 18. Більші значення підвищують безпеку, але програма витрачатиме більше часу на їх обчислення під час запуску сеансу."
+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 "
+"numbers are more secure, but take longer to calculate when you start a "
+"session."
+msgstr ""
+"Список груп modp, які буде використано для шифрування за Діффі-Гелманом, "
+"першою слід вказати групу з найвищим пріоритетом, групи у списку слід "
+"відокремлювати комами. Можливі значення: 1, 2, 5, 14, 15, 16, 17 і 18. "
+"Більші значення підвищують безпеку, але програма витрачатиме більше часу на "
+"їх обчислення під час запуску сеансу."
 
 #: ../src/common/config.py:215
 msgid "Preview new messages in notification popup?"
-msgstr "Здійснювати попередній перегляд нових повідомлень у виринаючому сповіщенні?"
+msgstr ""
+"Здійснювати попередній перегляд нових повідомлень у виринаючому сповіщенні?"
 
 #: ../src/common/config.py:220
-msgid "A semicolon-separated list of words that will be highlighted in group chats."
-msgstr "Список відокремлених крапкою з комою слів, які буде виділено у групових балачках."
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+msgstr ""
+"Список відокремлених крапкою з комою слів, які буде виділено у групових "
+"балачках."
 
 #: ../src/common/config.py:221
-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 "Якщо має значення «True», роботу Gajim буде завершено після натискання кнопки з позначкою «X» у менеджері вікон. Цей параметр братиметься до уваги, лише якщо використовується піктограма лотка."
+#, fuzzy
+msgid ""
+"If True, quits Gajim when X button of Window Manager is clicked. This "
+"setting is taken into account only if notification icon is used."
+msgstr ""
+"Якщо має значення «True», роботу Gajim буде завершено після натискання "
+"кнопки з позначкою «X» у менеджері вікон. Цей параметр братиметься до уваги, "
+"лише якщо використовується піктограма лотка."
 
 #: ../src/common/config.py:222
-msgid "If True, Gajim will check if it's the default jabber client on each startup."
-msgstr "Якщо має значення «True», Gajim перевірятиме, чи є програма типовим клієнтом jabber під час кожного запуску програми."
+msgid ""
+"If True, Gajim will check if it's the default jabber client on each startup."
+msgstr ""
+"Якщо має значення «True», Gajim перевірятиме, чи є програма типовим клієнтом "
+"jabber під час кожного запуску програми."
 
 #: ../src/common/config.py:223
-msgid "If True, Gajim will display an icon on each tab containing unread messages. Depending on the theme, this icon may be animated."
-msgstr "Якщо має значення «True», Gajim показуватиме певну піктограму на кожній з вкладок, на якій містяться непрочитані повідомлення. Залежно від обраної вами теми, піктограму може бути анімовано."
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"Якщо має значення «True», Gajim показуватиме певну піктограму на кожній з "
+"вкладок, на якій містяться непрочитані повідомлення. Залежно від обраної "
+"вами теми, піктограму може бути анімовано."
 
 #: ../src/common/config.py:224
-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 показуватиме повідомлення про стан, якщо це повідомлення не буде порожнім, для кожного з контактів під іменем контакту у вікні реєстру."
+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:230
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr "Визначає позицію аватару у реєстрі. Можливі значення: left і right"
 
 #: ../src/common/config.py:231
-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 "Якщо має значення «True», Gajim запитуватиме аватар у кожного з облікових записів контактів, чий аватар не було отримано під час попереднього сеансу, або контактів, чиї аватари вважатимуться застарілими."
+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 ""
+"Якщо має значення «True», Gajim запитуватиме аватар у кожного з облікових "
+"записів контактів, чий аватар не було отримано під час попереднього сеансу, "
+"або контактів, чиї аватари вважатимуться застарілими."
 
 #: ../src/common/config.py:232
-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», Gajim більше не буде виводити рядок стану у балачках, коли контакт змінює свій стан і/або своє повідомлення про стан."
+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», Gajim більше не буде виводити "
+"рядок стану у балачках, коли контакт змінює свій стан і/або своє "
+"повідомлення про стан."
 
 #: ../src/common/config.py:233
-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 status and/or his or her status message. If \"all\" Gajim will print all status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves group chat."
-msgstr "може мати значення \"none\", \"all\" і \"in_and_out\". За значення \"none\", Gajim більше не виводитиме рядок стану у групових балачках після зміни постійним учасником стану або повідомлення про стан. За значення \"all\" Gajim виводитиме всі повідомлення про стан. Значення \"in_and_out\" призведе до того, що Gajim виводитиме лише повідомлення про те, що «такий-то увійшов або полишив групову балачку»."
+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 "
+"status and/or his or her status message. If \"all\" Gajim will print all "
+"status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
+"group chat."
+msgstr ""
+"може мати значення \"none\", \"all\" і \"in_and_out\". За значення \"none\", "
+"Gajim більше не виводитиме рядок стану у групових балачках після зміни "
+"постійним учасником стану або повідомлення про стан. За значення \"all\" "
+"Gajim виводитиме всі повідомлення про стан. Значення \"in_and_out\" призведе "
+"до того, що Gajim виводитиме лише повідомлення про те, що «такий-то увійшов "
+"або полишив групову балачку»."
 
 #: ../src/common/config.py:235
 msgid "Background color of contacts when they just signed in."
@@ -3516,8 +4103,11 @@ msgid "Background color of contacts when they just signed out."
 msgstr "Колір контактів, які тільки-но вийшли з мережі."
 
 #: ../src/common/config.py:238
-msgid "If True, restored messages will use a smaller font than the default one."
-msgstr "Якщо цей параметр матиме значення «True», відновлені повідомлення буде показано меншим ніж типовий шрифтом."
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+"Якщо цей параметр матиме значення «True», відновлені повідомлення буде "
+"показано меншим ніж типовий шрифтом."
 
 #: ../src/common/config.py:239
 msgid "Don't show avatar for the transport itself."
@@ -3528,37 +4118,58 @@ msgid "Don't show roster in the system taskbar."
 msgstr "Не показувати реєстр на системній панелі задач."
 
 #: ../src/common/config.py:241
-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 "Якщо цей параметр матиме значення «True» і у системі буде встановлено версії GTK+ і PyGTK не старіші за 2.8, у разі наявності подій у черзі позначка вікна програми почне блимати (типова поведінка у більшості менеджерів вікон)."
+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 ""
+"Якщо цей параметр матиме значення «True» і у системі буде встановлено версії "
+"GTK+ і PyGTK не старіші за 2.8, у разі наявності подій у черзі позначка "
+"вікна програми почне блимати (типова поведінка у більшості менеджерів вікон)."
 
 #: ../src/common/config.py:243
-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 presences."
-msgstr "Jabberd1.4 не сприймає відомості sha під час приєднання учасників до захищеної паролем групової балачки. Вкажіть для цього параметра значення «False», щоб вимкнути надсилання відомостей sha до сервера групової балачки."
+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 "
+"presences."
+msgstr ""
+"Jabberd1.4 не сприймає відомості sha під час приєднання учасників до "
+"захищеної паролем групової балачки. Вкажіть для цього параметра значення "
+"«False», щоб вимкнути надсилання відомостей sha до сервера групової балачки."
 
 #. always, never, peracct, pertype should not be translated
 #: ../src/common/config.py:246
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
-"'always_with_roster' - Like 'always' but the messages are in a single window along with the roster.\n"
+"'always_with_roster' - Like 'always' but the messages are in a single window "
+"along with the roster.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a specific window."
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"specific window."
 msgstr ""
 "Керує вікно, куди виводяться нові повідомлення.\n"
 "'always' — всі повідомлення буде надіслано до єдиного вікна.\n"
-"'always_with_roster' — те саме, що і 'always', але повідомлення буде показано у єдиному вікні разом з реєстром.\n"
+"'always_with_roster' — те саме, що і 'always', але повідомлення буде "
+"показано у єдиному вікні разом з реєстром.\n"
 "'never' — кожне з повідомлень буде показано у окремому вікні.\n"
-"'peracct' — повідомлення для кожного з облікових записів буде показано у окремому вікні.\n"
-"'pertype' — повідомлення буде розподілено за типом (наприклад, прості і групові балачки) між окремими вікнами."
+"'peracct' — повідомлення для кожного з облікових записів буде показано у "
+"окремому вікні.\n"
+"'pertype' — повідомлення буде розподілено за типом (наприклад, прості і "
+"групові балачки) між окремими вікнами."
 
 #: ../src/common/config.py:247
 msgid "If False, you will no longer see the avatar in the chat window."
-msgstr "Якщо цей параметр матиме значення «False», ви не бачитимете аватарів у вікні балачки."
+msgstr ""
+"Якщо цей параметр матиме значення «False», ви не бачитимете аватарів у вікні "
+"балачки."
 
 #: ../src/common/config.py:248
 msgid "If True, pressing the escape key closes a tab/window."
-msgstr "Якщо цей параметр матиме значення «True», натискання клавіші escape закриватиме вкладку або вікно програми."
+msgstr ""
+"Якщо цей параметр матиме значення «True», натискання клавіші escape "
+"закриватиме вкладку або вікно програми."
 
 #: ../src/common/config.py:249
 msgid "Hides the buttons in chat windows."
@@ -3577,144 +4188,261 @@ msgid "Hides the group chat occupants list in group chat window."
 msgstr "Ховає список учасників групової балачки у вікні групової балачки."
 
 #: ../src/common/config.py:253
-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 "У балачках, показувати псевдонім на початку рядка повідомлення, лише якщо це повідомлення не тої самої особи, якою було надіслано попереднє повідомлення."
+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:254
 msgid "Indentation when using merge consecutive nickname."
-msgstr "Відступ за використання об’єднання послідовних повідомлень від однієї особи."
+msgstr ""
+"Відступ за використання об’єднання послідовних повідомлень від однієї особи."
 
 #: ../src/common/config.py:255
 msgid "Smooth scroll message in conversation window"
 msgstr "Плавне гортання повідомлень у вікні балачки"
 
 #: ../src/common/config.py:256
-msgid "List of colors, separated by \":\", that will be used to color nicknames in group chats."
-msgstr "Список кольорів, відокремлених символом «:», які буде використано для розфарбовування псевдонімів у групових балачках."
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
+msgstr ""
+"Список кольорів, відокремлених символом «:», які буде використано для "
+"розфарбовування псевдонімів у групових балачках."
 
 #: ../src/common/config.py:257
 msgid "Ctrl-Tab go to next composing tab when none is unread."
-msgstr "Ctrl-Tab переводить до наступної вкладки створення повідомлення, якщо немає непрочитаних."
+msgstr ""
+"Ctrl-Tab переводить до наступної вкладки створення повідомлення, якщо немає "
+"непрочитаних."
 
 #: ../src/common/config.py:258
-msgid "Should we show the confirm metacontacts creation dialog or not? Empty string means we never show the dialog."
-msgstr "Чи слід показувати діалогове вікно підтвердження створення метаконтактів? Порожній рядок вказуватиме на те, що це діалогове вікно не слід показувати."
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+"Чи слід показувати діалогове вікно підтвердження створення метаконтактів? "
+"Порожній рядок вказуватиме на те, що це діалогове вікно не слід показувати."
 
 #: ../src/common/config.py:259
-msgid "Should we show the confirm block contact dialog or not? Empty string means we never show the dialog."
-msgstr "Чи слід показувати діалогове вікно підтвердження блокування контактів? Порожній рядок вказуватиме на те, що це діалогове вікно не слід показувати."
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Чи слід показувати діалогове вікно підтвердження блокування контактів? "
+"Порожній рядок вказуватиме на те, що це діалогове вікно не слід показувати."
 
 #: ../src/common/config.py:260
-msgid "Should we show the confirm custom status dialog or not? Empty string means we never show the dialog."
-msgstr "Чи слід показувати діалогове вікно підтвердження створення особливих статусів? Порожній рядок вказуватиме на те, що це діалогове вікно не слід показувати."
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Чи слід показувати діалогове вікно підтвердження створення особливих "
+"статусів? Порожній рядок вказуватиме на те, що це діалогове вікно не слід "
+"показувати."
 
 #: ../src/common/config.py:261
-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 "Якщо цей параметр матиме значення «True», ви зможете встановлювати від’ємне значення пріоритету для вашого облікового запису у вікні зміни параметрів облікового запису. БУДЬТЕ ОБЕРЕЖНІ за умови входу з від’ємним пріоритетом: у такому разі ви НЕ отримуватимете повідомлень від вашого сервера."
+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 ""
+"Якщо цей параметр матиме значення «True», ви зможете встановлювати від’ємне "
+"значення пріоритету для вашого облікового запису у вікні зміни параметрів "
+"облікового запису. БУДЬТЕ ОБЕРЕЖНІ за умови входу з від’ємним пріоритетом: у "
+"такому разі ви НЕ отримуватимете повідомлень від вашого сервера."
 
 #: ../src/common/config.py:262
-msgid "If True, Gajim will use Gnome Keyring (if available) to store account passwords."
-msgstr "Якщо цей параметр матиме значення «True», Gajim використовуватиме Gnome Keyring (за його наявності) для зберігання паролі облікових записів."
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+"Якщо цей параметр матиме значення «True», Gajim використовуватиме Gnome "
+"Keyring (за його наявності) для зберігання паролі облікових записів."
 
 #: ../src/common/config.py:263
-msgid "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store account passwords."
-msgstr "Якщо цей параметр матиме значення «True», Gajim використовуватиме менеджер торбинок KDE (якщо kwalletcli доступний) для зберігання паролів облікових записів."
+msgid ""
+"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+"account passwords."
+msgstr ""
+"Якщо цей параметр матиме значення «True», Gajim використовуватиме менеджер "
+"торбинок KDE (якщо kwalletcli доступний) для зберігання паролів облікових "
+"записів."
 
 #: ../src/common/config.py:264
-msgid "If True, Gajim will show number of online and total contacts in account and group rows."
-msgstr "Якщо цей параметр матиме значення «True», Gajim показуватиме кількість контактів у мережі і загальну кількість контактів у рядках облікових записів і груп."
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+"Якщо цей параметр матиме значення «True», Gajim показуватиме кількість "
+"контактів у мережі і загальну кількість контактів у рядках облікових записів "
+"і груп."
 
 #: ../src/common/config.py:265
-msgid "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages as if they were of this type"
-msgstr "Може мати порожнє значення або значення 'chat' і 'normal'. Якщо вказано непорожнє значення, вважати всі вхідні повідомлення повідомленнями вказано типу"
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+msgstr ""
+"Може мати порожнє значення або значення 'chat' і 'normal'. Якщо вказано "
+"непорожнє значення, вважати всі вхідні повідомлення повідомленнями вказано "
+"типу"
 
 #: ../src/common/config.py:266
-msgid "If True, Gajim will scroll and select the contact who sent you the last message, if chat window is not already opened."
-msgstr "Якщо цей параметр матиме значення «True», Gajim гортатиме список і обиратиме у ньому контакт, яким вам було надіслано останнє повідомлення, якщо вікно балачки ще не було відкрито."
+msgid ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+"Якщо цей параметр матиме значення «True», Gajim гортатиме список і обиратиме "
+"у ньому контакт, яким вам було надіслано останнє повідомлення, якщо вікно "
+"балачки ще не було відкрито."
 
 #: ../src/common/config.py:267
-msgid "If True, Gajim will convert string between $$ and $$ to an image using dvips and convert before insterting it in chat window."
-msgstr "Якщо цей параметр матиме значення «True», Gajim перетворюватиме рядок між позначками $$ і $$ на зображення за допомогою dvips після перетворення його на формулу, і показуватиме зображення у вікні балачки."
+msgid ""
+"If True, Gajim will convert string between $$ and $$ to an image using dvips "
+"and convert before insterting it in chat window."
+msgstr ""
+"Якщо цей параметр матиме значення «True», Gajim перетворюватиме рядок між "
+"позначками $$ і $$ на зображення за допомогою dvips після перетворення його "
+"на формулу, і показуватиме зображення у вікні балачки."
 
 #: ../src/common/config.py:268
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Час відсутності активності потрібний для закриття вікна зміни стану."
 
 #: ../src/common/config.py:269
-msgid "Maximum number of lines that are printed in conversations. Oldest lines are cleared."
-msgstr "Максимальна кількість рядків, які буде показано протягом спілкування. Застарілі рядки понад вказане число вилучатимуться."
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
+msgstr ""
+"Максимальна кількість рядків, які буде показано протягом спілкування. "
+"Застарілі рядки понад вказане число вилучатимуться."
 
 #: ../src/common/config.py:270
-msgid "If True, notification windows from notification-daemon will be attached to systray icon."
-msgstr "Якщо цей параметр матиме значення «True», вікна сповіщення від фонової служби сповіщення (notification-daemon) буде приєднано до піктограми у системному лотку."
+#, fuzzy
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"notification icon."
+msgstr ""
+"Якщо цей параметр матиме значення «True», вікна сповіщення від фонової "
+"служби сповіщення (notification-daemon) буде приєднано до піктограми у "
+"системному лотку."
 
 #: ../src/common/config.py:271
 msgid "Choose interval between 2 checks of idleness."
-msgstr "Оберіть інтервал між двома послідовними перевірками на відсутність активності."
+msgstr ""
+"Оберіть інтервал між двома послідовними перевірками на відсутність "
+"активності."
 
 #: ../src/common/config.py:272
-msgid "Change the value to change the size of latex formulas displayed. The higher is larger."
-msgstr "За допомогою цього параметра можна регулювати розмір формул latex. Більші значення відповідають більшим символам формул."
+msgid ""
+"Change the value to change the size of latex formulas displayed. The higher "
+"is larger."
+msgstr ""
+"За допомогою цього параметра можна регулювати розмір формул latex. Більші "
+"значення відповідають більшим символам формул."
 
 #: ../src/common/config.py:273
-msgid "Valid uri schemes. Only schemes in this list will be accepted as \"real\" uri. (mailto and xmpp are handled separately)"
-msgstr "Чинні схеми uri. «Справжніми» uri вважатимуться лише схеми вказані у списку. (mailto і xmpp обробляються окремо)"
+msgid ""
+"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
+"uri. (mailto and xmpp are handled separately)"
+msgstr ""
+"Чинні схеми uri. «Справжніми» uri вважатимуться лише схеми вказані у списку. "
+"(mailto і xmpp обробляються окремо)"
 
 #: ../src/common/config.py:274
-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 "Запит повідомлень відсутності до усих відключених контактів при появі з ними зв’язку.  УВАГА: це призведе до відсилання великої кількості запитів."
+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:275
 msgid "If True, completion in groupchats will be like a shell auto-completion"
-msgstr "Якщо Істино, доповнення у групових балачках будуть схожі на автодоповнення командної оболонки."
+msgstr ""
+"Якщо Істино, доповнення у групових балачках будуть схожі на автодоповнення "
+"командної оболонки."
 
 #: ../src/common/config.py:276
-msgid "When is self contact row displayed. Can be \"always\", \"when_other_resource\" or \"never\""
-msgstr "Коли показувати запис власного контакту. Може бути \"завжди\", \"коли_інший_ресурс\" або \"ніколи\""
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+"Коли показувати запис власного контакту. Може бути \"завжди\", "
+"\"коли_інший_ресурс\" або \"ніколи\""
 
 #: ../src/common/config.py:281
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
-msgstr "Опціонально виправляти частоту кадрів вихідного відео Jingle. Приклад: 10/1 або 25/2"
+msgstr ""
+"Опціонально виправляти частоту кадрів вихідного відео Jingle. Приклад: 10/1 "
+"або 25/2"
 
 #: ../src/common/config.py:282
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr "Опціонально змінювати розмір вихідного відео Jingle. Приклад: 320х240"
 
 #: ../src/common/config.py:285
-msgid "If True, Gajim will try to use a STUN server when using jingle. The one in \"stun_server\" option, or the one given by the jabber server."
-msgstr "Якщо ввімкнено, Gajim спробує використати STUN-сервер для Jingle. Буде використано значення параметру \"stun_server\", або отримане з серверу Jabber."
+msgid ""
+"If True, Gajim will try to use a STUN server when using jingle. The one in "
+"\"stun_server\" option, or the one given by the jabber server."
+msgstr ""
+"Якщо ввімкнено, Gajim спробує використати STUN-сервер для Jingle. Буде "
+"використано значення параметру \"stun_server\", або отримане з серверу "
+"Jabber."
 
 #: ../src/common/config.py:286
 msgid "STUN server to use when using jingle"
 msgstr "Сервер STUN для використання з Jingle"
 
 #: ../src/common/config.py:287
-msgid "If True, Gajim will show affiliation of groupchat occupants by adding a colored square to the status icon"
-msgstr "Якщо увімкнено, Gajim покаже членство учасників балачки додаванням кольорового квадрату до піктограми стану."
+msgid ""
+"If True, Gajim will show affiliation of groupchat occupants by adding a "
+"colored square to the status icon"
+msgstr ""
+"Якщо увімкнено, Gajim покаже членство учасників балачки додаванням "
+"кольорового квадрату до піктограми стану."
 
 #: ../src/common/config.py:300
-msgid "Priority will change automatically according to your status. Priorities are defined in autopriority_* options."
-msgstr "Пріоритет автоматично змінюватиметься залежно від вашого стану. Пріоритети визначаються за допомогою параметрів autopriority_*."
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+"Пріоритет автоматично змінюватиметься залежно від вашого стану. Пріоритети "
+"визначаються за допомогою параметрів autopriority_*."
 
 #: ../src/common/config.py:308
-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 "Стан, який буде використано під час автоматичного з’єднання. Можливі значення: online, chat, away, xa, dnd, invisible. ЗАУВАЖЕННЯ: цей параметр використовуватиметься, лише якщо вимкнено параметр restore_last_status"
+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 ""
+"Стан, який буде використано під час автоматичного з’єднання. Можливі "
+"значення: online, chat, away, xa, dnd, invisible. ЗАУВАЖЕННЯ: цей параметр "
+"використовуватиметься, лише якщо вимкнено параметр restore_last_status"
 
 #: ../src/common/config.py:309
 msgid "If enabled, restore the last status that was used."
 msgstr "Якщо увімкнено, відновлювати попередній використаний стан."
 
 #: ../src/common/config.py:311
-msgid "If True, Contacts requesting authorization will be automatically accepted."
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
 msgstr "Якщо Істино, усі запити авторизації буде автоматично задоволено."
 
 #: ../src/common/config.py:312
-msgid "If False, this account will be disabled and will not appear in roster window."
-msgstr "Якщо цей параметр матиме значення «False», обліковий запис буде вимкнено та не буде відображатись у вікні реєстру."
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr ""
+"Якщо цей параметр матиме значення «False», обліковий запис буде вимкнено та "
+"не буде відображатись у вікні реєстру."
 
 #: ../src/common/config.py:315
-msgid "If disabled, don't sign presences with GPG key, even if GPG is configured."
-msgstr "Якщо вимкнено, не підписувати повідомлення про присутність ключем GPG, навіть якщо GPG налаштовано для використання."
+msgid ""
+"If disabled, don't sign presences with GPG key, even if GPG is configured."
+msgstr ""
+"Якщо вимкнено, не підписувати повідомлення про присутність ключем GPG, "
+"навіть якщо GPG налаштовано для використання."
 
 #: ../src/common/config.py:317
 msgid "Enable ESessions encryption for this account."
@@ -3725,20 +4453,32 @@ msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Чи має Gajim автоматично починати сеанс з шифруванням за можливості?"
 
 #: ../src/common/config.py:319
-msgid "Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain"
-msgstr "Впорядкований список відокремлених комами типів з’єднання, які має спробувати програма. Можливі значення: tls, ssl і plain"
+msgid ""
+"Ordered list (space separated) of connection type to try. Can contain tls, "
+"ssl or plain"
+msgstr ""
+"Впорядкований список відокремлених комами типів з’єднання, які має "
+"спробувати програма. Можливі значення: tls, ssl і plain"
 
 #: ../src/common/config.py:320
-msgid "Show a warning dialog before sending password on an plaintext connection."
-msgstr "Показувати діалогове вікно попередження, перш ніж надсилати пароль нешифрованим з’єднанням."
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection."
+msgstr ""
+"Показувати діалогове вікно попередження, перш ніж надсилати пароль "
+"нешифрованим з’єднанням."
 
 #: ../src/common/config.py:321
 msgid "Show a warning dialog before using standard SSL library."
-msgstr "Показувати діалогове вікно попередження, перш ніж користуватися стандартною бібліотекою SSL."
+msgstr ""
+"Показувати діалогове вікно попередження, перш ніж користуватися стандартною "
+"бібліотекою SSL."
 
 #: ../src/common/config.py:322
-msgid "Show a warning dialog before sending PLAIN password over a plain conenction."
-msgstr "Показувати діалогове вікно попередження, перш ніж надсилати відкритий пароль незашифрованим з’єднанням."
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain conenction."
+msgstr ""
+"Показувати діалогове вікно попередження, перш ніж надсилати відкритий пароль "
+"незашифрованим з’єднанням."
 
 #: ../src/common/config.py:324
 msgid "Space separated list of ssl errors to ignore."
@@ -3753,8 +4493,13 @@ msgid "XMPP ping sent after inactivity"
 msgstr "Надсилання XMPP ехо після неактивності."
 
 #: ../src/common/config.py:338
-msgid "How many seconds to wait for the answer of ping alive packet before we try to reconnect."
-msgstr "Проміжок часу у секундах, протягом якого слід очікувати на відповідь на пакет підтримування зв’язку, перш ніж розпочати процедуру повторного з’єднання."
+msgid ""
+"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:342
@@ -3762,8 +4507,13 @@ msgid "Jabberd2 workaround"
 msgstr "Обхідний прийом для Jabberd2"
 
 #: ../src/common/config.py:345
-msgid "If checked, Gajim will use your IP and proxies defined in file_transfer_proxies option for file transfer."
-msgstr "Якщо буде позначено цей пункт, Gajim використовуватиме вашу IP-адресу і проксі сервери, визначення параметром file_transfer_proxies, для передавання файлів."
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+"Якщо буде позначено цей пункт, Gajim використовуватиме вашу IP-адресу і "
+"проксі сервери, визначення параметром file_transfer_proxies, для передавання "
+"файлів."
 
 #: ../src/common/config.py:359
 msgid "Answer to receipt requests"
@@ -3774,282 +4524,234 @@ msgid "Sent receipt requests"
 msgstr "Надіслані запити на підтвердження отримання"
 
 #: ../src/common/config.py:370
-msgid "When negotiating an encrypted session, should Gajim assume you want your messages to be logged?"
-msgstr "Під час налаштування сеансу з шифруванням, чи слід Gajim припускати, що ви бажаєте вести запис повідомлень?"
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+"Під час налаштування сеансу з шифруванням, чи слід Gajim припускати, що ви "
+"бажаєте вести запис повідомлень?"
 
 #: ../src/common/config.py:373
 msgid "Message that is sent to contacts you want to add"
 msgstr "Повідомлення що буде надіслано контакту який ви бажаєте додати"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:374
+msgid "Last time we syncronized with logs from server."
+msgstr ""
+
+#: ../src/common/config.py:436
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Чи увімкнено OpenPGP для цього контакту?"
 
-#: ../src/common/config.py:436
-msgid "Should Gajim automatically start an encrypted session with this contact when possible?"
-msgstr "Чи має Gajim за можливості автоматично запускати шифрований сеанс спілкування з цим контактом?"
+#: ../src/common/config.py:437
+msgid ""
+"Should Gajim automatically start an encrypted session with this contact when "
+"possible?"
+msgstr ""
+"Чи має Gajim за можливості автоматично запускати шифрований сеанс "
+"спілкування з цим контактом?"
 
-#: ../src/common/config.py:437 ../src/common/config.py:440
+#: ../src/common/config.py:438 ../src/common/config.py:441
 msgid "Language for which we want to check misspelled words"
 msgstr "Мова, згідно правил якої відбуватиметься перевірка правопису слів"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:447
 msgid "all or space separated status"
 msgstr "all або відокремлені пробілами стани"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:448
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no' або 'both'"
 
-#: ../src/common/config.py:448 ../src/common/config.py:450
-#: ../src/common/config.py:451 ../src/common/config.py:454
-#: ../src/common/config.py:455
+#: ../src/common/config.py:449 ../src/common/config.py:451
+#: ../src/common/config.py:452 ../src/common/config.py:455
+#: ../src/common/config.py:456
 msgid "'yes', 'no' or ''"
 msgstr "'так', 'ні' або ''"
 
-#: ../src/common/config.py:461 ../src/common/pep.py:157
+#: ../src/common/config.py:460
+msgid ""
+"State whether plugins should be activated on exit (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
+msgstr ""
+
+#: ../src/common/config.py:465 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Сплю"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back soon"
 msgstr "Скоро повернуся"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back in some minutes."
 msgstr "Повернуся за декілька хвилин."
 
-#: ../src/common/config.py:463 ../src/common/pep.py:127
+#: ../src/common/config.py:467 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Їм"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:467
 msgid "I'm eating, so leave me a message."
 msgstr "Зараз їм, залиште повідомлення, перегляну пізніше."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "Movie"
 msgstr "Відео"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "I'm watching a movie."
 msgstr "Я дивлюся відео."
 
-#: ../src/common/config.py:465 ../src/common/pep.py:186
+#: ../src/common/config.py:469 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Працюю"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:469
 msgid "I'm working."
 msgstr "Я працюю."
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "I'm on the phone."
 msgstr "Я розмовляю телефоном."
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "Out"
 msgstr "Відійшов(шла)"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "I'm out enjoying life."
 msgstr "Я насолоджуюся життям."
 
-#: ../src/common/config.py:478
+#: ../src/common/config.py:482
 msgid "I'm available."
 msgstr "Я — доступний (доступна) для балачки."
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:483
 msgid "I'm free for chat."
 msgstr "Я — вільний (вільна) для балачки."
 
-#: ../src/common/config.py:480 ../src/config.py:1600
+#: ../src/common/config.py:484 ../src/config.py:1600
 msgid "Be right back."
 msgstr "Скоро повернуся."
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:485
 msgid "I'm not available."
 msgstr "Я — недоступний (недоступна) для балачки."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:486
 msgid "Do not disturb."
 msgstr "Не турбувати."
 
-#: ../src/common/config.py:483 ../src/common/config.py:484
+#: ../src/common/config.py:487 ../src/common/config.py:488
 msgid "Bye!"
 msgstr "Пока!"
 
-#: ../src/common/config.py:494
-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_highlight_words, або якщо повідомлення групової балачки містить ваш псевдонім."
+#: ../src/common/config.py:498
+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_highlight_words, або якщо "
+"повідомлення групової балачки містить ваш псевдонім."
 
-#: ../src/common/config.py:495
+#: ../src/common/config.py:499
 msgid "Sound to play when any MUC message arrives."
 msgstr "Звук, який буде відтворено за появи повідомлення групової балачки."
 
-#: ../src/common/config.py:504 ../src/common/optparser.py:304
+#: ../src/common/config.py:508 ../src/common/optparser.py:308
 msgid "green"
 msgstr "зелений"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:290
+#: ../src/common/config.py:512 ../src/common/optparser.py:294
 msgid "grocery"
 msgstr "овочевий"
 
-#: ../src/common/config.py:512
+#: ../src/common/config.py:516
 msgid "human"
 msgstr "тілесний"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:520
 msgid "marine"
 msgstr "морський"
 
-#: ../src/common/connection_handlers.py:84
+#: ../src/common/connection_handlers.py:94
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Не вдалося завантажити модуль перевірки відсутності активності"
 
-#: ../src/common/connection_handlers.py:117
+#: ../src/common/connection_handlers.py:127
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
-msgstr "Відомості щодо реєстрації з транспорту %s не надійшли протягом визначеного проміжку часу"
+msgstr ""
+"Відомості щодо реєстрації з транспорту %s не надійшли протягом визначеного "
+"проміжку часу"
 
-#: ../src/common/connection_handlers.py:124
+#: ../src/common/connection_handlers.py:134
 msgid "Registration succeeded"
 msgstr "Зареєструватися на %s"
 
-#: ../src/common/connection_handlers.py:125
+#: ../src/common/connection_handlers.py:135
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Реєстрацію з агентом %s вдало закінчено"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 msgid "Registration failed"
 msgstr "Спроба з’єднання завершилася невдало"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 #, python-format
-msgid "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
-msgstr "Реєстрація з агентом %(agent)s невдала через помилку %(error)s: %(error_msg)s"
+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:445
-#: ../src/common/connection_handlers.py:1633
-#: ../src/common/connection_handlers.py:1756
-#: ../src/common/connection_handlers.py:1957
-#: ../src/common/connection_handlers.py:2108 ../src/common/connection.py:449
+#: ../src/common/connection_handlers.py:466
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
 #: ../src/gajim.py:341
 msgid "Disk Write Error"
 msgstr "Помилка під час спроби запису на диск"
 
-#: ../src/common/connection_handlers.py:678 ../src/common/connection.py:1472
+#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
 msgid "Invisibility not supported"
 msgstr "Невидимість не підтримується"
 
-#: ../src/common/connection_handlers.py:679 ../src/common/connection.py:1473
+#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Обліковий запис %s не підтримує невидимості."
 
-#: ../src/common/connection_handlers.py:1446 ../src/common/connection.py:253
-#: ../src/config.py:2091 ../src/config.py:2100 ../src/config.py:2168
-#: ../src/config.py:3560 ../src/dataforms_widget.py:597 ../src/dialogs.py:2931
+#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
+#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
+#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
 msgid "Invalid Jabber ID"
 msgstr "Некоректний ідентифікатор Jabber"
 
-#: ../src/common/connection_handlers.py:1447
+#: ../src/common/connection_handlers.py:1405
 msgid "A message from a non-valid JID arrived, it has been ignored."
-msgstr "Надійшло повідомлення від некоректного JID, це повідомлення було проігноровано."
+msgstr ""
+"Надійшло повідомлення від некоректного JID, це повідомлення було "
+"проігноровано."
 
-#: ../src/common/connection_handlers.py:1636
-#: ../src/common/connection_handlers.py:1759
-#: ../src/common/connection_handlers.py:1961
-#: ../src/common/connection_handlers.py:2111 ../src/common/connection.py:453
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
 #: ../src/gajim.py:160 ../src/session.py:139
 #, 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 "Файл бази даних (%s) непридатний для читання. Спробуйте виправити його (див. http://trac.gajim.org/wiki/DatabaseBackup) або вилучити його (всі журнали буде втрачено)."
-
-#: ../src/common/connection_handlers.py:1805
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "Заборонений псевдонім: %s"
-
-#: ../src/common/connection_handlers.py:1902
-#: ../src/common/connection_handlers.py:1911
-#: ../src/common/connection_handlers.py:1918
-#: ../src/common/connection_handlers.py:1922
-#: ../src/common/connection_handlers.py:1926
-#: ../src/common/connection_handlers.py:1931 ../src/gui_interface.py:139
-msgid "Unable to join group chat"
-msgstr "Не вдалося приєднатися до групової балачки"
-
-#: ../src/common/connection_handlers.py:1903
-#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr "Максимальна кількість користувачів %s вже досягнута."
-
-#: ../src/common/connection_handlers.py:1912
-#, python-format
-msgid "You are banned from group chat %s."
-msgstr "Вас заблокували у груповій балачці %s."
-
-#: ../src/common/connection_handlers.py:1919
-#, python-format
-msgid "Group chat %s does not exist."
-msgstr "Групової балачки %s не існує."
-
-#: ../src/common/connection_handlers.py:1923
-msgid "Group chat creation is restricted."
-msgstr "Можливість створення групових балачок обмежено."
-
-#: ../src/common/connection_handlers.py:1927
-#, python-format
-msgid "Your registered nickname must be used in group chat %s."
-msgstr "Для групової балачки %s слід використовувати псевдонім, під яким ви зареєструвалися."
-
-#: ../src/common/connection_handlers.py:1932
-#, 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:1976
-msgid "Room has been destroyed"
-msgstr "Кімнату було знищено"
-
-#: ../src/common/connection_handlers.py:1984
-#, python-format
-msgid "You can join this room instead: %s"
-msgstr "Ви можете приєднатися до цієї кімнати замість %s"
-
-#: ../src/common/connection_handlers.py:2020
-msgid "I would like to add you to my roster."
-msgstr "Я хочу додати вас до свого реєстру."
-
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2041
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "тепер ми підписані на %s"
-
-#: ../src/common/connection_handlers.py:2043
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "запит на скасування підписки від %s"
-
-#: ../src/common/connection_handlers.py:2045
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "підписку на %s скасовано"
-
-#: ../src/common/connection_handlers.py:2240
-#, python-format
-msgid "JID %s is not RFC compliant. It will not be added to your roster. Use roster management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr "JID %s не відповідає стандартам. Його не може бути додано до реєстру. Скористайтеся інструментами для керування реєстром, наприклад, http://jru.jabberstudio.org/ для його вилучення"
+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 ""
+"Файл бази даних (%s) непридатний для читання. Спробуйте виправити його (див. "
+"http://trac.gajim.org/wiki/DatabaseBackup) або вилучити його (всі журнали "
+"буде втрачено)."
 
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
@@ -4179,27 +4881,28 @@ msgstr "До призначення ключа не належить підпи
 msgid "Application verification failure"
 msgstr "Помилка під час перевірки програми"
 
-#: ../src/common/connection.py:254 ../src/dialogs.py:2932
+#: ../src/common/connection.py:256 ../src/dialogs.py:2948
 #, 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:276
+#: ../src/common/connection.py:278
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr "Не підписано повідомлення про присутність, ключа також не призначено."
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:281
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr "Ключ контакту (%s) не збігається з ключем, призначеним для нього у Gajim."
+msgstr ""
+"Ключ контакту (%s) не збігається з ключем, призначеним для нього у Gajim."
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:331
+#: ../src/common/connection.py:333
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Це повідомлення *зашифровано* (див. :XEP:`27`]"
 
-#: ../src/common/connection.py:439
+#: ../src/common/connection.py:441
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4208,76 +4911,81 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:807
+#: ../src/common/connection.py:809
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "З’єднання з обліковим записом «%s» було втрачено"
 
-#: ../src/common/connection.py:808
+#: ../src/common/connection.py:810
 msgid "Reconnect manually."
 msgstr "Виконати повторне з’єднання вручну."
 
-#: ../src/common/connection.py:820
+#: ../src/common/connection.py:822
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
-msgstr "Від сервера %(name)s було отримано помилкову відповідь на запит щодо реєстрації: %(error)s"
+msgstr ""
+"Від сервера %(name)s було отримано помилкову відповідь на запит щодо "
+"реєстрації: %(error)s"
 
-#: ../src/common/connection.py:854
+#: ../src/common/connection.py:856
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "На сервері %s передбачено іншу форму реєстрації"
 
-#: ../src/common/connection.py:867
+#: ../src/common/connection.py:869
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Невідома помилка SSL: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:882
+#: ../src/common/connection.py:884
 msgid "Invalid answer"
 msgstr "Некоректна відповідь"
 
-#: ../src/common/connection.py:883
+#: ../src/common/connection.py:885
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
-msgstr "Транспорт %(name)s надіслав помилкову відповідь на запит щодо реєстрації: %(error)s"
+msgstr ""
+"Транспорт %(name)s надіслав помилкову відповідь на запит щодо реєстрації: "
+"%(error)s"
 
-#: ../src/common/connection.py:1165 ../src/common/connection.py:1294
-#: ../src/common/connection.py:1784
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
+#: ../src/common/connection.py:1792
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Не вдалося з’єднатися з «%s»"
 
-#: ../src/common/connection.py:1166 ../src/gui_interface.py:755
+#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
 msgid "Check your connection or try again later."
 msgstr "Перевірте ваше з’єднання, а потім повторіть спробу."
 
-#: ../src/common/connection.py:1171
+#: ../src/common/connection.py:1173
 #, python-format
 msgid "Server replied: %s"
 msgstr "Збережено за адресою: %s"
 
-#: ../src/common/connection.py:1184
+#: ../src/common/connection.py:1186
 msgid "Connection to proxy failed"
 msgstr "Спроба встановити з'єднання з проксі-сервером завершилася невдало"
 
-#: ../src/common/connection.py:1215 ../src/common/connection.py:1274
+#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Не вдалося з’єднатися з обліковим записом %s"
 
-#: ../src/common/connection.py:1216 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
-msgstr "З’єднання з обліковим записом було втрачено %s. Повторна спроба з’єднання."
+msgstr ""
+"З’єднання з обліковим записом було втрачено %s. Повторна спроба з’єднання."
 
-#: ../src/common/connection.py:1241
+#: ../src/common/connection.py:1243
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Достовірність сертифіката %s знаходиться під питанням."
 
-#: ../src/common/connection.py:1244
+#: ../src/common/connection.py:1246
 #, python-format
 msgid ""
 "\n"
@@ -4286,7 +4994,7 @@ msgstr ""
 "\n"
 "Помилка SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1248
 #, python-format
 msgid ""
 "\n"
@@ -4295,61 +5003,67 @@ msgstr ""
 "\n"
 "Невідома помилка SSL: %d"
 
-#: ../src/common/connection.py:1295
+#: ../src/common/connection.py:1297
 msgid "Check your connection or try again later"
 msgstr "Перевірте ваше з’єднання або повторіть спробу пізніше"
 
-#: ../src/common/connection.py:1324
+#: ../src/common/connection.py:1329
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Спроба розпізнавання за допомогою «%s» завершилася невдало"
 
-#: ../src/common/connection.py:1326
+#: ../src/common/connection.py:1331
 msgid "Please check your login and password for correctness."
 msgstr "Будь ласка, перевірте, чи правильно вказано ім’я користувача і пароль."
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1400
 msgid "Error while removing privacy list"
 msgstr "Помилка під час вилучення списку конфіденційності"
 
-#: ../src/common/connection.py:1396
+#: ../src/common/connection.py:1401
 #, 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 "Список конфіденційності %s не було вилучено. Ймовірно, він використовується у одному з ресурсів, з яким з’єднано ваш клієнт. Вимкніть цей ресурс і повторіть спробу."
+msgid ""
+"Privacy list %s has not been removed. It is maybe active in one of your "
+"connected resources. Deactivate it and try again."
+msgstr ""
+"Список конфіденційності %s не було вилучено. Ймовірно, він використовується "
+"у одному з ресурсів, з яким з’єднано ваш клієнт. Вимкніть цей ресурс і "
+"повторіть спробу."
 
-#: ../src/common/connection.py:1650
+#: ../src/common/connection.py:1658
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Відправлений контакт:  \"%s\" (%s)"
 
-#: ../src/common/connection.py:1653
+#: ../src/common/connection.py:1661
 msgid "Sent contacts:"
 msgstr "Надіслати контакти:"
 
-#: ../src/common/connection.py:1799 ../src/common/connection.py:1822
+#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
 msgid "Not fetched because of invisible status"
 msgstr "Не отримано через стан невидимості"
 
-#: ../src/common/connection.py:2254
+#: ../src/common/connection.py:2262
 msgid "Unregister failed"
 msgstr "Спроба скасування реєстрації завершилася невдало"
 
-#: ../src/common/connection.py:2255
+#: ../src/common/connection.py:2263
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
-msgstr "Видалення реєстрації з серверу %(server)s не вдалося через помилку: %(error)s"
+msgstr ""
+"Видалення реєстрації з серверу %(server)s не вдалося через помилку: %(error)s"
 
 #: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:674
+#: ../src/gui_interface.py:551
 msgid "Observers"
 msgstr "Спостерігачі"
 
 #: ../src/common/contacts.py:139 ../src/common/contacts.py:366
 #: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1499 ../src/gui_interface.py:424
-#: ../src/roster_window.py:840 ../src/roster_window.py:1525
-#: ../src/roster_window.py:1606 ../src/roster_window.py:1608
-#: ../src/roster_window.py:1769
+#: ../src/disco.py:1517 ../src/roster_window.py:854
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
+#: ../src/roster_window.py:2466
 msgid "Transports"
 msgstr "Транспорти"
 
@@ -4385,7 +5099,9 @@ msgstr "Не вдалося прочитати базу даних."
 
 #: ../src/common/exceptions.py:56
 msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr "Служба недоступна: Gajim не запущено або встановлено значення «False» для параметра remote_control"
+msgstr ""
+"Служба недоступна: Gajim не запущено або встановлено значення «False» для "
+"параметра remote_control"
 
 #: ../src/common/exceptions.py:67
 msgid "D-Bus is not present on this machine or python module is missing"
@@ -4457,8 +5173,7 @@ msgstr "десята"
 msgid "eleven"
 msgstr "одинадцята"
 
-#. Strings to use for the output. %(0)s will be replaced with the preceding
-#. hour
+#. 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"). '''
 #: ../src/common/fuzzyclock.py:44
 #, python-format
@@ -4573,201 +5288,217 @@ msgstr "Кінець тижня"
 msgid "Weekend!"
 msgstr "Вихідні!"
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:148
+msgid "Username must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:153
 msgid "Invalid character in username."
 msgstr "Некоректний символ у імені користувача."
 
-#: ../src/common/helpers.py:156
-msgid "Server address required."
-msgstr "Слід вказати адресу сервера."
+#: ../src/common/helpers.py:159
+msgid "Server must be between 1 and 1023 chars"
+msgstr ""
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 msgid "Invalid character in hostname."
 msgstr "Некоректний символ у назві вузла."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:166
+msgid "Server address required."
+msgstr "Слід вказати адресу сервера."
+
+#: ../src/common/helpers.py:170
+msgid "Resource must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:175
 msgid "Invalid character in resource."
 msgstr "Некоректний символ у назві ресурсу."
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:215
 msgid "_Busy"
 msgstr "_Зайнятий"
 
-#: ../src/common/helpers.py:211 ../src/tooltips.py:195
+#: ../src/common/helpers.py:217 ../src/tooltips.py:195
 msgid "Busy"
 msgstr "Зайнятий"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:220
 msgid "_Not Available"
 msgstr "_Не доступний"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:225
 msgid "_Free for Chat"
 msgstr "_Вільний для балачки"
 
-#: ../src/common/helpers.py:221 ../src/tooltips.py:191
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Free for Chat"
 msgstr "Вільний для балачки"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:230
 msgid "?user status:_Available"
 msgstr "?стан користувача:_Доступний"
 
-#: ../src/common/helpers.py:226 ../src/tooltips.py:189
+#: ../src/common/helpers.py:232 ../src/tooltips.py:189
 msgid "?user status:Available"
 msgstr "?стан користувача:Доступний"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:234
 msgid "Connecting"
 msgstr "Виконується з'єднання"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:237
 msgid "A_way"
 msgstr "В_ідійшов"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:242
 msgid "_Offline"
 msgstr "_Поза мережею"
 
-#: ../src/common/helpers.py:238 ../src/tooltips.py:199
+#: ../src/common/helpers.py:244 ../src/tooltips.py:199
 msgid "Offline"
 msgstr "Поза мережею"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:247
 msgid "_Invisible"
 msgstr "_Невидимий"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:253
 msgid "?contact has status:Unknown"
 msgstr "?стан контакту:Невідомий"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:255
 msgid "?contact has status:Has errors"
 msgstr "?стан контакту:З помилками"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:260
 msgid "?Subscription we already have:None"
 msgstr "?Підписка яку ми вже маємо:Жодної"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:262
 msgid "To"
 msgstr "До"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
+msgid "From"
+msgstr "Від"
+
+#: ../src/common/helpers.py:266
 msgid "Both"
 msgstr "Обидва"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:274
 msgid "?Ask (for Subscription):None"
 msgstr "?Запит (на підписку):Немає"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:276
 msgid "Subscribe"
 msgstr "Підписатися"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:285
 msgid "?Group Chat Contact Role:None"
 msgstr "?Роль у груповій балачці:Немає"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:288
 msgid "Moderators"
 msgstr "Модератори"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:290
 msgid "Moderator"
 msgstr "Модератор"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:293
 msgid "Participants"
 msgstr "Учасники"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:295
 msgid "Participant"
 msgstr "Учасник"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:298
 msgid "Visitors"
 msgstr "Відвідувачі"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:300
 msgid "Visitor"
 msgstr "Відвідувач"
 
-#: ../src/common/helpers.py:300 ../src/tooltips.py:210
+#: ../src/common/helpers.py:306 ../src/tooltips.py:210
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Членство контакту у груповій балачці:Жодного"
 
-#: ../src/common/helpers.py:302 ../src/tooltips.py:216
+#: ../src/common/helpers.py:308 ../src/tooltips.py:216
 msgid "Owner"
 msgstr "Власник"
 
-#: ../src/common/helpers.py:304 ../src/tooltips.py:214
+#: ../src/common/helpers.py:310 ../src/tooltips.py:214
 msgid "Administrator"
 msgstr "Адміністратор"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:212
+#: ../src/common/helpers.py:312 ../src/tooltips.py:212
 msgid "Member"
 msgstr "Учасник"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:351
 msgid "is paying attention to the conversation"
 msgstr "спілкується"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:353
 msgid "is doing something else"
 msgstr "робить щось інше"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:355
 msgid "is composing a message..."
 msgstr "пише повідомлення..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:352
+#: ../src/common/helpers.py:358
 msgid "paused composing a message"
 msgstr "призупинив (призупинила) створення повідомлення"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:360
 msgid "has closed the chat window or tab"
 msgstr "закрив (закрила) вікно або вкладку балачки"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:619
+#: ../src/common/helpers.py:625
 #, python-format
 msgid "%s GiB"
 msgstr "%s ГіБ"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:622
+#: ../src/common/helpers.py:628
 #, python-format
 msgid "%s GB"
 msgstr "%s ГБ"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:626
+#: ../src/common/helpers.py:632
 #, python-format
 msgid "%s MiB"
 msgstr "%s МіБ"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:629
+#: ../src/common/helpers.py:635
 #, python-format
 msgid "%s MB"
 msgstr "%s МБ"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:633
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s KiB"
 msgstr "%s кіБ"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:636
+#: ../src/common/helpers.py:642
 #, python-format
 msgid "%s KB"
 msgstr "%s кБ"
 
 #. B means bytes
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:645
 #, python-format
 msgid "%s B"
 msgstr "%s Б"
@@ -4812,12 +5543,12 @@ msgstr "Gajim - %s"
 msgid "Hello, I am $name."
 msgstr "Привіт, я $name."
 
-#: ../src/common/jingle_rtp.py:111
+#: ../src/common/jingle_rtp.py:107
 #, python-format
 msgid "%s configuration error"
 msgstr "%s помилка конфігурації"
 
-#: ../src/common/jingle_rtp.py:112
+#: ../src/common/jingle_rtp.py:108
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -4836,11 +5567,11 @@ msgstr ""
 "Помилка:\n"
 "%s"
 
-#: ../src/common/jingle_rtp.py:209
+#: ../src/common/jingle_rtp.py:205
 msgid "GStreamer error"
 msgstr "Помилка GStreamer"
 
-#: ../src/common/jingle_rtp.py:210
+#: ../src/common/jingle_rtp.py:206
 #, python-format
 msgid ""
 "Error: %s\n"
@@ -4849,19 +5580,19 @@ msgstr ""
 "Повідомлення про помилку: %s\n"
 "Відлагодження: %s"
 
-#: ../src/common/jingle_rtp.py:336
+#: ../src/common/jingle_rtp.py:335
 msgid "audio input"
 msgstr "аудіо вхід"
 
-#: ../src/common/jingle_rtp.py:339
+#: ../src/common/jingle_rtp.py:338
 msgid "audio output"
 msgstr "аудіо вихід"
 
-#: ../src/common/jingle_rtp.py:382
+#: ../src/common/jingle_rtp.py:381
 msgid "video input"
 msgstr "відео вхід"
 
-#: ../src/common/jingle_rtp.py:390
+#: ../src/common/jingle_rtp.py:389
 msgid "video output"
 msgstr "відео вихід"
 
@@ -4937,11 +5668,11 @@ msgstr "Система X Window (без Xv)"
 msgid "error: cannot open %s for reading"
 msgstr "помилка: не вдалося відкрити %s для читання"
 
-#: ../src/common/optparser.py:299 ../src/common/optparser.py:300
+#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
 msgid "cyan"
 msgstr "блакитний"
 
-#: ../src/common/optparser.py:379
+#: ../src/common/optparser.py:383
 msgid "migrating logs database to indices"
 msgstr "перехід від бази даних журналів до покажчика"
 
@@ -5606,19 +6337,26 @@ msgid "Unable to bind to port %s."
 msgstr "Не вдалося прив’язатися до порту %s."
 
 #: ../src/common/socks5.py:92
-msgid "Maybe you have another running instance of Gajim. File Transfer will be cancelled."
-msgstr "Можливо, запущено інший екземпляр Gajim. Передавання файла буде скасовано."
+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:303
-msgid "[This is part of an encrypted session. If you see this message, something went wrong.]"
-msgstr "[Це частина шифрованого сеансу. Якщо ви бачите це повідомлення, сталася якась помилка.]"
+#: ../src/common/stanza_session.py:423
+msgid ""
+"[This is part of an encrypted session. If you see this message, something "
+"went wrong.]"
+msgstr ""
+"[Це частина шифрованого сеансу. Якщо ви бачите це повідомлення, сталася "
+"якась помилка.]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:178
+#: ../src/common/zeroconf/connection_zeroconf.py:181
 msgid "Avahi error"
 msgstr "Помилка Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:179
+#: ../src/common/zeroconf/connection_zeroconf.py:182
 #, python-format
 msgid ""
 "%s\n"
@@ -5627,46 +6365,50 @@ msgstr ""
 "%s\n"
 "Обмін локальними повідомленнями може працювати з помилками."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:190
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Будь ласка, переконайтеся, що встановлено Avahi або Bonjour."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:199
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Could not start local service"
 msgstr "Не вдалося запустити локальну службу"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Не вдалося прив’язатися до порту %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-#: ../src/common/zeroconf/connection_zeroconf.py:283
-#: ../src/common/zeroconf/connection_zeroconf.py:294
-#: ../src/common/zeroconf/connection_zeroconf.py:308
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:286
+#: ../src/common/zeroconf/connection_zeroconf.py:297
+#: ../src/common/zeroconf/connection_zeroconf.py:311
 msgid "Please check if avahi-daemon is running."
 msgstr "Будь ласка, переконайтеся, що запущено фонову службу avahi."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:282
-#: ../src/common/zeroconf/connection_zeroconf.py:293
-#: ../src/common/zeroconf/connection_zeroconf.py:307
+#: ../src/common/zeroconf/connection_zeroconf.py:285
+#: ../src/common/zeroconf/connection_zeroconf.py:296
+#: ../src/common/zeroconf/connection_zeroconf.py:310
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Не вдалося змінити стан облікового запису «%s»"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:325
+#: ../src/common/zeroconf/connection_zeroconf.py:328
 msgid "Your message could not be sent."
 msgstr "Ваше повідомлення неможливо надіслати."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:335
+#: ../src/common/zeroconf/connection_zeroconf.py:338
 msgid "Contact is offline. Your message could not be sent."
-msgstr "Контакт перебуває поза мережею. Ваше повідомлення не може бути надіслано."
+msgstr ""
+"Контакт перебуває поза мережею. Ваше повідомлення не може бути надіслано."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
-msgid "Connection to host could not be established: Timeout while sending data."
-msgstr "Неможливо встановити з’єднання з вузлом: перевищення очікування на підтвердження можливості надсилання даних."
+#: ../src/common/zeroconf/connection_zeroconf.py:363
+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
@@ -5682,19 +6424,23 @@ msgstr "Типове повідомлення"
 msgid "Enabled"
 msgstr "Увімкнено"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3078
+#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
 msgid "Default"
 msgstr "Типовий"
 
-#: ../src/config.py:739 ../src/dialogs.py:1395
+#: ../src/config.py:733 ../src/dialogs.py:1409
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Словники для мови %s не доступні"
 
-#: ../src/config.py:740
+#: ../src/config.py:734
 #, python-format
-msgid "You have to install %s dictionary to use spellchecking, or choose another language by setting the speller_language option."
-msgstr "Ви маєте встановити словники %s для використання перевірки орфографії, або обрати іншу мову через параметр speller_language."
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+"Ви маєте встановити словники %s для використання перевірки орфографії, або "
+"обрати іншу мову через параметр speller_language."
 
 #: ../src/config.py:1214
 msgid "status message title"
@@ -5705,9 +6451,9 @@ msgid "status message text"
 msgstr "текст повідомлення про стан"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2383 ../src/dialogs.py:2449
-#: ../src/dialogs.py:3215 ../src/disco.py:866 ../src/disco.py:1726
-#: ../src/disco.py:2030 ../src/history_window.py:90
+#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
+#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
+#: ../src/disco.py:2048 ../src/history_window.py:90
 msgid "Name"
 msgstr "Назва"
 
@@ -5717,7 +6463,9 @@ msgstr "Повторно увійти зараз?"
 
 #: ../src/config.py:1610
 msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr "Якщо ви бажаєте, щоб всі зміни негайно набули чинності, вам слід вийти з облікового запису, а потім знову туди увійти."
+msgstr ""
+"Якщо ви бажаєте, щоб всі зміни негайно набули чинності, вам слід вийти з "
+"облікового запису, а потім знову туди увійти."
 
 #: ../src/config.py:1764 ../src/config.py:1893
 msgid "OpenPGP is not usable on this computer"
@@ -5729,7 +6477,9 @@ msgstr "Непрочитані події"
 
 #: ../src/config.py:1934
 msgid "Read all pending events before removing this account."
-msgstr "Перш ніж вилучати цей обліковий запис, прочитайте усі повідомлення з черги подій."
+msgstr ""
+"Перш ніж вилучати цей обліковий запис, прочитайте усі повідомлення з черги "
+"подій."
 
 #: ../src/config.py:1963
 #, python-format
@@ -5738,27 +6488,36 @@ msgstr "Ви розпочали балачку за допомогою облі
 
 #: ../src/config.py:1964
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
-msgstr "Всі вікна балачок і групових балачок буде закрито. Бажаєте продовжити процедуру виходу?"
+msgstr ""
+"Всі вікна балачок і групових балачок буде закрито. Бажаєте продовжити "
+"процедуру виходу?"
 
-#: ../src/config.py:1976 ../src/config.py:2509 ../src/config.py:2545
+#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
 msgid "You are currently connected to the server"
 msgstr "Зараз ваш клієнт з’єднано з сервером"
 
 #: ../src/config.py:1977
 msgid "To change the account name, you must be disconnected."
-msgstr "Для зміни назви облікового запису вам слід від’єднати клієнт від сервера."
+msgstr ""
+"Для зміни назви облікового запису вам слід від’єднати клієнт від сервера."
 
 #: ../src/config.py:1981
 msgid "To change the account name, you must read all pending events."
-msgstr "Для зміни назви облікового запису вам слід прочитати усі повідомлення з черги подій."
+msgstr ""
+"Для зміни назви облікового запису вам слід прочитати усі повідомлення з "
+"черги подій."
 
 #: ../src/config.py:1987
 msgid "Account Name Already Used"
 msgstr "Така назва облікового запису вже використовується"
 
 #: ../src/config.py:1988
-msgid "This name is already used by another of your accounts. Please choose another name."
-msgstr "Ви вже створили обліковий запис з такою назвою. Будь ласка, оберіть іншу назву."
+msgid ""
+"This name is already used by another of your accounts. Please choose another "
+"name."
+msgstr ""
+"Ви вже створили обліковий запис з такою назвою. Будь ласка, оберіть іншу "
+"назву."
 
 #: ../src/config.py:1992 ../src/config.py:1996
 msgid "Invalid account name"
@@ -5772,131 +6531,136 @@ msgstr "Назва облікового запису не може бути по
 msgid "Account name cannot contain spaces."
 msgstr "Назва облікового запису не може містити пробіли."
 
-#: ../src/config.py:2072
+#: ../src/config.py:2074
 msgid "Rename Account"
 msgstr "Перейменувати запис"
 
-#: ../src/config.py:2073
+#: ../src/config.py:2075
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Введіть нову назву для облікового запису %s"
 
-#: ../src/config.py:2101
+#: ../src/config.py:2103
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Ідентифікатор Jabber слід вказувати як «користувач@назва.сервера»."
 
-#: ../src/config.py:2318 ../src/config.py:3606
+#: ../src/config.py:2320 ../src/config.py:3623
 msgid "Invalid entry"
 msgstr "Некоректний запис"
 
-#: ../src/config.py:2319 ../src/config.py:3607
+#: ../src/config.py:2321 ../src/config.py:3624
 msgid "Custom port must be a port number."
 msgstr "Нетиповий порти слід вказувати у вигляді номера."
 
-#: ../src/config.py:2340
+#: ../src/config.py:2342
 msgid "Failed to get secret keys"
 msgstr "Спроба отримання закритих ключів завершилася невдало"
 
-#: ../src/config.py:2341
+#: ../src/config.py:2343
 msgid "There is no OpenPGP secret key available."
 msgstr "Немає доступних закритих ключів OpenPGP."
 
-#: ../src/config.py:2375
+#: ../src/config.py:2377
 msgid "OpenPGP Key Selection"
 msgstr "Вибір ключа OpenPGP"
 
-#: ../src/config.py:2376
+#: ../src/config.py:2378
 msgid "Choose your OpenPGP key"
 msgstr "Оберіть свій ключ OpenPGP"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2385
 msgid "No such account available"
 msgstr "Вказаний обліковий запис недоступний"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2386
 msgid "You must create your account before editing your personal information."
-msgstr "Вам слід створити обліковий запис, перш ніж розпочати редагування ваших особистих відомостей."
+msgstr ""
+"Вам слід створити обліковий запис, перш ніж розпочати редагування ваших "
+"особистих відомостей."
 
-#: ../src/config.py:2391 ../src/dialogs.py:2136 ../src/dialogs.py:2371
-#: ../src/dialogs.py:2557 ../src/disco.py:511 ../src/profile_window.py:339
+#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
+#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
 msgid "You are not connected to the server"
 msgstr "Ваш комп’ютер не з’єднано з сервером"
 
-#: ../src/config.py:2392
+#: ../src/config.py:2394
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Без з’єднання ви не зможете редагувати ваші особисті відомості."
 
-#: ../src/config.py:2396
+#: ../src/config.py:2398
 msgid "Your server doesn't support Vcard"
 msgstr "Ваш сервер не підтримує Vcard"
 
-#: ../src/config.py:2397
+#: ../src/config.py:2399
 msgid "Your server can't save your personal information."
 msgstr "Ваш сервер не може зберігати ваші особисті відомості."
 
-#: ../src/config.py:2510 ../src/config.py:2546
+#: ../src/config.py:2512 ../src/config.py:2548
 msgid "To disable the account, you must be disconnected."
-msgstr "Для відключення облікового запису вам слід від’єднати клієнт від сервера."
+msgstr ""
+"Для відключення облікового запису вам слід від’єднати клієнт від сервера."
 
-#: ../src/config.py:2515
+#: ../src/config.py:2517
 msgid "Account Local already exists."
 msgstr "Обліковий запис Local вже існує."
 
-#: ../src/config.py:2516
+#: ../src/config.py:2518
 msgid "Please rename or remove it before enabling link-local messaging."
-msgstr "Будь ласка, перейменуйте або вилучіть його, перш ніж вмикати локальні повідомлення."
+msgstr ""
+"Будь ласка, перейменуйте або вилучіть його, перш ніж вмикати локальні "
+"повідомлення."
 
-#: ../src/config.py:2673
+#: ../src/config.py:2675
 #, python-format
 msgid "Edit %s"
 msgstr "Редагувати %s"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2677
 #, python-format
 msgid "Register to %s"
 msgstr "Зареєструватися на %s"
 
 #. list at the beginning
-#: ../src/config.py:2711
+#: ../src/config.py:2713
 msgid "Ban List"
 msgstr "Список заборон"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2714
 msgid "Member List"
 msgstr "Список учасників"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2714
 msgid "Owner List"
 msgstr "Список власників"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2715
 msgid "Administrator List"
 msgstr "Список адміністраторів"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2763 ../src/disco.py:873 ../src/history_manager.py:201
+#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2773
+#: ../src/config.py:2789
 msgid "Reason"
 msgstr "Підстава"
 
-#: ../src/config.py:2780
+#: ../src/config.py:2796
 msgid "Nick"
 msgstr "Прізвисько"
 
-#: ../src/config.py:2786
+#: ../src/config.py:2802
 msgid "Role"
 msgstr "Роль"
 
-#: ../src/config.py:2813
+#: ../src/config.py:2829
 msgid "Banning..."
 msgstr "Блокування..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2815
+#: ../src/config.py:2831
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -5904,11 +6668,11 @@ msgstr ""
 "<b>Кого ви бажаєте заблокувати?</b>\n"
 "\n"
 
-#: ../src/config.py:2817
+#: ../src/config.py:2833
 msgid "Adding Member..."
 msgstr "Додавання учасника..."
 
-#: ../src/config.py:2818
+#: ../src/config.py:2834
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -5916,11 +6680,11 @@ msgstr ""
 "<b>Кому ви бажаєте надати можливість участі?</b>\n"
 "\n"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2836
 msgid "Adding Owner..."
 msgstr "Додавання власника..."
 
-#: ../src/config.py:2821
+#: ../src/config.py:2837
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -5928,11 +6692,11 @@ msgstr ""
 "<b>Кого ви бажаєте зробити власником?</b>\n"
 "\n"
 
-#: ../src/config.py:2823
+#: ../src/config.py:2839
 msgid "Adding Administrator..."
 msgstr "Додавання адміністратора..."
 
-#: ../src/config.py:2824
+#: ../src/config.py:2840
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -5940,7 +6704,7 @@ msgstr ""
 "<b>Кого ви бажаєте зробити адміністратором?</b>\n"
 "\n"
 
-#: ../src/config.py:2825
+#: ../src/config.py:2841
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -5956,134 +6720,144 @@ msgstr ""
 "4. домен (пошук лише домену: записів користувач@домен,\n"
 "домен/ресурс або адреси, що містить піддомен)."
 
-#: ../src/config.py:2926
+#: ../src/config.py:2943
 #, python-format
 msgid "Removing %s account"
 msgstr "Вилучення облікового запису %s"
 
-#: ../src/config.py:2941
+#: ../src/config.py:2958
 msgid "Account is disabled"
 msgstr "Обліковий запис вимкнено"
 
-#: ../src/config.py:2942
+#: ../src/config.py:2959
 msgid "To unregister from a server, account must be enabled."
 msgstr "Щоб зняти реєстрацію з серверу, обліковий запис має бути активним."
 
-#: ../src/config.py:2955 ../src/gui_interface.py:1132
-#: ../src/gui_interface.py:1243
+#: ../src/config.py:2972 ../src/gui_interface.py:311
+#: ../src/gui_interface.py:1048
 msgid "Password Required"
 msgstr "Слід ввести пароль"
 
-#: ../src/config.py:2956 ../src/gui_interface.py:1223
+#: ../src/config.py:2973 ../src/gui_interface.py:1028
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Введіть ваш пароль для облікового запису %s"
 
-#: ../src/config.py:2957 ../src/gui_interface.py:1243
+#: ../src/config.py:2974 ../src/gui_interface.py:1048
 msgid "Save password"
 msgstr "Зберегти пароль"
 
-#: ../src/config.py:2967
+#: ../src/config.py:2984
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Обліковий запис «%s» з’єднано з сервером"
 
-#: ../src/config.py:2968
+#: ../src/config.py:2985
 msgid "If you remove it, the connection will be lost."
 msgstr "Якщо ви вилучите його, з’єднання буде розірвано."
 
-#: ../src/config.py:2982
+#: ../src/config.py:2999
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "Спроба встановити з'єднання з сервером %s завершилася невдало"
 
-#: ../src/config.py:2983
+#: ../src/config.py:3000
 msgid "What would you like to do?"
 msgstr "Що ви хочете зробити?"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3001
 msgid "Remove only from Gajim"
 msgstr "Вилучити _лише з Gajim"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3002
 msgid "Don't remove anything. I'll try again later"
 msgstr "Не видаляти нічого. Я спробую пізніше ще раз."
 
-#: ../src/config.py:3078
+#: ../src/config.py:3095
 msgid "?print_status:All"
 msgstr "Всі"
 
-#: ../src/config.py:3079
+#: ../src/config.py:3096
 msgid "Enter and leave only"
 msgstr "Лише вхід і вихід"
 
-#: ../src/config.py:3080
+#: ../src/config.py:3097
 msgid "?print_status:None"
 msgstr "Жодного"
 
-#: ../src/config.py:3150
+#: ../src/config.py:3167
 msgid "New Group Chat"
 msgstr "Створити групову балачку"
 
-#: ../src/config.py:3183
+#: ../src/config.py:3200
 msgid "This bookmark has invalid data"
 msgstr "У цій закладці містяться некоректні дані"
 
-#: ../src/config.py:3184
-msgid "Please be sure to fill out server and room fields or remove this bookmark."
+#: ../src/config.py:3201
+msgid ""
+"Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Будь ласка, заповніть поля сервера і кімнати або вилучіть цю закладку."
 
 #. invalid char
-#: ../src/config.py:3302 ../src/dialogs.py:1934
+#: ../src/config.py:3319 ../src/dialogs.py:1950
 msgid "Invalid nickname"
 msgstr "Некоректний псевдонім"
 
-#: ../src/config.py:3303 ../src/config.py:3317 ../src/config.py:3331
+#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
 msgid "Character not allowed"
 msgstr "Заборонений символ"
 
-#: ../src/config.py:3316 ../src/config.py:3582
+#: ../src/config.py:3333 ../src/config.py:3599
 msgid "Invalid server"
 msgstr "Некоректний сервер"
 
-#: ../src/config.py:3330
+#: ../src/config.py:3347
 msgid "Invalid room"
 msgstr "Некоректна кімната"
 
-#: ../src/config.py:3498
+#: ../src/config.py:3515
 msgid "Account has been added successfully"
 msgstr "Обліковий запис було успішно додано"
 
-#: ../src/config.py:3499 ../src/config.py:3505
-msgid "You can set advanced account options by pressing the Advanced button, or later by choosing the Accounts menu item under the Edit menu from the main window."
-msgstr "Додаткові параметри облікового запису можна вказати після натискання кнопки «Додатково». Пізніше ви можете виконати ті самі дії з налаштування вибором пункту «Облікові записи» у меню «Правка» головного вікна програми."
+#: ../src/config.py:3516 ../src/config.py:3522
+msgid ""
+"You can set advanced account options by pressing the Advanced button, or "
+"later by choosing the Accounts menu item under the Edit menu from the main "
+"window."
+msgstr ""
+"Додаткові параметри облікового запису можна вказати після натискання кнопки "
+"«Додатково». Пізніше ви можете виконати ті самі дії з налаштування вибором "
+"пункту «Облікові записи» у меню «Правка» головного вікна програми."
 
-#: ../src/config.py:3504
+#: ../src/config.py:3521
 msgid "Your new account has been created successfully"
 msgstr "Ваш новий обліковий запис було успішно створено"
 
-#: ../src/config.py:3543
+#: ../src/config.py:3560
 msgid "Invalid username"
 msgstr "Некоректне ім’я користувача"
 
-#: ../src/config.py:3545
+#: ../src/config.py:3562
 msgid "You must provide a username to configure this account."
-msgstr "Щоб налаштувати цей обліковий запис, вам слід вказати ім’я користувача."
+msgstr ""
+"Щоб налаштувати цей обліковий запис, вам слід вказати ім’я користувача."
 
-#: ../src/config.py:3583
+#: ../src/config.py:3600
 msgid "Please provide a server on which you want to register."
-msgstr "Будь ласка, вкажіть назву сервера, на якому ви бажаєте зареєструватися."
+msgstr ""
+"Будь ласка, вкажіть назву сервера, на якому ви бажаєте зареєструватися."
 
-#: ../src/config.py:3639 ../src/gui_interface.py:1904
+#: ../src/config.py:3656 ../src/gui_interface.py:1693
 msgid "Certificate Already in File"
 msgstr "Сертифікат вже наявний у файлі"
 
-#: ../src/config.py:3640 ../src/gui_interface.py:1905
+#: ../src/config.py:3657 ../src/gui_interface.py:1694
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
-msgstr "Цей сертифікат вже існує у файлі %s, програма не буде додавати його ще раз."
+msgstr ""
+"Цей сертифікат вже існує у файлі %s, програма не буде додавати його ще раз."
 
-#: ../src/config.py:3717
+#: ../src/config.py:3734
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6098,7 +6872,7 @@ msgstr ""
 "Помилка SSL: %(error)s\n"
 "Ви все ще бажаєте з’єднатися з цим сервером?"
 
-#: ../src/config.py:3723 ../src/gui_interface.py:1932
+#: ../src/config.py:3740 ../src/gui_interface.py:1721
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6109,63 +6883,72 @@ msgstr ""
 "Відбиток SHA1 сертифіката:\n"
 "%s"
 
-#: ../src/config.py:3755 ../src/config.py:3789
+#: ../src/config.py:3772 ../src/config.py:3806
 msgid "An error occurred during account creation"
 msgstr "Під час спроби створення облікового запису сталася помилка"
 
-#: ../src/config.py:3854
+#: ../src/config.py:3871
 msgid "Account name is in use"
 msgstr "Цю назву облікового запису вже використано"
 
-#: ../src/config.py:3855
+#: ../src/config.py:3872
 msgid "You already have an account using this name."
 msgstr "У вас вже є обліковий запис з такою назвою."
 
-#: ../src/config.py:4009
+#: ../src/config.py:3991
+msgid "PEP node was not removed"
+msgstr "Вузол повідомлення про стан було вилучено"
+
+#: ../src/config.py:3992
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr "Вузол повідомлення про стан %(node)s було вилучено: %(message)s"
+
+#: ../src/config.py:4036
 msgid "Active"
 msgstr "Активний"
 
-#: ../src/config.py:4017
+#: ../src/config.py:4044
 msgid "Event"
 msgstr "Подія"
 
-#: ../src/config.py:4052
+#: ../src/config.py:4079
 msgid "First Message Received"
 msgstr "Перше отримане повідомлення"
 
-#: ../src/config.py:4053
+#: ../src/config.py:4080
 msgid "Next Message Received Focused"
 msgstr "Фокус на наступне отримане повідомлення"
 
-#: ../src/config.py:4055
+#: ../src/config.py:4082
 msgid "Next Message Received Unfocused"
 msgstr "Зняття фокусу з наступного отриманого повідомлення"
 
-#: ../src/config.py:4056
+#: ../src/config.py:4083
 msgid "Contact Connected"
 msgstr "Контакт з'єднано"
 
-#: ../src/config.py:4057
+#: ../src/config.py:4084
 msgid "Contact Disconnected"
 msgstr "Контакт від'єднано"
 
-#: ../src/config.py:4058
+#: ../src/config.py:4085
 msgid "Message Sent"
 msgstr "Повідомлення надіслано"
 
-#: ../src/config.py:4059
+#: ../src/config.py:4086
 msgid "Group Chat Message Highlight"
 msgstr "Виділення повідомлення групової балачки"
 
-#: ../src/config.py:4060
+#: ../src/config.py:4087
 msgid "Group Chat Message Received"
 msgstr "Отримано повідомлення групової балачки"
 
-#: ../src/config.py:4061
+#: ../src/config.py:4088
 msgid "GMail Email Received"
 msgstr "Отримано електронного листа GMail "
 
-#: ../src/conversation_textview.py:600
+#: ../src/conversation_textview.py:601
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6175,7 +6958,7 @@ msgstr ""
 "отримано співрозмовником. Якщо програма показуватиме\n"
 "цю піктограму довго, ймовірно, повідомлення було втрачено."
 
-#: ../src/conversation_textview.py:619
+#: ../src/conversation_textview.py:620
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6183,44 +6966,44 @@ msgstr ""
 "Текст під цим рядком відповідає повідомленням, які було\n"
 "надіслано з часу, коли ви востаннє зазирали до цього вікна групової балачки"
 
-#: ../src/conversation_textview.py:739
+#: ../src/conversation_textview.py:740
 msgid "_Quote"
 msgstr "_Цитата"
 
-#: ../src/conversation_textview.py:746
+#: ../src/conversation_textview.py:747
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Дії для «%s»"
 
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Read _Wikipedia Article"
 msgstr "Прочитати статтю у В_ікіпедії"
 
-#: ../src/conversation_textview.py:763
+#: ../src/conversation_textview.py:765
 msgid "Look it up in _Dictionary"
 msgstr "Пошукати це у _словнику"
 
-#: ../src/conversation_textview.py:780
+#: ../src/conversation_textview.py:782
 #, 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:793
+#: ../src/conversation_textview.py:795
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "У адресі URL для пошуку у Тенетах не вказано «%s»"
 
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 msgid "Web _Search for it"
 msgstr "Пошук у _Тенетах"
 
-#: ../src/conversation_textview.py:802
+#: ../src/conversation_textview.py:804
 msgid "Open as _Link"
 msgstr "Відкрити як _посилання"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1296
+#: ../src/conversation_textview.py:1298
 #, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6229,284 +7012,308 @@ msgstr[1] "%i днів тому"
 msgstr[2] "%i днів тому"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1344 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
 
-#: ../src/dataforms_widget.py:544
+#: ../src/dataforms_widget.py:545
 msgid "Unable to load image"
 msgstr "Не вдалося завантажити зображення"
 
-#: ../src/dataforms_widget.py:546
+#: ../src/dataforms_widget.py:547
 #, python-format
 msgid "Media type not supported: %s"
 msgstr "Тим медіа не підтримується: %s"
 
-#: ../src/dataforms_widget.py:601
+#: ../src/dataforms_widget.py:562
+msgid "This field is required"
+msgstr ""
+
+#: ../src/dataforms_widget.py:607
 msgid "Jabber ID already in list"
 msgstr "Ідентифікатор Jabber вже є у списку"
 
-#: ../src/dataforms_widget.py:602
+#: ../src/dataforms_widget.py:608
 msgid "The Jabber ID you entered is already in the list. Choose another one."
-msgstr "Введений вами ідентифікатор Jabber вже є у списку. Оберіть якийсь інший."
+msgstr ""
+"Введений вами ідентифікатор Jabber вже є у списку. Оберіть якийсь інший."
 
 #. Default jid
-#: ../src/dataforms_widget.py:613
+#: ../src/dataforms_widget.py:619
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:616 ../src/dataforms_widget.py:618
+#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Назва контакту: <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:195
 msgid "Group"
 msgstr "Група"
 
-#: ../src/dialogs.py:201
+#: ../src/dialogs.py:202
 msgid "In the group"
 msgstr "У групі"
 
-#: ../src/dialogs.py:292
+#: ../src/dialogs.py:293
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:297
+#: ../src/dialogs.py:298
 msgid "Contact name"
 msgstr "Ім'я контакту"
 
-#: ../src/dialogs.py:469
+#: ../src/dialogs.py:470
 msgid "Set Mood"
 msgstr "Встановити настрій"
 
-#: ../src/dialogs.py:589
+#: ../src/dialogs.py:590
 #, python-format
 msgid "%s Status Message"
 msgstr "Повідомлення про стан %s"
 
-#: ../src/dialogs.py:603
+#: ../src/dialogs.py:604
 msgid "Status Message"
 msgstr "Повідомлення про стан"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:794
 msgid "Overwrite Status Message?"
 msgstr "Перезаписати повідомлення про стан?"
 
-#: ../src/dialogs.py:794
-msgid "This name is already used. Do you want to overwrite this status message?"
-msgstr "Цю назву вже було використано. Бажаєте перезаписати повідомлення про стан?"
+#: ../src/dialogs.py:795
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
+msgstr ""
+"Цю назву вже було використано. Бажаєте перезаписати повідомлення про стан?"
 
-#: ../src/dialogs.py:802
+#: ../src/dialogs.py:803
 msgid "Save as Preset Status Message"
 msgstr "Зберегти як стандартне повідомлення про стан"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:804
 msgid "Please type a name for this status message"
 msgstr "Будь ласка, введіть назву цього повідомлення про стан"
 
-#: ../src/dialogs.py:831
+#: ../src/dialogs.py:832
 msgid "AIM Address:"
 msgstr "Адреса AIM:"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:833
 msgid "GG Number:"
 msgstr "Номер GG:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:834
 msgid "ICQ Number:"
 msgstr "Номер ICQ:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:835
 msgid "MSN Address:"
 msgstr "Адреса MSN:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:836
 msgid "Yahoo! Address:"
 msgstr "Адреса Yahoo!:"
 
-#: ../src/dialogs.py:872
+#: ../src/dialogs.py:873
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
-msgstr "Будь ласка, вкажіть дані контакту, який ви бажаєте додати до облікового запису %s"
+msgstr ""
+"Будь ласка, вкажіть дані контакту, який ви бажаєте додати до облікового "
+"запису %s"
 
-#: ../src/dialogs.py:875
+#: ../src/dialogs.py:876
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Будь ласка, вкажіть дані контакту, який ви бажаєте додати"
 
-#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
+#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
+#: ../src/dialogs.py:3464
 msgid "Invalid User ID"
 msgstr "Некоректний ідентифікатор користувача"
 
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1052
 msgid "The user ID must not contain a resource."
 msgstr "У ідентифікаторі користувача не повинно міститися назви ресурсу."
 
-#: ../src/dialogs.py:1051
+#: ../src/dialogs.py:1057
 msgid "You cannot add yourself to your roster."
 msgstr "Ви не можете додавати себе ж до реєстру."
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1071
 msgid "Contact already in roster"
 msgstr "Цей контакт вже є у реєстрі"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1072
 msgid "This contact is already listed in your roster."
 msgstr "Цей контакт уже є у вашому реєстрі."
 
-#: ../src/dialogs.py:1112
+#: ../src/dialogs.py:1118
 msgid "User ID:"
 msgstr "Ідентифікатор:"
 
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1189
 msgid "A GTK+ jabber client"
 msgstr "Клієнт Jabber на GTK+"
 
-#: ../src/dialogs.py:1176
+#: ../src/dialogs.py:1190
 msgid "GTK+ Version:"
 msgstr "Версія GTK+:"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1191
 msgid "PyGTK Version:"
 msgstr "Версія PyGTK:"
 
-#: ../src/dialogs.py:1187
+#: ../src/dialogs.py:1201
 msgid "Current Developers:"
 msgstr "Поточні розробники:"
 
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1203
 msgid "Past Developers:"
 msgstr "Колишні розробники:"
 
-#: ../src/dialogs.py:1195
+#: ../src/dialogs.py:1209
 msgid "THANKS:"
 msgstr "ПОДЯКИ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1215
 msgid "Last but not least, we would like to thank all the package maintainers."
-msgstr "Нарешті, але ані трохи не менше, ми вдячні всім супровідникам пакунків з програмою."
+msgstr ""
+"Нарешті, але ані трохи не менше, ми вдячні всім супровідникам пакунків з "
+"програмою."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1213
+#: ../src/dialogs.py:1227
 msgid "translator-credits"
 msgstr "Сергій Єгоров <prapor@unixzone.org.ua>"
 
-#: ../src/dialogs.py:1396
+#: ../src/dialogs.py:1410
 #, python-format
 msgid ""
-"You have to install %s dictionary to use spellchecking, or choose another language by setting the speller_language option.\n"
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option.\n"
 "\n"
 "Highlighting misspelled words feature will not be used"
 msgstr ""
-"Вам слід встановити словник %s, щоб мати змогу користуватися перевіркою правопису або обрати іншу мову за допомогою параметра speller_language.\n"
+"Вам слід встановити словник %s, щоб мати змогу користуватися перевіркою "
+"правопису або обрати іншу мову за допомогою параметра speller_language.\n"
 "\n"
 "Можливість підсвічування неправильно написаних слів буде поки що вимкнено"
 
-#: ../src/dialogs.py:1935 ../src/dialogs.py:2322
+#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
 msgid "The nickname has not allowed characters."
 msgstr "У псевдонімі є недозволені символи."
 
-#: ../src/dialogs.py:2053
+#: ../src/dialogs.py:2069
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Запит на підписку до облікового запису %(account)s від %(jid)s"
 
-#: ../src/dialogs.py:2056
+#: ../src/dialogs.py:2072
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Запит на підписку від %s"
 
-#: ../src/dialogs.py:2131 ../src/gui_interface.py:2672
+#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Ви вже берете участь у груповій балачці %s"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2153
 msgid "You can not join a group chat unless you are connected."
-msgstr "Вам слід з’єднати ваш обліковий запис, щоб взяти участь у груповій балачці."
+msgstr ""
+"Вам слід з’єднати ваш обліковий запис, щоб взяти участь у груповій балачці."
 
-#: ../src/dialogs.py:2178
+#: ../src/dialogs.py:2194
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Приєднатися до групової балачки з облікового запису %s"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2325
 msgid "Invalid Account"
 msgstr "Некоректний обліковий запис"
 
-#: ../src/dialogs.py:2310
-msgid "You have to choose an account from which you want to join the groupchat."
-msgstr "Ви маєте обрати обліковий запис, з якого ви бажаєте приєднатись до групової балачки."
+#: ../src/dialogs.py:2326
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
+msgstr ""
+"Ви маєте обрати обліковий запис, з якого ви бажаєте приєднатись до групової "
+"балачки."
 
-#: ../src/dialogs.py:2321
+#: ../src/dialogs.py:2337
 msgid "Invalid Nickname"
 msgstr "Некоректний псевдонім"
 
-#: ../src/dialogs.py:2326 ../src/dialogs.py:2332
-#: ../src/groupchat_control.py:1832
+#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
+#: ../src/groupchat_control.py:1847
 msgid "Invalid group chat Jabber ID"
 msgstr "Некоректний ідентифікатор Jabber групової балачки"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2343
 msgid "Please enter the group chat Jabber ID as room@server."
-msgstr "Будь ласка, вкажіть Jabber ID групової балачки у вигляді кімната@сервер."
+msgstr ""
+"Будь ласка, вкажіть Jabber ID групової балачки у вигляді кімната@сервер."
 
-#: ../src/dialogs.py:2333 ../src/groupchat_control.py:1833
+#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
 msgid "The group chat Jabber ID has not allowed characters."
-msgstr "У ідентифікаторі Jabber групової балачки містяться недозволені символи."
+msgstr ""
+"У ідентифікаторі Jabber групової балачки містяться недозволені символи."
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2356
 msgid "This is not a group chat"
 msgstr "Це не групова балачка"
 
-#: ../src/dialogs.py:2341
+#: ../src/dialogs.py:2357
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s не є назвою групової балачки."
 
-#: ../src/dialogs.py:2372
+#: ../src/dialogs.py:2388
 msgid "Without a connection, you can not synchronise your contacts."
-msgstr "Для синхронізації ваших контактів потрібно встановити з’єднання облікового запису з сервером."
+msgstr ""
+"Для синхронізації ваших контактів потрібно встановити з’єднання облікового "
+"запису з сервером."
 
-#: ../src/dialogs.py:2386
+#: ../src/dialogs.py:2402
 msgid "Server"
 msgstr "Сервер"
 
-#: ../src/dialogs.py:2421
+#: ../src/dialogs.py:2437
 msgid "This account is not connected to the server"
 msgstr "Цей обліковий запис не з’єднано з сервером"
 
-#: ../src/dialogs.py:2422
+#: ../src/dialogs.py:2438
 msgid "You cannot synchronize with an account unless it is connected."
-msgstr "Можливістю синхронізації можна скористатися, лише якщо обліковий запис з’єднано з сервером."
+msgstr ""
+"Можливістю синхронізації можна скористатися, лише якщо обліковий запис "
+"з’єднано з сервером."
 
-#: ../src/dialogs.py:2446
+#: ../src/dialogs.py:2462
 msgid "Synchronise"
 msgstr "Синхронізувати"
 
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2523
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Почати балачку з облікового запису %s"
 
-#: ../src/dialogs.py:2509
+#: ../src/dialogs.py:2525
 msgid "Start Chat"
 msgstr "Почати балачку"
 
-#: ../src/dialogs.py:2510
+#: ../src/dialogs.py:2526
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6515,318 +7322,356 @@ msgstr ""
 "бажаєте надіслати повідомлення балачки:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2536 ../src/dialogs.py:2917 ../src/dialogs.py:3129
+#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
 msgid "Connection not available"
 msgstr "З’єднання недоступне"
 
-#: ../src/dialogs.py:2537 ../src/dialogs.py:2918 ../src/dialogs.py:3130
+#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Будь ласка, переконайтеся, що клієнт з’єднано з «%s»."
 
-#: ../src/dialogs.py:2546 ../src/dialogs.py:2549
+#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
 msgid "Invalid JID"
 msgstr "Некоректний JID"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2565
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Не вдалося обробити «%s»."
 
-#: ../src/dialogs.py:2558
+#: ../src/dialogs.py:2574
 msgid "Without a connection, you can not change your password."
 msgstr "До встановлення з’єднання ви не зможете змінити ваш пароль."
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "Invalid password"
 msgstr "Некоректний пароль"
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "You must enter a password."
 msgstr "Вам слід ввести пароль."
 
-#: ../src/dialogs.py:2581
+#: ../src/dialogs.py:2597
 msgid "Passwords do not match"
 msgstr "Паролі не збігаються"
 
-#: ../src/dialogs.py:2582
+#: ../src/dialogs.py:2598
 msgid "The passwords typed in both fields must be identical."
 msgstr "Паролі, введені у обидва поля, мають бути тотожними."
 
 #. default value
-#: ../src/dialogs.py:2619 ../src/notify.py:247 ../src/notify.py:473
+#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
 msgid "Contact Signed In"
 msgstr "Контакт увійшов до мережі"
 
-#: ../src/dialogs.py:2621 ../src/notify.py:255 ../src/notify.py:475
+#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
 msgid "Contact Signed Out"
 msgstr "Контакт вийшов з мережі"
 
 #. chat message
-#: ../src/dialogs.py:2623 ../src/notify.py:277 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
 msgid "New Message"
 msgstr "Нове повідомлення"
 
 #. single message
-#: ../src/dialogs.py:2623 ../src/notify.py:259 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
 msgid "New Single Message"
 msgstr "Створити окреме повідомлення"
 
 #. private message
-#: ../src/dialogs.py:2624 ../src/notify.py:265 ../src/notify.py:478
+#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
 msgid "New Private Message"
 msgstr "Нове конфіденційне повідомлення"
 
-#: ../src/dialogs.py:2624 ../src/gui_interface.py:1358 ../src/notify.py:487
+#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
 msgid "New E-mail"
 msgstr "Нове повідомлення електронної пошти"
 
-#: ../src/dialogs.py:2626 ../src/gui_interface.py:1420 ../src/notify.py:480
+#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
 msgid "File Transfer Request"
 msgstr "Запит на передавання файла"
 
-#: ../src/dialogs.py:2628 ../src/gui_interface.py:1320
-#: ../src/gui_interface.py:1389 ../src/notify.py:482
+#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
+#: ../src/gui_interface.py:1186 ../src/notify.py:482
 msgid "File Transfer Error"
 msgstr "Помилка під час передавання файла"
 
-#: ../src/dialogs.py:2630 ../src/gui_interface.py:1466
-#: ../src/gui_interface.py:1489 ../src/gui_interface.py:1506
+#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
+#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
 #: ../src/notify.py:484
 msgid "File Transfer Completed"
 msgstr "Завершення передавання файла"
 
-#: ../src/dialogs.py:2631 ../src/gui_interface.py:1469 ../src/notify.py:485
+#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
 msgid "File Transfer Stopped"
 msgstr "Зупинка передавання файла"
 
-#: ../src/dialogs.py:2633 ../src/gui_interface.py:1152 ../src/notify.py:489
+#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
 msgid "Groupchat Invitation"
 msgstr "Запрошення до групової балачки"
 
-#: ../src/dialogs.py:2635 ../src/notify.py:239 ../src/notify.py:491
+#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
 msgid "Contact Changed Status"
 msgstr "Зміна контактом стану"
 
-#: ../src/dialogs.py:2836
+#: ../src/dialogs.py:2852
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Окреме повідомлення з використанням облікового запису %s"
 
-#: ../src/dialogs.py:2838
+#: ../src/dialogs.py:2854
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Окреме повідомлення для облікового запису %s"
 
-#: ../src/dialogs.py:2840
+#: ../src/dialogs.py:2856
 msgid "Single Message"
 msgstr "Окреме повідомлення"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2843
+#: ../src/dialogs.py:2859
 #, python-format
 msgid "Send %s"
 msgstr "Надіслати %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:2882
 #, python-format
 msgid "Received %s"
 msgstr "Отримано %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2889
+#: ../src/dialogs.py:2905
 #, 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:2968
+#: ../src/dialogs.py:2984
 #, python-format
 msgid "RE: %s"
 msgstr "Відповідь: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:2985
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s написав(-ла):\n"
 
-#: ../src/dialogs.py:3028
+#: ../src/dialogs.py:3044
 #, python-format
 msgid "XML Console for %s"
 msgstr "Консоль XML для %s"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3046
 msgid "XML Console"
 msgstr "Консоль XML"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 msgid "add"
 msgstr "додати"
 
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 msgid "modify"
 msgstr "змінити"
 
-#: ../src/dialogs.py:3160
+#: ../src/dialogs.py:3176
 msgid "remove"
 msgstr "вилучити"
 
-#: ../src/dialogs.py:3188
+#: ../src/dialogs.py:3204
 #, python-format
-msgid "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your roster."
-msgstr "<b>%(jid)s</b> бажає <b>%(action)s</b> кілька контактів у вашому реєстрі."
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
+msgstr ""
+"<b>%(jid)s</b> бажає <b>%(action)s</b> кілька контактів у вашому реєстрі."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3204 ../src/dialogs.py:3250
+#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
 msgid "Add"
 msgstr "Додати"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3206 ../src/dialogs.py:3281
+#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
 msgid "Modify"
 msgstr "Змінити"
 
-#: ../src/dialogs.py:3212
+#: ../src/dialogs.py:3228
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:3218
+#: ../src/dialogs.py:3234
 msgid "Groups"
 msgstr "Групи"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3342
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s підказав мені додати вас до мого реєстру."
 
-#: ../src/dialogs.py:3340
+#: ../src/dialogs.py:3356
 #, python-format
 msgid "Added  %s contacts"
 msgstr "Додано %s контактів"
 
-#: ../src/dialogs.py:3377
+#: ../src/dialogs.py:3393
 #, python-format
 msgid "Removed  %s contacts"
 msgstr "Вилучено %s контактів"
 
-#: ../src/dialogs.py:3430
+#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#, python-format
+msgid "Archiving Preferences for %s"
+msgstr ""
+
+#: ../src/dialogs.py:3473
+#, fuzzy
+msgid "Invalid expire value"
+msgstr "Некоректна назва сервера"
+
+#: ../src/dialogs.py:3474
+msgid "Expire must be a valid positive integer."
+msgstr ""
+
+#: ../src/dialogs.py:3521
+msgid "There is an error with the form"
+msgstr ""
+
+#: ../src/dialogs.py:3732
+#, fuzzy
+msgid "There is an error"
+msgstr "Служба повернула повідомлення про помилку."
+
+#: ../src/dialogs.py:3796
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Списки конфіденційності <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3434
+#: ../src/dialogs.py:3800
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Списки приватності для %s"
 
-#: ../src/dialogs.py:3490
+#: ../src/dialogs.py:3856
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
-msgstr "Порядок: %(order)s, дія: %(action)s, тип: %(type)s, значення: %(value)s"
+msgstr ""
+"Порядок: %(order)s, дія: %(action)s, тип: %(type)s, значення: %(value)s"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3861
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Порядок: %(order)s, дія: %(action)s"
 
-#: ../src/dialogs.py:3539
+#: ../src/dialogs.py:3905
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Редагувати правило</b>"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:4016
 msgid "<b>Add a rule</b>"
 msgstr "<b>Додати правило</b>"
 
-#: ../src/dialogs.py:3750
+#: ../src/dialogs.py:4116
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Списки приватності для %s"
 
-#: ../src/dialogs.py:3752
+#: ../src/dialogs.py:4118
 msgid "Privacy Lists"
 msgstr "Списки конфіденційності"
 
-#: ../src/dialogs.py:3822
+#: ../src/dialogs.py:4188
 msgid "Invalid List Name"
 msgstr "Некоректна назва списку"
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4189
 msgid "You must enter a name to create a privacy list."
 msgstr "Для створення списку конфіденційності вам слід ввести його назву."
 
-#: ../src/dialogs.py:3855
+#: ../src/dialogs.py:4221
 msgid "You are invited to a groupchat"
 msgstr "Вас запрошено до групової балачки"
 
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4224
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact запросив вас до участі у обговоренні"
 
-#: ../src/dialogs.py:3860
+#: ../src/dialogs.py:4226
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact запросив вас до групової балачки %(room_jid)s"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4234
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4236
 msgid "Do you want to accept the invitation?"
 msgstr "Чи бажаєте ви прийняти це запрошення?"
 
-#: ../src/dialogs.py:3932
+#: ../src/dialogs.py:4298
 msgid "Choose Client Cert #PCKS12"
 msgstr "Оберіть клієнтський сертифікат PCKS#12"
 
-#: ../src/dialogs.py:3942 ../src/dialogs.py:3985 ../src/dialogs.py:4041
+#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
+#: ../src/dialogs.py:4495
 msgid "All files"
 msgstr "Всі файли"
 
-#: ../src/dialogs.py:3947
+#: ../src/dialogs.py:4313
 msgid "PKCS12 Files"
 msgstr "Файли PKCS12"
 
-#: ../src/dialogs.py:3975
+#: ../src/dialogs.py:4341
 msgid "Choose Sound"
 msgstr "Обрати звук"
 
-#: ../src/dialogs.py:3990
+#: ../src/dialogs.py:4356
 msgid "Wav Sounds"
 msgstr "Звуки wav"
 
-#: ../src/dialogs.py:4028
+#: ../src/dialogs.py:4394
 msgid "Choose Image"
 msgstr "Вибрати зображення"
 
-#: ../src/dialogs.py:4046
+#: ../src/dialogs.py:4412
 msgid "Images"
 msgstr "Зображення"
 
-#: ../src/dialogs.py:4113
+#: ../src/dialogs.py:4482
+#, fuzzy
+msgid "Choose Archive"
+msgstr "Вибрати зображення"
+
+#: ../src/dialogs.py:4500
+#, fuzzy
+msgid "Zip files"
+msgstr "Всі файли"
+
+#: ../src/dialogs.py:4525
 #, python-format
 msgid "When %s becomes:"
 msgstr "Якщо %s стане рівним:"
 
-#: ../src/dialogs.py:4115
+#: ../src/dialogs.py:4527
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Додавання особливого сповіщення для %s"
 
-#: ../src/dialogs.py:4190
+#: ../src/dialogs.py:4602
 msgid "Condition"
 msgstr "Умова"
 
-#: ../src/dialogs.py:4310
+#: ../src/dialogs.py:4722
 msgid "when I am "
 msgstr "якщо я "
 
-#: ../src/dialogs.py:4786
+#: ../src/dialogs.py:5198
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6837,82 +7682,109 @@ msgstr ""
 "\n"
 "Коротким рядком розпізнавання (SAS) цього сеансу є <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4789
+#: ../src/dialogs.py:5201
 msgid "You have already verified this contact's identity."
 msgstr "Ви вже перевіряли особу контакту."
 
-#: ../src/dialogs.py:4795 ../src/dialogs.py:4879
+#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
 msgid "Contact's identity verified"
 msgstr "Особу контакту перевірено"
 
-#: ../src/dialogs.py:4801
+#: ../src/dialogs.py:5213
 msgid "Verify again..."
 msgstr "Повторити перевірку..."
 
-#: ../src/dialogs.py:4806
-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 "Щоб переконатися у тому, що ваші повідомлення зможе читати <b>лише</b> бажана особа, і що ця лише ця особа матиме змогу надсилати вам повідомлення, вам слід підтвердити їх ідентичність натисканням кнопки, розташованої нижче."
+#: ../src/dialogs.py:5218
+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 ""
+"Щоб переконатися у тому, що ваші повідомлення зможе читати <b>лише</b> "
+"бажана особа, і що ця лише ця особа матиме змогу надсилати вам повідомлення, "
+"вам слід підтвердити їх ідентичність натисканням кнопки, розташованої нижче."
 
-#: ../src/dialogs.py:4809 ../src/dialogs.py:4860 ../src/dialogs.py:4873
+#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
 msgid "Contact's identity NOT verified"
 msgstr "Особу контакту НЕ перевірено"
 
-#: ../src/dialogs.py:4814
+#: ../src/dialogs.py:5226
 msgid "Verify..."
 msgstr "Перевірити..."
 
-#: ../src/dialogs.py:4825
+#: ../src/dialogs.py:5237
 msgid "Have you verified the contact's identity?"
 msgstr "Чи перевірили ви особу контакту?"
 
-#: ../src/dialogs.py:4826
+#: ../src/dialogs.py:5238
 #, python-format
 msgid ""
-"To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> directly (in person or on the phone) and verify that they see the same Short Authentication String (SAS) as you.\n"
+"To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
+"directly (in person or on the phone) and verify that they see the same Short "
+"Authentication String (SAS) as you.\n"
 "\n"
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
-"Щоб уникнути можливості розмови зі сторонньою особою, вам слід зв’язатися з <b>%(jid)s</b> напряму (особисто або телефоном) і перевірити чи бачить ця особа той самий короткий рядок розпізнавання (SAS), що і ви.\n"
+"Щоб уникнути можливості розмови зі сторонньою особою, вам слід зв’язатися з "
+"<b>%(jid)s</b> напряму (особисто або телефоном) і перевірити чи бачить ця "
+"особа той самий короткий рядок розпізнавання (SAS), що і ви.\n"
 "\n"
 "Коротким рядком розпізнавання у цьому сеансі буде <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4827
+#: ../src/dialogs.py:5239
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Ви зв’язалися з контактом і перевірили SAS?"
 
-#: ../src/dialogs.py:4861
+#: ../src/dialogs.py:5273
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
-msgstr "Ключ контакту (%s) <b>не збігається</b> з ключем, призначеним для нього у Gajim."
+msgstr ""
+"Ключ контакту (%s) <b>не збігається</b> з ключем, призначеним для нього у "
+"Gajim."
 
-#: ../src/dialogs.py:4867
+#: ../src/dialogs.py:5279
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
-msgstr "З цим контактом не пов’язано жодних ключів GPG. Отже шифрування повідомлень буде неможливим."
+msgstr ""
+"З цим контактом не пов’язано жодних ключів GPG. Отже шифрування повідомлень "
+"буде неможливим."
 
-#: ../src/dialogs.py:4874
-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 "З цим контактом пов’язано ключ GPG, але <b>ви вважаєте цей ключ ненадійним</b>, отже повідомлення <b>не може</b> бути зашифрованим. Для того, щоб встановити надійність цього ключа, скористайтесь вашим клієнтом GPG."
+#: ../src/dialogs.py:5286
+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 ""
+"З цим контактом пов’язано ключ GPG, але <b>ви вважаєте цей ключ ненадійним</"
+"b>, отже повідомлення <b>не може</b> бути зашифрованим. Для того, щоб "
+"встановити надійність цього ключа, скористайтесь вашим клієнтом GPG."
 
-#: ../src/dialogs.py:4880
-msgid "GPG Key is assigned to this contact, and you trust his key, so messages will be encrypted."
-msgstr "З цим контактом пов’язано ключ GPG, ви вважаєте цей ключ надійним, отже повідомлення буде зашифровано."
+#: ../src/dialogs.py:5292
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
+msgstr ""
+"З цим контактом пов’язано ключ GPG, ви вважаєте цей ключ надійним, отже "
+"повідомлення буде зашифровано."
 
-#: ../src/dialogs.py:4945
+#: ../src/dialogs.py:5357
 msgid "an audio and video"
 msgstr "аудіо та відео"
 
-#: ../src/dialogs.py:4947
+#: ../src/dialogs.py:5359
 msgid "an audio"
 msgstr "аудіо"
 
-#: ../src/dialogs.py:4949
+#: ../src/dialogs.py:5361
 msgid "a video"
 msgstr "відео"
 
-#: ../src/dialogs.py:4953
+#: ../src/dialogs.py:5365
 #, python-format
-msgid "%(contact)s wants to start %(type)s session with you. Do you want to answer the call?"
-msgstr "%(contact)s бажають розпочати %(type)s розмову з вами. Ви бажаєте відповісти на запит?"
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
+msgstr ""
+"%(contact)s бажають розпочати %(type)s розмову з вами. Ви бажаєте відповісти "
+"на запит?"
 
 #: ../src/disco.py:119
 msgid "Others"
@@ -6923,114 +7795,120 @@ msgstr "Інші"
 msgid "Conference"
 msgstr "Конференція"
 
-#: ../src/disco.py:512
+#: ../src/disco.py:513
 msgid "Without a connection, you can not browse available services"
-msgstr "Для того, щоб переглядати доступні служби, вам слід встановити з’єднання"
+msgstr ""
+"Для того, щоб переглядати доступні служби, вам слід встановити з’єднання"
 
-#: ../src/disco.py:589
+#: ../src/disco.py:600
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Пошук служб за допомогою облікового запису %s"
 
-#: ../src/disco.py:591
+#: ../src/disco.py:602
 msgid "Service Discovery"
 msgstr "Пошук у службі"
 
-#: ../src/disco.py:741
+#: ../src/disco.py:758
 msgid "The service could not be found"
 msgstr "Не вдалося знайти службу"
 
-#: ../src/disco.py:742
-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:759
+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:746 ../src/disco.py:1082
+#: ../src/disco.py:763 ../src/disco.py:1100
 msgid "The service is not browsable"
 msgstr "Служба не придатна для перегляду"
 
-#: ../src/disco.py:747
+#: ../src/disco.py:764
 msgid "This type of service does not contain any items to browse."
 msgstr "Служби такого типу не містять елементів, які можна було б переглядати."
 
-#: ../src/disco.py:786 ../src/disco.py:796
+#: ../src/disco.py:804 ../src/disco.py:814
 msgid "Invalid Server Name"
 msgstr "Некоректна назва сервера"
 
-#: ../src/disco.py:850
+#: ../src/disco.py:868
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Перегляд %(address)s з використанням облікового запису %(account)s"
 
-#: ../src/disco.py:894
+#: ../src/disco.py:912
 msgid "_Browse"
 msgstr "_Перегляд"
 
-#: ../src/disco.py:1083
+#: ../src/disco.py:1101
 msgid "This service does not contain any items to browse."
 msgstr "Ця служба не містить жодних елементів, які можна було б переглядати."
 
-#: ../src/disco.py:1323
+#: ../src/disco.py:1341
 msgid "_Execute Command"
 msgstr "Ви_конати команду"
 
-#: ../src/disco.py:1333 ../src/disco.py:1504
+#: ../src/disco.py:1351 ../src/disco.py:1522
 msgid "Re_gister"
 msgstr "За_реєструватися"
 
-#: ../src/disco.py:1545
+#: ../src/disco.py:1563
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Пошук %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1736
+#: ../src/disco.py:1754
 msgid "Users"
 msgstr "Користувачі"
 
 #. Description column
-#: ../src/disco.py:1744
+#: ../src/disco.py:1762
 msgid "Description"
 msgstr "Опис"
 
 #. Id column
-#: ../src/disco.py:1752
+#: ../src/disco.py:1770
 msgid "Id"
 msgstr "Ідентифікатор"
 
-#: ../src/disco.py:1817 ../src/gui_interface.py:3182
+#: ../src/disco.py:1835 ../src/gui_interface.py:2995
 msgid "Bookmark already set"
 msgstr "Закладку вже встановлено"
 
-#: ../src/disco.py:1818 ../src/gui_interface.py:3183
+#: ../src/disco.py:1836 ../src/gui_interface.py:2996
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Закладка на груповій балачці «%s» вже існує."
 
-#: ../src/disco.py:1827 ../src/gui_interface.py:3197
+#: ../src/disco.py:1845 ../src/gui_interface.py:3010
 msgid "Bookmark has been added successfully"
 msgstr "Закладку було успішно додано"
 
-#: ../src/disco.py:1828 ../src/gui_interface.py:3198
+#: ../src/disco.py:1846 ../src/gui_interface.py:3011
 msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "Керувати вашими закладками можна за допомогою меню дій у вашому реєстрі."
+msgstr ""
+"Керувати вашими закладками можна за допомогою меню дій у вашому реєстрі."
 
-#: ../src/disco.py:2039
+#: ../src/disco.py:2057
 msgid "Subscribed"
 msgstr "Підписано"
 
-#: ../src/disco.py:2047
+#: ../src/disco.py:2065
 msgid "Node"
 msgstr "Вузол"
 
-#: ../src/disco.py:2111
+#: ../src/disco.py:2129
 msgid "New post"
 msgstr "Нове повідомлення"
 
-#: ../src/disco.py:2117
+#: ../src/disco.py:2135
 msgid "_Subscribe"
 msgstr "_Підписатися"
 
-#: ../src/disco.py:2123
+#: ../src/disco.py:2141
 msgid "_Unsubscribe"
 msgstr "_Скасувати підписку"
 
@@ -7039,8 +7917,11 @@ msgid "SSL certificat validation"
 msgstr "Помилка сертифіката SSL"
 
 #: ../src/features_window.py:50
-msgid "A library used to validate server certificates to ensure a secure connection."
-msgstr "Бібліотека, призначена для перевірки сертифікатів сервера, які забезпечують безпеку з’єднання."
+msgid ""
+"A library used to validate server certificates to ensure a secure connection."
+msgstr ""
+"Бібліотека, призначена для перевірки сертифікатів сервера, які забезпечують "
+"безпеку з’єднання."
 
 #: ../src/features_window.py:51 ../src/features_window.py:52
 msgid "Requires python-pyopenssl."
@@ -7052,7 +7933,9 @@ msgstr "Bonjour / Zeroconf"
 
 #: ../src/features_window.py:54
 msgid "Serverless chatting with autodetected clients in a local network."
-msgstr "Балачка, для якої не потрібен сервер, з автоматичним виявленням клієнтів у локальній мережі."
+msgstr ""
+"Балачка, для якої не потрібен сервер, з автоматичним виявленням клієнтів у "
+"локальній мережі."
 
 #: ../src/features_window.py:55
 msgid "Requires python-avahi."
@@ -7111,7 +7994,9 @@ msgstr "Керування сеансами"
 
 #: ../src/features_window.py:70
 msgid "Gajim session is stored on logout and restored on login."
-msgstr "Збереження сеансу Gajim під час завершення роботи у системі і відновлення сеансу після входу до системи."
+msgstr ""
+"Збереження сеансу Gajim під час завершення роботи у системі і відновлення "
+"сеансу після входу до системи."
 
 #: ../src/features_window.py:71
 msgid "Requires python-gnome2."
@@ -7166,8 +8051,12 @@ msgid "Passive popups notifying for new events."
 msgstr "Контекстні виринаючі вікна для нових подій."
 
 #: ../src/features_window.py:87
-msgid "Requires python-notify or instead python-dbus in conjunction with notification-daemon."
-msgstr "Потрібен пакунок python-notify або його замінник: python-dbus разом з фоновою службою сповіщення (notification-daemon)."
+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
 msgid "Automatic status"
@@ -7175,7 +8064,9 @@ msgstr "_Узгодити зі станом"
 
 #: ../src/features_window.py:90
 msgid "Ability to measure idle time, in order to set auto status."
-msgstr "Можливість вимірювання часу відсутності активності для встановлення автоматичного стану."
+msgstr ""
+"Можливість вимірювання часу відсутності активності для встановлення "
+"автоматичного стану."
 
 #: ../src/features_window.py:91
 msgid "Requires libxss library."
@@ -7194,12 +8085,23 @@ msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Перетворення виразів LaTeX, обмежених позначками $$."
 
 #: ../src/features_window.py:95
-msgid "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True in the Advanced Configuration Editor."
-msgstr "Потрібні пакунки texlive-latex-base і dvipng. Крім того, вам слід вказати для параметра «use_latex» значення «True» у Редакторі додаткових налаштувань."
+#, fuzzy
+msgid ""
+"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
+msgstr ""
+"Потрібні пакунки texlive-latex-base і dvipng. Крім того, вам слід вказати "
+"для параметра «use_latex» значення «True» у Редакторі додаткових налаштувань."
 
 #: ../src/features_window.py:96
-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 "Потрібні пакунки texlive-latex-base і dvipng (ці пакунки є у MikTeX). Вам також слід встановити для параметра «use_latex» значення «True» у Редакторі додаткових налаштувань."
+#, fuzzy
+msgid ""
+"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
+"You have to set 'use_latex' to True in the Advanced Configuration Editor."
+msgstr ""
+"Потрібні пакунки texlive-latex-base і dvipng (ці пакунки є у MikTeX). Вам "
+"також слід встановити для параметра «use_latex» значення «True» у Редакторі "
+"додаткових налаштувань."
 
 #: ../src/features_window.py:97
 msgid "End to End message encryption"
@@ -7218,8 +8120,12 @@ msgid "RST Generator"
 msgstr "Інструмент створення RST"
 
 #: ../src/features_window.py:102
-msgid "Generate XHTML output from RST code (see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html)."
-msgstr "Створення XHTML з коду RST (див. http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html)."
+msgid ""
+"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
+msgstr ""
+"Створення XHTML з коду RST (див. http://docutils.sourceforge.net/docs/ref/"
+"rst/restructuredtext.html)."
 
 #: ../src/features_window.py:103 ../src/features_window.py:104
 msgid "Requires python-docutils."
@@ -7347,31 +8253,34 @@ msgstr "Опис: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s бажає надіслати вам файл:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Не вдалося перезаписати існуючий файл «%s»"
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
-msgid "A file with this name already exists and you do not have permission to overwrite it."
-msgstr "Файл з такою назвою вже існує, у вас немає дозволів для його перезапису."
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
+msgid ""
+"A file with this name already exists and you do not have permission to "
+"overwrite it."
+msgstr ""
+"Файл з такою назвою вже існує, у вас немає дозволів для його перезапису."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 msgid "This file already exists"
 msgstr "Файл з такою назвою вже існує."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 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:369 ../src/gtkgui_helpers.py:914
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Запис до каталогу «%s» неможливий"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
 msgid "You do not have permission to create files in this directory."
 msgstr "Ваш користувач не має права на створення файлів у цьому каталозі."
 
@@ -7434,7 +8343,8 @@ msgstr "Для роботи Gajim потрібен PyGTK 2.16 або новіш
 
 #: ../src/gajim.py:187
 msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
-msgstr "Для запуску Gajim потрібен PyGTK 2.16 або новіша версія. Завершення роботи..."
+msgstr ""
+"Для запуску Gajim потрібен PyGTK 2.16 або новіша версія. Завершення роботи..."
 
 #: ../src/gajim.py:189
 msgid "Gajim needs GTK 2.16 or above"
@@ -7442,7 +8352,9 @@ msgstr "Для роботи Gajim потрібна бібліотека GTK 2.16
 
 #: ../src/gajim.py:190
 msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
-msgstr "Для запуску Gajim потрібна бібліотека GTK 2.16 або новіша версія. Завершення роботи..."
+msgstr ""
+"Для запуску Gajim потрібна бібліотека GTK 2.16 або новіша версія. Завершення "
+"роботи..."
 
 #: ../src/gajim.py:199
 msgid "Gajim needs pywin32 to run"
@@ -7450,8 +8362,12 @@ msgstr "Для роботи Gajim потрібен pywin32"
 
 #: ../src/gajim.py:200
 #, python-format
-msgid "Please make sure that Pywin32 is installed on your system. You can get it at %s"
-msgstr "Будь ласка, переконайтеся, що у вашій системі встановлено Pywin32. Звантажити цю програму можна за адресою %s"
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+"Будь ласка, переконайтеся, що у вашій системі встановлено Pywin32. "
+"Звантажити цю програму можна за адресою %s"
 
 #. set the icon to all newly opened wind
 #: ../src/gajim.py:316
@@ -7466,31 +8382,43 @@ msgstr ""
 "Здається, вже запущено інший екземпляр Gajim.\n"
 "Запустити ще один екземпляр?"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "Показує довідку щодо вказаної команди"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:80
+#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
 msgid "command"
 msgstr "команда"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "показати довідку щодо команди"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "Вмикає або вимикає показ вікна реєстру"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
-msgstr "Відкриває контекстне вікно з повідомленням про наступну заплановану подію"
-
-#: ../src/gajim-remote.py:93
-msgid "Prints a list of all contacts in the roster. Each contact appears on a separate line"
-msgstr "Показує список всіх контактів з реєстру. Кожен з записів контактів буде показано у окремому рядку"
+msgstr ""
+"Відкриває контекстне вікно з повідомленням про наступну заплановану подію"
 
+#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
+msgid ""
+"Prints a list of all contacts in the roster. Each contact appears on a "
+"separate line"
+msgstr ""
+"Показує список всіх контактів з реєстру. Кожен з записів контактів буде "
+"показано у окремому рядку"
+
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
+#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
+#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
+#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
 #: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
 #: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
 #: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
@@ -7502,231 +8430,390 @@ msgstr "Показує список всіх контактів з реєстр
 msgid "account"
 msgstr "обліковий запис"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "показати лише контакти вказаного облікового запису"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "Показує список зареєстрованих облікових записів"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "Змінює стан облікового запису або обліковий запис"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
 msgid "status"
 msgstr "стан"
 
-#: ../src/gajim-remote.py:109
-msgid "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use accoun't previous status"
-msgstr "одне зі значень: поза мережею, доступний, балачка, пішов, далеко, не турбувати, невидимий. Якщо не вказано, буде використано попередній стан облікового запису."
-
-#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
-msgid "message"
-msgstr "повідомлення"
+#: ../src/gajim-remote-plugin.py:106
+#, fuzzy
+msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+msgstr ""
+"одне зі значень: поза мережею, доступний, балачка, пішов, далеко, не "
+"турбувати, невидимий. Якщо не вказано, буде використано попередній стан "
+"облікового запису."
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "повідомлення про стан"
 
-#: ../src/gajim-remote.py:111
-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 "змінити стан облікового запису «account». Якщо назви облікового запису не вказано, спробувати змінити стан всіх облікових записів, для яких було позначено пункт «синхронізувати з загальним станом»"
-
-#: ../src/gajim-remote.py:117
-msgid "Changes the priority of account or accounts"
-msgstr "Змінює пріоритет одного або кількох облікових записів"
-
-#: ../src/gajim-remote.py:119
-msgid "priority"
-msgstr "пріоритет"
-
-#: ../src/gajim-remote.py:119
-msgid "priority you want to give to the account"
-msgstr "пріоритет який ви бажаєте надати обліковому запису"
-
-#: ../src/gajim-remote.py:121
-msgid "change the priority of the given account. If not specified, change status of all accounts that have \"sync with global status\" option set"
-msgstr "змінити пріоритет вказаного облікового запису. Якщо назви облікового запису не вказано, спробувати змінити стан всіх облікових записів, для яких було позначено пункт «синхронізувати з загальним станом»"
+#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
+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 ""
+"змінити стан облікового запису «account». Якщо назви облікового запису не "
+"вказано, спробувати змінити стан всіх облікових записів, для яких було "
+"позначено пункт «синхронізувати з загальним станом»"
 
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
-msgstr "Відкриває діалогове вікно балачки, за допомогою якого ви зможете надсилати повідомлення контакту"
+msgstr ""
+"Відкриває діалогове вікно балачки, за допомогою якого ви зможете надсилати "
+"повідомлення контакту"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "JID контакту, з яким ви бажаєте розпочати балачку"
 
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
 #: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
-msgstr "якщо вказано, контакт буде взято зі списку контактів цього облікового запису"
-
-#: ../src/gajim-remote.py:134
-msgid "message content. The account must be specified or \"\""
-msgstr "вміст повідомлення. Обліковий запис має бути зазначено або \"\""
+msgstr ""
+"якщо вказано, контакт буде взято зі списку контактів цього облікового запису"
 
-#: ../src/gajim-remote.py:139
-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 key', just set 'OpenPGP key' to ''."
-msgstr "Надсилає нове повідомлення балачки контакту з реєстру. Параметри «Ключ OpenPGP» і «Обліковий запис» не є обов’язковими. Якщо вам потрібно встановити лише 'account', без 'OpenPGP key', просто встановіть значення 'OpenPGP key' рівним ''."
+#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
+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 "
+"key', just set 'OpenPGP key' to ''."
+msgstr ""
+"Надсилає нове повідомлення балачки контакту з реєстру. Параметри «Ключ "
+"OpenPGP» і «Обліковий запис» не є обов’язковими. Якщо вам потрібно "
+"встановити лише 'account', без 'OpenPGP key', просто встановіть значення "
+"'OpenPGP key' рівним ''."
 
+#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
 #: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID контакту, який отримає це повідомлення"
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
+#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "вміст повідомлення"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "ключ pgp"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "якщо вказано, повідомлення буде зашифровано відкритим ключем"
 
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
+#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "якщо вказано, повідомлення буде надіслано з цього облікового запису"
 
-#: ../src/gajim-remote.py:152
-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 key', just set 'OpenPGP key' to ''."
-msgstr "Надсилає нове окреме повідомлення контакту з реєстру. Параметри «Ключ OpenPGP» і «Обліковий запис» не є обов’язковими. Якщо вам потрібно встановити лише 'account', без 'OpenPGP key', просто встановіть значення 'OpenPGP key' рівним ''."
+#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
+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 "
+"key', just set 'OpenPGP key' to ''."
+msgstr ""
+"Надсилає нове окреме повідомлення контакту з реєстру. Параметри «Ключ "
+"OpenPGP» і «Обліковий запис» не є обов’язковими. Якщо вам потрібно "
+"встановити лише 'account', без 'OpenPGP key', просто встановіть значення "
+"'OpenPGP key' рівним ''."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "тема"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "тема повідомлення"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
-msgstr "Надсилає нове повідомлення до групової балачки, до якої ви приєдналися."
+msgstr ""
+"Надсилає нове повідомлення до групової балачки, до якої ви приєдналися."
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "JID кімнати, де буде отримано це повідомлення"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "Отримує докладні відомості щодо контакту"
 
+#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
+#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
 #: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
 #: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID контакту"
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "Отримує докладні відомості щодо контакту"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "Назва облікового запису"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "Надсилає контакту файл"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "file"
 msgstr "файл"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "Шлях до файла"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "якщо вказано, файл буде надіслано з цього облікового запису"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "Показує список всі параметрів та значення цих параметрів"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "Встановлює значення «ключ» у «значення»"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "ключ=значення"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "«ключ» — це назва параметра, «значення» — значення параметра"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "Вилучає запис параметра"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
 msgid "key"
 msgstr "ключ"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "назва параметра, який буде вилучено"
 
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Записує поточні значення параметрів Gajim до файла .config"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "Вилучає контакт з реєстру"
 
-#: ../src/gajim-remote.py:227
+#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "Додає контакт до реєстру"
 
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "jid"
-
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "Додає новий контакт до цього облікового запису"
 
-#: ../src/gajim-remote.py:235
+#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
-msgstr "Повертає поточний стан (загальний стан, якщо не було вказано облікового запису)"
+msgstr ""
+"Повертає поточний стан (загальний стан, якщо не було вказано облікового "
+"запису)"
 
-#: ../src/gajim-remote.py:242
-msgid "Returns current status message (the global one unless account is specified)"
-msgstr "Повертає поточне повідомлення стану (загальне повідомлення, якщо не було вказано облікового запису)"
+#: ../src/gajim-remote-plugin.py:226
+#, fuzzy
+msgid ""
+"Returns current status message(the global one unless account is specified)"
+msgstr ""
+"Повертає поточне повідомлення стану (загальне повідомлення, якщо не було "
+"вказано облікового запису)"
 
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote-plugin.py:233 ../src/gajim-remote.py:249
 msgid "Returns number of unread messages"
 msgstr "Повертає кількість непрочитаних повідомлень"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr "Відкриває діалогове вікно «Почати балачку»"
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "Розпочати балачку з цього облікового запису"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr "Надсилає нетиповий XML"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr "XML для надсилання"
 
-#: ../src/gajim-remote.py:262
-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-plugin.py:246 ../src/gajim-remote.py:262
+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-plugin.py:252 ../src/gajim-remote.py:277
+msgid "Handle a xmpp:/ uri"
+msgstr "Обробка xmpp:/ uri"
+
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
+msgid "uri"
+msgstr "uri"
+
+#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+msgid "Join a MUC room"
+msgstr "Приєднатися до кімнати групової балачки"
+
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+msgid "room"
+msgstr "кімната"
+
+#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+msgid "nick"
+msgstr "псевдонім"
+
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+msgid "password"
+msgstr "пароль"
+
+#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+msgid "Check if Gajim is running"
+msgstr "Перевірити, чи запущено Gajim"
+
+#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
+#: ../src/gajim-remote.py:300
+msgid "Shows or hides the ipython window"
+msgstr "Показує або ховає вікно ipython"
+
+#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+msgid "Missing argument \"contact_jid\""
+msgstr "Пропущено аргумент «contact_jid»"
+
+#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#, python-format
+msgid ""
+"'%s' is not in your roster.\n"
+"Please specify account for sending the message."
+msgstr ""
+"«%s» немає у реєстрі.\n"
+"Будь ласка, вкажіть обліковий запис для надсилання цього повідомлення."
+
+#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+msgid "You have no active account"
+msgstr "У вас немає жодного задіяного облікового запису"
+
+#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+msgid "It seems Gajim is not running. So you can't use gajim-remote."
+msgstr ""
+"Здається, Gajim не запущено. Отже ви не зможете скористатися gajim-remote."
+
+#: ../src/gajim-remote-plugin.py:412
+#, python-format
+msgid ""
+"Usage: %s %s %s \n"
+"\t %s"
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+msgid "Arguments:"
+msgstr "Аргументи:"
+
+#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#, python-format
+msgid "%s not found"
+msgstr "%s не знайдено"
+
+#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
+#, python-format
+msgid ""
+"Usage: %s command [arguments]\n"
+"Command is one of:\n"
+msgstr ""
+"Використання: %s команда [аргументи]\n"
+"Можливі команди:\n"
+
+#: ../src/gajim-remote-plugin.py:496
+#, fuzzy, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Забагато аргументів. \n"
+"Виконайте команду \"%(basename)s help %(command)s\", щоб дізнатися більше"
+
+#: ../src/gajim-remote-plugin.py:500
+#, fuzzy, python-format
+msgid ""
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Не було вказано аргумент \"%(arg)s\". \n"
+"Виконайте команду \"%(basename)s help %(command)s\", щоб дізнатися більше"
+
+#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
+msgid "Wrong uri"
+msgstr "Помилкова адреса uri"
+
+#: ../src/gajim-remote.py:109
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
+msgstr ""
+"одне зі значень: поза мережею, доступний, балачка, пішов, далеко, не "
+"турбувати, невидимий. Якщо не вказано, буде використано попередній стан "
+"облікового запису."
+
+#: ../src/gajim-remote.py:117
+msgid "Changes the priority of account or accounts"
+msgstr "Змінює пріоритет одного або кількох облікових записів"
+
+#: ../src/gajim-remote.py:119
+msgid "priority"
+msgstr "пріоритет"
+
+#: ../src/gajim-remote.py:119
+msgid "priority you want to give to the account"
+msgstr "пріоритет який ви бажаєте надати обліковому запису"
+
+#: ../src/gajim-remote.py:121
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"змінити пріоритет вказаного облікового запису. Якщо назви облікового запису "
+"не вказано, спробувати змінити стан всіх облікових записів, для яких було "
+"позначено пункт «синхронізувати з загальним станом»"
+
+#: ../src/gajim-remote.py:134
+msgid "message content. The account must be specified or \"\""
+msgstr "вміст повідомлення. Обліковий запис має бути зазначено або \"\""
+
+#: ../src/gajim-remote.py:242
+msgid ""
+"Returns current status message (the global one unless account is specified)"
+msgstr ""
+"Повертає поточне повідомлення стану (загальне повідомлення, якщо не було "
+"вказано облікового запису)"
 
 #: ../src/gajim-remote.py:268
 msgid "Change the avatar"
@@ -7737,16 +8824,12 @@ msgid "Picture to use"
 msgstr "Картинка, яку слід використовувати"
 
 #: ../src/gajim-remote.py:271
-msgid "Account in which the avatar will be set; if not specified, the avatar will be set for all accounts"
-msgstr "Обліковий запис, на для якого буде встановлено аватар; якщо не вказано, аватар буде встановлено до всіх облікових записів"
-
-#: ../src/gajim-remote.py:277
-msgid "Handle a xmpp:/ uri"
-msgstr "Обробка xmpp:/ uri"
-
-#: ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "uri"
+msgid ""
+"Account in which the avatar will be set; if not specified, the avatar will "
+"be set for all accounts"
+msgstr ""
+"Обліковий запис, на для якого буде встановлено аватар; якщо не вказано, "
+"аватар буде встановлено до всіх облікових записів"
 
 #: ../src/gajim-remote.py:279
 msgid "URI to handle"
@@ -7760,30 +8843,14 @@ msgstr "Обліковий запис, який має це обробляти"
 msgid "Message content"
 msgstr "Вміст повідомлення"
 
-#: ../src/gajim-remote.py:286
-msgid "Join a MUC room"
-msgstr "Приєднатися до кімнати групової балачки"
-
-#: ../src/gajim-remote.py:288
-msgid "room"
-msgstr "кімната"
-
 #: ../src/gajim-remote.py:288
 msgid "Room JID"
 msgstr "JID кімнати"
 
-#: ../src/gajim-remote.py:289
-msgid "nick"
-msgstr "псевдонім"
-
 #: ../src/gajim-remote.py:289
 msgid "Nickname to use"
 msgstr "Псевдонім, який слід використовувати"
 
-#: ../src/gajim-remote.py:290
-msgid "password"
-msgstr "пароль"
-
 #: ../src/gajim-remote.py:290
 msgid "Password to enter the room"
 msgstr "Пароль для входу до кімнати"
@@ -7792,35 +8859,6 @@ msgstr "Пароль для входу до кімнати"
 msgid "Account from which you want to enter the room"
 msgstr "Обліковий запис, з якого ви бажаєте увійти до кімнати"
 
-#: ../src/gajim-remote.py:296
-msgid "Check if Gajim is running"
-msgstr "Перевірити, чи запущено Gajim"
-
-#: ../src/gajim-remote.py:300
-msgid "Shows or hides the ipython window"
-msgstr "Показує або ховає вікно ipython"
-
-#: ../src/gajim-remote.py:327
-msgid "Missing argument \"contact_jid\""
-msgstr "Пропущено аргумент «contact_jid»"
-
-#: ../src/gajim-remote.py:348
-#, python-format
-msgid ""
-"'%s' is not in your roster.\n"
-"Please specify account for sending the message."
-msgstr ""
-"«%s» немає у реєстрі.\n"
-"Будь ласка, вкажіть обліковий запис для надсилання цього повідомлення."
-
-#: ../src/gajim-remote.py:351
-msgid "You have no active account"
-msgstr "У вас немає жодного задіяного облікового запису"
-
-#: ../src/gajim-remote.py:404
-msgid "It seems Gajim is not running. So you can't use gajim-remote."
-msgstr "Здається, Gajim не запущено. Отже ви не зможете скористатися gajim-remote."
-
 #: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
@@ -7830,24 +8868,6 @@ msgstr ""
 "Використання: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:435
-msgid "Arguments:"
-msgstr "Аргументи:"
-
-#: ../src/gajim-remote.py:439
-#, python-format
-msgid "%s not found"
-msgstr "%s не знайдено"
-
-#: ../src/gajim-remote.py:445
-#, python-format
-msgid ""
-"Usage: %s command [arguments]\n"
-"Command is one of:\n"
-msgstr ""
-"Використання: %s команда [аргументи]\n"
-"Можливі команди:\n"
-
 #: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
@@ -7870,10 +8890,6 @@ msgstr ""
 msgid "No uri given"
 msgstr "Не надано універсальний ідентифікатор ресурсу"
 
-#: ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Помилкова адреса uri"
-
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "Тема"
@@ -7899,175 +8915,176 @@ msgstr "Ви не можете вилучати вашої поточної те
 msgid "Please first choose another for your current theme."
 msgstr "Будь ласка, спершу змініть тему на іншу."
 
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:170
 msgid "Sending private message failed"
 msgstr "Спроба надсилання конфіденційного повідомлення зазнала невдачі"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:171
+#: ../src/groupchat_control.py:172
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
-msgstr "Ви полишили групову балачку «%(room)s» або це зробив (зробила) «%(nick)s»."
+msgstr ""
+"Ви полишили групову балачку «%(room)s» або це зробив (зробила) «%(nick)s»."
 
-#: ../src/groupchat_control.py:450
+#: ../src/groupchat_control.py:455
 msgid "Insert Nickname"
 msgstr "Вставити псевдонім"
 
-#: ../src/groupchat_control.py:631
+#: ../src/groupchat_control.py:636
 msgid "Conversation with "
 msgstr "Спілкування з"
 
-#: ../src/groupchat_control.py:633
+#: ../src/groupchat_control.py:638
 msgid "Continued conversation"
 msgstr "Спілкування з продовженням"
 
-#. Can be a message (see handle_event_gc_config_change in
-#. gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1272 ../src/gui_interface.py:1080
+#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Всі учасники можуть бачити ваш JID повністю"
 
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1286
 msgid "Room logging is enabled"
 msgstr "Увімкнено запис кімнати"
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1288
 msgid "A new room has been created"
 msgstr "Було створено нову кімнату"
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1291
 msgid "The server has assigned or modified your roomnick"
 msgstr "Сервер призначив вам псевдонім у кімнаті або змінив цей псевдонім"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1287
+#: ../src/groupchat_control.py:1297
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s було викинуто: %(reason)s"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1300
 #, 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:1300
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s було заблоковано: %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1312
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s було заблоковано %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1314 ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
 #, python-format
 msgid "You are now known as %s"
 msgstr "Ви тепер відомі як %s"
 
-#: ../src/groupchat_control.py:1330 ../src/gui_interface.py:919
+#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s тепер стає %(new_nick)s"
 
-#: ../src/groupchat_control.py:1372 ../src/groupchat_control.py:1377
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1392
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s було вилучено з кімнати (%(reason)s)"
 
-#: ../src/groupchat_control.py:1374
+#: ../src/groupchat_control.py:1383
 msgid "affiliation changed"
 msgstr "змінено місце роботи"
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1388
 msgid "room configuration changed to members-only"
 msgstr "налаштування кімнати змінено на «лише для постійних учасників»"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1394
 msgid "system shutdown"
 msgstr "вимкнення системи"
 
-#: ../src/groupchat_control.py:1470
+#: ../src/groupchat_control.py:1477
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
-msgstr "** Належність %(nick)s було встановлено у значення %(affiliation)s %(actor)s"
+msgstr ""
+"** Належність %(nick)s було встановлено у значення %(affiliation)s %(actor)s"
 
-#: ../src/groupchat_control.py:1474
+#: ../src/groupchat_control.py:1481
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Належність of %(nick)s було встановлено у значення %(affiliation)s"
 
-#: ../src/groupchat_control.py:1489
+#: ../src/groupchat_control.py:1496
 #, 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:1493
+#: ../src/groupchat_control.py:1500
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Роль %(nick)s було встановлено у значення %(role)s"
 
-#: ../src/groupchat_control.py:1522
+#: ../src/groupchat_control.py:1530
 #, python-format
 msgid "%s has left"
 msgstr "%s вийшов"
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1535
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s приєднався до групової балачки"
 
-#: ../src/groupchat_control.py:1529 ../src/gui_interface.py:946
+#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
 #: ../src/history_window.py:447 ../src/notify.py:234
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s тепер %(status)s"
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1774
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Ви справді бажаєте полишити групову балачку «%s»?"
 
-#: ../src/groupchat_control.py:1761
-msgid "If you close this window, you will be disconnected from this group chat."
+#: ../src/groupchat_control.py:1776
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
 msgstr "Якщо ви закриєте це вікно, вас буде від’єднано від групової балачки."
 
-#: ../src/groupchat_control.py:1765 ../src/gui_interface.py:1216
-#: ../src/gui_interface.py:1992 ../src/gui_interface.py:2029
-#: ../src/gui_interface.py:2064 ../src/message_window.py:224
-#: ../src/roster_window.py:2739 ../src/roster_window.py:3399
-#: ../src/roster_window.py:4123
+#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
+#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
+#: ../src/gui_interface.py:1853 ../src/message_window.py:224
+#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
+#: ../src/roster_window.py:4195
 msgid "_Do not ask me again"
 msgstr "Більше _не питати мене"
 
-#: ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:1814
 msgid "Changing Subject"
 msgstr "Зміна теми"
 
-#: ../src/groupchat_control.py:1800
+#: ../src/groupchat_control.py:1815
 msgid "Please specify the new subject:"
 msgstr "Будь ласка, вкажіть нову тему:"
 
-#: ../src/groupchat_control.py:1807
+#: ../src/groupchat_control.py:1822
 msgid "Changing Nickname"
 msgstr "Зміна псевдоніма"
 
-#: ../src/groupchat_control.py:1808
+#: ../src/groupchat_control.py:1823
 msgid "Please specify the new nickname you want to use:"
 msgstr "Будь ласка, вкажіть новий псевдонім, яким ви бажаєте скористатися:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1839
+#: ../src/groupchat_control.py:1854
 #, python-format
 msgid "Destroying %s"
 msgstr "Знищення %s"
 
-#: ../src/groupchat_control.py:1840
+#: ../src/groupchat_control.py:1855
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8075,22 +9092,22 @@ msgstr ""
 "Ви маєте намір знищити цю кімнату.\n"
 "Нижче ви можете вказати причину цього рішення:"
 
-#: ../src/groupchat_control.py:1842
+#: ../src/groupchat_control.py:1857
 msgid "You may also enter an alternate venue:"
 msgstr "Ви також можете вказати альтернативне місце зустрічі:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2028
+#: ../src/groupchat_control.py:2046
 #, python-format
 msgid "Kicking %s"
 msgstr "Викидання %s"
 
-#: ../src/groupchat_control.py:2029 ../src/groupchat_control.py:2356
+#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
 msgid "You may specify a reason below:"
 msgstr "Нижче ви можете зазначити причину:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2355
+#: ../src/groupchat_control.py:2373
 #, python-format
 msgid "Banning %s"
 msgstr "Блокування %s"
@@ -8100,8 +9117,11 @@ msgid "A programming error has been detected"
 msgstr "Було виявлено помилку у програмі"
 
 #: ../src/gtkexcepthook.py:47
-msgid "It probably is not fatal, but should be reported to the developers nonetheless."
-msgstr "Ця помилка не є критичною, але все ж варто повідомити про неї розробникам."
+msgid ""
+"It probably is not fatal, but should be reported to the developers "
+"nonetheless."
+msgstr ""
+"Ця помилка не є критичною, але все ж варто повідомити про неї розробникам."
 
 #: ../src/gtkexcepthook.py:54
 msgid "_Report Bug"
@@ -8112,113 +9132,164 @@ msgid "Details"
 msgstr "Подробиці"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
+#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Помилка: не вдалося відкрити %s для читання"
 
-#: ../src/gtkgui_helpers.py:400
+#: ../src/gtkgui_helpers.py:404
 msgid "Error reading file:"
 msgstr "Помилка під час спроби прочитати файл:"
 
-#: ../src/gtkgui_helpers.py:403
+#: ../src/gtkgui_helpers.py:407
 msgid "Error parsing file:"
 msgstr "Помилка під час обробки файла:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:444
+#: ../src/gtkgui_helpers.py:448
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
-msgstr "Не вдалося виконати запис до %s. Підтримка керування сеансами не працюватиме"
+msgstr ""
+"Не вдалося виконати запис до %s. Підтримка керування сеансами не працюватиме"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:818
+#: ../src/gtkgui_helpers.py:822
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim не є типовим клієнтом Jabber"
 
-#: ../src/gtkgui_helpers.py:819
+#: ../src/gtkgui_helpers.py:823
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Чи бажаєте ви зробити Gajim типовим клієнтом Jabber?"
 
-#: ../src/gtkgui_helpers.py:820
+#: ../src/gtkgui_helpers.py:824
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr "Завжди перевіряти, чи є Gajim типовим клієнтом Jabber, під час запуску"
 
-#: ../src/gtkgui_helpers.py:887
+#: ../src/gtkgui_helpers.py:891
 msgid "Extension not supported"
 msgstr "Додаток не підтримується"
 
-#: ../src/gtkgui_helpers.py:888
+#: ../src/gtkgui_helpers.py:892
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
-msgstr "Зображення не може бути збережено у форматі %(type)s. Зберегти як %(new_filename)s?"
+msgstr ""
+"Зображення не може бути збережено у форматі %(type)s. Зберегти як "
+"%(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:924
+#: ../src/gtkgui_helpers.py:928
 msgid "Save Image as..."
 msgstr "Зберегти зображення як..."
 
-#: ../src/gui_interface.py:140
+#. we are banned
+#. group chat does not exist
+#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
+#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
+#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
+#: ../src/gui_interface.py:348
+msgid "Unable to join group chat"
+msgstr "Не вдалося приєднатися до групової балачки"
+
+#: ../src/gui_interface.py:138
 #, python-format
 msgid ""
-"Your desired nickname in group chat %s is in use or registered by another occupant.\n"
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
-"Псевдонім у груповій балачці %s, який ви бажали використати, вже використовує інший учасник.\n"
+"Псевдонім у груповій балачці %s, який ви бажали використати, вже "
+"використовує інший учасник.\n"
 "Будь ласка, вкажіть нижче інший псевдонім:"
 
-#: ../src/gui_interface.py:143
+#: ../src/gui_interface.py:141
 msgid "Always use this nickname when there is a conflict"
 msgstr "Завжди використовувати цей псевдонім при виникненні конфліктів."
 
-#: ../src/gui_interface.py:159
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Чи приймаєте ви цей запит?"
 
-#: ../src/gui_interface.py:161
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Чи приймаєте ви запит щодо облікового запису %s?"
 
-#: ../src/gui_interface.py:164
+#: ../src/gui_interface.py:163
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) уповноваження для %(url)s (ідентифікатор: %(id)s)"
 
-#: ../src/gui_interface.py:213 ../src/notify.py:493
+#: ../src/gui_interface.py:209 ../src/notify.py:493
 msgid "Connection Failed"
 msgstr "Спроба з’єднання завершилася невдало"
 
-#: ../src/gui_interface.py:606 ../src/gui_interface.py:610
+#: ../src/gui_interface.py:312
+#, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr ""
+"Для приєднання до кімнати %s потрібен пароль. Будь ласка, введіть його."
+
+#: ../src/gui_interface.py:324
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr "Максимальна кількість користувачів %s вже досягнута."
+
+#: ../src/gui_interface.py:333
+#, python-format
+msgid "You are banned from group chat %s."
+msgstr "Вас заблокували у груповій балачці %s."
+
+#: ../src/gui_interface.py:338
+#, python-format
+msgid "Group chat %s does not exist."
+msgstr "Групової балачки %s не існує."
+
+#: ../src/gui_interface.py:341
+msgid "Group chat creation is restricted."
+msgstr "Можливість створення групових балачок обмежено."
+
+#: ../src/gui_interface.py:344
+#, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr ""
+"Для групової балачки %s слід використовувати псевдонім, під яким ви "
+"зареєструвалися."
+
+#: ../src/gui_interface.py:349
+#, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Вас немає у списку постійних учасників групової балачки %s."
+
+#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Помилка %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:621 ../src/gui_interface.py:636
+#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "помилка під час надсилання %(message)s ( %(error)s )"
 
-#: ../src/gui_interface.py:663 ../src/notify.py:495
+#: ../src/gui_interface.py:540 ../src/notify.py:495
 msgid "Subscription request"
 msgstr "Запит на підписку"
 
-#: ../src/gui_interface.py:688
+#: ../src/gui_interface.py:565
 msgid "Authorization accepted"
 msgstr "Уповноваження прийнято"
 
-#: ../src/gui_interface.py:689
+#: ../src/gui_interface.py:566
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Контакт «%s» уповноважив вас на перегляд свого стану."
 
-#: ../src/gui_interface.py:702
+#: ../src/gui_interface.py:579
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контакт «%s» вилучив вашу підписку"
 
-#: ../src/gui_interface.py:703
+#: ../src/gui_interface.py:580
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8226,92 +9297,99 @@ msgstr ""
 "Цей контакт завжди буде показано зі станом «поза мережею».\n"
 "Бажаєте вилучити контакт з вашого списку контактів?"
 
-#: ../src/gui_interface.py:727 ../src/notify.py:497
+#: ../src/gui_interface.py:604 ../src/notify.py:497
 msgid "Unsubscribed"
 msgstr "_Непідписаний"
 
-#: ../src/gui_interface.py:754
+#: ../src/gui_interface.py:631
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Зв’язок з «%s» встановити не вдалося"
 
-#: ../src/gui_interface.py:1015
+#: ../src/gui_interface.py:859
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s встановив тему %(subject)s"
 
-#: ../src/gui_interface.py:1083
+#: ../src/gui_interface.py:926
 msgid "Room now shows unavailable member"
 msgstr "Тепер у кімнаті буде показано недоступних постійних учасників"
 
-#: ../src/gui_interface.py:1085
+#: ../src/gui_interface.py:928
 msgid "room now does not show unavailable members"
 msgstr "тепер у кімнаті не можна буде бачити недоступних постійних учасників"
 
-#: ../src/gui_interface.py:1087
+#: ../src/gui_interface.py:930
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr "Сталася зміна налаштувань кімнати, не пов’язана з конфіденційністю"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:1091
+#: ../src/gui_interface.py:934
 msgid "Room logging is now enabled"
 msgstr "Тепер увімкнено запис повідомлень кімнати"
 
-#: ../src/gui_interface.py:1093
+#: ../src/gui_interface.py:936
 msgid "Room logging is now disabled"
 msgstr "Тепер запис кімнати вимкнено"
 
-#: ../src/gui_interface.py:1095
+#: ../src/gui_interface.py:938
 msgid "Room is now non-anonymous"
 msgstr "Тепер у кімнаті вимкнено анонімність"
 
-#: ../src/gui_interface.py:1098
+#: ../src/gui_interface.py:941
 msgid "Room is now semi-anonymous"
 msgstr "Тепер у кімнаті увімкнено напіванонімність"
 
-#: ../src/gui_interface.py:1101
+#: ../src/gui_interface.py:944
 msgid "Room is now fully-anonymous"
 msgstr "Тепер у кімнаті увімкнено анонімність"
 
-#: ../src/gui_interface.py:1133
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Для приєднання до кімнати %s потрібен пароль. Будь ласка, введіть його."
-
-#: ../src/gui_interface.py:1180
-msgid "You configured Gajim to use GPG agent, but there is no GPG agent running or it returned a wrong passphrase.\n"
-msgstr "Ви налаштували Gajim на використання агента GPG, але агент GPG не запущено або цей агент повернув помилковий пароль.\n"
+#: ../src/gui_interface.py:985
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+"Ви налаштували Gajim на використання агента GPG, але агент GPG не запущено "
+"або цей агент повернув помилковий пароль.\n"
 
-#: ../src/gui_interface.py:1182 ../src/gui_interface.py:1189
+#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Ви виконали з’єднання без вашого ключа OpenPGP."
 
-#: ../src/gui_interface.py:1184
+#: ../src/gui_interface.py:989
 msgid "Your passphrase is incorrect"
 msgstr "Ваш пароль не є коректним"
 
-#: ../src/gui_interface.py:1188
+#: ../src/gui_interface.py:993
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Ваш OpenPGP пароль не є коректним"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid "GPG key not trusted"
 msgstr "GPG непридатне для використання"
 
-#: ../src/gui_interface.py:1214
-msgid "The GPG key used to encrypt this chat is not trusted. Do you really want to encrypt this message?"
-msgstr "З цим контактом не пов’язано жодних ключів GPG. Отже шифрування повідомлень буде неможливим."
+#: ../src/gui_interface.py:1019
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+"З цим контактом не пов’язано жодних ключів GPG. Отже шифрування повідомлень "
+"буде неможливим."
 
-#: ../src/gui_interface.py:1226
-msgid "Gnome Keyring is installed but not                 correctly started (environment variable probably not                 correctly set)"
-msgstr "Gnome Keyring встановлено, але не                 запущено належним чином (ймовірно, змінну середовища вказано                  неправильно)"
+#: ../src/gui_interface.py:1031
+msgid ""
+"Gnome Keyring is installed but not                 correctly started "
+"(environment variable probably not                 correctly set)"
+msgstr ""
+"Gnome Keyring встановлено, але не                 запущено належним чином "
+"(ймовірно, змінну середовища вказано                  неправильно)"
 
-#: ../src/gui_interface.py:1330
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Нові повідомлення у %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1332
+#: ../src/gui_interface.py:1133
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -8319,7 +9397,7 @@ msgstr[0] "Отримано %d новий лист"
 msgstr[1] "Отримано %d нових листи"
 msgstr[2] "Отримано %d нових листів"
 
-#: ../src/gui_interface.py:1345
+#: ../src/gui_interface.py:1146
 #, python-format
 msgid ""
 "\n"
@@ -8334,42 +9412,42 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1418
+#: ../src/gui_interface.py:1215
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s бажає надіслати вам файл."
 
-#: ../src/gui_interface.py:1455 ../src/roster_window.py:1856
+#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
 msgid "Remote contact stopped transfer"
 msgstr "Віддалений контакт зупинив передавання файлу"
 
-#: ../src/gui_interface.py:1458 ../src/roster_window.py:1858
+#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
 msgid "Error opening file"
 msgstr "Помилка під час спроби прочитати файл"
 
-#: ../src/gui_interface.py:1490
+#: ../src/gui_interface.py:1287
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Ви успішно отримали %(filename)s від %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1494
+#: ../src/gui_interface.py:1291
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Передавання файлу·%(filename)s·від·%(name)s·зупинено."
 
-#: ../src/gui_interface.py:1507
+#: ../src/gui_interface.py:1304
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Ви успішно надіслали %(filename)s до %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1511
+#: ../src/gui_interface.py:1308
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Надсилання файлу %(filename)s до %(name)s зупинено"
 
-#: ../src/gui_interface.py:1623
+#: ../src/gui_interface.py:1426
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8378,156 +9456,189 @@ msgstr ""
 "Не вдалося розшифрувати повідомлення від %s\n"
 "Можливо, хтось втрутився у ваше з’єднання."
 
-#: ../src/gui_interface.py:1630
+#: ../src/gui_interface.py:1433
 msgid "Unable to decrypt message"
 msgstr "Не вдалося розшифрувати повідомлення"
 
-#: ../src/gui_interface.py:1702
+#: ../src/gui_interface.py:1505
 msgid "Username Conflict"
 msgstr "Конфлікт імен користувачів"
 
-#: ../src/gui_interface.py:1703
+#: ../src/gui_interface.py:1506
 msgid "Please type a new username for your local account"
-msgstr "Будь ласка, введіть нове ім'я користувача для вашого локального облікового запису"
+msgstr ""
+"Будь ласка, введіть нове ім'я користувача для вашого локального облікового "
+"запису"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1519
 msgid "Ping?"
 msgstr "Гу?"
 
-#: ../src/gui_interface.py:1729
+#: ../src/gui_interface.py:1532
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Га! (%s s.)"
 
-#: ../src/gui_interface.py:1740
+#: ../src/gui_interface.py:1543
 msgid "Error."
 msgstr "Помилка."
 
-#: ../src/gui_interface.py:1768
+#: ../src/gui_interface.py:1556
 msgid "Resource Conflict"
 msgstr "Конфлікт ресурсів"
 
-#: ../src/gui_interface.py:1769
-msgid "You are already connected to this account with the same resource. Please type a new one"
-msgstr "Ваш клієнт вже з’єднано з цим обліковим записом і тим самим ресурсом. Будь ласка, вкажіть інший ресурс"
+#: ../src/gui_interface.py:1557
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+"Ваш клієнт вже з’єднано з цим обліковим записом і тим самим ресурсом. Будь "
+"ласка, вкажіть інший ресурс"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1816
+#: ../src/gui_interface.py:1604
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s бажає розпочати голосову розмову."
 
-#: ../src/gui_interface.py:1819
+#: ../src/gui_interface.py:1607
 msgid "Voice Chat Request"
 msgstr "Запит на голосову розмову"
 
-#: ../src/gui_interface.py:1927
+#: ../src/gui_interface.py:1716
 msgid "Error verifying SSL certificate"
 msgstr "Помилка під час перевірки сертифіката SSL"
 
-#: ../src/gui_interface.py:1928
+#: ../src/gui_interface.py:1717
 #, python-format
 msgid ""
-"There was an error verifying the SSL certificate of your jabber server: %(error)s\n"
+"There was an error verifying the SSL certificate of your jabber server: "
+"%(error)s\n"
 "Do you still want to connect to this server?"
 msgstr ""
-"Під час спроби перевірки сертифіката SSL вашого сервера jabber сталася помилка: %(error)s\n"
+"Під час спроби перевірки сертифіката SSL вашого сервера jabber сталася "
+"помилка: %(error)s\n"
 "Ви все ще маєте намір з’єднатися з сервером?"
 
-#: ../src/gui_interface.py:1936
+#: ../src/gui_interface.py:1725
 msgid "Ignore this error for this certificate."
 msgstr "Ігнорувати цю помилку для цього сертифіката."
 
-#: ../src/gui_interface.py:1956
+#: ../src/gui_interface.py:1745
 msgid "SSL certificate error"
 msgstr "Помилка сертифіката SSL"
 
-#: ../src/gui_interface.py:1957
+#: ../src/gui_interface.py:1746
 #, python-format
 msgid ""
-"It seems the SSL certificate of account %(account)s 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 ""
-"Здається сертифікат SSL облікового запису  %(account)s було змінено або хтось втрутився у ваше з’єднання.\n"
+"Здається сертифікат SSL облікового запису  %(account)s було змінено або "
+"хтось втрутився у ваше з’єднання.\n"
 "Старий відбиток: %(old)s\n"
 "Новий відбиток: %(new)s\n"
 "\n"
 "Ви все ще маєте намір з’єднатися і оновити відбиток сертифіката?"
 
-#: ../src/gui_interface.py:1987 ../src/gui_interface.py:2024
-#: ../src/gui_interface.py:2060
+#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
+#: ../src/gui_interface.py:1849
 msgid "Insecure connection"
 msgstr "Небезпечне з’єднання"
 
-#: ../src/gui_interface.py:1988
-msgid "You are about to connect to the server with an insecure connection. This means all your conversations will be exchanged unencrypted. Are you sure you want to do that?"
-msgstr "Ви маєте намір надіслати з’єднатись незахищеним з’єднанням. Весь ваш обмін повідомленнями буде незашифрованим. Виконати надсилання пароля зараз?"
+#: ../src/gui_interface.py:1777
+msgid ""
+"You are about to connect to the server with an insecure connection. This "
+"means all your conversations will be exchanged unencrypted. Are you sure you "
+"want to do that?"
+msgstr ""
+"Ви маєте намір надіслати з’єднатись незахищеним з’єднанням. Весь ваш обмін "
+"повідомленнями буде незашифрованим. Виконати надсилання пароля зараз?"
 
-#: ../src/gui_interface.py:1991 ../src/gui_interface.py:2028
-#: ../src/gui_interface.py:2063
+#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
+#: ../src/gui_interface.py:1852
 msgid "Yes, I really want to connect insecurely"
 msgstr "Так, я справді бажаю знехтувати безпекою"
 
-#: ../src/gui_interface.py:2025
-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 "Ви маєте намір надіслати ваш пароль незахищеним з’єднанням. Щоб покращити безпеку з’єднання, вам слід встановити PyOpenSSL. Виконати надсилання пароля зараз?"
+#: ../src/gui_interface.py:1814
+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 ""
+"Ви маєте намір надіслати ваш пароль незахищеним з’єднанням. Щоб покращити "
+"безпеку з’єднання, вам слід встановити PyOpenSSL. Виконати надсилання пароля "
+"зараз?"
 
-#: ../src/gui_interface.py:2061
-msgid "You are about to send your password unencrypted on an insecure connection. Are you sure you want to do that?"
-msgstr "Ви маєте намір надіслати ваш пароль незашифрованим з’єднанням у відкритому вигляді. Виконати надсилання пароля?"
+#: ../src/gui_interface.py:1850
+msgid ""
+"You are about to send your password unencrypted on an insecure connection. "
+"Are you sure you want to do that?"
+msgstr ""
+"Ви маєте намір надіслати ваш пароль незашифрованим з’єднанням у відкритому "
+"вигляді. Виконати надсилання пароля?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2624 ../src/gui_interface.py:2647
+#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
 msgid "Emoticons disabled"
 msgstr "Емоційки вимкнено"
 
-#: ../src/gui_interface.py:2625
-msgid "Your configured emoticons theme has not been found, so emoticons have been disabled."
+#: ../src/gui_interface.py:2423
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
 msgstr "Вказаної вами теми емоційок не було знайдено, емоційки буде вимкнено."
 
-#: ../src/gui_interface.py:2648
-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 "Не вдалося завантажити вказану вами тему емоційок. Можливо, вам слід оновити формат файла emoticons.py. Докладніше про новий формат можна дізнатися за адресою http://trac.gajim.org/wiki/Emoticons."
+#: ../src/gui_interface.py:2446
+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 ""
+"Не вдалося завантажити вказану вами тему емоційок. Можливо, вам слід оновити "
+"формат файла emoticons.py. Докладніше про новий формат можна дізнатися за "
+"адресою http://trac.gajim.org/wiki/Emoticons."
 
-#: ../src/gui_interface.py:2679 ../src/roster_window.py:3560
+#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
 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/gui_interface.py:3058
+#: ../src/gui_interface.py:2871
 msgid "Could not save your settings and preferences"
 msgstr "Не вдалося зберегти ваші налаштування і параметри"
 
-#: ../src/gui_interface.py:3592
+#: ../src/gui_interface.py:3411
 msgid "Passphrase Required"
 msgstr "Слід вказати пароль"
 
-#: ../src/gui_interface.py:3593
+#: ../src/gui_interface.py:3412
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Введіть пароль ключа GPG для ключа %(keyid)s (account %(account)s)."
 
-#: ../src/gui_interface.py:3607
+#: ../src/gui_interface.py:3426
 msgid "GPG key expired"
 msgstr "Немає ключа GPG"
 
-#: ../src/gui_interface.py:3608
+#: ../src/gui_interface.py:3427
 #, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Ваш ключ GPG застарів. З’єднання з %s буде встановлено без OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3617
+#: ../src/gui_interface.py:3436
 msgid "Wrong Passphrase"
 msgstr "Вказано помилковий пароль"
 
-#: ../src/gui_interface.py:3618
+#: ../src/gui_interface.py:3437
 msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Будь ласка, введіть ще раз свій пароль GPG або натисніть кнопку «Скасувати»."
+msgstr ""
+"Будь ласка, введіть ще раз свій пароль GPG або натисніть кнопку «Скасувати»."
 
 #: ../src/gui_menu_builder.py:93
 msgid "_New Group Chat"
@@ -8563,17 +9674,31 @@ msgstr "Псевдонім"
 msgid "Message"
 msgstr "Повідомлення"
 
+#. holds subject
+#: ../src/history_manager.py:188 ../src/history_manager.py:219
+msgid "Subject"
+msgstr "Тема"
+
 #: ../src/history_manager.py:241
-msgid "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING)"
-msgstr "Бажаєте спорожнити базу даних? (НАПОЛЕГЛИВО НЕ РЕКОМЕНДУЄМО ЦЬОГО РОБИТИ, ЯКЩО ЗАПУЩЕНО GAJIM)"
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
+msgstr ""
+"Бажаєте спорожнити базу даних? (НАПОЛЕГЛИВО НЕ РЕКОМЕНДУЄМО ЦЬОГО РОБИТИ, "
+"ЯКЩО ЗАПУЩЕНО GAJIM)"
 
 #: ../src/history_manager.py:243
 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 click NO.\n"
+"Normally allocated database size will not be freed, it will just become "
+"reusable. If you really want to reduce database filesize, click YES, else "
+"click NO.\n"
 "\n"
 "In case you click YES, please wait..."
 msgstr ""
-"Зазвичай, пам’ять, виділену для бази даних не буде звільнено, її просто можна буде використати повторно. Якщо ви справді бажаєте зменшити розмір файла бази даних, натисніть кнопку «ТАК», у іншому випадку натисніть кнопку «НІ».\n"
+"Зазвичай, пам’ять, виділену для бази даних не буде звільнено, її просто "
+"можна буде використати повторно. Якщо ви справді бажаєте зменшити розмір "
+"файла бази даних, натисніть кнопку «ТАК», у іншому випадку натисніть кнопку "
+"«НІ».\n"
 "\n"
 "Якщо ви натиснете кнопку «ТАК», вам доведеться зачекати..."
 
@@ -8653,19 +9778,19 @@ msgstr "Ви збираєтесь закрити кілька вкладок"
 msgid "Do you really want to close them all?"
 msgstr "Ви справді бажаєте закритити їх усі?"
 
-#: ../src/message_window.py:484
+#: ../src/message_window.py:485
 msgid "Chats"
 msgstr "Балачки"
 
-#: ../src/message_window.py:486
+#: ../src/message_window.py:487
 msgid "Group Chats"
 msgstr "Групові балачки"
 
-#: ../src/message_window.py:488
+#: ../src/message_window.py:489
 msgid "Private Chats"
 msgstr "Конфіденційні балачки"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:495
 msgid "Messages"
 msgstr "Повідомлення"
 
@@ -8721,286 +9846,343 @@ msgstr "Нове повідомлення від %(nickname)s"
 msgid "Ignore"
 msgstr "_Ігнорувати"
 
-#: ../src/profile_window.py:57
+#: ../src/profile_window.py:58
 msgid "Retrieving profile..."
 msgstr "Отримання профілю..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2935
+#: ../src/profile_window.py:111 ../src/roster_window.py:3001
 msgid "File is empty"
 msgstr "Файл порожній"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2938
+#: ../src/profile_window.py:114 ../src/roster_window.py:3004
 msgid "File does not exist"
 msgstr "Файла не існує"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2940 ../src/roster_window.py:2951
+#: ../src/profile_window.py:128 ../src/profile_window.py:144
+#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
 msgid "Could not load image"
 msgstr "Не вдалося завантажити зображення"
 
-#: ../src/profile_window.py:214
+#: ../src/profile_window.py:215
 msgid "Wrong date format"
 msgstr "Невірний формат дати"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:216
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Формат має бути РРРР-ММ-ДД"
 
-#: ../src/profile_window.py:269
+#: ../src/profile_window.py:270
 msgid "Information received"
 msgstr "Отримано відомості"
 
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:341
 msgid "Without a connection you can not publish your contact information."
-msgstr "Для того, щоб оприлюднити відомості щодо контакту з вами, вам слід встановити з’єднання."
+msgstr ""
+"Для того, щоб оприлюднити відомості щодо контакту з вами, вам слід "
+"встановити з’єднання."
 
-#: ../src/profile_window.py:353
+#: ../src/profile_window.py:354
 msgid "Sending profile..."
 msgstr "Надсилання профілю..."
 
-#: ../src/profile_window.py:368
+#: ../src/profile_window.py:369
 msgid "Information NOT published"
 msgstr "Відомості НЕ оприлюднено"
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:376
 msgid "vCard publication failed"
 msgstr "Спроба оприлюднення vCard зазнала невдачі"
 
-#: ../src/profile_window.py:376
-msgid "There was an error while publishing your personal information, try again later."
-msgstr "Під час спроби оприлюднення ваших особистих відомостей, спробуйте пізніше."
+#: ../src/profile_window.py:377
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Під час спроби оприлюднення ваших особистих відомостей, спробуйте пізніше."
 
-#: ../src/roster_window.py:256 ../src/roster_window.py:1012
+#: ../src/roster_window.py:262 ../src/roster_window.py:1026
 msgid "Merged accounts"
 msgstr "Об’єднані облікові записи"
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1942
 msgid "Authorization has been sent"
 msgstr "Було надіслано уповноваження"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1943
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Тепер «%s» буде відомий ваш стан."
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1966
 msgid "Subscription request has been sent"
 msgstr "Було надіслано запит на підписку"
 
-#: ../src/roster_window.py:1944
+#: ../src/roster_window.py:1967
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Якщо «%s» прийме цей запит, ви дізнаватиметеся про його або її стан."
 
-#: ../src/roster_window.py:1958
+#: ../src/roster_window.py:1981
 msgid "Authorization has been removed"
 msgstr "Уповноваження було вилучено"
 
-#: ../src/roster_window.py:1959
+#: ../src/roster_window.py:1982
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Тепер «%s» завжди бачитиме вас як «поза мережею»."
 
-#: ../src/roster_window.py:1986
+#: ../src/roster_window.py:2009
 msgid "GPG is not usable"
 msgstr "GPG непридатне для використання"
 
-#: ../src/roster_window.py:1987
+#: ../src/roster_window.py:2010
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "З’єднання з %s буде встановлено без OpenPGP."
 
-#: ../src/roster_window.py:2199 ../src/roster_window.py:3496
+#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
 msgid "You are participating in one or more group chats"
 msgstr "Ви берете участь у одній або декількох групових балачках"
 
-#: ../src/roster_window.py:2200 ../src/roster_window.py:3497
-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:2223 ../src/roster_window.py:3563
+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:2226
+#: ../src/roster_window.py:2249
 msgid "desync'ed"
 msgstr "розсинхронізація"
 
-#: ../src/roster_window.py:2288
+#: ../src/roster_window.py:2311
 msgid "Really quit Gajim?"
 msgstr "Справді вийти з Gajim?"
 
-#: ../src/roster_window.py:2289
+#: ../src/roster_window.py:2312
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Ви справді бажаєте вийти з Gajim?"
 
-#: ../src/roster_window.py:2290
+#: ../src/roster_window.py:2313
 msgid "Always close Gajim"
 msgstr "Завжди закривати Gajim"
 
-#: ../src/roster_window.py:2373
+#: ../src/roster_window.py:2396
 msgid "You have running file transfers"
 msgstr "Ви маєте активні перенесення файлів"
 
-#: ../src/roster_window.py:2374
-msgid "If you quit now, the file(s) being transfered will be stopped. Do you still want to quit?"
-msgstr "Якщо ви вийдете зараз, усі передачі файлів буде зупинено. Ви все ще бажаєте вийти?"
+#: ../src/roster_window.py:2397
+#, fuzzy
+msgid ""
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
+"want to quit?"
+msgstr ""
+"Якщо ви вийдете зараз, усі передачі файлів буде зупинено. Ви все ще бажаєте "
+"вийти?"
 
-#: ../src/roster_window.py:2405 ../src/roster_window.py:2653
+#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
 msgid "You have unread messages"
 msgstr "У вас є непрочитані повідомлення"
 
-#: ../src/roster_window.py:2406
-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:2429
+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:2654
+#: ../src/roster_window.py:2720
 msgid "You must read them before removing this transport."
 msgstr "Вам слід прочитати їх, перш ніж вилучати цей транспорт."
 
-#: ../src/roster_window.py:2657
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспорт \"%s\" буде вилучено"
 
-#: ../src/roster_window.py:2658
-msgid "You will no longer be able to send and receive messages from contacts using this transport."
-msgstr "Ви більше не зможете надсилати і отримувати повідомлення від контактів за допомогою цього транспорту."
+#: ../src/roster_window.py:2724
+msgid ""
+"You will no longer be able to send and receive messages from contacts using "
+"this transport."
+msgstr ""
+"Ви більше не зможете надсилати і отримувати повідомлення від контактів за "
+"допомогою цього транспорту."
 
-#: ../src/roster_window.py:2661
+#: ../src/roster_window.py:2727
 msgid "Transports will be removed"
 msgstr "Транспорти буде вилучено"
 
-#: ../src/roster_window.py:2666
+#: ../src/roster_window.py:2732
 #, python-format
-msgid "You will no longer be able to send and receive messages to contacts from these transports: %s"
-msgstr "Ви більше не зможете надсилати і отримувати повідомлення від контактів за допомогою цих транспортів: %s"
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports: %s"
+msgstr ""
+"Ви більше не зможете надсилати і отримувати повідомлення від контактів за "
+"допомогою цих транспортів: %s"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2800
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Ви маєте намір створити метаконтакт. Ви справді цього бажаєте?"
 
-#: ../src/roster_window.py:2736
-msgid "This contact will see you offline and you will not receive messages he will send you."
-msgstr "Цей контакт буде бачити вас як \"поза мережею\" та ви не будете отримувати від нього повідомлень."
+#: ../src/roster_window.py:2802
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+"Цей контакт буде бачити вас як \"поза мережею\" та ви не будете отримувати "
+"від нього повідомлень."
 
 #. it's jid
-#: ../src/roster_window.py:2827
+#: ../src/roster_window.py:2893
 msgid "Rename Contact"
 msgstr "Перейменувати контакт"
 
-#: ../src/roster_window.py:2828
+#: ../src/roster_window.py:2894
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Введіть новий псевдонім для контакту %s"
 
-#: ../src/roster_window.py:2835
+#: ../src/roster_window.py:2901
 msgid "Rename Group"
 msgstr "Перейменувати групу"
 
-#: ../src/roster_window.py:2836
+#: ../src/roster_window.py:2902
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Введіть нову назву для групи %s"
 
-#: ../src/roster_window.py:2881
+#: ../src/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Вилучити групу"
 
-#: ../src/roster_window.py:2882
+#: ../src/roster_window.py:2948
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Бажаєте вилучити групу %s з реєстру?"
 
-#: ../src/roster_window.py:2883
+#: ../src/roster_window.py:2949
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Крім того, вилучити всі контакти з цієї групи з вашого реєстру"
 
-#: ../src/roster_window.py:2922
+#: ../src/roster_window.py:2988
 msgid "Assign OpenPGP Key"
 msgstr "Призначити ключ OpenPGP"
 
-#: ../src/roster_window.py:2923
+#: ../src/roster_window.py:2989
 msgid "Select a key to apply to the contact"
 msgstr "Оберіть ключ для використання з цим контактом"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3372
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контакт «%s» буде вилучено з вашого реєстру"
 
-#: ../src/roster_window.py:3308
+#: ../src/roster_window.py:3374
 #, 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:3313
-msgid "By removing this contact you also remove authorization resulting in him or her always seeing you as offline."
-msgstr "Вилучення цього контакту призведе до вилучення уповноваження, отже він або вона не зможуть визначати, коли ви перебуватимете у мережі."
+#: ../src/roster_window.py:3379
+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:3319
+#: ../src/roster_window.py:3385
 msgid "Do you want to continue?"
 msgstr "Бажаєте продовжити виконання операції?"
 
-#: ../src/roster_window.py:3323
-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:3389
+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:3326
+#: ../src/roster_window.py:3392
 msgid "I want this contact to know my status after removal"
 msgstr "Я хочу, щоб цей контакт знав про мій стан після вилучення"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3330
+#: ../src/roster_window.py:3396
 msgid "Contacts will be removed from your roster"
 msgstr "Контакти буде вилучено з вашого реєстру"
 
-#: ../src/roster_window.py:3335
+#: ../src/roster_window.py:3401
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
 "you also remove authorization resulting in them always seeing you as offline."
 msgstr ""
 "Вилучення цих контактів:%s\n"
-"призведе до вилучення уповноваження, отже для них ви завжди залишатиметеся поза мережею."
+"призведе до вилучення уповноваження, отже для них ви завжди залишатиметеся "
+"поза мережею."
 
-#: ../src/roster_window.py:3393
-msgid "You are about to send a custom status. Are you sure you want  to continue?"
+#: ../src/roster_window.py:3459
+msgid ""
+"You are about to send a custom status. Are you sure you want  to continue?"
 msgstr "Ви маєте намір надіслати особливий статус. Ви справді цього бажаєте?"
 
-#: ../src/roster_window.py:3395
+#: ../src/roster_window.py:3461
 #, python-format
-msgid "This contact will temporarily see you as %(status)s, but only until you change your status. Then he or she will see your global status."
-msgstr "Цей контакт тимчасово бачитиме вас як %(status)s, но лише до зміни вашого статусу. Потім він бачитиме ваш глобальний статус."
+msgid ""
+"This contact will temporarily see you as %(status)s, but only until you "
+"change your status. Then he or she will see your global status."
+msgstr ""
+"Цей контакт тимчасово бачитиме вас як %(status)s, но лише до зміни вашого "
+"статусу. Потім він бачитиме ваш глобальний статус."
 
-#: ../src/roster_window.py:3414
+#: ../src/roster_window.py:3480
 msgid "No account available"
 msgstr "Немає жодного облікового запису"
 
-#: ../src/roster_window.py:3415
+#: ../src/roster_window.py:3481
 msgid "You must create an account before you can chat with other contacts."
-msgstr "Перш ніж ви зможете розпочати балачку з контактами, вам слід створити обліковий запис."
+msgstr ""
+"Перш ніж ви зможете розпочати балачку з контактами, вам слід створити "
+"обліковий запис."
 
-#: ../src/roster_window.py:4023
+#: ../src/roster_window.py:4095
 msgid "Metacontacts storage not supported by your server"
 msgstr "Збереження метаконтактів не підтримується вашим сервером"
 
-#: ../src/roster_window.py:4025
-msgid "Your server does not support storing metacontacts information. So those information will not be saved on next reconnection."
-msgstr "Ваш сервер не підтримує збереження відомостей щодо метаконтактів. Отже ці відомості не буде збережено до наступного з’єднання."
+#: ../src/roster_window.py:4097
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be saved on next reconnection."
+msgstr ""
+"Ваш сервер не підтримує збереження відомостей щодо метаконтактів. Отже ці "
+"відомості не буде збережено до наступного з’єднання."
 
-#: ../src/roster_window.py:4117
-msgid "You are about to create a metacontact. Are you sure you want to continue?"
+#: ../src/roster_window.py:4189
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Ви маєте намір створити метаконтакт. Ви справді цього бажаєте?"
 
-#: ../src/roster_window.py:4119
-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 "За допомогою метаконтактів можна збирати декілька контактів у одному рядку списку. Загалом кажучи, метаконтакти використовуються, якщо вашим контактом є особа з декількома обліковими записами або транспортами Jabber."
+#: ../src/roster_window.py:4191
+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 ""
+"За допомогою метаконтактів можна збирати декілька контактів у одному рядку "
+"списку. Загалом кажучи, метаконтакти використовуються, якщо вашим контактом "
+"є особа з декількома обліковими записами або транспортами Jabber."
 
-#: ../src/roster_window.py:4234
+#: ../src/roster_window.py:4306
 msgid "Invalid file URI:"
 msgstr "Некоректна адреса файла:"
 
-#: ../src/roster_window.py:4246
+#: ../src/roster_window.py:4318
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9008,12 +10190,12 @@ msgstr[0] "Ви справді бажаєте надіслати цей файл
 msgstr[1] "Ви справді бажаєте надіслати ці файли до %s:"
 msgstr[2] "Ви справді бажаєте надіслати ці файли до %s:"
 
-#: ../src/roster_window.py:4361
+#: ../src/roster_window.py:4433
 #, python-format
 msgid "Send %s to %s"
 msgstr "Надіслати %s до %s"
 
-#: ../src/roster_window.py:4367
+#: ../src/roster_window.py:4439
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Робить %s та %s метаконтактом."
@@ -9023,142 +10205,142 @@ msgstr "Робить %s та %s метаконтактом."
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4816 ../src/roster_window.py:4889
-#: ../src/roster_window.py:4898 ../src/statusicon.py:246
-#: ../src/statusicon.py:293 ../src/statusicon.py:299
+#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
+#: ../src/roster_window.py:4970 ../src/statusicon.py:263
+#: ../src/statusicon.py:310 ../src/statusicon.py:316
 #, python-format
 msgid "using account %s"
 msgstr "з облікового запису %s"
 
 #. add
-#: ../src/roster_window.py:4905
+#: ../src/roster_window.py:4977
 #, python-format
 msgid "to %s account"
 msgstr "до облікового запису %s"
 
 #. disco
-#: ../src/roster_window.py:4910
+#: ../src/roster_window.py:4982
 #, python-format
 msgid "using %s account"
 msgstr "з облікового запису %s"
 
-#: ../src/roster_window.py:4948 ../src/statusicon.py:309
+#: ../src/roster_window.py:5020 ../src/statusicon.py:326
 msgid "_Manage Bookmarks..."
 msgstr "_Керування закладками..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4968
+#: ../src/roster_window.py:5040
 #, python-format
 msgid "of account %s"
 msgstr "облікового запису %s"
 
-#: ../src/roster_window.py:5009
+#: ../src/roster_window.py:5081
 #, python-format
 msgid "for account %s"
 msgstr "до облікового запису %s"
 
-#: ../src/roster_window.py:5069 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
 msgid "_Change Status Message"
 msgstr "_Змінити повідомлення про стан"
 
-#: ../src/roster_window.py:5102
+#: ../src/roster_window.py:5174
 msgid "Publish Tune"
 msgstr "Оприлюднити музику"
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5176
 msgid "Publish Location"
 msgstr "Оприлюднити положення"
 
-#: ../src/roster_window.py:5107
+#: ../src/roster_window.py:5179
 msgid "Configure Services..."
 msgstr "Налаштувати служби..."
 
-#: ../src/roster_window.py:5252
+#: ../src/roster_window.py:5324
 msgid "_Maximize All"
 msgstr "_Максимізувати всі"
 
-#: ../src/roster_window.py:5262 ../src/roster_window.py:5436
+#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
 msgid "Send Group M_essage"
 msgstr "Надіслати групове п_овідомлення"
 
-#: ../src/roster_window.py:5270
+#: ../src/roster_window.py:5342
 msgid "To all users"
 msgstr "Усім користувачам"
 
-#: ../src/roster_window.py:5274
+#: ../src/roster_window.py:5346
 msgid "To all online users"
 msgstr "Усім користувачам на зв'язку"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5456
+#: ../src/roster_window.py:5528
 msgid "_Manage Contacts"
 msgstr "_Керування контактами"
 
 #. Edit Groups
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5537
 msgid "Edit _Groups"
 msgstr "Редагувати _групи"
 
 #. Send single message
-#: ../src/roster_window.py:5520
+#: ../src/roster_window.py:5592
 msgid "Send Single Message"
 msgstr "Надіслати окреме повідомлення"
 
 #. Execute Command
-#: ../src/roster_window.py:5567
+#: ../src/roster_window.py:5639
 msgid "Execute Command..."
 msgstr "Виконати команду..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5577
+#: ../src/roster_window.py:5649
 msgid "_Manage Transport"
 msgstr "_Керування транспортом"
 
 #. Modify Transport
-#: ../src/roster_window.py:5586
+#: ../src/roster_window.py:5658
 msgid "_Modify Transport"
 msgstr "_Змінити транспорт"
 
 #. Rename
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5668
 msgid "_Rename"
 msgstr "Пере_йменувати"
 
-#: ../src/roster_window.py:5656
+#: ../src/roster_window.py:5728
 msgid "_Maximize"
 msgstr "_Максимізувати"
 
-#: ../src/roster_window.py:5665
+#: ../src/roster_window.py:5737
 msgid "_Reconnect"
 msgstr "_Перез’єднати"
 
-#: ../src/roster_window.py:5672
+#: ../src/roster_window.py:5744
 msgid "_Disconnect"
 msgstr "_Роз'єднати"
 
 #. History manager
-#: ../src/roster_window.py:5754
+#: ../src/roster_window.py:5833
 msgid "History Manager"
 msgstr "Керування журналом"
 
-#: ../src/roster_window.py:5765
+#: ../src/roster_window.py:5844
 msgid "_Join New Group Chat"
 msgstr "_Приєднатись до нової групової балачки"
 
-#: ../src/roster_window.py:5938
+#: ../src/roster_window.py:6019
 msgid "Change Status Message..."
 msgstr "Змінити повідомлення про стан..."
 
-#: ../src/search_window.py:94
+#: ../src/search_window.py:105
 msgid "Waiting for results"
 msgstr "Очікування на результати"
 
-#: ../src/search_window.py:132 ../src/search_window.py:210
+#: ../src/search_window.py:143 ../src/search_window.py:220
 msgid "Error in received dataform"
 msgstr "Помилка у отриманих даних"
 
 #. No result
-#: ../src/search_window.py:166 ../src/search_window.py:202
+#: ../src/search_window.py:177 ../src/search_window.py:212
 msgid "No result"
 msgstr "Результату немає"
 
@@ -9171,14 +10353,15 @@ msgstr "Помилка під час запису на диск"
 msgid "Subject: %s"
 msgstr "Тема: %s"
 
-#: ../src/session.py:433 ../src/session.py:468
+#: ../src/session.py:447 ../src/session.py:491
 msgid "Confirm these session options"
 msgstr "Підтвердити параметри цих сеансів"
 
-#: ../src/session.py:435
-#, python-format
+#: ../src/session.py:448
+#, fuzzy, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
+"The remote client wants '\n"
+"                            'to negotiate an session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -9190,7 +10373,7 @@ msgstr ""
 "\n"
 "\tЧи всі вказані параметри є прийнятними?"
 
-#: ../src/session.py:469
+#: ../src/session.py:492
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9205,15 +10388,15 @@ msgstr ""
 "\n"
 "Продовжити цей сеанс?"
 
-#: ../src/statusicon.py:210
+#: ../src/statusicon.py:227
 msgid "_Change Status Message..."
 msgstr "_Змінити повідомлення про стан..."
 
-#: ../src/statusicon.py:322
+#: ../src/statusicon.py:339
 msgid "Hide _Roster"
 msgstr "Сховати реєстр"
 
-#: ../src/statusicon.py:333
+#: ../src/statusicon.py:350
 msgid "Hide this menu"
 msgstr "Сховати це меню"
 
@@ -9352,80 +10535,142 @@ msgstr ""
 "Ця служба не може надсилати у відповідь докладні відомості.\n"
 "Причиною є застарілість або пошкодженість служби"
 
-#: ../src/vcard.py:251
+#: ../src/vcard.py:265
 msgid "?Client:Unknown"
 msgstr "?Клієнт:Невідомий"
 
-#: ../src/vcard.py:253
+#: ../src/vcard.py:267
 msgid "?OS:Unknown"
 msgstr "?ОС:Невідома"
 
-#: ../src/vcard.py:274
+#: ../src/vcard.py:288
 msgid "?Time:Unknown"
 msgstr "?Час:Невідомий"
 
-#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
+#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
 #, python-format
 msgid "since %s"
 msgstr "з %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:345
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr "?Роль в груповій балачці:<b>Роль:</b>"
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:349
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Належність:</b>"
 
-#: ../src/vcard.py:343
-msgid "This contact is interested in your presence information, but you are not interested in his/her presence"
-msgstr "Цей контакт зацікавлений у ваших відомостях щодо присутності, але ви не цікавитеся відомостями щодо його або її присутності"
+#: ../src/vcard.py:357
+msgid ""
+"This contact is interested in your presence information, but you are not "
+"interested in his/her presence"
+msgstr ""
+"Цей контакт зацікавлений у ваших відомостях щодо присутності, але ви не "
+"цікавитеся відомостями щодо його або її присутності"
 
-#: ../src/vcard.py:345
-msgid "You are interested in the contact's presence information, but he/she is not interested in yours"
-msgstr "Ви зацікавлені у відомостях щодо присутності контакту, але він або вона не цікавляться вашими відомостями"
+#: ../src/vcard.py:359
+msgid ""
+"You are interested in the contact's presence information, but he/she is not "
+"interested in yours"
+msgstr ""
+"Ви зацікавлені у відомостях щодо присутності контакту, але він або вона не "
+"цікавляться вашими відомостями"
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:361
 msgid "You and the contact are interested in each other's presence information"
-msgstr "Ви і цей контакт взаємно зацікавлені у відомостях щодо присутності одне одного"
+msgstr ""
+"Ви і цей контакт взаємно зацікавлені у відомостях щодо присутності одне "
+"одного"
 
 #. None
-#: ../src/vcard.py:349
-msgid "You are not interested in the contact's presence, and neither he/she is interested in yours"
-msgstr "Ви не зацікавлені у присутності контакту, а він або вона у вашій присутності"
+#: ../src/vcard.py:363
+msgid ""
+"You are not interested in the contact's presence, and neither he/she is "
+"interested in yours"
+msgstr ""
+"Ви не зацікавлені у присутності контакту, а він або вона у вашій присутності"
 
-#: ../src/vcard.py:356
+#: ../src/vcard.py:370
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Ви очікуєте на відповідь контакту на ваш запит щодо підписки"
 
-#: ../src/vcard.py:358
+#: ../src/vcard.py:372
 msgid "There is no pending subscription request."
 msgstr "У черзі немає запитів на підписку."
 
-#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
+#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
 msgid " resource with priority "
 msgstr " пріоритетний ресурс"
 
+#~ msgid "@"
+#~ msgstr "@"
+
+#~ msgid "_Disable showing event in systray"
+#~ msgstr "_Вимкнути події появи у системному лотку"
+
+#~ msgid "_Show event in systray"
+#~ msgstr "_Показати подію у системному лотку"
+
+#~ msgid "Always use GNOME default applications"
+#~ msgstr "Завжди використовувати типові програми GNOME"
+
+#~ msgid "Always use Xfce default applications"
+#~ msgstr "Завжди використовувати типові програми Xfce"
+
+#~ msgid "Autodetect on every Gajim startup"
+#~ msgstr "Автоматично визначати при кожному старті Gajim"
+
+#~ msgid "Show systray:"
+#~ msgstr "_Показати подію у системному лотку"
+
+#~ msgid "Nickname not allowed: %s"
+#~ msgstr "Заборонений псевдонім: %s"
+
+#~ msgid "Room has been destroyed"
+#~ msgstr "Кімнату було знищено"
+
+#~ msgid "You can join this room instead: %s"
+#~ msgstr "Ви можете приєднатися до цієї кімнати замість %s"
+
+#~ msgid "I would like to add you to my roster."
+#~ msgstr "Я хочу додати вас до свого реєстру."
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "тепер ми підписані на %s"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "запит на скасування підписки від %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "підписку на %s скасовано"
+
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "JID %s не відповідає стандартам. Його не може бути додано до реєстру. "
+#~ "Скористайтеся інструментами для керування реєстром, наприклад, http://jru."
+#~ "jabberstudio.org/ для його вилучення"
+
 #~ msgid "Mic volume:"
 #~ msgstr "Гучність мікрофону"
 
 #~ msgid "Sound volume:"
 #~ msgstr "Гучність звуку"
 
-#~ msgid "_Available"
-#~ msgstr "_Доступний"
-
-#~ msgid "PEP node was not removed"
-#~ msgstr "Вузол повідомлення про стан було вилучено"
-
-#~ msgid "PEP node %(node)s was not removed: %(message)s"
-#~ msgstr "Вузол повідомлення про стан %(node)s було вилучено: %(message)s"
-
 #~ msgid "Account Modification"
 #~ msgstr "Зміна облікового запису"
 
-#~ msgid "Check this so Gajim will connect in port 5223 where legacy servers are expected to have SSL capabilities. Note that Gajim uses TLS encryption by default if broadcasted by the server, and with this option enabled TLS will be disabled"
-#~ msgstr "Позначте цей пункт, щоб Gajim використовував порт 5223 для з'єднання з застарілими серверами, які, як очікує програма використовують SSL-шифрування. Зауважте, що Gajim використовує TLS-шифрування, якщо не вказано іншого. Якщо позначити цей пункт шифрування буде вимкнено TLS"
+#~ msgid ""
+#~ "Check this so Gajim will connect in port 5223 where legacy servers are "
+#~ "expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
+#~ "default if broadcasted by the server, and with this option enabled TLS "
+#~ "will be disabled"
+#~ msgstr ""
+#~ "Позначте цей пункт, щоб Gajim використовував порт 5223 для з'єднання з "
+#~ "застарілими серверами, які, як очікує програма використовують SSL-"
+#~ "шифрування. Зауважте, що Gajim використовує TLS-шифрування, якщо не "
+#~ "вказано іншого. Якщо позначити цей пункт шифрування буде вимкнено TLS"
 
 #~ msgid "Edit Personal Information..."
 #~ msgstr "Редагувати особисті відомості..."
@@ -9433,8 +10678,12 @@ msgstr " пріоритетний ресурс"
 #~ msgid "Hostname: "
 #~ msgstr "Назва вузла: "
 
-#~ msgid "If checked, Gajim will store the password in ~/.gajim/config with 'read' permission only for you"
-#~ msgstr "Якщо буде позначено цей пункт, Gajim буде зберігати паролі у файлі ~/.gajim/config, доступ на запис до якого матимете лише ви"
+#~ msgid ""
+#~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+#~ "permission only for you"
+#~ msgstr ""
+#~ "Якщо буде позначено цей пункт, Gajim буде зберігати паролі у файлі ~/."
+#~ "gajim/config, доступ на запис до якого матимете лише ви"
 
 #~ msgid "Port: "
 #~ msgstr "Порт: "
@@ -9517,39 +10766,9 @@ msgstr " пріоритетний ресурс"
 #~ msgid "gtk-delete"
 #~ msgstr "gtk-delete"
 
-#~ msgid "Add this contact to roster (Ctrl+D)"
-#~ msgstr "Додати цей контакт до реєстру (Ctrl+D)"
-
-#~ msgid "Bookmark this room (Ctrl+B)"
-#~ msgstr "Зробити закладку на цій кімнаті (Ctrl+B)"
-
-#~ msgid "Browse the chat history (Ctrl+H)"
-#~ msgstr "Переглянути журнал балачки (Ctrl+H)"
-
-#~ msgid "Change the room's subject (Alt+T)"
-#~ msgstr "Змінити тему обговорення у кімнаті (Alt+T)"
-
-#~ msgid "Change your nickname (Ctrl+N)"
-#~ msgstr "Змінити ваш псевдонім (Ctrl+N)"
-
-#~ msgid "Invite contacts to the conversation (Ctrl+G)"
-#~ msgstr "Запросити контакти до спілкування (Ctrl+G)"
-
 #~ msgid "Send a file (Ctrl+F)"
 #~ msgstr "Надіслати файл (Ctrl+F)"
 
-#~ msgid "Show a list of emoticons (Alt+M)"
-#~ msgstr "Показати список емоційок (Alt+M)"
-
-#~ msgid "Show a list of formattings"
-#~ msgstr "Показати список інструментів форматування"
-
-#~ msgid "Show a menu of advanced functions (Alt+D)"
-#~ msgstr "Показати меню додаткових можливостей (Alt+A)"
-
-#~ msgid "Show the contact's profile (Ctrl+I)"
-#~ msgstr "Показати профіль контакту (Ctrl+I)"
-
 #~ msgid ""
 #~ "All chat states\n"
 #~ "Composing only\n"
@@ -9608,9 +10827,6 @@ msgstr " пріоритетний ресурс"
 #~ msgid "gtk-cancel"
 #~ msgstr "gtk-cancel"
 
-#~ msgid "_Preferences"
-#~ msgstr "_Параметри"
-
 #~ msgid "_Quit"
 #~ msgstr "Ви_йти"
 
@@ -9624,13 +10840,16 @@ msgstr " пріоритетний ресурс"
 #~ msgstr "Некоректна локальна адреса? :-O"
 
 #~ msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-#~ msgstr "Не знайдено пакунка pysqlite2 (або python-pysqlite2). Завершення роботи..."
+#~ msgstr ""
+#~ "Не знайдено пакунка pysqlite2 (або python-pysqlite2). Завершення роботи..."
 
 #~ msgid "Banners and clickable links"
 #~ msgstr "Банери та активні посилання"
 
 #~ msgid "Ability to have clickable URLs in chat and groupchat window banners."
-#~ msgstr "Можливість користуватися натисканням адрес URL у підписах вікон балачки і групової балачки."
+#~ msgstr ""
+#~ "Можливість користуватися натисканням адрес URL у підписах вікон балачки і "
+#~ "групової балачки."
 
 #~ msgid "Requires python-sexy."
 #~ msgstr "Потрібен python-sexy."
@@ -9638,11 +10857,18 @@ msgstr " пріоритетний ресурс"
 #~ msgid "GTK+ runtime is missing libglade support"
 #~ msgstr "У середовищі виконання GTK+ відсутня підтримка libglade"
 
-#~ msgid "Please remove your current GTK+ runtime and install the latest stable version from %s"
-#~ msgstr "Будь ласка, вилучіть поточні бібліотеки GTK+ з системи і встановіть останню стабільну версію цих бібліотек, яку можна знайти за адресою %s"
+#~ msgid ""
+#~ "Please remove your current GTK+ runtime and install the latest stable "
+#~ "version from %s"
+#~ msgstr ""
+#~ "Будь ласка, вилучіть поточні бібліотеки GTK+ з системи і встановіть "
+#~ "останню стабільну версію цих бібліотек, яку можна знайти за адресою %s"
 
-#~ msgid "Please make sure that GTK+ and PyGTK have libglade support in your system."
-#~ msgstr "Будь ласка, перевірте, чи увімкнено підтримку libglade у GTK+ і PyGTK на вашій системі."
+#~ msgid ""
+#~ "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#~ msgstr ""
+#~ "Будь ласка, перевірте, чи увімкнено підтримку libglade у GTK+ і PyGTK на "
+#~ "вашій системі."
 
 #~ msgid "Gajim needs PySQLite2 to run"
 #~ msgstr "Для запуску Gajim потрібен PySQLite2"
@@ -9656,17 +10882,29 @@ msgstr " пріоритетний ресурс"
 #~ msgid "gtk-ok"
 #~ msgstr "gtk-ok"
 
-#~ msgid "The host %s you configured as the ft_add_hosts_to_send advanced option is not valid, so ignored."
-#~ msgstr "Вузол %s, який було налаштовано вами за допомогою параметра ft_add_hosts_to_send advanced записано некоректно, його буде проігноровано."
+#~ msgid ""
+#~ "The host %s you configured as the ft_add_hosts_to_send advanced option is "
+#~ "not valid, so ignored."
+#~ msgstr ""
+#~ "Вузол %s, який було налаштовано вами за допомогою параметра "
+#~ "ft_add_hosts_to_send advanced записано некоректно, його буде "
+#~ "проігноровано."
 
 #~ msgid "OpenPGP passphrase was not given"
 #~ msgstr "Не було вказано пароля OpenPGP"
 
-#~ msgid "To continue sending and receiving messages, you will need to reconnect."
-#~ msgstr "Щоб продовжити надсилання і отримання повідомлень, вам потрібно повторити процедуру з’єднання."
+#~ msgid ""
+#~ "To continue sending and receiving messages, you will need to reconnect."
+#~ msgstr ""
+#~ "Щоб продовжити надсилання і отримання повідомлень, вам потрібно повторити "
+#~ "процедуру з’єднання."
 
-#~ msgid "You are not connected or not visible to others. Your message could not be sent."
-#~ msgstr "Ваш обліковий запис не з’єднано з сервером або цей обліковий запис перебуває у стані невидимості. Ваше повідомлення не може бути надіслано."
+#~ msgid ""
+#~ "You are not connected or not visible to others. Your message could not be "
+#~ "sent."
+#~ msgstr ""
+#~ "Ваш обліковий запис не з’єднано з сервером або цей обліковий запис "
+#~ "перебуває у стані невидимості. Ваше повідомлення не може бути надіслано."
 
 #~ msgid "[This message is encrypted]"
 #~ msgstr "[Це повідомлення зашифровано]"
@@ -9680,8 +10918,12 @@ msgstr " пріоритетний ресурс"
 #~ msgid "A icon in systemtray reflecting the current presence."
 #~ msgstr "Піктограма у системному лотку показує поточний стан присутності."
 
-#~ msgid "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-#~ msgstr "Потрібен пакунок python-gnome2-extras або модуль піктограми лотка (trayicon), зібраний з початкових кодів Gajim."
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compiled trayicon module from Gajim "
+#~ "sources."
+#~ msgstr ""
+#~ "Потрібен пакунок python-gnome2-extras або модуль піктограми лотка "
+#~ "(trayicon), зібраний з початкових кодів Gajim."
 
 #~ msgid "Requires PyGTK >= 2.10."
 #~ msgstr "Потрібний PyGTK >= 2.10."
@@ -9704,8 +10946,13 @@ msgstr " пріоритетний ресурс"
 #~ msgid "Usage: /%s, hide the chat buttons."
 #~ msgstr "Використання: /%s, сховає кнопки балачки."
 
-#~ msgid "Usage: /%(command)s <action>, sends action to the current group chat. Use third person. (e.g. /%(command)s explodes.)"
-#~ msgstr "Використання: /%(command)s <action>, надішле повідомлення про заняття до поточної групової балачки. Буде використано третю особу. (наприклад, /%(command)s впав під стілець.)"
+#~ msgid ""
+#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
+#~ "third person. (e.g. /%(command)s explodes.)"
+#~ msgstr ""
+#~ "Використання: /%(command)s <action>, надішле повідомлення про заняття до "
+#~ "поточної групової балачки. Буде використано третю особу. (наприклад, /"
+#~ "%(command)s впав під стілець.)"
 
 #~ msgid "Usage: /%s, sends a ping to the contact"
 #~ msgstr "Використання: /%s, надсилає луна-імпульс (пінг) контактові"
@@ -9745,44 +10992,91 @@ msgstr " пріоритетний ресурс"
 #~ "Виникла неоднозначність: %d псевдонімів збігаються.\n"
 #~ "Будь ласка, скористайтесь графічним інтерфейсом"
 
-#~ 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."
-#~ msgstr "Використання: /%s <псевдонім|JID> [причина], заблокувати JID у груповій розмові. Може бути виконано заміну псевдоніма учасника, але лише, якщо цей псевдонім не містить символів «@». Якщо особа з вказаним JID все ще бере участь у груповій балачці, її буде викинуто з балачки."
+#~ 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."
+#~ msgstr ""
+#~ "Використання: /%s <псевдонім|JID> [причина], заблокувати JID у груповій "
+#~ "розмові. Може бути виконано заміну псевдоніма учасника, але лише, якщо "
+#~ "цей псевдонім не містить символів «@». Якщо особа з вказаним JID все ще "
+#~ "бере участь у груповій балачці, її буде викинуто з балачки."
 
-#~ msgid "Usage: /%s <nickname>, opens a private chat window with the specified occupant."
-#~ msgstr "Використання: /%s <nickname>, відкрити вікно конфіденційної балачки з вказаним учасником."
+#~ msgid ""
+#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
+#~ "occupant."
+#~ msgstr ""
+#~ "Використання: /%s <nickname>, відкрити вікно конфіденційної балачки з "
+#~ "вказаним учасником."
 
-#~ msgid "Usage: /%s [reason], closes the current window or tab, displaying reason if specified."
-#~ msgstr "Використання: /%s [причина], закрити поточне вікно або вкладку з показом причини, якщо таку вказано."
+#~ msgid ""
+#~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
+#~ "if specified."
+#~ msgstr ""
+#~ "Використання: /%s [причина], закрити поточне вікно або вкладку з показом "
+#~ "причини, якщо таку вказано."
 
-#~ msgid "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally providing a reason."
-#~ msgstr "Використання: /%s <JID> [причина], запросити JID до групової балачки з необов’язковим зазначенням причини."
+#~ msgid ""
+#~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
+#~ "optionally providing a reason."
+#~ msgstr ""
+#~ "Використання: /%s <JID> [причина], запросити JID до групової балачки з "
+#~ "необов’язковим зазначенням причини."
 
-#~ msgid "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally using specified nickname."
-#~ msgstr "Використання: /%s <кімната>@<сервер>[/псевдонім], приєднатися до кімнати на сервері з необов’язковим вказаним псевдонімом."
+#~ msgid ""
+#~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
+#~ "optionally using specified nickname."
+#~ msgstr ""
+#~ "Використання: /%s <кімната>@<сервер>[/псевдонім], приєднатися до кімнати "
+#~ "на сервері з необов’язковим вказаним псевдонімом."
 
-#~ msgid "Usage: /%s <nickname> [reason], removes the occupant specified by nickname from the group chat and optionally displays a reason."
-#~ msgstr "Використання: /%s <псевдонім> [причина], вилучити учасника з вказаним псевдонімом з групової балачки з необов’язковим зазначенням причини."
+#~ msgid ""
+#~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
+#~ "nickname from the group chat and optionally displays a reason."
+#~ msgstr ""
+#~ "Використання: /%s <псевдонім> [причина], вилучити учасника з вказаним "
+#~ "псевдонімом з групової балачки з необов’язковим зазначенням причини."
 
-#~ msgid "Usage: /%s <nickname> [message], opens a private message window and sends message to the occupant specified by nickname."
-#~ msgstr "Використання: /%s <nickname> [message], відкрити вікно конфіденційного повідомлення і надіслати це повідомлення учаснику з вказаним псевдонімом."
+#~ msgid ""
+#~ "Usage: /%s <nickname> [message], opens a private message window and sends "
+#~ "message to the occupant specified by nickname."
+#~ msgstr ""
+#~ "Використання: /%s <nickname> [message], відкрити вікно конфіденційного "
+#~ "повідомлення і надіслати це повідомлення учаснику з вказаним псевдонімом."
 
 #~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-#~ msgstr "Використання: /%s <псевдонім>, змінити ваш псевдонім у поточній груповій балачці."
+#~ msgstr ""
+#~ "Використання: /%s <псевдонім>, змінити ваш псевдонім у поточній груповій "
+#~ "балачці."
 
 #~ msgid "Usage: /%s , display the names of group chat occupants."
 #~ msgstr "Використання: /%s , показати імена учасників групової балачки."
 
-#~ msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-#~ msgstr "Використання: /%s [тема], показати або оновити поточну тему групової балачки."
+#~ msgid ""
+#~ "Usage: /%s [topic], displays or updates the current group chat topic."
+#~ msgstr ""
+#~ "Використання: /%s [тема], показати або оновити поточну тему групової "
+#~ "балачки."
 
-#~ msgid "Usage: /%s <message>, sends a message without looking for other commands."
-#~ msgstr "Використання: /%s <message>, надіслати повідомлення без використання інших команд."
+#~ msgid ""
+#~ "Usage: /%s <message>, sends a message without looking for other commands."
+#~ msgstr ""
+#~ "Використання: /%s <message>, надіслати повідомлення без використання "
+#~ "інших команд."
 
-#~ msgid "Usage: /%s <nickname>, prevent <nickname> to send you messages or private messages."
-#~ msgstr "Використання: /%s <псевдонім>, заблокує для <псевдонім> можливість надсилати вам особисті повідомлення."
+#~ msgid ""
+#~ "Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
+#~ "messages."
+#~ msgstr ""
+#~ "Використання: /%s <псевдонім>, заблокує для <псевдонім> можливість "
+#~ "надсилати вам особисті повідомлення."
 
-#~ msgid "Usage: /%s <nickname>, allow <nickname> to send you messages and private messages."
-#~ msgstr "Використання: /%s <псевдонім>, дозволить <псевдонім> надсилати вам звичайні та особисті повідомлення."
+#~ msgid ""
+#~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
+#~ "messages."
+#~ msgstr ""
+#~ "Використання: /%s <псевдонім>, дозволить <псевдонім> надсилати вам "
+#~ "звичайні та особисті повідомлення."
 
 #~ msgid "B_OSH Port:"
 #~ msgstr "П_орт BOSH:"
@@ -9842,11 +11136,12 @@ msgstr " пріоритетний ресурс"
 #~ 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 ""
+#~ "Requires python-gnome2-extras or compilation of gtkspell module from "
+#~ "Gajim sources."
+#~ msgstr ""
+#~ "Потрібен пакунок python-gnome2-extras або модуль gtkspell, зібраний з "
+#~ "початкових кодів Gajim."
 
 #~ msgid "Idle"
 #~ msgstr "Відсутність активності"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4ab9860a18558f1678e67fdc36ce8a6165381180..428d195c9cc3f5150af0b552a8124280a4fd8084 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,11 +5,15 @@
 # wwld <wwld@radio.lzusiyu.org>, 2005.
 # kangkang <kanger@gamil.com>, 2005.
 #
+#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-27 11:28+0200\n"
+"POT-Creation-Date: 2010-10-01 20:39+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"
@@ -30,7 +34,7 @@ msgstr "加入群聊(_G)"
 msgid "_Add Contact..."
 msgstr "添加联系人(_A)..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:17
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
 msgid "_Discover Services"
 msgstr "发掘服务(_D)"
 
@@ -52,7 +56,7 @@ msgstr "打开 Gmail 收件箱(_O)"
 msgid "_Personal Events"
 msgstr "个人信息"
 
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:23
+#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
 #, fuzzy
 msgid "_Start Chat..."
 msgstr "开始聊天(_S)"
@@ -87,76 +91,72 @@ msgid "<b>Please select a server</b>"
 msgstr ""
 
 #: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid "@"
-msgstr ""
-
-#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
 msgstr ""
 
-#: ../data/gui/account_creation_wizard_window.ui.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:10
 #, fuzzy
 msgid "Anon_ymous authentication"
 msgstr "使用验证"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Connect when I press Finish"
 msgstr "当我点击“结束”时连接"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim： 帐户创建向导"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 #, fuzzy
 msgid "I already have an account I want to _use"
 msgstr "我已经拥有了一个帐户"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I want to _register for a new account"
 msgstr "我想注册一个新帐户(_R)"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:16
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 #: ../data/gui/accounts_window.ui.h:28
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "如果选定，Gajim 会记录本帐户密码"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:17
+#: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
 msgstr "管理..."
 
-#: ../data/gui/account_creation_wizard_window.ui.h:18
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
 #: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2263 ../src/config.py:2342
-#: ../src/config.py:2355 ../src/config.py:3596 ../src/config.py:3671
-#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513
-#: ../src/dialogs.py:526 ../src/roster_window.py:2890
-#: ../src/roster_window.py:2896 ../src/roster_window.py:2901
+#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
+#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
+#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
+#: ../src/dialogs.py:527 ../src/roster_window.py:2956
+#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
 msgid "None"
 msgstr "æ— "
 
-#: ../data/gui/account_creation_wizard_window.ui.h:19
+#: ../data/gui/account_creation_wizard_window.ui.h:18
 #, fuzzy
 msgid "Prox_y:"
 msgstr "代理服务器："
 
-#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #: ../data/gui/accounts_window.ui.h:48
 msgid "Save pass_word"
 msgstr "保存密码(_W)"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:21
+#: ../data/gui/account_creation_wizard_window.ui.h:20
 msgid "Set my profile when I connect"
 msgstr "当连接上时设置我的模版"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:22
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Use custom hostname/port"
 msgstr "使用自定义主机名/端口号"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:23
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -164,35 +164,35 @@ msgstr ""
 "您需要一个帐户来连接\n"
 "Jabber 网络"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:25
-#: ../data/gui/roster_window.ui.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:16
 msgid "_Advanced"
 msgstr "高级(_A)"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:25
 msgid "_Finish"
 msgstr "完成(_F)"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:27
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 #, fuzzy
 msgid "_Hostname:"
 msgstr "主机名："
 
-#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #: ../data/gui/accounts_window.ui.h:62
 msgid "_Jabber ID:"
 msgstr "Jabber ID(_J)："
 
-#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:28
 #: ../data/gui/accounts_window.ui.h:64
 msgid "_Password:"
 msgstr "密码(_P)："
 
-#: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:29
 msgid "_Port:"
 msgstr "端口(_P)"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:31
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Server:"
 msgstr "服务器(_S)："
 
@@ -304,17 +304,17 @@ msgstr "姓："
 #. No configured account
 #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
 #: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592
-#: ../src/notify.py:608
+#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
+#: ../src/notify.py:616
 msgid "Gajim"
 msgstr "Gajim"
 
 #. FIXME: Ugly workaround.
 #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
 #. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:61
-#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121
-#: ../src/roster_window.py:2832 ../src/roster_window.py:5379
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
+#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
 msgid "General"
 msgstr "常规"
 
@@ -367,7 +367,7 @@ msgstr "服务器中保存的关于您的信息"
 
 #: ../data/gui/accounts_window.ui.h:35
 #: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:830
+#: ../src/dialogs.py:831
 msgid "Jabber ID:"
 msgstr "Jabber ID"
 
@@ -381,7 +381,7 @@ msgid "Mer_ge accounts"
 msgstr "合并帐户(_G)"
 
 #: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2356
+#: ../src/config.py:2358
 msgid "No key selected"
 msgstr "没有选择钥匙"
 
@@ -407,7 +407,7 @@ msgid "Priority will change automatically according to your status."
 msgstr "优先级将根据您的状态自动转换。"
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5329
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
 msgid "Re_name"
 msgstr "重命名(_N)"
 
@@ -646,41 +646,46 @@ msgstr "删除每日消息"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
 #, fuzzy
+msgid "Edit Archi_ving Preferences"
+msgstr "首选项(_P)"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#, fuzzy
 msgid "Edit _Privacy Lists..."
 msgstr "私人列表(_P)"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 #, fuzzy
 msgid "Sends a message to users currently connected to this server"
 msgstr "发送消息至连接到当前服务器的用户"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 #, fuzzy
 msgid "Set MOTD..."
 msgstr "设定 MOTD"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "设定每日消息"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Show _XML Console"
 msgstr "显示 XML 控制台(_X)"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "æ›´æ–° MOTD"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "更新每日消息"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:11
 msgid "_Administrator"
 msgstr "管理员(_A)"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:11
+#: ../data/gui/advanced_menuitem_menu.ui.h:12
 #, fuzzy
 msgid "_Send Server Message..."
 msgstr "发送服务器消息(_S)"
@@ -715,7 +720,7 @@ msgid "All statuses"
 msgstr "所有状态"
 
 #: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:233
+#: ../src/common/commands.py:106 ../src/common/helpers.py:239
 #: ../src/tooltips.py:193
 msgid "Away"
 msgstr "离开"
@@ -768,7 +773,7 @@ msgid "Have "
 msgstr "有"
 
 #: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:243
+#: ../src/common/helpers.py:249
 msgid "Invisible"
 msgstr "隐身"
 
@@ -777,7 +782,7 @@ msgid "Launch a command"
 msgstr "启动命令"
 
 #: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:216 ../src/tooltips.py:197
+#: ../src/common/helpers.py:222 ../src/tooltips.py:197
 msgid "Not Available"
 msgstr "不可用"
 
@@ -820,12 +825,13 @@ msgid "_Disable existing sound for this event"
 msgstr "禁用现有的此事件的声音(_D)"
 
 #: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in roster"
+#, fuzzy
+msgid "_Disable showing event in notification area"
 msgstr "禁用在名单中显示事件(_D)"
 
 #: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in systray"
-msgstr "禁用在系统托盘显示事件(_D)"
+msgid "_Disable showing event in roster"
+msgstr "禁用在名单中显示事件(_D)"
 
 #: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
@@ -836,12 +842,13 @@ msgid "_Open chat window with user"
 msgstr "与用户打开聊天窗口(_O)"
 
 #: ../data/gui/advanced_notifications_window.ui.h:35
-msgid "_Show event in roster"
+#, fuzzy
+msgid "_Show event in notification area"
 msgstr "在名单中显示事件(_S)"
 
 #: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in systray"
-msgstr "在系统托盘中显示事件(_S)"
+msgid "_Show event in roster"
+msgstr "在名单中显示事件(_S)"
 
 #: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
@@ -869,6 +876,45 @@ msgstr "群组"
 msgid "when I'm in"
 msgstr "当我在"
 
+#: ../data/gui/archiving_preferences_window.ui.h:1
+msgid "<i>Method Auto</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "<i>Method Local</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:3
+msgid "<i>Method Manual</i>"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:4
+#, fuzzy
+msgid "Auto"
+msgstr "自动加入"
+
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Concede"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "Forbid"
+msgstr ""
+
+#: ../data/gui/archiving_preferences_window.ui.h:7
+#, fuzzy
+msgid "No"
+msgstr "æ— "
+
+#: ../data/gui/archiving_preferences_window.ui.h:8
+#, fuzzy
+msgid "Prefer"
+msgstr "参数"
+
+#: ../data/gui/archiving_preferences_window.ui.h:9
+msgid "Yes"
+msgstr ""
+
 #: ../data/gui/atom_entry_window.ui.h:1
 #, fuzzy
 msgid "Entry:"
@@ -900,8 +946,8 @@ msgstr "联系人"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5348
-#: ../src/roster_window.py:5476 ../src/roster_window.py:5609
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
+#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
 msgid "_Unblock"
 msgstr ""
 
@@ -995,7 +1041,7 @@ msgid "_Start Chat"
 msgstr "开始聊天(_S)"
 
 #. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4184
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
 msgid "#"
 msgstr "#"
 
@@ -1043,13 +1089,55 @@ msgstr ""
 msgid "9"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:13
+#, fuzzy
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "向名单添加联系人"
+
 #: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
+msgid "Browse the chat history (Ctrl+H)"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:15
+#, fuzzy
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "正在专注于聊天"
+
+#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+#, fuzzy
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "点这里插入表情符 (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
+#, fuzzy
+msgid "Show a list of formattings"
+msgstr "点这里插入表情符 (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "点这里插入表情符 (Alt+M)"
+
+#: ../data/gui/chat_control.ui.h:19
+#, fuzzy
+msgid "Show the contact's profile (Ctrl+I)"
+msgstr "向名单添加联系人"
+
+#: ../data/gui/chat_control.ui.h:20
+msgid "Toggle audio session"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:21
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
 #: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
 msgid "_Send"
 msgstr "发送(_S)"
 
-#: ../data/gui/chat_control.ui.h:15 ../data/gui/groupchat_control.ui.h:3
+#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
 msgid "label"
 msgstr ""
 
@@ -1103,8 +1191,8 @@ msgstr "编辑群组"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5284
-#: ../src/roster_window.py:5444
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
+#: ../src/roster_window.py:5516
 msgid "In_vite to"
 msgstr "邀请到(_V)"
 
@@ -1118,8 +1206,8 @@ msgstr "联系人"
 msgid "Remo_ve"
 msgstr "移除(_R)"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5294
-#: ../src/roster_window.py:5533
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
+#: ../src/roster_window.py:5605
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "发送自定义 XML"
@@ -1155,8 +1243,8 @@ msgid "_Allow him/her to see my status"
 msgstr "允许他/她查看我的状态(_A)"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5482 ../src/roster_window.py:5612
+#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
+#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
 msgid "_Block"
 msgstr ""
 
@@ -1166,8 +1254,8 @@ msgstr "禁止他/她查看我的状态(_F)"
 
 #: ../data/gui/contact_context_menu.ui.h:20
 #: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:21
-#: ../src/roster_window.py:5683
+#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
+#: ../src/roster_window.py:5755
 msgid "_History"
 msgstr "历史(_H)"
 
@@ -1305,7 +1393,7 @@ msgstr "<b>聊天标签颜色</b>"
 msgid "Account row"
 msgstr "账户"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:925
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
 msgid "Bold"
 msgstr "粗体"
 
@@ -1343,7 +1431,7 @@ msgstr "群组"
 msgid "Inactive"
 msgstr "未活动的"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:926
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
 msgid "Italic"
 msgstr "斜体"
 
@@ -1394,7 +1482,7 @@ msgstr "更换主题(_S)"
 msgid "Configure _Room..."
 msgstr "设置房间(_R)"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1782
+#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
 #, fuzzy
 msgid "_Bookmark"
 msgstr "将本房间加入书签(_B)"
@@ -1458,20 +1546,34 @@ msgstr "发送私聊消息(_S)"
 msgid "_Voice"
 msgstr "语音(_V)"
 
+#: ../data/gui/groupchat_control.ui.h:1
+#, fuzzy
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "将本房间加入书签(_B)"
+
+#: ../data/gui/groupchat_control.ui.h:3
+msgid "Change the room's subject (Alt+T)"
+msgstr ""
+
+#: ../data/gui/groupchat_control.ui.h:4
+#, fuzzy
+msgid "Change your nickname (Ctrl+N)"
+msgstr "更换昵称(_N)"
+
 #: ../data/gui/groups_post_window.ui.h:1
 #, fuzzy
 msgid "Create new post"
 msgstr "新发表"
 
-#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
-msgid "From"
-msgstr "来自"
+#: ../data/gui/groups_post_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:2
+msgid "From:"
+msgstr "从："
 
-#. holds subject
-#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
-#: ../src/history_manager.py:219
-msgid "Subject"
-msgstr "主题"
+#: ../data/gui/groups_post_window.ui.h:3
+#: ../data/gui/single_message_window.ui.h:7
+msgid "Subject:"
+msgstr "主题："
 
 #: ../data/gui/history_manager.ui.h:1
 #, fuzzy
@@ -1494,8 +1596,8 @@ msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Gajim 历史记录管理器"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3208
-#: ../src/dialogs.py:3305
+#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
+#: ../src/dialogs.py:3321
 msgid "Delete"
 msgstr "删除"
 
@@ -1549,12 +1651,75 @@ msgstr "查找"
 msgid "_Log conversation history"
 msgstr "记录聊天历史(_L)"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
+msgid "approve"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:2
+msgid "body"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:3
+msgid "concede"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:4
+msgid "expire"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:5
+msgid "false"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:6
+msgid "forbid"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:7
+#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+msgid "jid"
+msgstr "JID"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:8
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
+#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
+msgid "message"
+msgstr "消息"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
+msgid "oppose"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
+#, fuzzy
+msgid "otr"
+msgstr "主机(_H)："
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:11
+msgid "prefer"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:12
+msgid "require"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:13
+msgid "save"
+msgstr ""
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:14
+msgid "stream"
+msgstr ""
+
 #: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
 msgid "Bro_wse Rooms"
 msgstr "浏览(_B)"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2180
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
 msgid "Join Group Chat"
 msgstr "加入群聊"
 
@@ -1592,8 +1757,8 @@ msgstr "服务器："
 msgid "_Bookmark this room"
 msgstr "将本房间加入书签(_B)"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1341
-#: ../src/disco.py:1786
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../src/disco.py:1804
 msgid "_Join"
 msgstr "加入(_J)"
 
@@ -1703,6 +1868,75 @@ msgstr "用户名(_U)："
 msgid "Passphrase"
 msgstr "密文"
 
+#: ../data/gui/plugins_window.ui.h:1
+msgid "&lt;empty&gt;"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:2
+msgid "<empty>"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:3
+#, fuzzy
+msgid "Authors:"
+msgstr "授权(_V)"
+
+#: ../data/gui/plugins_window.ui.h:4
+#, fuzzy
+msgid "Available"
+msgstr "在线(_A)"
+
+#: ../data/gui/plugins_window.ui.h:5
+#, fuzzy
+msgid "Configure"
+msgstr "继续(_C)"
+
+#: ../data/gui/plugins_window.ui.h:6
+#, fuzzy
+msgid "Descrition:"
+msgstr "描述： %s"
+
+#: ../data/gui/plugins_window.ui.h:7
+#, fuzzy
+msgid "Homepage:"
+msgstr "主页："
+
+#: ../data/gui/plugins_window.ui.h:8
+msgid "Install"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:9
+#, fuzzy
+msgid "Installed"
+msgstr "已冻结"
+
+#: ../data/gui/plugins_window.ui.h:10
+msgid ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialization."
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:11
+msgid "Plugins"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:12
+msgid "Uninstall"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:13
+#, fuzzy
+msgid "Version:"
+msgstr "GTK+ 版本："
+
+#: ../data/gui/plugins_window.ui.h:14
+msgid "button"
+msgstr ""
+
+#: ../data/gui/plugins_window.ui.h:15
+msgid "homepage url"
+msgstr ""
+
 #: ../data/gui/popup_notification_window.ui.h:1
 #, fuzzy
 msgid "Event Type"
@@ -1838,125 +2072,108 @@ msgid "Always"
 msgstr "离开"
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Always use GNOME default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:32
-msgid "Always use KDE default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:33
-msgid "Always use Xfce default applications"
-msgstr ""
-
-#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "询问状态消息，当我："
 
-#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
 msgid "Audio / Video"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:33
 msgid "Audio input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Audio output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:38
-#, fuzzy
-msgid "Autodetect on every Gajim startup"
-msgstr "Gajim 启动时连接(_O)"
-
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:35
 #, fuzzy
 msgid "Chat message:"
 msgstr "状态消息：(_S)"
 
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:36
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:37
 #, fuzzy
 msgid "Composing only"
 msgstr "正在编写"
 
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:38
 msgid "Configure color and font of the interface"
 msgstr "配置界面颜色与字体"
 
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
 msgid "Contact's message:"
 msgstr "状态消息：(_S)"
 
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "联系人名"
 
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:41
 #, fuzzy
 msgid "Custom"
 msgstr "<b>自定义</b>"
 
-#: ../data/gui/preferences_window.ui.h:46
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Detached roster with chat grouped by account"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Detached roster with detached chats"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:45
 msgid "Detached roster with single chat"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
-#: ../src/config.py:671
+#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
+#: ../src/config.py:665
 msgid "Disabled"
 msgstr "禁用"
 
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:47
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "显示名单中的联系人明细(_V)"
 
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:48
 msgid "Display _extra email details"
 msgstr "显示扩展电子邮件详情(_E)"
 
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:49
 #, fuzzy
 msgid "Display _location of contacts in roster"
 msgstr "显示名单中的联系人明细(_V)"
 
-#: ../data/gui/preferences_window.ui.h:54
+#: ../data/gui/preferences_window.ui.h:50
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "显示名单中的联系人明细(_V)"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display a_vatars of contacts in roster"
 msgstr "显示名单中的联系人明细(_V)"
 
-#: ../data/gui/preferences_window.ui.h:56
+#: ../data/gui/preferences_window.ui.h:52
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "显示名单中的联系人明细(_V)"
 
-#: ../data/gui/preferences_window.ui.h:57
+#: ../data/gui/preferences_window.ui.h:53
 msgid "Display status _messages of contacts in roster"
 msgstr "显示名单中联系人的状态消息(_M)"
 
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:54
 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 "
@@ -1965,7 +2182,7 @@ msgstr ""
 "Gajim 可以收发您与联系人所进行谈话的相关信息。此处您可是指定您想在聊天窗口中"
 "显示的聊天状态。"
 
-#: ../data/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:55
 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 "
@@ -1974,86 +2191,86 @@ msgstr ""
 "Gajim 可以收发您与联系人所进行谈话的相关信息。此处您可是指定发给第三方的角"
 "色。"
 
-#: ../data/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:56
 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/gui/preferences_window.ui.h:62
+#: ../data/gui/preferences_window.ui.h:58
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "在群聊窗口中隐藏按钮。"
 
-#: ../data/gui/preferences_window.ui.h:63
+#: ../data/gui/preferences_window.ui.h:59
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
 msgstr "如果选定，Gajim 会在启动时加入聊天群组"
 
-#: ../data/gui/preferences_window.ui.h:64
+#: ../data/gui/preferences_window.ui.h:60
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr "如果选中，Gajim 将包含关于新的电子邮件发送者的信息"
 
-#: ../data/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:61
 #, fuzzy
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr "如果选定，Gajim 同样可以显示系统托盘图标"
 
-#: ../data/gui/preferences_window.ui.h:66
+#: ../data/gui/preferences_window.ui.h:62
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
 msgstr "如果选定，Gajim 会在名单和群聊窗口中显示名单中的联系人明细"
 
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
 msgstr "如果选定，Gajim 会在名单和群聊窗口中联系人名下方显示联系人状态消息"
 
-#: ../data/gui/preferences_window.ui.h:69
+#: ../data/gui/preferences_window.ui.h:65
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr "如果选定，Gajim 会在名单和群聊窗口中显示名单中的联系人明细"
 
-#: ../data/gui/preferences_window.ui.h:70
+#: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the location of contacts in the roster window"
 msgstr "如果选定，Gajim 会在名单和群聊窗口中显示名单中的联系人明细"
 
-#: ../data/gui/preferences_window.ui.h:71
+#: ../data/gui/preferences_window.ui.h:67
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr "如果选定，Gajim 会在名单和群聊窗口中显示名单中的联系人明细"
 
-#: ../data/gui/preferences_window.ui.h:72
+#: ../data/gui/preferences_window.ui.h:68
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr "如果选定，Gajim 会在名单和群聊窗口中显示名单中的联系人明细"
 
-#: ../data/gui/preferences_window.ui.h:73
+#: ../data/gui/preferences_window.ui.h:69
 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/gui/preferences_window.ui.h:74
+#: ../data/gui/preferences_window.ui.h:70
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -2063,21 +2280,21 @@ msgstr ""
 "当被不在名单中的联系人骚扰时，检查此选项。它会屏蔽所有名单之外联系人的消息，"
 "请谨慎使用。"
 
-#: ../data/gui/preferences_window.ui.h:75
+#: ../data/gui/preferences_window.ui.h:71
 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/gui/preferences_window.ui.h:76
+#: ../data/gui/preferences_window.ui.h:72
 #, fuzzy
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
 msgstr "如果选中，Gajim 将包含关于新的电子邮件发送者的信息"
 
-#: ../data/gui/preferences_window.ui.h:77
+#: ../data/gui/preferences_window.ui.h:73
 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, "
@@ -2086,116 +2303,116 @@ msgstr ""
 "如果选定，Gajim 会以协议特定方式显示状态图标。(例如，MSN 联系人会以 MSN 相同"
 "图标方式显示，以表示在线，离开，忙，等等...)"
 
-#: ../data/gui/preferences_window.ui.h:78
+#: ../data/gui/preferences_window.ui.h:74
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:79
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
 msgstr "如果不禁用，Gajim 会用相应的图片表情符替代字符表情,例如“:)”"
 
-#: ../data/gui/preferences_window.ui.h:80
+#: ../data/gui/preferences_window.ui.h:76
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:81
+#: ../data/gui/preferences_window.ui.h:77
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "消息窗口：(_W)"
 
-#: ../data/gui/preferences_window.ui.h:82
+#: ../data/gui/preferences_window.ui.h:78
 msgid "Ma_nage..."
 msgstr "管理...(_N)"
 
-#: ../data/gui/preferences_window.ui.h:83
+#: ../data/gui/preferences_window.ui.h:79
 #, fuzzy
 msgid "Never"
 msgstr "从不(_N)"
 
-#: ../data/gui/preferences_window.ui.h:84
+#: ../data/gui/preferences_window.ui.h:80
 #, fuzzy
 msgid "Notifications"
 msgstr "帐户修改"
 
-#: ../data/gui/preferences_window.ui.h:85
+#: ../data/gui/preferences_window.ui.h:81
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "提醒我关于联系人："
 
-#: ../data/gui/preferences_window.ui.h:86
+#: ../data/gui/preferences_window.ui.h:82
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "提醒我关于联系人："
 
-#: ../data/gui/preferences_window.ui.h:87
+#: ../data/gui/preferences_window.ui.h:83
 #, fuzzy
 msgid "Notify me about it"
 msgstr "提醒我(_N)"
 
-#: ../data/gui/preferences_window.ui.h:88
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notify on new _GMail email"
 msgstr "新 Gmail 邮件通知"
 
-#: ../data/gui/preferences_window.ui.h:89
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Only when pending events"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:90
+#: ../data/gui/preferences_window.ui.h:86
 #, fuzzy
 msgid "Personal Events"
 msgstr "个人信息"
 
-#: ../data/gui/preferences_window.ui.h:91
+#: ../data/gui/preferences_window.ui.h:87
 msgid "Play _sounds"
 msgstr "播放声音(_S)"
 
-#: ../data/gui/preferences_window.ui.h:92
+#: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
 msgid "Pop it up"
 msgstr "弹出(_P)"
 
-#: ../data/gui/preferences_window.ui.h:93
+#: ../data/gui/preferences_window.ui.h:89
 msgid "Preferences"
 msgstr "参数"
 
-#: ../data/gui/preferences_window.ui.h:94
+#: ../data/gui/preferences_window.ui.h:90
 msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:96
+#: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
 msgid "STUN server:"
 msgstr "服务器："
 
-#: ../data/gui/preferences_window.ui.h:97
+#: ../data/gui/preferences_window.ui.h:93
 #, fuzzy
-msgid "Show only in roster"
-msgstr "只显示名单中(_R)"
+msgid "Show notification area icon:"
+msgstr "使用托盘图标(aka. 提示区域图表)(_R)"
 
-#: ../data/gui/preferences_window.ui.h:98
+#: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
-msgid "Show systray:"
-msgstr "在系统托盘中显示事件(_S)"
+msgid "Show only in roster"
+msgstr "只显示名单中(_R)"
 
-#: ../data/gui/preferences_window.ui.h:99
+#: ../data/gui/preferences_window.ui.h:95
 msgid "Sign _in"
 msgstr "登录(I)"
 
-#: ../data/gui/preferences_window.ui.h:100
+#: ../data/gui/preferences_window.ui.h:96
 msgid "Sign _out"
 msgstr "退出登录(_O)"
 
-#: ../data/gui/preferences_window.ui.h:101
+#: ../data/gui/preferences_window.ui.h:97
 msgid "Single window for everything"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:102
+#: ../data/gui/preferences_window.ui.h:98
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2203,30 +2420,30 @@ msgstr ""
 "一些消息会包含丰富的内容(例如 格式，颜色) 。如果选定，Gajim 将显示原本的消息"
 "内容。"
 
-#: ../data/gui/preferences_window.ui.h:103
+#: ../data/gui/preferences_window.ui.h:99
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "按状态分类联系人(_S)"
 
-#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
 msgid "Status"
 msgstr "状态"
 
-#: ../data/gui/preferences_window.ui.h:105
+#: ../data/gui/preferences_window.ui.h:101
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "默认状态图标设置:(_I)"
 
-#: ../data/gui/preferences_window.ui.h:106
+#: ../data/gui/preferences_window.ui.h:102
 #, fuzzy
 msgid "Style"
 msgstr "已冻结"
 
-#: ../data/gui/preferences_window.ui.h:107
+#: ../data/gui/preferences_window.ui.h:103
 msgid "T_heme:"
 msgstr "主题：(_H)"
 
-#: ../data/gui/preferences_window.ui.h:108
+#: ../data/gui/preferences_window.ui.h:104
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2234,7 +2451,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:111
+#: ../data/gui/preferences_window.ui.h:107
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2242,131 +2459,135 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:114
+#: ../data/gui/preferences_window.ui.h:110
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "使用代理的图标设定(_T)"
 
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:111
+msgid "Use default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:112
 msgid "Use system _default"
 msgstr "使用系统默认(_D)"
 
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:113
 msgid "Video framerate"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:117
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Video input device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:118
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Video output device"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:119
+#: ../data/gui/preferences_window.ui.h:116
 msgid "Video size"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:120
+#: ../data/gui/preferences_window.ui.h:117
 #, fuzzy
 msgid "When new event is received:"
 msgstr "当新事件发生时"
 
-#: ../data/gui/preferences_window.ui.h:121
+#: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
 msgid "Your message:"
 msgstr "错误消息：%s"
 
-#: ../data/gui/preferences_window.ui.h:122
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your nickname:"
 msgstr "在昵称前：(_E)"
 
-#: ../data/gui/preferences_window.ui.h:123
+#: ../data/gui/preferences_window.ui.h:120
 #, fuzzy
 msgid "_Away after:"
 msgstr "自动离开(_A)："
 
-#: ../data/gui/preferences_window.ui.h:124
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
 msgstr "浏览器(_B)："
 
-#: ../data/gui/preferences_window.ui.h:125
+#: ../data/gui/preferences_window.ui.h:122
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "显示聊天状态信息(_F)："
 
-#: ../data/gui/preferences_window.ui.h:126
+#: ../data/gui/preferences_window.ui.h:123
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "表情符："
 
-#: ../data/gui/preferences_window.ui.h:127
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_File manager:"
 msgstr "文件管理器：(_F)"
 
-#: ../data/gui/preferences_window.ui.h:128
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_Highlight misspelled words"
 msgstr "拼写检查(_H)"
 
-#: ../data/gui/preferences_window.ui.h:129
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Ignore events from contacts not in the roster"
 msgstr "忽略名单以外的联系人触发的事件(_I)"
 
-#: ../data/gui/preferences_window.ui.h:130
+#: ../data/gui/preferences_window.ui.h:127
 #, fuzzy
 msgid "_Ignore rich content in incoming messages"
 msgstr "忽略收到的消息中的扩展内容"
 
-#: ../data/gui/preferences_window.ui.h:131
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Log status changes of contacts"
 msgstr "记录联系人状态变化(_L)"
 
-#: ../data/gui/preferences_window.ui.h:132
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Mail client:"
 msgstr "邮件客户端(_M)："
 
-#: ../data/gui/preferences_window.ui.h:133
+#: ../data/gui/preferences_window.ui.h:130
 #, fuzzy
 msgid "_Not available after:"
 msgstr "自动不可用(_N)："
 
-#: ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Open..."
 msgstr "打开...(_O)"
 
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Reset to Default Colors"
 msgstr "恢复为默认颜色设置(_R)"
 
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:133
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "显示聊天状态信息(_F)："
 
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Status message:"
 msgstr "状态消息：(_S)"
 
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:140
+#: ../data/gui/preferences_window.ui.h:137
 #, fuzzy
 msgid "in _group chats"
 msgstr "加入群聊(_G)"
 
-#: ../data/gui/preferences_window.ui.h:141
+#: ../data/gui/preferences_window.ui.h:138
 #, fuzzy
 msgid "in _roster"
 msgstr "不在名单中"
 
-#: ../data/gui/preferences_window.ui.h:142
+#: ../data/gui/preferences_window.ui.h:139
 msgid "minutes"
 msgstr "分钟"
 
@@ -2419,7 +2640,7 @@ msgstr "Jabber ID"
 msgid "Order:"
 msgstr "订阅："
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3436
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
 msgid "Privacy List"
 msgstr "私人列表"
 
@@ -2654,8 +2875,8 @@ msgstr "同时从 Gajim 和服务器移除帐户(_S)"
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5492 ../src/roster_window.py:5622
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
+#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
 msgid "_Remove"
 msgstr "移除(_R)"
 
@@ -2701,59 +2922,63 @@ msgid "Help online"
 msgstr "在线帮助"
 
 #: ../data/gui/roster_window.ui.h:8
+msgid "P_lugins"
+msgstr ""
+
+#: ../data/gui/roster_window.ui.h:9
 msgid "Profile, A_vatar"
 msgstr "模板，明细(V)"
 
-#: ../data/gui/roster_window.ui.h:9
+#: ../data/gui/roster_window.ui.h:10
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "显示离线联系人"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
 msgid "Show Trans_ports"
 msgstr "显示代理(_P)"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
 msgid "Show _Offline Contacts"
 msgstr "显示离线联系人"
 
-#: ../data/gui/roster_window.ui.h:12 ../src/statusicon.py:326
+#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
 msgid "Show _Roster"
 msgstr "显示名单(_R)"
 
-#: ../data/gui/roster_window.ui.h:13
+#: ../data/gui/roster_window.ui.h:14
 #, 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/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
 #: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "动作(_A)"
 
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
 msgid "_Contents"
 msgstr "内容(_C)"
 
-#: ../data/gui/roster_window.ui.h:18 ../src/disco.py:1502
+#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../data/gui/roster_window.ui.h:19
+#: ../data/gui/roster_window.ui.h:20
 msgid "_FAQ"
 msgstr "常见问题(_A)"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../data/gui/roster_window.ui.h:22
+#: ../data/gui/roster_window.ui.h:23
 #, fuzzy
 msgid "_Send Single Message..."
 msgstr "发送一条消息...(_M)"
 
-#: ../data/gui/roster_window.ui.h:24
+#: ../data/gui/roster_window.ui.h:25
 msgid "_View"
 msgstr "视图(_V)"
 
@@ -2772,12 +2997,12 @@ msgid "_Add contact"
 msgstr "添加联系人(_C)"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5634
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
 #, fuzzy
 msgid "_Information"
 msgstr "联系人信息"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1353
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
 msgid "_Search"
 msgstr "查找(_S)"
 
@@ -2797,10 +3022,6 @@ msgstr "注册到"
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../data/gui/single_message_window.ui.h:2
-msgid "From:"
-msgstr "从："
-
 #: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "回复本条消息"
@@ -2817,10 +3038,6 @@ msgstr "发送消息"
 msgid "Send message and close window"
 msgstr "发送消息并关闭窗口"
 
-#: ../data/gui/single_message_window.ui.h:7
-msgid "Subject:"
-msgstr "主题："
-
 #: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "到："
@@ -3041,26 +3258,36 @@ msgstr "Gajim 即时消息软件"
 msgid "Jabber IM Client"
 msgstr "Jabber 即时消息客户端"
 
-#: ../src/adhoc_commands.py:314
+#: ../src/adhoc_commands.py:323
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "联系人信息"
 
-#: ../src/adhoc_commands.py:315
+#: ../src/adhoc_commands.py:324
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:351 ../src/adhoc_commands.py:374
+#: ../src/adhoc_commands.py:370
+#, fuzzy
+msgid "Invalid Form"
+msgstr "无效输入"
+
+#: ../src/adhoc_commands.py:371
+#, fuzzy
+msgid "The form is not filled correctly."
+msgstr "群聊 Jabber ID 包含非法字符。"
+
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:360
+#: ../src/adhoc_commands.py:399
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:471
+#: ../src/adhoc_commands.py:513
 msgid "Service returned an error."
 msgstr ""
 
@@ -3088,7 +3315,7 @@ msgstr "群组内"
 msgid "Text"
 msgstr "文本"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:945
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
 msgid "Color"
 msgstr ""
 
@@ -3124,241 +3351,241 @@ msgstr[0] ""
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "English"
 msgstr "English"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Belarusian"
 msgstr "Bulgarian"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Bulgarian"
 msgstr "Bulgarian"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Breton"
 msgstr "Briton"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Czech"
 msgstr "Czech"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "German"
 msgstr "German"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Greek"
 msgstr "Greek"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "British"
 msgstr "Briton"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Spanish"
 msgstr "Spanish"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Basque"
 msgstr "Basc"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "French"
 msgstr "French"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Croatian"
 msgstr "Croatian"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Italian"
 msgstr "Italian"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Norwegian (b)"
 msgstr "Norvegian b"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Dutch"
 msgstr "Dutch"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Norwegian"
 msgstr "Norvegian"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Polish"
 msgstr "Polish"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Portuguese"
 msgstr "Portuguese"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Brazilian Portuguese"
 msgstr "Brazilian Portuguese"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Russian"
 msgstr "Russian"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 #, fuzzy
 msgid "Serbian"
 msgstr "German"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Slovak"
 msgstr "Slovak"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Swedish"
 msgstr "Swedish"
 
-#: ../src/chat_control.py:75
+#: ../src/chat_control.py:76
 msgid "Chinese (Ch)"
 msgstr "中文"
 
-#: ../src/chat_control.py:479
+#: ../src/chat_control.py:496
 msgid "Spelling language"
 msgstr "拼写检查"
 
 #. we are not connected
-#: ../src/chat_control.py:511 ../src/chat_control.py:720
+#: ../src/chat_control.py:528 ../src/chat_control.py:737
 msgid "A connection is not available"
 msgstr "连接不可用"
 
-#: ../src/chat_control.py:512 ../src/chat_control.py:721
+#: ../src/chat_control.py:529 ../src/chat_control.py:738
 msgid "Your message can not be sent until you are connected."
 msgstr "连接之后您的消息才能发送"
 
-#: ../src/chat_control.py:927
+#: ../src/chat_control.py:944
 #, fuzzy
 msgid "Underline"
 msgstr "下划线"
 
-#: ../src/chat_control.py:928
+#: ../src/chat_control.py:945
 #, fuzzy
 msgid "Strike"
 msgstr "昵称"
 
-#: ../src/chat_control.py:951
+#: ../src/chat_control.py:968
 #, fuzzy
 msgid "Font"
 msgstr "字号：(_F)"
 
-#: ../src/chat_control.py:960
+#: ../src/chat_control.py:977
 #, fuzzy
 msgid "Clear formating"
 msgstr "联系人信息"
 
-#: ../src/chat_control.py:1038
+#: ../src/chat_control.py:1055
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:1039
+#: ../src/chat_control.py:1056
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1503 ../src/chat_control.py:1987
+#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "启用加密"
 
 #. Add to roster
-#: ../src/chat_control.py:1528 ../src/common/contacts.py:158
+#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
 #: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:245 ../src/dialogs.py:1064 ../src/dialogs.py:2078
-#: ../src/dialogs.py:2107 ../src/gui_interface.py:674
+#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
+#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
 #: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1610 ../src/roster_window.py:1612
-#: ../src/roster_window.py:1942 ../src/roster_window.py:3289
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
+#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
+#: ../src/roster_window.py:3382
 msgid "Not in Roster"
 msgstr "不在名单中"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1575
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "文件发送、完成和中止的清单"
 
-#: ../src/chat_control.py:1561
+#: ../src/chat_control.py:1578
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1656
+#: ../src/chat_control.py:1677
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1848
+#: ../src/chat_control.py:1869
 #, 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:1967 ../src/dialogs.py:4866
+#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1968
+#: ../src/chat_control.py:1991
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1977
+#: ../src/chat_control.py:2000
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "禁用加密"
 
-#: ../src/chat_control.py:2003
+#: ../src/chat_control.py:2026
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:2028
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:2022
+#: ../src/chat_control.py:2045
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:2024
+#: ../src/chat_control.py:2047
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2051
 #, fuzzy
 msgid "and authenticated"
 msgstr "使用验证"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2032
+#: ../src/chat_control.py:2055
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "使用验证"
@@ -3366,79 +3593,85 @@ 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:2039
+#: ../src/chat_control.py:2062
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2182
+#: ../src/chat_control.py:2205
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2191
+#: ../src/chat_control.py:2215
+msgid "This session WILL be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2217
+msgid "This session WILL NOT be archived on server"
+msgstr ""
+
+#: ../src/chat_control.py:2226
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[本条消息已加密]"
 
-#: ../src/chat_control.py:2194
+#: ../src/chat_control.py:2229
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2196
+#: ../src/chat_control.py:2231
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2201
+#: ../src/chat_control.py:2236
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2203
+#: ../src/chat_control.py:2238
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "禁用加密"
 
-#: ../src/chat_control.py:2241 ../src/chat_control.py:2254
+#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[本条消息已加密]"
 
-#: ../src/chat_control.py:2247
+#: ../src/chat_control.py:2288
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[本条消息已加密]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2519
+#: ../src/chat_control.py:2566
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "收到一条来自 “%s” 的消息"
 
-#: ../src/chat_control.py:2520
+#: ../src/chat_control.py:2567
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr "如果您关闭此标签并且禁用历史，此消息会丢失。"
 
-#: ../src/chat_control.py:2663 ../src/common/connection_handlers.py:1635
-#: ../src/common/connection_handlers.py:1758
-#: ../src/common/connection_handlers.py:1960
-#: ../src/common/connection_handlers.py:2110 ../src/common/connection.py:452
+#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
 #: ../src/gajim.py:159 ../src/session.py:138
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2664
+#: ../src/chat_control.py:2714
 #, 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:2906
+#: ../src/chat_control.py:2962
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s 的状态是 %(status)s"
@@ -3452,28 +3685,28 @@ msgstr "建立日志数据库"
 msgid "creating cache database"
 msgstr "建立日志数据库"
 
-#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
-#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
-#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
-#: ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
+#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
+#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
+#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s 应为文件但它应为一个目录"
 
-#: ../src/common/check_paths.py:275 ../src/common/check_paths.py:282
-#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
-#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
-#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:333
+#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
+#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
+#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
 msgid "Gajim will now exit"
 msgstr "Gajim 即将退出"
 
-#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
+#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s 应为文件但它是一个目录"
 
-#: ../src/common/check_paths.py:342
+#: ../src/common/check_paths.py:351
 #, python-format
 msgid "creating %s directory"
 msgstr "正在建立 %s 目录"
@@ -3545,9 +3778,9 @@ msgstr ""
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:801
-#: ../src/roster_window.py:1614 ../src/roster_window.py:1616
-#: ../src/roster_window.py:5251
+#: ../src/common/helpers.py:57 ../src/roster_window.py:815
+#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
+#: ../src/roster_window.py:5323
 #, fuzzy
 msgid "Groupchats"
 msgstr "群聊"
@@ -3610,7 +3843,8 @@ msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
 #: ../src/common/config.py:88
-msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgid ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
 #: ../src/common/config.py:93
@@ -3664,9 +3898,9 @@ msgid ""
 msgstr "折叠的列(账户和组)的列表(空格分隔)。"
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:501
-#: ../src/common/optparser.py:290 ../src/common/optparser.py:486
-#: ../src/common/optparser.py:520 ../src/gui_interface.py:3370
+#: ../src/common/config.py:106 ../src/common/config.py:505
+#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
+#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
 #, fuzzy
 msgid "default"
 msgstr "默认"
@@ -3857,7 +4091,8 @@ msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC 标准规定 KiB = 1024 字节，KB = 1000 字节。"
 
 #: ../src/common/config.py:197
-msgid "Notify of events in the system trayicon."
+#, fuzzy
+msgid "Notify of events in the notification area."
 msgstr "在系统托盘图标通知事件。"
 
 #: ../src/common/config.py:203
@@ -3891,9 +4126,10 @@ msgid ""
 msgstr "用分号隔开的群聊中将高亮显示的单词列表。"
 
 #: ../src/common/config.py:221
+#, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
+"setting is taken into account only if notification icon is used."
 msgstr ""
 "如选是， 单击窗口管理器的 X 键，会退出 Gajim。这一设定仅当启用了系统托盘图标"
 "时才会生效。"
@@ -4139,7 +4375,7 @@ msgstr ""
 #: ../src/common/config.py:270
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
-"systray icon."
+"notification icon."
 msgstr ""
 
 #: ../src/common/config.py:271
@@ -4308,200 +4544,207 @@ msgstr ""
 msgid "Message that is sent to contacts you want to add"
 msgstr "请填入您想增加的联系人数据"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:374
+msgid "Last time we syncronized with logs from server."
+msgstr ""
+
+#: ../src/common/config.py:436
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "是否为此联系人使用 OpenPGP?"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:437 ../src/common/config.py:440
+#: ../src/common/config.py:438 ../src/common/config.py:441
 msgid "Language for which we want to check misspelled words"
 msgstr "想要检查拼写的语言"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:447
 msgid "all or space separated status"
 msgstr "全部或空格分隔的状态"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:448
 msgid "'yes', 'no', or 'both'"
 msgstr "'是'，'否'或'两者'"
 
-#: ../src/common/config.py:448 ../src/common/config.py:450
-#: ../src/common/config.py:451 ../src/common/config.py:454
-#: ../src/common/config.py:455
+#: ../src/common/config.py:449 ../src/common/config.py:451
+#: ../src/common/config.py:452 ../src/common/config.py:455
+#: ../src/common/config.py:456
 msgid "'yes', 'no' or ''"
 msgstr "'是'，'否'或''"
 
-#: ../src/common/config.py:461 ../src/common/pep.py:157
+#: ../src/common/config.py:460
+msgid ""
+"State whether plugins should be activated on exit (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
+msgstr ""
+
+#: ../src/common/config.py:465 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "正在睡觉"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back soon"
 msgstr "马上回来"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:466
 msgid "Back in some minutes."
 msgstr "很快回来"
 
-#: ../src/common/config.py:463 ../src/common/pep.py:127
+#: ../src/common/config.py:467 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "吃饭"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:467
 msgid "I'm eating, so leave me a message."
 msgstr "正在吃饭，请留言"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "Movie"
 msgstr "电影"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:468
 msgid "I'm watching a movie."
 msgstr "正在看电影"
 
-#: ../src/common/config.py:465 ../src/common/pep.py:186
+#: ../src/common/config.py:469 ../src/common/pep.py:186
 msgid "Working"
 msgstr "工作"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:469
 msgid "I'm working."
 msgstr "工作中"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "Phone"
 msgstr "电话"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:470
 msgid "I'm on the phone."
 msgstr "我在打电话"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "Out"
 msgstr "外出"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:471
 msgid "I'm out enjoying life."
 msgstr "我正在享受户外生活。"
 
-#: ../src/common/config.py:478
+#: ../src/common/config.py:482
 msgid "I'm available."
 msgstr "我现在在线。"
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:483
 msgid "I'm free for chat."
 msgstr "自由聊天。"
 
-#: ../src/common/config.py:480 ../src/config.py:1600
+#: ../src/common/config.py:484 ../src/config.py:1600
 msgid "Be right back."
 msgstr "很快回来。"
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:485
 msgid "I'm not available."
 msgstr "我现在不可用。"
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:486
 msgid "Do not disturb."
 msgstr "不分发。"
 
-#: ../src/common/config.py:483 ../src/common/config.py:484
+#: ../src/common/config.py:487 ../src/common/config.py:488
 msgid "Bye!"
 msgstr "再见！"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:498
 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:495
+#: ../src/common/config.py:499
 msgid "Sound to play when any MUC message arrives."
 msgstr "当 MUC 信息到达时的声音"
 
-#: ../src/common/config.py:504 ../src/common/optparser.py:304
+#: ../src/common/config.py:508 ../src/common/optparser.py:308
 msgid "green"
 msgstr "绿色"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:290
+#: ../src/common/config.py:512 ../src/common/optparser.py:294
 msgid "grocery"
 msgstr "杂货店"
 
-#: ../src/common/config.py:512
+#: ../src/common/config.py:516
 msgid "human"
 msgstr "人类"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:520
 msgid "marine"
 msgstr "æµ·æ´‹"
 
-#: ../src/common/connection_handlers.py:84
+#: ../src/common/connection_handlers.py:94
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "无法加载发呆模块"
 
-#: ../src/common/connection_handlers.py:117
+#: ../src/common/connection_handlers.py:127
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "代理 %s 所需的注册信息未按时抵达"
 
-#: ../src/common/connection_handlers.py:124
+#: ../src/common/connection_handlers.py:134
 #, fuzzy
 msgid "Registration succeeded"
 msgstr " vCard 发布成功"
 
-#: ../src/common/connection_handlers.py:125
+#: ../src/common/connection_handlers.py:135
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 #, fuzzy
 msgid "Registration failed"
 msgstr "vCard 发布失败"
 
-#: ../src/common/connection_handlers.py:133
+#: ../src/common/connection_handlers.py:143
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:445
-#: ../src/common/connection_handlers.py:1633
-#: ../src/common/connection_handlers.py:1756
-#: ../src/common/connection_handlers.py:1957
-#: ../src/common/connection_handlers.py:2108 ../src/common/connection.py:449
+#: ../src/common/connection_handlers.py:466
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
 #: ../src/gajim.py:341
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:678 ../src/common/connection.py:1472
+#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "不支持扩展"
 
-#: ../src/common/connection_handlers.py:679 ../src/common/connection.py:1473
+#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1446 ../src/common/connection.py:253
-#: ../src/config.py:2091 ../src/config.py:2100 ../src/config.py:2168
-#: ../src/config.py:3560 ../src/dataforms_widget.py:597 ../src/dialogs.py:2931
+#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
+#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
+#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
 msgid "Invalid Jabber ID"
 msgstr "无效的 Jabber ID"
 
-#: ../src/common/connection_handlers.py:1447
+#: ../src/common/connection_handlers.py:1405
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1636
-#: ../src/common/connection_handlers.py:1759
-#: ../src/common/connection_handlers.py:1961
-#: ../src/common/connection_handlers.py:2111 ../src/common/connection.py:453
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
 #: ../src/gajim.py:160 ../src/session.py:139
 #, python-format
 msgid ""
@@ -4509,90 +4752,6 @@ msgid ""
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1805
-#, python-format
-msgid "Nickname not allowed: %s"
-msgstr "昵称不允许： %s "
-
-#: ../src/common/connection_handlers.py:1902
-#: ../src/common/connection_handlers.py:1911
-#: ../src/common/connection_handlers.py:1918
-#: ../src/common/connection_handlers.py:1922
-#: ../src/common/connection_handlers.py:1926
-#: ../src/common/connection_handlers.py:1931 ../src/gui_interface.py:139
-msgid "Unable to join group chat"
-msgstr "无法加入群聊"
-
-#: ../src/common/connection_handlers.py:1903
-#, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:1912
-#, fuzzy, python-format
-msgid "You are banned from group chat %s."
-msgstr "您被该群聊封禁。"
-
-#: ../src/common/connection_handlers.py:1919
-#, fuzzy, python-format
-msgid "Group chat %s does not exist."
-msgstr "不存在这样的群聊"
-
-#: ../src/common/connection_handlers.py:1923
-msgid "Group chat creation is restricted."
-msgstr "群聊创建受限。"
-
-#: ../src/common/connection_handlers.py:1927
-#, fuzzy, python-format
-msgid "Your registered nickname must be used in group chat %s."
-msgstr "您注册的昵称已被使用"
-
-#: ../src/common/connection_handlers.py:1932
-#, 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:1976
-#, fuzzy
-msgid "Room has been destroyed"
-msgstr "授权被移除"
-
-#: ../src/common/connection_handlers.py:1984
-#, python-format
-msgid "You can join this room instead: %s"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:2020
-msgid "I would like to add you to my roster."
-msgstr "我申请添加您到联系人名单"
-
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2041
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr " %s 请求认证"
-
-#: ../src/common/connection_handlers.py:2043
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr " %s 请求解除认证"
-
-#: ../src/common/connection_handlers.py:2045
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "%s 解除了认证"
-
-#: ../src/common/connection_handlers.py:2240
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"JID %s 不识配 RFC，未被加入名单。请使用诸如 http://jru.jabberstudio.org/ 的名"
-"单管理工具移除。"
-
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr ""
@@ -4723,28 +4882,28 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:254 ../src/dialogs.py:2932
+#: ../src/common/connection.py:256 ../src/dialogs.py:2948
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "无法发送空文件"
 
-#: ../src/common/connection.py:276
+#: ../src/common/connection.py:278
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:281
 #, 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:331
+#: ../src/common/connection.py:333
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[本条消息已 *加密* (见 :JEP:`27`]"
 
-#: ../src/common/connection.py:439
+#: ../src/common/connection.py:441
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4753,150 +4912,150 @@ msgstr ""
 "主题：%s\n"
 "%s"
 
-#: ../src/common/connection.py:807
+#: ../src/common/connection.py:809
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "帐户“%s”的连接丢失"
 
-#: ../src/common/connection.py:808
+#: ../src/common/connection.py:810
 msgid "Reconnect manually."
 msgstr "手动重连。"
 
-#: ../src/common/connection.py:820
+#: ../src/common/connection.py:822
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "服务代理 %s 对注册请求响应错误：%s"
 
-#: ../src/common/connection.py:854
+#: ../src/common/connection.py:856
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:867
+#: ../src/common/connection.py:869
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "未知的 D-Bus 版本： %s"
 
 #. wrong answer
-#: ../src/common/connection.py:882
+#: ../src/common/connection.py:884
 msgid "Invalid answer"
 msgstr "无效答案"
 
-#: ../src/common/connection.py:883
+#: ../src/common/connection.py:885
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "服务代理 %s 对注册请求响应错误：%s"
 
-#: ../src/common/connection.py:1165 ../src/common/connection.py:1294
-#: ../src/common/connection.py:1784
-#: ../src/common/zeroconf/connection_zeroconf.py:189
+#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
+#: ../src/common/connection.py:1792
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "尚未连接到“%s”"
 
-#: ../src/common/connection.py:1166 ../src/gui_interface.py:755
+#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
 msgid "Check your connection or try again later."
 msgstr "检查连接并稍后重试。"
 
-#: ../src/common/connection.py:1171
+#: ../src/common/connection.py:1173
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "保存在： %s"
 
-#: ../src/common/connection.py:1184
+#: ../src/common/connection.py:1186
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "连接失败"
 
-#: ../src/common/connection.py:1215 ../src/common/connection.py:1274
+#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "尚未连接到“%s”"
 
-#: ../src/common/connection.py:1216 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "帐户“%s”的连接丢失"
 
-#: ../src/common/connection.py:1241
+#: ../src/common/connection.py:1243
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1244
+#: ../src/common/connection.py:1246
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1248
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "未知的 D-Bus 版本： %s"
 
-#: ../src/common/connection.py:1295
+#: ../src/common/connection.py:1297
 msgid "Check your connection or try again later"
 msgstr "检查连接并稍后重试"
 
-#: ../src/common/connection.py:1324
+#: ../src/common/connection.py:1329
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "“%s”登录验证失败"
 
-#: ../src/common/connection.py:1326
+#: ../src/common/connection.py:1331
 msgid "Please check your login and password for correctness."
 msgstr "请检查登录信息和密码的正确性"
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1400
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "添加服务错误。 %s"
 
-#: ../src/common/connection.py:1396
+#: ../src/common/connection.py:1401
 #, 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:1650
+#: ../src/common/connection.py:1658
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1653
+#: ../src/common/connection.py:1661
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "联系人"
 
-#: ../src/common/connection.py:1799 ../src/common/connection.py:1822
+#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
 msgid "Not fetched because of invisible status"
 msgstr "由于隐身状态不获取"
 
-#: ../src/common/connection.py:2254
+#: ../src/common/connection.py:2262
 #, fuzzy
 msgid "Unregister failed"
 msgstr "vCard 发布失败"
 
-#: ../src/common/connection.py:2255
+#: ../src/common/connection.py:2263
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
 #: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:674
+#: ../src/gui_interface.py:551
 msgid "Observers"
 msgstr "旁观者"
 
 #: ../src/common/contacts.py:139 ../src/common/contacts.py:366
 #: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1499 ../src/gui_interface.py:424
-#: ../src/roster_window.py:840 ../src/roster_window.py:1525
-#: ../src/roster_window.py:1606 ../src/roster_window.py:1608
-#: ../src/roster_window.py:1769
+#: ../src/disco.py:1517 ../src/roster_window.py:854
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
+#: ../src/roster_window.py:2466
 msgid "Transports"
 msgstr "代理"
 
@@ -5121,203 +5280,219 @@ msgstr "一周末"
 msgid "Weekend!"
 msgstr "周末"
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:148
+msgid "Username must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:153
 msgid "Invalid character in username."
 msgstr "无效的用户名特征。"
 
-#: ../src/common/helpers.py:156
-msgid "Server address required."
-msgstr "此处需要服务器地址"
+#: ../src/common/helpers.py:159
+msgid "Server must be between 1 and 1023 chars"
+msgstr ""
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:164
 msgid "Invalid character in hostname."
 msgstr "无效的主机名特征。"
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:166
+msgid "Server address required."
+msgstr "此处需要服务器地址"
+
+#: ../src/common/helpers.py:170
+msgid "Resource must be between 1 and 1023 chars"
+msgstr ""
+
+#: ../src/common/helpers.py:175
 msgid "Invalid character in resource."
 msgstr "无效的资源特征。"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:215
 msgid "_Busy"
 msgstr "忙碌(_B)"
 
-#: ../src/common/helpers.py:211 ../src/tooltips.py:195
+#: ../src/common/helpers.py:217 ../src/tooltips.py:195
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:220
 msgid "_Not Available"
 msgstr "不可用(_N)"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:225
 msgid "_Free for Chat"
 msgstr "自由聊天(_F)"
 
-#: ../src/common/helpers.py:221 ../src/tooltips.py:191
+#: ../src/common/helpers.py:227 ../src/tooltips.py:191
 msgid "Free for Chat"
 msgstr "自由聊天"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:230
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?transfer status:暂停"
 
-#: ../src/common/helpers.py:226 ../src/tooltips.py:189
+#: ../src/common/helpers.py:232 ../src/tooltips.py:189
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?transfer status:暂停"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:234
 msgid "Connecting"
 msgstr "正在连接"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:237
 msgid "A_way"
 msgstr "离开(_A)"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:242
 msgid "_Offline"
 msgstr "离线(_O)"
 
-#: ../src/common/helpers.py:238 ../src/tooltips.py:199
+#: ../src/common/helpers.py:244 ../src/tooltips.py:199
 msgid "Offline"
 msgstr "离线"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:247
 msgid "_Invisible"
 msgstr "隐身(_I)"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:253
 msgid "?contact has status:Unknown"
 msgstr "?contact has status: 未知"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:255
 msgid "?contact has status:Has errors"
 msgstr "?contact has status: 有错误"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:260
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have: æ— "
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:262
 msgid "To"
 msgstr "到"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
+msgid "From"
+msgstr "来自"
+
+#: ../src/common/helpers.py:266
 msgid "Both"
 msgstr "双方"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:274
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription): æ— "
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:276
 msgid "Subscribe"
 msgstr "认证"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:285
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role: æ— "
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:288
 msgid "Moderators"
 msgstr "主持人"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:290
 msgid "Moderator"
 msgstr "主持人"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:293
 msgid "Participants"
 msgstr "参与者"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:295
 msgid "Participant"
 msgstr "参与者"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:298
 msgid "Visitors"
 msgstr "访客"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:300
 msgid "Visitor"
 msgstr "访客"
 
-#: ../src/common/helpers.py:300 ../src/tooltips.py:210
+#: ../src/common/helpers.py:306 ../src/tooltips.py:210
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation: æ— "
 
-#: ../src/common/helpers.py:302 ../src/tooltips.py:216
+#: ../src/common/helpers.py:308 ../src/tooltips.py:216
 msgid "Owner"
 msgstr "所有者"
 
-#: ../src/common/helpers.py:304 ../src/tooltips.py:214
+#: ../src/common/helpers.py:310 ../src/tooltips.py:214
 msgid "Administrator"
 msgstr "管理员"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:212
+#: ../src/common/helpers.py:312 ../src/tooltips.py:212
 msgid "Member"
 msgstr "成员"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:351
 msgid "is paying attention to the conversation"
 msgstr "正在专注于聊天"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:353
 msgid "is doing something else"
 msgstr "在做其他事"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:355
 msgid "is composing a message..."
 msgstr "正在输入消息..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:352
+#: ../src/common/helpers.py:358
 msgid "paused composing a message"
 msgstr "中断输入消息"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:360
 msgid "has closed the chat window or tab"
 msgstr "关闭了聊天窗口或标签"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:619
+#: ../src/common/helpers.py:625
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:622
+#: ../src/common/helpers.py:628
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:626
+#: ../src/common/helpers.py:632
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:629
+#: ../src/common/helpers.py:635
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:633
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:636
+#: ../src/common/helpers.py:642
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:645
 #, python-format
 msgid "%s B"
 msgstr "%s B"
@@ -5358,12 +5533,12 @@ msgstr "Gajim - %s"
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:111
+#: ../src/common/jingle_rtp.py:107
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "房间设置："
 
-#: ../src/common/jingle_rtp.py:112
+#: ../src/common/jingle_rtp.py:108
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5375,30 +5550,30 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:209
+#: ../src/common/jingle_rtp.py:205
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:210
+#: ../src/common/jingle_rtp.py:206
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "错误消息：%s"
 
-#: ../src/common/jingle_rtp.py:336
+#: ../src/common/jingle_rtp.py:335
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:339
+#: ../src/common/jingle_rtp.py:338
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:382
+#: ../src/common/jingle_rtp.py:381
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:390
+#: ../src/common/jingle_rtp.py:389
 msgid "video output"
 msgstr ""
 
@@ -5475,11 +5650,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "错误：无法按读打开文件 %s"
 
-#: ../src/common/optparser.py:299 ../src/common/optparser.py:300
+#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
 msgid "cyan"
 msgstr "青色"
 
-#: ../src/common/optparser.py:379
+#: ../src/common/optparser.py:383
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "合并日志数据库"
@@ -6217,17 +6392,17 @@ msgid ""
 msgstr "或许您正在运行另一个 Gajim 实例。文件传输将被取消。"
 
 #. we're not english
-#: ../src/common/stanza_session.py:303
+#: ../src/common/stanza_session.py:423
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:178
+#: ../src/common/zeroconf/connection_zeroconf.py:181
 msgid "Avahi error"
 msgstr "Avahi 错误"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:179
+#: ../src/common/zeroconf/connection_zeroconf.py:182
 #, python-format
 msgid ""
 "%s\n"
@@ -6236,46 +6411,46 @@ msgstr ""
 "%s\n"
 "本地消息将无法正常工作。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:190
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "请检查 Avahi 是否已经安装。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:199
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Could not start local service"
 msgstr "无法启动本地服务"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:200
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "无法绑定端口 %d。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-#: ../src/common/zeroconf/connection_zeroconf.py:283
-#: ../src/common/zeroconf/connection_zeroconf.py:294
-#: ../src/common/zeroconf/connection_zeroconf.py:308
+#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:286
+#: ../src/common/zeroconf/connection_zeroconf.py:297
+#: ../src/common/zeroconf/connection_zeroconf.py:311
 msgid "Please check if avahi-daemon is running."
 msgstr "请检查 avahi-daemon 是否运行。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:282
-#: ../src/common/zeroconf/connection_zeroconf.py:293
-#: ../src/common/zeroconf/connection_zeroconf.py:307
+#: ../src/common/zeroconf/connection_zeroconf.py:285
+#: ../src/common/zeroconf/connection_zeroconf.py:296
+#: ../src/common/zeroconf/connection_zeroconf.py:310
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "无法改变账户“%s”的状态"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:325
+#: ../src/common/zeroconf/connection_zeroconf.py:328
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "联系人离线。您的消息将不被发送。"
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:335
+#: ../src/common/zeroconf/connection_zeroconf.py:338
 msgid "Contact is offline. Your message could not be sent."
 msgstr "联系人离线。您的消息将不被发送。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:363
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "到主机的连接无法建立：发送数据超时。"
@@ -6296,16 +6471,16 @@ msgstr "默认状态消息"
 msgid "Enabled"
 msgstr "启用"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3078
+#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
 msgid "Default"
 msgstr "默认"
 
-#: ../src/config.py:739 ../src/dialogs.py:1395
+#: ../src/config.py:733 ../src/dialogs.py:1409
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "语言 %s 的字典不可用"
 
-#: ../src/config.py:740
+#: ../src/config.py:734
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6322,9 +6497,9 @@ msgid "status message text"
 msgstr "状态消息文本"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2383 ../src/dialogs.py:2449
-#: ../src/dialogs.py:3215 ../src/disco.py:866 ../src/disco.py:1726
-#: ../src/disco.py:2030 ../src/history_window.py:90
+#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
+#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
+#: ../src/disco.py:2048 ../src/history_window.py:90
 msgid "Name"
 msgstr "名称"
 
@@ -6358,7 +6533,7 @@ msgstr "您已在账户 %s 打开聊天"
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "所有的聊天和群聊窗口将会关闭。您想继续吗？"
 
-#: ../src/config.py:1976 ../src/config.py:2509 ../src/config.py:2545
+#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
 msgid "You are currently connected to the server"
 msgstr "正在连接到服务器"
 
@@ -6392,134 +6567,134 @@ msgstr "账户名不能为空。"
 msgid "Account name cannot contain spaces."
 msgstr "账户名不能包含空格。"
 
-#: ../src/config.py:2072
+#: ../src/config.py:2074
 #, fuzzy
 msgid "Rename Account"
 msgstr "帐户管理"
 
-#: ../src/config.py:2073
+#: ../src/config.py:2075
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "为群组 %s 输入新的名称"
 
-#: ../src/config.py:2101
+#: ../src/config.py:2103
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID 的格式为 “用户@服务器名”。"
 
-#: ../src/config.py:2318 ../src/config.py:3606
+#: ../src/config.py:2320 ../src/config.py:3623
 msgid "Invalid entry"
 msgstr "无效输入"
 
-#: ../src/config.py:2319 ../src/config.py:3607
+#: ../src/config.py:2321 ../src/config.py:3624
 msgid "Custom port must be a port number."
 msgstr "自定义端口必须为端口号。"
 
-#: ../src/config.py:2340
+#: ../src/config.py:2342
 msgid "Failed to get secret keys"
 msgstr "获取密钥失败"
 
-#: ../src/config.py:2341
+#: ../src/config.py:2343
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "在取回 OpenPGP 密钥时发生错误。"
 
-#: ../src/config.py:2375
+#: ../src/config.py:2377
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP 密钥选择"
 
-#: ../src/config.py:2376
+#: ../src/config.py:2378
 msgid "Choose your OpenPGP key"
 msgstr "选择您的 OpenPGP 钥匙"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2385
 msgid "No such account available"
 msgstr "没有有效账户"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2386
 msgid "You must create your account before editing your personal information."
 msgstr "您必须在编辑个人信息前创建账户。"
 
-#: ../src/config.py:2391 ../src/dialogs.py:2136 ../src/dialogs.py:2371
-#: ../src/dialogs.py:2557 ../src/disco.py:511 ../src/profile_window.py:339
+#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
+#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
 msgid "You are not connected to the server"
 msgstr "尚未连接到服务器"
 
-#: ../src/config.py:2392
+#: ../src/config.py:2394
 msgid "Without a connection, you can not edit your personal information."
 msgstr "无法脱机编辑个人信息。"
 
-#: ../src/config.py:2396
+#: ../src/config.py:2398
 msgid "Your server doesn't support Vcard"
 msgstr "您的服务器不支持 Vcard"
 
-#: ../src/config.py:2397
+#: ../src/config.py:2399
 msgid "Your server can't save your personal information."
 msgstr "您的服务器无法保存您的个人信息。"
 
-#: ../src/config.py:2510 ../src/config.py:2546
+#: ../src/config.py:2512 ../src/config.py:2548
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "如要改变账户名称，需断开连接。"
 
-#: ../src/config.py:2515
+#: ../src/config.py:2517
 msgid "Account Local already exists."
 msgstr "帐户本地已存在。"
 
-#: ../src/config.py:2516
+#: ../src/config.py:2518
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "请在使用本地消息前重命名或移除它。"
 
-#: ../src/config.py:2673
+#: ../src/config.py:2675
 #, python-format
 msgid "Edit %s"
 msgstr "编辑 %s"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2677
 #, python-format
 msgid "Register to %s"
 msgstr "注册到 %s"
 
 #. list at the beginning
-#: ../src/config.py:2711
+#: ../src/config.py:2713
 msgid "Ban List"
 msgstr "封禁名单"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2714
 msgid "Member List"
 msgstr "成员列表"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2714
 msgid "Owner List"
 msgstr "房主列表"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2715
 msgid "Administrator List"
 msgstr "管理员列表"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2763 ../src/disco.py:873 ../src/history_manager.py:201
+#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2773
+#: ../src/config.py:2789
 msgid "Reason"
 msgstr "原因"
 
-#: ../src/config.py:2780
+#: ../src/config.py:2796
 msgid "Nick"
 msgstr "昵称"
 
-#: ../src/config.py:2786
+#: ../src/config.py:2802
 msgid "Role"
 msgstr "角色"
 
-#: ../src/config.py:2813
+#: ../src/config.py:2829
 msgid "Banning..."
 msgstr "封禁..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2815
+#: ../src/config.py:2831
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6527,11 +6702,11 @@ msgstr ""
 "<b>想做封禁谁？</b>\n"
 "\n"
 
-#: ../src/config.py:2817
+#: ../src/config.py:2833
 msgid "Adding Member..."
 msgstr "正在添加成员..."
 
-#: ../src/config.py:2818
+#: ../src/config.py:2834
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6539,11 +6714,11 @@ msgstr ""
 "<b>想要将谁加为成员？</b>\n"
 "\n"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2836
 msgid "Adding Owner..."
 msgstr "添加房主..."
 
-#: ../src/config.py:2821
+#: ../src/config.py:2837
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -6552,11 +6727,11 @@ msgstr ""
 "<b>想要将谁加为房主？</b>\n"
 "\n"
 
-#: ../src/config.py:2823
+#: ../src/config.py:2839
 msgid "Adding Administrator..."
 msgstr "添加管理员..."
 
-#: ../src/config.py:2824
+#: ../src/config.py:2840
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6564,7 +6739,7 @@ msgstr ""
 "<b>想要指定谁为管理员？</b>\n"
 "\n"
 
-#: ../src/config.py:2825
+#: ../src/config.py:2841
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6581,114 +6756,114 @@ msgstr ""
 "4. domain (该域本身匹配, 例如任何 user@domain,\n"
 "domain/resource, 或者地址包含一个子域."
 
-#: ../src/config.py:2926
+#: ../src/config.py:2943
 #, python-format
 msgid "Removing %s account"
 msgstr "移除账户 %s"
 
-#: ../src/config.py:2941
+#: ../src/config.py:2958
 #, fuzzy
 msgid "Account is disabled"
 msgstr "禁用加密"
 
-#: ../src/config.py:2942
+#: ../src/config.py:2959
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2955 ../src/gui_interface.py:1132
-#: ../src/gui_interface.py:1243
+#: ../src/config.py:2972 ../src/gui_interface.py:311
+#: ../src/gui_interface.py:1048
 msgid "Password Required"
 msgstr "需要密码"
 
-#: ../src/config.py:2956 ../src/gui_interface.py:1223
+#: ../src/config.py:2973 ../src/gui_interface.py:1028
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "输入帐户 %s 的密码"
 
-#: ../src/config.py:2957 ../src/gui_interface.py:1243
+#: ../src/config.py:2974 ../src/gui_interface.py:1048
 msgid "Save password"
 msgstr "保存密码"
 
-#: ../src/config.py:2967
+#: ../src/config.py:2984
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "账户 “%s” 已连接到服务器"
 
-#: ../src/config.py:2968
+#: ../src/config.py:2985
 msgid "If you remove it, the connection will be lost."
 msgstr "如果移除，将会丢失连接"
 
-#: ../src/config.py:2982
+#: ../src/config.py:2999
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "连接失败"
 
-#: ../src/config.py:2983
+#: ../src/config.py:3000
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "想做什么？"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3001
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "仅从 Gajim 移除帐户(_O)"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3002
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3078
+#: ../src/config.py:3095
 msgid "?print_status:All"
 msgstr "?print_status:全部"
 
-#: ../src/config.py:3079
+#: ../src/config.py:3096
 msgid "Enter and leave only"
 msgstr "只是登录和离开"
 
-#: ../src/config.py:3080
+#: ../src/config.py:3097
 #, fuzzy
 msgid "?print_status:None"
 msgstr "?print_status:全部"
 
-#: ../src/config.py:3150
+#: ../src/config.py:3167
 msgid "New Group Chat"
 msgstr "新群聊"
 
-#: ../src/config.py:3183
+#: ../src/config.py:3200
 msgid "This bookmark has invalid data"
 msgstr "此书签含无效数据"
 
-#: ../src/config.py:3184
+#: ../src/config.py:3201
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "请确认填写服务器与房间字段或移除此书签。"
 
 #. invalid char
-#: ../src/config.py:3302 ../src/dialogs.py:1934
+#: ../src/config.py:3319 ../src/dialogs.py:1950
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "无效用户名"
 
-#: ../src/config.py:3303 ../src/config.py:3317 ../src/config.py:3331
+#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
 #, fuzzy
 msgid "Character not allowed"
 msgstr "昵称不允许： %s "
 
-#: ../src/config.py:3316 ../src/config.py:3582
+#: ../src/config.py:3333 ../src/config.py:3599
 #, fuzzy
 msgid "Invalid server"
 msgstr "无效用户名"
 
-#: ../src/config.py:3330
+#: ../src/config.py:3347
 #, fuzzy
 msgid "Invalid room"
 msgstr "无效输入"
 
-#: ../src/config.py:3498
+#: ../src/config.py:3515
 msgid "Account has been added successfully"
 msgstr "成功添加账户"
 
-#: ../src/config.py:3499 ../src/config.py:3505
+#: ../src/config.py:3516 ../src/config.py:3522
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6698,34 +6873,34 @@ msgstr ""
 "您可以通过点击高级按钮进行高级设置，或稍后点击主窗口中编辑菜单下的账户菜单"
 "项。"
 
-#: ../src/config.py:3504
+#: ../src/config.py:3521
 msgid "Your new account has been created successfully"
 msgstr "注册新账户成功"
 
-#: ../src/config.py:3543
+#: ../src/config.py:3560
 msgid "Invalid username"
 msgstr "无效用户名"
 
-#: ../src/config.py:3545
+#: ../src/config.py:3562
 msgid "You must provide a username to configure this account."
 msgstr "必须提供用户名来配置此账户。"
 
-#: ../src/config.py:3583
+#: ../src/config.py:3600
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "请指定您想使用的新昵称："
 
-#: ../src/config.py:3639 ../src/gui_interface.py:1904
+#: ../src/config.py:3656 ../src/gui_interface.py:1693
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "联系人已经在名单中"
 
-#: ../src/config.py:3640 ../src/gui_interface.py:1905
+#: ../src/config.py:3657 ../src/gui_interface.py:1694
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3717
+#: ../src/config.py:3734
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6735,7 +6910,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3723 ../src/gui_interface.py:1932
+#: ../src/config.py:3740 ../src/gui_interface.py:1721
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6743,310 +6918,324 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3755 ../src/config.py:3789
+#: ../src/config.py:3772 ../src/config.py:3806
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "创建帐户过程中发生错误"
 
-#: ../src/config.py:3854
+#: ../src/config.py:3871
 msgid "Account name is in use"
 msgstr "帐户名已经被使用"
 
-#: ../src/config.py:3855
+#: ../src/config.py:3872
 msgid "You already have an account using this name."
 msgstr "有同名账户。"
 
-#: ../src/config.py:4009
+#: ../src/config.py:3991
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/config.py:3992
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#: ../src/config.py:4036
 msgid "Active"
 msgstr "活动"
 
-#: ../src/config.py:4017
+#: ../src/config.py:4044
 msgid "Event"
 msgstr "事件"
 
-#: ../src/config.py:4052
+#: ../src/config.py:4079
 msgid "First Message Received"
 msgstr "最初收到的消息"
 
-#: ../src/config.py:4053
+#: ../src/config.py:4080
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "收到的下一条消息"
 
-#: ../src/config.py:4055
+#: ../src/config.py:4082
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "收到的下一条消息"
 
-#: ../src/config.py:4056
+#: ../src/config.py:4083
 msgid "Contact Connected"
 msgstr "已连接的联系人"
 
-#: ../src/config.py:4057
+#: ../src/config.py:4084
 msgid "Contact Disconnected"
 msgstr "联系人已断开连接"
 
-#: ../src/config.py:4058
+#: ../src/config.py:4085
 msgid "Message Sent"
 msgstr "消息已发送"
 
-#: ../src/config.py:4059
+#: ../src/config.py:4086
 msgid "Group Chat Message Highlight"
 msgstr "群聊消息突出显示"
 
-#: ../src/config.py:4060
+#: ../src/config.py:4087
 msgid "Group Chat Message Received"
 msgstr "收到的群聊消息"
 
-#: ../src/config.py:4061
+#: ../src/config.py:4088
 msgid "GMail Email Received"
 msgstr "收到 GMail 邮件"
 
-#: ../src/conversation_textview.py:600
+#: ../src/conversation_textview.py:601
 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:619
+#: ../src/conversation_textview.py:620
 #, 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:739
+#: ../src/conversation_textview.py:740
 #, fuzzy
 msgid "_Quote"
 msgstr "退出(_Q)"
 
-#: ../src/conversation_textview.py:746
+#: ../src/conversation_textview.py:747
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "“%s”的动作(_A)"
 
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:760
 msgid "Read _Wikipedia Article"
 msgstr "读取 Wikipedia 文章(_W)"
 
-#: ../src/conversation_textview.py:763
+#: ../src/conversation_textview.py:765
 msgid "Look it up in _Dictionary"
 msgstr "从字典(_D)中搜索"
 
-#: ../src/conversation_textview.py:780
+#: ../src/conversation_textview.py:782
 #, 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:793
+#: ../src/conversation_textview.py:795
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "网站搜索地址缺少 “%s”"
 
-#: ../src/conversation_textview.py:796
+#: ../src/conversation_textview.py:798
 msgid "Web _Search for it"
 msgstr "用网页搜索(_S)"
 
-#: ../src/conversation_textview.py:802
+#: ../src/conversation_textview.py:804
 msgid "Open as _Link"
 msgstr "作为链接打开(_L)："
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1296
+#: ../src/conversation_textview.py:1298
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
 msgstr[0] "昨天"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1344 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
 #, python-format
 msgid "Subject: %s\n"
 msgstr "主题：%s\n"
 
-#: ../src/dataforms_widget.py:544
+#: ../src/dataforms_widget.py:545
 #, fuzzy
 msgid "Unable to load image"
 msgstr "无法加载发呆模块"
 
-#: ../src/dataforms_widget.py:546
+#: ../src/dataforms_widget.py:547
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "不支持扩展"
 
-#: ../src/dataforms_widget.py:601
+#: ../src/dataforms_widget.py:562
+msgid "This field is required"
+msgstr ""
+
+#: ../src/dataforms_widget.py:607
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Jabber 即时消息客户端"
 
-#: ../src/dataforms_widget.py:602
+#: ../src/dataforms_widget.py:608
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:613
+#: ../src/dataforms_widget.py:619
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:616 ../src/dataforms_widget.py:618
+#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:82
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "联系人名称：<i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:84
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID： <i>%s</i>"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:195
 msgid "Group"
 msgstr "群组"
 
-#: ../src/dialogs.py:201
+#: ../src/dialogs.py:202
 msgid "In the group"
 msgstr "群组内"
 
-#: ../src/dialogs.py:292
+#: ../src/dialogs.py:293
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:297
+#: ../src/dialogs.py:298
 msgid "Contact name"
 msgstr "联系人名"
 
-#: ../src/dialogs.py:469
+#: ../src/dialogs.py:470
 #, fuzzy
 msgid "Set Mood"
 msgstr "设定 MOTD"
 
-#: ../src/dialogs.py:589
+#: ../src/dialogs.py:590
 #, python-format
 msgid "%s Status Message"
 msgstr " %s 状态消息"
 
-#: ../src/dialogs.py:603
+#: ../src/dialogs.py:604
 msgid "Status Message"
 msgstr "状态消息"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:794
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "状态消息"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:795
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "该名称已被您的另一个帐号使用。请选择其他名称"
 
-#: ../src/dialogs.py:802
+#: ../src/dialogs.py:803
 msgid "Save as Preset Status Message"
 msgstr "<b>保存为预设状态消息</b>"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:804
 msgid "Please type a name for this status message"
 msgstr "请为该状态信息键入名称："
 
-#: ../src/dialogs.py:831
+#: ../src/dialogs.py:832
 msgid "AIM Address:"
 msgstr "AIM 地址："
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:833
 msgid "GG Number:"
 msgstr "GG 号码："
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:834
 msgid "ICQ Number:"
 msgstr "ICQ 号码："
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:835
 msgid "MSN Address:"
 msgstr "MSN 地址："
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:836
 msgid "Yahoo! Address:"
 msgstr "Yahoo! 地址："
 
-#: ../src/dialogs.py:872
+#: ../src/dialogs.py:873
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "请为账户 %s 填入您想增加的联系人数据"
 
-#: ../src/dialogs.py:875
+#: ../src/dialogs.py:876
 msgid "Please fill in the data of the contact you want to add"
 msgstr "请填入您想增加的联系人数据"
 
-#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
+#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
+#: ../src/dialogs.py:3464
 msgid "Invalid User ID"
 msgstr "无效的用户 ID"
 
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1052
 msgid "The user ID must not contain a resource."
 msgstr "该用户 ID 不可包含任何源"
 
-#: ../src/dialogs.py:1051
+#: ../src/dialogs.py:1057
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "我申请添加您到联系人名单"
 
-#: ../src/dialogs.py:1065
+#: ../src/dialogs.py:1071
 msgid "Contact already in roster"
 msgstr "联系人已经在名单中"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1072
 msgid "This contact is already listed in your roster."
 msgstr "此联系人已在名单中。"
 
-#: ../src/dialogs.py:1112
+#: ../src/dialogs.py:1118
 msgid "User ID:"
 msgstr "用户 ID："
 
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1189
 msgid "A GTK+ jabber client"
 msgstr "一个 GTK+ 的 Jabber 客户端"
 
-#: ../src/dialogs.py:1176
+#: ../src/dialogs.py:1190
 msgid "GTK+ Version:"
 msgstr "GTK+ 版本："
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1191
 msgid "PyGTK Version:"
 msgstr "PyGTK 版本："
 
-#: ../src/dialogs.py:1187
+#: ../src/dialogs.py:1201
 msgid "Current Developers:"
 msgstr "当前的开发者："
 
-#: ../src/dialogs.py:1189
+#: ../src/dialogs.py:1203
 msgid "Past Developers:"
 msgstr "既往开发作者："
 
-#: ../src/dialogs.py:1195
+#: ../src/dialogs.py:1209
 msgid "THANKS:"
 msgstr "感谢："
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1215
 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:1213
+#: ../src/dialogs.py:1227
 msgid "translator-credits"
 msgstr ""
 "wwld <wwld@radio.lzusiyu.org>\n"
 "kangkang <kanger@gmail.com>\n"
 "jeanet <qianxiaojun604@gmail.com>"
 
-#: ../src/dialogs.py:1396
+#: ../src/dialogs.py:1410
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7056,275 +7245,275 @@ msgid ""
 msgstr ""
 "您需安装 %s 字典以使用拼写检查，或者设置拼写检查选项以选择另外一种语言。(_L)"
 
-#: ../src/dialogs.py:1935 ../src/dialogs.py:2322
+#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr "群聊 Jabber ID 包含非法字符。"
 
-#: ../src/dialogs.py:2053
+#: ../src/dialogs.py:2069
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "该认证要求来自帐户 %s 由 %s 发送"
 
-#: ../src/dialogs.py:2056
+#: ../src/dialogs.py:2072
 #, python-format
 msgid "Subscription request from %s"
 msgstr "来自 %s 的认证请求"
 
-#: ../src/dialogs.py:2131 ../src/gui_interface.py:2672
+#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "您已经在群聊房间 %s 。"
 
-#: ../src/dialogs.py:2137
+#: ../src/dialogs.py:2153
 msgid "You can not join a group chat unless you are connected."
 msgstr "请在加入群聊前先连接到服务器。"
 
-#: ../src/dialogs.py:2178
+#: ../src/dialogs.py:2194
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "使用账户 %s 加入群聊"
 
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2325
 #, fuzzy
 msgid "Invalid Account"
 msgstr "无效的账户名称"
 
-#: ../src/dialogs.py:2310
+#: ../src/dialogs.py:2326
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "您必须在与他人聊天前新建账户。"
 
-#: ../src/dialogs.py:2321
+#: ../src/dialogs.py:2337
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "无效用户名"
 
-#: ../src/dialogs.py:2326 ../src/dialogs.py:2332
-#: ../src/groupchat_control.py:1832
+#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
+#: ../src/groupchat_control.py:1847
 msgid "Invalid group chat Jabber ID"
 msgstr "无效的群聊 Jabber ID"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2343
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "群聊 Jabber ID 包含非法字符。"
 
-#: ../src/dialogs.py:2333 ../src/groupchat_control.py:1833
+#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "群聊 Jabber ID 包含非法字符。"
 
-#: ../src/dialogs.py:2340
+#: ../src/dialogs.py:2356
 msgid "This is not a group chat"
 msgstr "这不是一个群聊"
 
-#: ../src/dialogs.py:2341
+#: ../src/dialogs.py:2357
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s 不是群聊的名称。"
 
-#: ../src/dialogs.py:2372
+#: ../src/dialogs.py:2388
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "连接后才可更改密码。"
 
-#: ../src/dialogs.py:2386
+#: ../src/dialogs.py:2402
 msgid "Server"
 msgstr "服务器"
 
-#: ../src/dialogs.py:2421
+#: ../src/dialogs.py:2437
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "账户 “%s” 已连接到服务器"
 
-#: ../src/dialogs.py:2422
+#: ../src/dialogs.py:2438
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "请在加入群聊前先连接到服务器。"
 
-#: ../src/dialogs.py:2446
+#: ../src/dialogs.py:2462
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2523
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "使用账户 %s 加入群聊"
 
-#: ../src/dialogs.py:2509
+#: ../src/dialogs.py:2525
 msgid "Start Chat"
 msgstr "开始聊天"
 
-#: ../src/dialogs.py:2510
+#: ../src/dialogs.py:2526
 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:2536 ../src/dialogs.py:2917 ../src/dialogs.py:3129
+#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
 msgid "Connection not available"
 msgstr "连接不可用"
 
-#: ../src/dialogs.py:2537 ../src/dialogs.py:2918 ../src/dialogs.py:3130
+#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "请确认已连接到 “%s”。"
 
-#: ../src/dialogs.py:2546 ../src/dialogs.py:2549
+#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
 msgid "Invalid JID"
 msgstr "无效的 Jabber ID"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2565
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "无法解析 \"%s\"。"
 
-#: ../src/dialogs.py:2558
+#: ../src/dialogs.py:2574
 msgid "Without a connection, you can not change your password."
 msgstr "连接后才可更改密码。"
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "Invalid password"
 msgstr "无效密码"
 
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2593
 msgid "You must enter a password."
 msgstr "此处必须输入密码"
 
-#: ../src/dialogs.py:2581
+#: ../src/dialogs.py:2597
 msgid "Passwords do not match"
 msgstr "密码不符"
 
-#: ../src/dialogs.py:2582
+#: ../src/dialogs.py:2598
 msgid "The passwords typed in both fields must be identical."
 msgstr "两次密码输入不一致。"
 
 #. default value
-#: ../src/dialogs.py:2619 ../src/notify.py:247 ../src/notify.py:473
+#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
 msgid "Contact Signed In"
 msgstr "联系人登录"
 
-#: ../src/dialogs.py:2621 ../src/notify.py:255 ../src/notify.py:475
+#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
 msgid "Contact Signed Out"
 msgstr "联系人退出登录"
 
 #. chat message
-#: ../src/dialogs.py:2623 ../src/notify.py:277 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
 msgid "New Message"
 msgstr "新消息"
 
 #. single message
-#: ../src/dialogs.py:2623 ../src/notify.py:259 ../src/notify.py:477
+#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
 msgid "New Single Message"
 msgstr "新消息"
 
 #. private message
-#: ../src/dialogs.py:2624 ../src/notify.py:265 ../src/notify.py:478
+#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
 msgid "New Private Message"
 msgstr "新的个人消息"
 
-#: ../src/dialogs.py:2624 ../src/gui_interface.py:1358 ../src/notify.py:487
+#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
 msgid "New E-mail"
 msgstr "新的电子邮件"
 
-#: ../src/dialogs.py:2626 ../src/gui_interface.py:1420 ../src/notify.py:480
+#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
 msgid "File Transfer Request"
 msgstr "文件传输请求"
 
-#: ../src/dialogs.py:2628 ../src/gui_interface.py:1320
-#: ../src/gui_interface.py:1389 ../src/notify.py:482
+#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
+#: ../src/gui_interface.py:1186 ../src/notify.py:482
 msgid "File Transfer Error"
 msgstr "文件传输错误"
 
-#: ../src/dialogs.py:2630 ../src/gui_interface.py:1466
-#: ../src/gui_interface.py:1489 ../src/gui_interface.py:1506
+#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
+#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
 #: ../src/notify.py:484
 msgid "File Transfer Completed"
 msgstr "文件传输完成"
 
-#: ../src/dialogs.py:2631 ../src/gui_interface.py:1469 ../src/notify.py:485
+#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
 msgid "File Transfer Stopped"
 msgstr "文件传输已停止"
 
-#: ../src/dialogs.py:2633 ../src/gui_interface.py:1152 ../src/notify.py:489
+#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
 msgid "Groupchat Invitation"
 msgstr "群聊邀请"
 
-#: ../src/dialogs.py:2635 ../src/notify.py:239 ../src/notify.py:491
+#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
 msgid "Contact Changed Status"
 msgstr "联系人状态改变"
 
-#: ../src/dialogs.py:2836
+#: ../src/dialogs.py:2852
 #, python-format
 msgid "Single Message using account %s"
 msgstr "账户 %s 的单条消息"
 
-#: ../src/dialogs.py:2838
+#: ../src/dialogs.py:2854
 #, python-format
 msgid "Single Message in account %s"
 msgstr "账户 %s 的单条消息"
 
-#: ../src/dialogs.py:2840
+#: ../src/dialogs.py:2856
 msgid "Single Message"
 msgstr "单条消息"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2843
+#: ../src/dialogs.py:2859
 #, python-format
 msgid "Send %s"
 msgstr "发送 %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:2882
 #, python-format
 msgid "Received %s"
 msgstr "已接收 %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2889
+#: ../src/dialogs.py:2905
 #, 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:2968
+#: ../src/dialogs.py:2984
 #, python-format
 msgid "RE: %s"
 msgstr "回复： %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:2985
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s 写道：\n"
 
-#: ../src/dialogs.py:3028
+#: ../src/dialogs.py:3044
 #, python-format
 msgid "XML Console for %s"
 msgstr "账户 %s 的 XML 控制台"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3046
 msgid "XML Console"
 msgstr " XML 控制台"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "add"
 msgstr "已冻结"
 
-#: ../src/dialogs.py:3159
+#: ../src/dialogs.py:3175
 #, fuzzy
 msgid "modify"
 msgstr "修改(_M)"
 
-#: ../src/dialogs.py:3160
+#: ../src/dialogs.py:3176
 #, fuzzy
 msgid "remove"
 msgstr "移除(_R)"
 
-#: ../src/dialogs.py:3188
+#: ../src/dialogs.py:3204
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7332,159 +7521,192 @@ msgid ""
 msgstr "我想添加您到我的联系人名单"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3204 ../src/dialogs.py:3250
+#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
 msgid "Add"
 msgstr "地址"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3206 ../src/dialogs.py:3281
+#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
 #, fuzzy
 msgid "Modify"
 msgstr "修改(_M)"
 
-#: ../src/dialogs.py:3212
+#: ../src/dialogs.py:3228
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3218
+#: ../src/dialogs.py:3234
 #, fuzzy
 msgid "Groups"
 msgstr "群组"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3342
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "我申请添加您到联系人名单"
 
-#: ../src/dialogs.py:3340
+#: ../src/dialogs.py:3356
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "添加联系人(_C)"
 
-#: ../src/dialogs.py:3377
+#: ../src/dialogs.py:3393
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "从名单移除联系人"
 
-#: ../src/dialogs.py:3430
+#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#, python-format
+msgid "Archiving Preferences for %s"
+msgstr ""
+
+#: ../src/dialogs.py:3473
+#, fuzzy
+msgid "Invalid expire value"
+msgstr "无效用户名"
+
+#: ../src/dialogs.py:3474
+msgid "Expire must be a valid positive integer."
+msgstr ""
+
+#: ../src/dialogs.py:3521
+msgid "There is an error with the form"
+msgstr ""
+
+#: ../src/dialogs.py:3732
+msgid "There is an error"
+msgstr ""
+
+#: ../src/dialogs.py:3796
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "私人列表 <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3434
+#: ../src/dialogs.py:3800
 #, python-format
 msgid "Privacy List for %s"
 msgstr "%s 的私人列表"
 
-#: ../src/dialogs.py:3490
+#: ../src/dialogs.py:3856
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "顺序：%s，动作：%s，类型：%s，值：%s"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3861
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "顺序： %s，动作：%s"
 
-#: ../src/dialogs.py:3539
+#: ../src/dialogs.py:3905
 msgid "<b>Edit a rule</b>"
 msgstr "<b>编辑规则</b>"
 
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:4016
 msgid "<b>Add a rule</b>"
 msgstr "<b>添加规则</b>"
 
-#: ../src/dialogs.py:3750
+#: ../src/dialogs.py:4116
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "%s 的私人列表"
 
-#: ../src/dialogs.py:3752
+#: ../src/dialogs.py:4118
 msgid "Privacy Lists"
 msgstr "私人列表"
 
-#: ../src/dialogs.py:3822
+#: ../src/dialogs.py:4188
 msgid "Invalid List Name"
 msgstr "无效列表名"
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4189
 msgid "You must enter a name to create a privacy list."
 msgstr "您必须输入一个名称以创建一个私人列表。"
 
-#: ../src/dialogs.py:3855
+#: ../src/dialogs.py:4221
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "您被该群聊封禁。"
 
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4224
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "%(contact_jid)s 邀请您到 %(room_jid)s 群聊"
 
-#: ../src/dialogs.py:3860
+#: ../src/dialogs.py:4226
 #, fuzzy, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s 邀请您到 %(room_jid)s 群聊"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4234
 #, python-format
 msgid "Comment: %s"
 msgstr "注释： %s"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4236
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3932
+#: ../src/dialogs.py:4298
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:3942 ../src/dialogs.py:3985 ../src/dialogs.py:4041
+#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
+#: ../src/dialogs.py:4495
 msgid "All files"
 msgstr "全部文件"
 
-#: ../src/dialogs.py:3947
+#: ../src/dialogs.py:4313
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:3975
+#: ../src/dialogs.py:4341
 msgid "Choose Sound"
 msgstr "选择声音"
 
-#: ../src/dialogs.py:3990
+#: ../src/dialogs.py:4356
 msgid "Wav Sounds"
 msgstr "Wav声音"
 
-#: ../src/dialogs.py:4028
+#: ../src/dialogs.py:4394
 msgid "Choose Image"
 msgstr "选择形象"
 
-#: ../src/dialogs.py:4046
+#: ../src/dialogs.py:4412
 msgid "Images"
 msgstr "形象"
 
-#: ../src/dialogs.py:4113
+#: ../src/dialogs.py:4482
+#, fuzzy
+msgid "Choose Archive"
+msgstr "选择形象"
+
+#: ../src/dialogs.py:4500
+#, fuzzy
+msgid "Zip files"
+msgstr "全部文件"
+
+#: ../src/dialogs.py:4525
 #, python-format
 msgid "When %s becomes:"
 msgstr "当 %s 变为："
 
-#: ../src/dialogs.py:4115
+#: ../src/dialogs.py:4527
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "正在为 %s 添加特殊通告"
 
-#: ../src/dialogs.py:4190
+#: ../src/dialogs.py:4602
 msgid "Condition"
 msgstr "条件"
 
-#: ../src/dialogs.py:4310
+#: ../src/dialogs.py:4722
 msgid "when I am "
 msgstr "当我"
 
-#: ../src/dialogs.py:4786
+#: ../src/dialogs.py:5198
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7492,38 +7714,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4789
+#: ../src/dialogs.py:5201
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4795 ../src/dialogs.py:4879
+#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4801
+#: ../src/dialogs.py:5213
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4806
+#: ../src/dialogs.py:5218
 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:4809 ../src/dialogs.py:4860 ../src/dialogs.py:4873
+#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4814
+#: ../src/dialogs.py:5226
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4825
+#: ../src/dialogs.py:5237
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4826
+#: ../src/dialogs.py:5238
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7533,44 +7755,44 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4827
+#: ../src/dialogs.py:5239
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4861
+#: ../src/dialogs.py:5273
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4867
+#: ../src/dialogs.py:5279
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4874
+#: ../src/dialogs.py:5286
 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:4880
+#: ../src/dialogs.py:5292
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:4945
+#: ../src/dialogs.py:5357
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4947
+#: ../src/dialogs.py:5359
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4949
+#: ../src/dialogs.py:5361
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4953
+#: ../src/dialogs.py:5365
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7586,119 +7808,119 @@ msgstr "其他"
 msgid "Conference"
 msgstr "会议"
 
-#: ../src/disco.py:512
+#: ../src/disco.py:513
 msgid "Without a connection, you can not browse available services"
 msgstr "连接后才可浏览可用服务"
 
-#: ../src/disco.py:589
+#: ../src/disco.py:600
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "正在使用帐号 %s 来发掘服务"
 
-#: ../src/disco.py:591
+#: ../src/disco.py:602
 msgid "Service Discovery"
 msgstr "搜索服务"
 
-#: ../src/disco.py:741
+#: ../src/disco.py:758
 msgid "The service could not be found"
 msgstr "找不到该服务"
 
-#: ../src/disco.py:742
+#: ../src/disco.py:759
 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:746 ../src/disco.py:1082
+#: ../src/disco.py:763 ../src/disco.py:1100
 msgid "The service is not browsable"
 msgstr "该服务无法浏览"
 
-#: ../src/disco.py:747
+#: ../src/disco.py:764
 msgid "This type of service does not contain any items to browse."
 msgstr "此服务没有项目可浏览。"
 
-#: ../src/disco.py:786 ../src/disco.py:796
+#: ../src/disco.py:804 ../src/disco.py:814
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "无效用户名"
 
-#: ../src/disco.py:850
+#: ../src/disco.py:868
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "浏览 %s 在帐户 %s 上"
 
-#: ../src/disco.py:894
+#: ../src/disco.py:912
 msgid "_Browse"
 msgstr "浏览(_B)"
 
-#: ../src/disco.py:1083
+#: ../src/disco.py:1101
 msgid "This service does not contain any items to browse."
 msgstr "此服务不包含任何项目可浏览。"
 
-#: ../src/disco.py:1323
+#: ../src/disco.py:1341
 #, fuzzy
 msgid "_Execute Command"
 msgstr "执行命令(_E)..."
 
-#: ../src/disco.py:1333 ../src/disco.py:1504
+#: ../src/disco.py:1351 ../src/disco.py:1522
 msgid "Re_gister"
 msgstr "注册(_G)"
 
-#: ../src/disco.py:1545
+#: ../src/disco.py:1563
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "已扫描 %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1736
+#: ../src/disco.py:1754
 msgid "Users"
 msgstr "用户"
 
 #. Description column
-#: ../src/disco.py:1744
+#: ../src/disco.py:1762
 msgid "Description"
 msgstr "描述"
 
 #. Id column
-#: ../src/disco.py:1752
+#: ../src/disco.py:1770
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1817 ../src/gui_interface.py:3182
+#: ../src/disco.py:1835 ../src/gui_interface.py:2995
 msgid "Bookmark already set"
 msgstr "书签已设定"
 
-#: ../src/disco.py:1818 ../src/gui_interface.py:3183
+#: ../src/disco.py:1836 ../src/gui_interface.py:2996
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "群聊“%s”已在您的书签中。"
 
-#: ../src/disco.py:1827 ../src/gui_interface.py:3197
+#: ../src/disco.py:1845 ../src/gui_interface.py:3010
 msgid "Bookmark has been added successfully"
 msgstr "书签添加成功"
 
-#: ../src/disco.py:1828 ../src/gui_interface.py:3198
+#: ../src/disco.py:1846 ../src/gui_interface.py:3011
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "您可以通过“动作”菜单管理您的名单。"
 
-#: ../src/disco.py:2039
+#: ../src/disco.py:2057
 msgid "Subscribed"
 msgstr "订阅"
 
-#: ../src/disco.py:2047
+#: ../src/disco.py:2065
 #, fuzzy
 msgid "Node"
 msgstr "æ— "
 
-#: ../src/disco.py:2111
+#: ../src/disco.py:2129
 msgid "New post"
 msgstr "新发表"
 
-#: ../src/disco.py:2117
+#: ../src/disco.py:2135
 msgid "_Subscribe"
 msgstr "认证(_S)"
 
-#: ../src/disco.py:2123
+#: ../src/disco.py:2141
 msgid "_Unsubscribe"
 msgstr "退订(_S)"
 
@@ -7874,14 +8096,14 @@ msgstr ""
 
 #: ../src/features_window.py:95
 msgid ""
-"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
-"in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 
 #: ../src/features_window.py:96
 msgid ""
-"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
+"You have to set 'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 
 #: ../src/features_window.py:97
@@ -8040,33 +8262,33 @@ msgstr "描述： %s"
 msgid "%s wants to send you a file:"
 msgstr "%s 想发送给您一个文件："
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "无法覆盖现有文件\"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "文件名已经存在且您没有权限覆盖它。"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 msgid "This file already exists"
 msgstr "文件已经存在"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
 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:369 ../src/gtkgui_helpers.py:914
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "目录 \"%s\" 不可写"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
 msgid "You do not have permission to create files in this directory."
 msgstr "您没有权限在这个目录里创建文件。"
 
@@ -8168,35 +8390,42 @@ msgstr ""
 "Gajim 另一个实例似乎正在运行 \n"
 "运行？"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "为特定命令显示帮助"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:80
+#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
 msgid "command"
 msgstr "命令"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "为命令显示帮助"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "显示/隐藏名单窗口"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "为下一条未读消息弹出窗口"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
 #, fuzzy
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 msgstr "打印名单中所有联系人。每个联系人一行。"
 
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
+#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
+#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
+#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
 #: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
 #: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
 #: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
@@ -8208,85 +8437,52 @@ msgstr "打印名单中所有联系人。每个联系人一行。"
 msgid "account"
 msgstr "账户"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "只显示指定帐户的联系人"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "打印注册的账户"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "改变一个或多个账户状态"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
 msgid "status"
 msgstr "状态"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote-plugin.py:106
 #, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"accoun't previous status"
+msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "下列中的一项： 离线，在线，聊天，离开，不可用, dnd, 隐身"
 
-#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
-msgid "message"
-msgstr "消息"
-
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "状态消息"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
 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:117
-#, fuzzy
-msgid "Changes the priority of account or accounts"
-msgstr "改变一个或多个账户状态"
-
-#: ../src/gajim-remote.py:119
-#, fuzzy
-msgid "priority"
-msgstr "优先级(_T):"
-
-#: ../src/gajim-remote.py:119
-#, fuzzy
-msgid "priority you want to give to the account"
-msgstr "我想注册一个新帐户(_R)"
-
-#: ../src/gajim-remote.py:121
-#, fuzzy
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-msgstr "改变账户的状态。如果不指明，将改变设置“与全局同步”选项的账户"
-
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "显示对话框用于给联系人发送消息"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "您想聊天的 JID"
 
+#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
 #: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "如指定，将从此帐户列表下移出联系人"
 
-#: ../src/gajim-remote.py:134
-msgid "message content. The account must be specified or \"\""
-msgstr ""
-
-#: ../src/gajim-remote.py:139
+#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
 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 "
@@ -8295,29 +8491,34 @@ msgstr ""
 "发送新聊天消息至名单中的联系人。 OpenPGP 密钥与帐户均可选。如果只选择“帐户”而"
 "不需要“ OpenPGP 密钥”，只需将“ OpenPGP 密钥”置为空。"
 
+#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
 #: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "联系人的JID将收到消息"
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
+#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "消息内容"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "PGP 钥匙"
 
+#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "如指定，该消息将使用本公共密钥加密"
 
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
+#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "如指定，消息将被用此账户发送"
 
-#: ../src/gajim-remote.py:152
+#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
 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 "
@@ -8326,139 +8527,286 @@ msgstr ""
 "发送新单条消息至名单中的联系人。 OpenPGP 密钥与帐户均可选。如果只选择“帐户”而"
 "不需要“ OpenPGP 密钥”，只需将“ OpenPGP 密钥”置为空。"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "主题"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "消息主题"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "联系人的JID将收到消息"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "获得联系人的详细信息"
 
+#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
+#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
 #: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
 #: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "联系人的 JID "
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "获得帐号的详细信息"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "帐号名称"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "向联系人发送文件"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "file"
 msgstr "文件"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "文件路径"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "如指定，文件将被用此账户发送"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "列出所有的参数及它们的值"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "将“密钥”的值设为“值”"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "键=值"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "“密钥”是参数名，而“值”是赋予参数的数值"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "删除一个参数项"
 
-#: ../src/gajim-remote.py:209
-msgid "key"
-msgstr "é”®"
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "key"
+msgstr "é”®"
+
+#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+msgid "name of the preference to be deleted"
+msgstr "需要删除的参数名"
+
+#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+msgid "Writes the current state of Gajim preferences to the .config file"
+msgstr "将当前Gajim的国家设置写入 .config 文件"
+
+#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
+msgid "Removes contact from roster"
+msgstr "从名单移除联系人"
+
+#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+msgid "Adds contact to roster"
+msgstr "向名单添加联系人"
+
+#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+msgid "Adds new contact to this account"
+msgstr "为此账户加入新联系人"
+
+#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+msgid "Returns current status (the global one unless account is specified)"
+msgstr "返回当前状态(如不指定账户将返回全局设置)"
+
+#: ../src/gajim-remote-plugin.py:226
+#, fuzzy
+msgid ""
+"Returns current status message(the global one unless account is specified)"
+msgstr "返回当前状态信息(如不指定账户将返回全局设置)"
+
+#: ../src/gajim-remote-plugin.py:233 ../src/gajim-remote.py:249
+#, fuzzy
+msgid "Returns number of unread messages"
+msgstr "未读消息的回复总数"
+
+#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+msgid "Opens 'Start Chat' dialog"
+msgstr "打开 '开始聊天' 对话框"
+
+#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+msgid "Starts chat, using this account"
+msgstr "开始聊天，使用这个账户"
+
+#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+msgid "Sends custom XML"
+msgstr "发送自定义 XML"
+
+#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+msgid "XML to send"
+msgstr "发送 XML"
+
+#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+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-plugin.py:252 ../src/gajim-remote.py:277
+msgid "Handle a xmpp:/ uri"
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
+msgid "uri"
+msgstr ""
+
+#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#, fuzzy
+msgid "Join a MUC room"
+msgstr "加入新房间(_J)"
+
+#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+#, fuzzy
+msgid "room"
+msgstr "来自"
+
+#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+#, fuzzy
+msgid "nick"
+msgstr "昵称"
+
+#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+#, fuzzy
+msgid "password"
+msgstr "密码："
+
+#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#, fuzzy
+msgid "Check if Gajim is running"
+msgstr "请检查 avahi-daemon 是否运行。"
+
+#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
+#: ../src/gajim-remote.py:300
+#, fuzzy
+msgid "Shows or hides the ipython window"
+msgstr "显示/隐藏名单窗口"
+
+#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+msgid "Missing argument \"contact_jid\""
+msgstr "缺失的“联系人 JID”参数"
+
+#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#, python-format
+msgid ""
+"'%s' is not in your roster.\n"
+"Please specify account for sending the message."
+msgstr ""
+"\"%s\" 不在您的名单中。\n"
+"请为发送此消息指定账户。"
+
+#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+msgid "You have no active account"
+msgstr "没有活动的账户"
+
+#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+msgid "It seems Gajim is not running. So you can't use gajim-remote."
+msgstr ""
 
-#: ../src/gajim-remote.py:209
-msgid "name of the preference to be deleted"
-msgstr "需要删除的参数名"
+#: ../src/gajim-remote-plugin.py:412
+#, python-format
+msgid ""
+"Usage: %s %s %s \n"
+"\t %s"
+msgstr ""
+"用法： %s %s %s \n"
+"\t %s"
 
-#: ../src/gajim-remote.py:213
-msgid "Writes the current state of Gajim preferences to the .config file"
-msgstr "将当前Gajim的国家设置写入 .config 文件"
+#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+msgid "Arguments:"
+msgstr "参数："
 
-#: ../src/gajim-remote.py:218
-msgid "Removes contact from roster"
-msgstr "从名单移除联系人"
+#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#, python-format
+msgid "%s not found"
+msgstr " %s 未找到"
 
-#: ../src/gajim-remote.py:227
-msgid "Adds contact to roster"
-msgstr "向名单添加联系人"
+#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
+#, python-format
+msgid ""
+"Usage: %s command [arguments]\n"
+"Command is one of:\n"
+msgstr ""
+"用法：%s 命令 [参数] \n"
+"命令是下列之一：\n"
 
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "JID"
+#: ../src/gajim-remote-plugin.py:496
+#, fuzzy, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"参数“%s”未指定。\n"
+"输入“%s help %s”以获取更多信息"
 
-#: ../src/gajim-remote.py:230
-msgid "Adds new contact to this account"
-msgstr "为此账户加入新联系人"
+#: ../src/gajim-remote-plugin.py:500
+#, fuzzy, python-format
+msgid ""
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"参数“%s”未指定。\n"
+"输入“%s help %s”以获取更多信息"
 
-#: ../src/gajim-remote.py:235
-msgid "Returns current status (the global one unless account is specified)"
-msgstr "返回当前状态(如不指定账户将返回全局设置)"
+#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
+#, fuzzy
+msgid "Wrong uri"
+msgstr "错误主机"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:109
+#, fuzzy
 msgid ""
-"Returns current status message (the global one unless account is specified)"
-msgstr "返回当前状态信息(如不指定账户将返回全局设置)"
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
+msgstr "下列中的一项： 离线，在线，聊天，离开，不可用, dnd, 隐身"
 
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:117
 #, fuzzy
-msgid "Returns number of unread messages"
-msgstr "未读消息的回复总数"
+msgid "Changes the priority of account or accounts"
+msgstr "改变一个或多个账户状态"
 
-#: ../src/gajim-remote.py:253
-msgid "Opens 'Start Chat' dialog"
-msgstr "打开 '开始聊天' 对话框"
+#: ../src/gajim-remote.py:119
+#, fuzzy
+msgid "priority"
+msgstr "优先级(_T):"
 
-#: ../src/gajim-remote.py:255
-msgid "Starts chat, using this account"
-msgstr "开始聊天，使用这个账户"
+#: ../src/gajim-remote.py:119
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "我想注册一个新帐户(_R)"
 
-#: ../src/gajim-remote.py:259
-msgid "Sends custom XML"
-msgstr "发送自定义 XML"
+#: ../src/gajim-remote.py:121
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr "改变账户的状态。如果不指明，将改变设置“与全局同步”选项的账户"
 
-#: ../src/gajim-remote.py:261
-msgid "XML to send"
-msgstr "发送 XML"
+#: ../src/gajim-remote.py:134
+msgid "message content. The account must be specified or \"\""
+msgstr ""
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:242
 msgid ""
-"Account in which the xml will be sent; if not specified, xml will be sent to "
-"all accounts"
-msgstr "XML 将被发送的账户；如果不指定，XML 将被发送至所有账户"
+"Returns current status message (the global one unless account is specified)"
+msgstr "返回当前状态信息(如不指定账户将返回全局设置)"
 
 #: ../src/gajim-remote.py:268
 #, fuzzy
@@ -8477,14 +8825,6 @@ msgid ""
 "be set for all accounts"
 msgstr "XML 将被发送的账户；如果不指定，XML 将被发送至所有账户"
 
-#: ../src/gajim-remote.py:277
-msgid "Handle a xmpp:/ uri"
-msgstr ""
-
-#: ../src/gajim-remote.py:279
-msgid "uri"
-msgstr ""
-
 #: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr ""
@@ -8498,36 +8838,16 @@ msgstr ""
 msgid "Message content"
 msgstr "消息内容"
 
-#: ../src/gajim-remote.py:286
-#, fuzzy
-msgid "Join a MUC room"
-msgstr "加入新房间(_J)"
-
-#: ../src/gajim-remote.py:288
-#, fuzzy
-msgid "room"
-msgstr "来自"
-
 #: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "Room JID"
 msgstr "房间："
 
-#: ../src/gajim-remote.py:289
-#, fuzzy
-msgid "nick"
-msgstr "昵称"
-
 #: ../src/gajim-remote.py:289
 #, fuzzy
 msgid "Nickname to use"
 msgstr "昵称未找到： %s "
 
-#: ../src/gajim-remote.py:290
-#, fuzzy
-msgid "password"
-msgstr "密码："
-
 #: ../src/gajim-remote.py:290
 #, fuzzy
 msgid "Password to enter the room"
@@ -8537,37 +8857,6 @@ msgstr "密码不符"
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:296
-#, fuzzy
-msgid "Check if Gajim is running"
-msgstr "请检查 avahi-daemon 是否运行。"
-
-#: ../src/gajim-remote.py:300
-#, fuzzy
-msgid "Shows or hides the ipython window"
-msgstr "显示/隐藏名单窗口"
-
-#: ../src/gajim-remote.py:327
-msgid "Missing argument \"contact_jid\""
-msgstr "缺失的“联系人 JID”参数"
-
-#: ../src/gajim-remote.py:348
-#, python-format
-msgid ""
-"'%s' is not in your roster.\n"
-"Please specify account for sending the message."
-msgstr ""
-"\"%s\" 不在您的名单中。\n"
-"请为发送此消息指定账户。"
-
-#: ../src/gajim-remote.py:351
-msgid "You have no active account"
-msgstr "没有活动的账户"
-
-#: ../src/gajim-remote.py:404
-msgid "It seems Gajim is not running. So you can't use gajim-remote."
-msgstr ""
-
 #: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
@@ -8575,24 +8864,6 @@ msgid ""
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:435
-msgid "Arguments:"
-msgstr "参数："
-
-#: ../src/gajim-remote.py:439
-#, python-format
-msgid "%s not found"
-msgstr " %s 未找到"
-
-#: ../src/gajim-remote.py:445
-#, python-format
-msgid ""
-"Usage: %s command [arguments]\n"
-"Command is one of:\n"
-msgstr ""
-"用法：%s 命令 [参数] \n"
-"命令是下列之一：\n"
-
 #: ../src/gajim-remote.py:514
 #, fuzzy, python-format
 msgid ""
@@ -8615,11 +8886,6 @@ msgstr ""
 msgid "No uri given"
 msgstr ""
 
-#: ../src/gajim-remote.py:540
-#, fuzzy
-msgid "Wrong uri"
-msgstr "错误主机"
-
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "主题"
@@ -8646,202 +8912,200 @@ msgstr "无法删除当前主题"
 msgid "Please first choose another for your current theme."
 msgstr "请先选择其他主题作为当前主题"
 
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:170
 msgid "Sending private message failed"
 msgstr "发送私有消息失败"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:171
+#: ../src/groupchat_control.py:172
 #, 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:450
+#: ../src/groupchat_control.py:455
 msgid "Insert Nickname"
 msgstr "插入昵称"
 
-#: ../src/groupchat_control.py:631
+#: ../src/groupchat_control.py:636
 #, fuzzy
 msgid "Conversation with "
 msgstr "对话历史"
 
-#: ../src/groupchat_control.py:633
+#: ../src/groupchat_control.py:638
 #, fuzzy
 msgid "Continued conversation"
 msgstr "连接"
 
-#. Can be a message (see handle_event_gc_config_change in
-#. gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1272 ../src/gui_interface.py:1080
+#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1286
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1288
 #, fuzzy
 msgid "A new room has been created"
 msgstr "注册新账户成功"
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1291
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1287
+#: ../src/groupchat_control.py:1297
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s 被踢出：%(reason)s"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1300
 #, 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:1300
+#: ../src/groupchat_control.py:1309
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s 被封禁：%(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1312
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s 被 %(who)s 封禁：%(reason)s"
 
-#: ../src/groupchat_control.py:1314 ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
 #, python-format
 msgid "You are now known as %s"
 msgstr "您现在成了 %s "
 
-#: ../src/groupchat_control.py:1330 ../src/gui_interface.py:919
+#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s 现在成了 %s"
 
-#: ../src/groupchat_control.py:1372 ../src/groupchat_control.py:1377
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1392
 #, 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:1374
+#: ../src/groupchat_control.py:1383
 #, fuzzy
 msgid "affiliation changed"
 msgstr "会籍："
 
-#: ../src/groupchat_control.py:1379
+#: ../src/groupchat_control.py:1388
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1394
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1470
+#: ../src/groupchat_control.py:1477
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1474
+#: ../src/groupchat_control.py:1481
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1489
+#: ../src/groupchat_control.py:1496
 #, 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:1493
+#: ../src/groupchat_control.py:1500
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s 被踢出：%(reason)s"
 
-#: ../src/groupchat_control.py:1522
+#: ../src/groupchat_control.py:1530
 #, python-format
 msgid "%s has left"
 msgstr " %s 离开了"
 
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1535
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s 加入群聊"
 
-#: ../src/groupchat_control.py:1529 ../src/gui_interface.py:946
+#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
 #: ../src/history_window.py:447 ../src/notify.py:234
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s 的状态是 %(status)s"
 
-#: ../src/groupchat_control.py:1759
+#: ../src/groupchat_control.py:1774
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "确定要离开群聊“ %s ”？"
 
-#: ../src/groupchat_control.py:1761
+#: ../src/groupchat_control.py:1776
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "如果关闭此窗口，您将断开此群聊的连接。"
 
-#: ../src/groupchat_control.py:1765 ../src/gui_interface.py:1216
-#: ../src/gui_interface.py:1992 ../src/gui_interface.py:2029
-#: ../src/gui_interface.py:2064 ../src/message_window.py:224
-#: ../src/roster_window.py:2739 ../src/roster_window.py:3399
-#: ../src/roster_window.py:4123
+#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
+#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
+#: ../src/gui_interface.py:1853 ../src/message_window.py:224
+#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
+#: ../src/roster_window.py:4195
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "不再提问此问题(_N)"
 
-#: ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:1814
 msgid "Changing Subject"
 msgstr "正在更换话题"
 
-#: ../src/groupchat_control.py:1800
+#: ../src/groupchat_control.py:1815
 msgid "Please specify the new subject:"
 msgstr "请指定新话题："
 
-#: ../src/groupchat_control.py:1807
+#: ../src/groupchat_control.py:1822
 msgid "Changing Nickname"
 msgstr "正在更换昵称"
 
-#: ../src/groupchat_control.py:1808
+#: ../src/groupchat_control.py:1823
 msgid "Please specify the new nickname you want to use:"
 msgstr "请指定您想使用的新昵称："
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1839
+#: ../src/groupchat_control.py:1854
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "描述： %s"
 
-#: ../src/groupchat_control.py:1840
+#: ../src/groupchat_control.py:1855
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1842
+#: ../src/groupchat_control.py:1857
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2028
+#: ../src/groupchat_control.py:2046
 #, python-format
 msgid "Kicking %s"
 msgstr "踢出 %s"
 
-#: ../src/groupchat_control.py:2029 ../src/groupchat_control.py:2356
+#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
 msgid "You may specify a reason below:"
 msgstr "您可以指定一个原因："
 
 #. ask for reason
-#: ../src/groupchat_control.py:2355
+#: ../src/groupchat_control.py:2373
 #, python-format
 msgid "Banning %s"
 msgstr "封禁 %s"
@@ -8865,54 +9129,63 @@ msgid "Details"
 msgstr "细节"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
+#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "错误：无法按读打开文件 %s"
 
-#: ../src/gtkgui_helpers.py:400
+#: ../src/gtkgui_helpers.py:404
 msgid "Error reading file:"
 msgstr "读文件错误："
 
-#: ../src/gtkgui_helpers.py:403
+#: ../src/gtkgui_helpers.py:407
 msgid "Error parsing file:"
 msgstr "分析文件错误："
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:444
+#: ../src/gtkgui_helpers.py:448
 #, 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:818
+#: ../src/gtkgui_helpers.py:822
 msgid "Gajim is not the default Jabber client"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:819
+#: ../src/gtkgui_helpers.py:823
 #, fuzzy
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "确认覆盖该文件？"
 
-#: ../src/gtkgui_helpers.py:820
+#: ../src/gtkgui_helpers.py:824
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:887
+#: ../src/gtkgui_helpers.py:891
 msgid "Extension not supported"
 msgstr "不支持扩展"
 
-#: ../src/gtkgui_helpers.py:888
+#: ../src/gtkgui_helpers.py:892
 #, 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:924
+#: ../src/gtkgui_helpers.py:928
 msgid "Save Image as..."
 msgstr "图片另存为..."
 
-#: ../src/gui_interface.py:140
+#. we are banned
+#. group chat does not exist
+#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
+#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
+#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
+#: ../src/gui_interface.py:348
+msgid "Unable to join group chat"
+msgstr "无法加入群聊"
+
+#: ../src/gui_interface.py:138
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8922,164 +9195,193 @@ msgstr ""
 "您申请的昵称正在使用或被其他人占有。\n"
 "从下列昵称中另外指定一个："
 
-#: ../src/gui_interface.py:143
+#: ../src/gui_interface.py:141
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:159
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "是否接受这个请求？"
 
-#: ../src/gui_interface.py:161
+#: ../src/gui_interface.py:160
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "是否接受这个请求？"
 
-#: ../src/gui_interface.py:164
+#: ../src/gui_interface.py:163
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) 授权给 %s (id: %s)"
 
-#: ../src/gui_interface.py:213 ../src/notify.py:493
+#: ../src/gui_interface.py:209 ../src/notify.py:493
 msgid "Connection Failed"
 msgstr "连接失败"
 
-#: ../src/gui_interface.py:606 ../src/gui_interface.py:610
+#: ../src/gui_interface.py:312
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "该群聊要求密码才能加入。"
+
+#: ../src/gui_interface.py:324
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/gui_interface.py:333
+#, fuzzy, python-format
+msgid "You are banned from group chat %s."
+msgstr "您被该群聊封禁。"
+
+#: ../src/gui_interface.py:338
+#, fuzzy, python-format
+msgid "Group chat %s does not exist."
+msgstr "不存在这样的群聊"
+
+#: ../src/gui_interface.py:341
+msgid "Group chat creation is restricted."
+msgstr "群聊创建受限。"
+
+#: ../src/gui_interface.py:344
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "您注册的昵称已被使用"
+
+#: ../src/gui_interface.py:349
+#, fuzzy, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "您不在成员名单中。"
+
+#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s： %(message)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:621 ../src/gui_interface.py:636
+#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "发送 %s ( %s ) 时出现错误"
 
-#: ../src/gui_interface.py:663 ../src/notify.py:495
+#: ../src/gui_interface.py:540 ../src/notify.py:495
 #, fuzzy
 msgid "Subscription request"
 msgstr "认证请求"
 
-#: ../src/gui_interface.py:688
+#: ../src/gui_interface.py:565
 msgid "Authorization accepted"
 msgstr "授权被接受"
 
-#: ../src/gui_interface.py:689
+#: ../src/gui_interface.py:566
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "联系人“%s”已授权您查看他/她的状态。"
 
-#: ../src/gui_interface.py:702
+#: ../src/gui_interface.py:579
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "联系人“%s”移除了来自您的认证"
 
-#: ../src/gui_interface.py:703
+#: ../src/gui_interface.py:580
 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/gui_interface.py:727 ../src/notify.py:497
+#: ../src/gui_interface.py:604 ../src/notify.py:497
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "退订(_S)"
 
-#: ../src/gui_interface.py:754
+#: ../src/gui_interface.py:631
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "无法与对方“ %s ”建立连接。"
 
-#: ../src/gui_interface.py:1015
+#: ../src/gui_interface.py:859
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1083
+#: ../src/gui_interface.py:926
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gui_interface.py:1085
+#: ../src/gui_interface.py:928
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gui_interface.py:1087
+#: ../src/gui_interface.py:930
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:1091
+#: ../src/gui_interface.py:934
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1093
+#: ../src/gui_interface.py:936
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1095
+#: ../src/gui_interface.py:938
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1098
+#: ../src/gui_interface.py:941
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1101
+#: ../src/gui_interface.py:944
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1133
-#, fuzzy, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "该群聊要求密码才能加入。"
-
-#: ../src/gui_interface.py:1180
+#: ../src/gui_interface.py:985
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gui_interface.py:1182 ../src/gui_interface.py:1189
+#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
 msgid "You are currently connected without your OpenPGP key."
 msgstr "已建立没有 OpenPGP 密钥的连接"
 
-#: ../src/gui_interface.py:1184
+#: ../src/gui_interface.py:989
 msgid "Your passphrase is incorrect"
 msgstr "您的密文不正确"
 
-#: ../src/gui_interface.py:1188
+#: ../src/gui_interface.py:993
 #, fuzzy
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "您的密文不正确"
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid "GPG key not trusted"
 msgstr ""
 
-#: ../src/gui_interface.py:1214
+#: ../src/gui_interface.py:1019
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
 msgstr ""
 
-#: ../src/gui_interface.py:1226
+#: ../src/gui_interface.py:1031
 msgid ""
 "Gnome Keyring is installed but not                 correctly started "
 "(environment variable probably not                 correctly set)"
 msgstr ""
 
-#: ../src/gui_interface.py:1330
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr " %(gmail_mail_address)s 上的新邮件"
 
-#: ../src/gui_interface.py:1332
+#: ../src/gui_interface.py:1133
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "您有 %d 条新邮件会话"
 
-#: ../src/gui_interface.py:1345
+#: ../src/gui_interface.py:1146
 #, python-format
 msgid ""
 "\n"
@@ -9089,103 +9391,103 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1418
+#: ../src/gui_interface.py:1215
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s 想发送给您一个文件。"
 
-#: ../src/gui_interface.py:1455 ../src/roster_window.py:1856
+#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "从名单移除联系人"
 
-#: ../src/gui_interface.py:1458 ../src/roster_window.py:1858
+#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
 #, fuzzy
 msgid "Error opening file"
 msgstr "读文件错误："
 
-#: ../src/gui_interface.py:1490
+#: ../src/gui_interface.py:1287
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "您成功的从 %(name)s 收到文件  %(filename)s。"
 
 #. ft stopped
-#: ../src/gui_interface.py:1494
+#: ../src/gui_interface.py:1291
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "从 %(name)s 传输的文件 %(filename)s 被停止。"
 
-#: ../src/gui_interface.py:1507
+#: ../src/gui_interface.py:1304
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "您成功的给 %(name)s 发送了文件 %(filename)s。"
 
 #. ft stopped
-#: ../src/gui_interface.py:1511
+#: ../src/gui_interface.py:1308
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "到 %(name)s 的文件传输 %(filename)s 被停止。"
 
-#: ../src/gui_interface.py:1623
+#: ../src/gui_interface.py:1426
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gui_interface.py:1630
+#: ../src/gui_interface.py:1433
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "对于每条消息(_M)"
 
-#: ../src/gui_interface.py:1702
+#: ../src/gui_interface.py:1505
 msgid "Username Conflict"
 msgstr "用户名冲突"
 
-#: ../src/gui_interface.py:1703
+#: ../src/gui_interface.py:1506
 msgid "Please type a new username for your local account"
 msgstr "<b>请在您本地账户填写新的用户名</b>"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1519
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gui_interface.py:1729
+#: ../src/gui_interface.py:1532
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gui_interface.py:1740
+#: ../src/gui_interface.py:1543
 msgid "Error."
 msgstr ""
 
-#: ../src/gui_interface.py:1768
+#: ../src/gui_interface.py:1556
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "用户名冲突"
 
-#: ../src/gui_interface.py:1769
+#: ../src/gui_interface.py:1557
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1816
+#: ../src/gui_interface.py:1604
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s 想发送给您一个文件。"
 
-#: ../src/gui_interface.py:1819
+#: ../src/gui_interface.py:1607
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "文件传输请求"
 
-#: ../src/gui_interface.py:1927
+#: ../src/gui_interface.py:1716
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1928
+#: ../src/gui_interface.py:1717
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9193,15 +9495,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1936
+#: ../src/gui_interface.py:1725
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1956
+#: ../src/gui_interface.py:1745
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gui_interface.py:1957
+#: ../src/gui_interface.py:1746
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9212,13 +9514,13 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gui_interface.py:1987 ../src/gui_interface.py:2024
-#: ../src/gui_interface.py:2060
+#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
+#: ../src/gui_interface.py:1849
 #, fuzzy
 msgid "Insecure connection"
 msgstr "连接"
 
-#: ../src/gui_interface.py:1988
+#: ../src/gui_interface.py:1777
 #, fuzzy
 msgid ""
 "You are about to connect to the server with an insecure connection. This "
@@ -9226,18 +9528,18 @@ msgid ""
 "want to do that?"
 msgstr "您在创建一个元联系人。确定继续？"
 
-#: ../src/gui_interface.py:1991 ../src/gui_interface.py:2028
-#: ../src/gui_interface.py:2063
+#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
+#: ../src/gui_interface.py:1852
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gui_interface.py:2025
+#: ../src/gui_interface.py:1814
 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/gui_interface.py:2061
+#: ../src/gui_interface.py:1850
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9245,58 +9547,58 @@ msgid ""
 msgstr "您在创建一个元联系人。确定继续？"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2624 ../src/gui_interface.py:2647
+#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "禁用加密"
 
-#: ../src/gui_interface.py:2625
+#: ../src/gui_interface.py:2423
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2648
+#: ../src/gui_interface.py:2446
 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/gui_interface.py:2679 ../src/roster_window.py:3560
+#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
 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/gui_interface.py:3058
+#: ../src/gui_interface.py:2871
 msgid "Could not save your settings and preferences"
 msgstr "无法保存您的设置。"
 
-#: ../src/gui_interface.py:3592
+#: ../src/gui_interface.py:3411
 msgid "Passphrase Required"
 msgstr "要求密文"
 
-#: ../src/gui_interface.py:3593
+#: ../src/gui_interface.py:3412
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "为账户 %s 输入 GPG 密文字段"
 
-#: ../src/gui_interface.py:3607
+#: ../src/gui_interface.py:3426
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gui_interface.py:3608
+#: ../src/gui_interface.py:3427
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "您将在无 OpenPGP 情况下连接到 %s。"
 
 #. ask again
-#: ../src/gui_interface.py:3617
+#: ../src/gui_interface.py:3436
 msgid "Wrong Passphrase"
 msgstr "错误字段"
 
-#: ../src/gui_interface.py:3618
+#: ../src/gui_interface.py:3437
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "请重新输入您的 GPG 字段或点“取消”"
 
@@ -9335,6 +9637,11 @@ msgstr "昵称"
 msgid "Message"
 msgstr "消息"
 
+#. holds subject
+#: ../src/history_manager.py:188 ../src/history_manager.py:219
+msgid "Subject"
+msgstr "主题"
+
 #: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -9429,19 +9736,19 @@ msgstr "尚未连接到服务器"
 msgid "Do you really want to close them all?"
 msgstr "您确定要删除所选定的消息？"
 
-#: ../src/message_window.py:484
+#: ../src/message_window.py:485
 msgid "Chats"
 msgstr "聊天"
 
-#: ../src/message_window.py:486
+#: ../src/message_window.py:487
 msgid "Group Chats"
 msgstr "群聊"
 
-#: ../src/message_window.py:488
+#: ../src/message_window.py:489
 msgid "Private Chats"
 msgstr "私聊"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:495
 msgid "Messages"
 msgstr "消息"
 
@@ -9498,269 +9805,269 @@ msgstr "来自 %(nickname)s 的新消息"
 msgid "Ignore"
 msgstr "九"
 
-#: ../src/profile_window.py:57
+#: ../src/profile_window.py:58
 msgid "Retrieving profile..."
 msgstr "取回概况..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2935
+#: ../src/profile_window.py:111 ../src/roster_window.py:3001
 #, fuzzy
 msgid "File is empty"
 msgstr "文件路径"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2938
+#: ../src/profile_window.py:114 ../src/roster_window.py:3004
 #, fuzzy
 msgid "File does not exist"
 msgstr "不存在这样的群聊"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2940 ../src/roster_window.py:2951
+#: ../src/profile_window.py:128 ../src/profile_window.py:144
+#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
 msgid "Could not load image"
 msgstr "无法读取图片"
 
-#: ../src/profile_window.py:214
+#: ../src/profile_window.py:215
 #, fuzzy
 msgid "Wrong date format"
 msgstr "联系人信息"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:216
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "格式： YYYY-MM-DD"
 
-#: ../src/profile_window.py:269
+#: ../src/profile_window.py:270
 msgid "Information received"
 msgstr "收到信息"
 
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:341
 msgid "Without a connection you can not publish your contact information."
 msgstr "无法脱机发布个人信息。"
 
-#: ../src/profile_window.py:353
+#: ../src/profile_window.py:354
 msgid "Sending profile..."
 msgstr "发送概况..."
 
-#: ../src/profile_window.py:368
+#: ../src/profile_window.py:369
 msgid "Information NOT published"
 msgstr "信息没有发布"
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:376
 msgid "vCard publication failed"
 msgstr "vCard 发布失败"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:377
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
 msgstr "发布您的个人信息时发生错误，请稍后重试。"
 
-#: ../src/roster_window.py:256 ../src/roster_window.py:1012
+#: ../src/roster_window.py:262 ../src/roster_window.py:1026
 msgid "Merged accounts"
 msgstr "已合并的帐户"
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1942
 msgid "Authorization has been sent"
 msgstr "授权发送成功"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1943
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "现在“%s”将知道您的状态。"
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1966
 msgid "Subscription request has been sent"
 msgstr "认证请求已发出"
 
-#: ../src/roster_window.py:1944
+#: ../src/roster_window.py:1967
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "如果“%s”接受此请求，您将知道他/她的状态。"
 
-#: ../src/roster_window.py:1958
+#: ../src/roster_window.py:1981
 msgid "Authorization has been removed"
 msgstr "授权被移除"
 
-#: ../src/roster_window.py:1959
+#: ../src/roster_window.py:1982
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "“%s” 将一直看到您的状态为离线。"
 
-#: ../src/roster_window.py:1986
+#: ../src/roster_window.py:2009
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:1987
+#: ../src/roster_window.py:2010
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "您将在无 OpenPGP 情况下连接到 %s。"
 
-#: ../src/roster_window.py:2199 ../src/roster_window.py:3496
+#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
 msgid "You are participating in one or more group chats"
 msgstr "您在一或多个群聊中"
 
-#: ../src/roster_window.py:2200 ../src/roster_window.py:3497
+#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
 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:2226
+#: ../src/roster_window.py:2249
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2288
+#: ../src/roster_window.py:2311
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2289
+#: ../src/roster_window.py:2312
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "确定要离开房间“ %s ”？"
 
-#: ../src/roster_window.py:2290
+#: ../src/roster_window.py:2313
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2373
+#: ../src/roster_window.py:2396
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "取消文件传输"
 
-#: ../src/roster_window.py:2374
+#: ../src/roster_window.py:2397
 msgid ""
-"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2405 ../src/roster_window.py:2653
+#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
 msgid "You have unread messages"
 msgstr "您有未读消息"
 
-#: ../src/roster_window.py:2406
+#: ../src/roster_window.py:2429
 #, 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:2654
+#: ../src/roster_window.py:2720
 msgid "You must read them before removing this transport."
 msgstr "移除代理前请阅读所有未决事件。"
 
-#: ../src/roster_window.py:2657
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "代理“%s”将被移除"
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2724
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr "您将无法从此代理收发消息。"
 
-#: ../src/roster_window.py:2661
+#: ../src/roster_window.py:2727
 msgid "Transports will be removed"
 msgstr "代理将被移除"
 
-#: ../src/roster_window.py:2666
+#: ../src/roster_window.py:2732
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "these transports: %s"
 msgstr "您将无法从这些代理的联系人收发消息：%s"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2800
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "您在创建一个元联系人。确定继续？"
 
-#: ../src/roster_window.py:2736
+#: ../src/roster_window.py:2802
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2827
+#: ../src/roster_window.py:2893
 msgid "Rename Contact"
 msgstr "重命名联系人"
 
-#: ../src/roster_window.py:2828
+#: ../src/roster_window.py:2894
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "为联系人 %s 输入新的昵称"
 
-#: ../src/roster_window.py:2835
+#: ../src/roster_window.py:2901
 msgid "Rename Group"
 msgstr "重命名群组"
 
-#: ../src/roster_window.py:2836
+#: ../src/roster_window.py:2902
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "为群组 %s 输入新的名称"
 
-#: ../src/roster_window.py:2881
+#: ../src/roster_window.py:2947
 msgid "Remove Group"
 msgstr "移除群组"
 
-#: ../src/roster_window.py:2882
+#: ../src/roster_window.py:2948
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "您想从名单中删除组 %s ?"
 
-#: ../src/roster_window.py:2883
+#: ../src/roster_window.py:2949
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "同时从名单移除这个群组的所有联系人"
 
-#: ../src/roster_window.py:2922
+#: ../src/roster_window.py:2988
 msgid "Assign OpenPGP Key"
 msgstr "指定您的 OpenPGP 钥匙"
 
-#: ../src/roster_window.py:2923
+#: ../src/roster_window.py:2989
 msgid "Select a key to apply to the contact"
 msgstr "选择一个键应用于联系人。"
 
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3372
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "联系人“%s”将从您的名单中移除"
 
-#: ../src/roster_window.py:3308
+#: ../src/roster_window.py:3374
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3313
+#: ../src/roster_window.py:3379
 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:3319
+#: ../src/roster_window.py:3385
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "想做什么？"
 
-#: ../src/roster_window.py:3323
+#: ../src/roster_window.py:3389
 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:3326
+#: ../src/roster_window.py:3392
 msgid "I want this contact to know my status after removal"
 msgstr "我想让此联系人在被移除之后仍然知道我的状态"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3330
+#: ../src/roster_window.py:3396
 msgid "Contacts will be removed from your roster"
 msgstr "联系人将从您的名单中移除"
 
-#: ../src/roster_window.py:3335
+#: ../src/roster_window.py:3401
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9769,32 +10076,32 @@ msgstr ""
 "移除这些联系人：%s 的同时\n"
 "将移除认证导致他们将一直看到您为离线。"
 
-#: ../src/roster_window.py:3393
+#: ../src/roster_window.py:3459
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want  to continue?"
 msgstr "您在创建一个元联系人。确定继续？"
 
-#: ../src/roster_window.py:3395
+#: ../src/roster_window.py:3461
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he or she will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3414
+#: ../src/roster_window.py:3480
 msgid "No account available"
 msgstr "没有有效账户"
 
-#: ../src/roster_window.py:3415
+#: ../src/roster_window.py:3481
 msgid "You must create an account before you can chat with other contacts."
 msgstr "您必须在与他人聊天前新建账户。"
 
-#: ../src/roster_window.py:4023
+#: ../src/roster_window.py:4095
 msgid "Metacontacts storage not supported by your server"
 msgstr "您的服务器不支持元联系人存储"
 
-#: ../src/roster_window.py:4025
+#: ../src/roster_window.py:4097
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9802,12 +10109,12 @@ msgid ""
 msgstr ""
 "您的服务器不支持存储元联系人信息。所以这些信息在下次重新连接时将不被保存。"
 
-#: ../src/roster_window.py:4117
+#: ../src/roster_window.py:4189
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "您在创建一个元联系人。确定继续？"
 
-#: ../src/roster_window.py:4119
+#: ../src/roster_window.py:4191
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -9817,23 +10124,23 @@ msgstr ""
 "元联系人是一种分组若干联系人的方法。一般而言这用在当一个人有若干 Jabber 账户"
 "或代理账户时。"
 
-#: ../src/roster_window.py:4234
+#: ../src/roster_window.py:4306
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "无效文件"
 
-#: ../src/roster_window.py:4246
+#: ../src/roster_window.py:4318
 #, 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:4361
+#: ../src/roster_window.py:4433
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "发送 %s"
 
-#: ../src/roster_window.py:4367
+#: ../src/roster_window.py:4439
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "创建 %s 和 %s 元联系人"
@@ -9843,151 +10150,151 @@ msgstr "创建 %s 和 %s 元联系人"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4816 ../src/roster_window.py:4889
-#: ../src/roster_window.py:4898 ../src/statusicon.py:246
-#: ../src/statusicon.py:293 ../src/statusicon.py:299
+#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
+#: ../src/roster_window.py:4970 ../src/statusicon.py:263
+#: ../src/statusicon.py:310 ../src/statusicon.py:316
 #, python-format
 msgid "using account %s"
 msgstr "使用账户 %s"
 
 #. add
-#: ../src/roster_window.py:4905
+#: ../src/roster_window.py:4977
 #, python-format
 msgid "to %s account"
 msgstr "至帐户 %s"
 
 #. disco
-#: ../src/roster_window.py:4910
+#: ../src/roster_window.py:4982
 #, python-format
 msgid "using %s account"
 msgstr "使用账户 %s"
 
-#: ../src/roster_window.py:4948 ../src/statusicon.py:309
+#: ../src/roster_window.py:5020 ../src/statusicon.py:326
 msgid "_Manage Bookmarks..."
 msgstr "书签管理(_M)..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4968
+#: ../src/roster_window.py:5040
 #, python-format
 msgid "of account %s"
 msgstr "帐户 %s 的"
 
-#: ../src/roster_window.py:5009
+#: ../src/roster_window.py:5081
 #, python-format
 msgid "for account %s"
 msgstr "为帐户 %s"
 
-#: ../src/roster_window.py:5069 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
 msgid "_Change Status Message"
 msgstr "更改状态消息(_C)"
 
-#: ../src/roster_window.py:5102
+#: ../src/roster_window.py:5174
 #, fuzzy
 msgid "Publish Tune"
 msgstr "发布(_P)"
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5176
 #, fuzzy
 msgid "Publish Location"
 msgstr "发布(_P)"
 
-#: ../src/roster_window.py:5107
+#: ../src/roster_window.py:5179
 #, fuzzy
 msgid "Configure Services..."
 msgstr "发掘服务(_D)..."
 
-#: ../src/roster_window.py:5252
+#: ../src/roster_window.py:5324
 msgid "_Maximize All"
 msgstr ""
 
-#: ../src/roster_window.py:5262 ../src/roster_window.py:5436
+#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
 msgid "Send Group M_essage"
 msgstr "发送群组消息(_E)"
 
-#: ../src/roster_window.py:5270
+#: ../src/roster_window.py:5342
 msgid "To all users"
 msgstr "向所有的用户"
 
-#: ../src/roster_window.py:5274
+#: ../src/roster_window.py:5346
 msgid "To all online users"
 msgstr "向所有在线用户"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5456
+#: ../src/roster_window.py:5528
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "重命名联系人"
 
 #. Edit Groups
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5537
 msgid "Edit _Groups"
 msgstr "编辑群组"
 
 #. Send single message
-#: ../src/roster_window.py:5520
+#: ../src/roster_window.py:5592
 #, fuzzy
 msgid "Send Single Message"
 msgstr "发送单条消息(_S)"
 
 #. Execute Command
-#: ../src/roster_window.py:5567
+#: ../src/roster_window.py:5639
 msgid "Execute Command..."
 msgstr "运行命令..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5577
+#: ../src/roster_window.py:5649
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "代理"
 
 #. Modify Transport
-#: ../src/roster_window.py:5586
+#: ../src/roster_window.py:5658
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "显示代理(_P)"
 
 #. Rename
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5668
 msgid "_Rename"
 msgstr "重命名(_R)"
 
-#: ../src/roster_window.py:5656
+#: ../src/roster_window.py:5728
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5665
+#: ../src/roster_window.py:5737
 #, fuzzy
 msgid "_Reconnect"
 msgstr "联系人已断开连接"
 
-#: ../src/roster_window.py:5672
+#: ../src/roster_window.py:5744
 #, fuzzy
 msgid "_Disconnect"
 msgstr "联系人已断开连接"
 
 #. History manager
-#: ../src/roster_window.py:5754
+#: ../src/roster_window.py:5833
 msgid "History Manager"
 msgstr "历史管理器"
 
-#: ../src/roster_window.py:5765
+#: ../src/roster_window.py:5844
 msgid "_Join New Group Chat"
 msgstr "加入新群聊(_J)"
 
-#: ../src/roster_window.py:5938
+#: ../src/roster_window.py:6019
 msgid "Change Status Message..."
 msgstr "更改状态消息..."
 
-#: ../src/search_window.py:94
+#: ../src/search_window.py:105
 msgid "Waiting for results"
 msgstr ""
 
-#: ../src/search_window.py:132 ../src/search_window.py:210
+#: ../src/search_window.py:143 ../src/search_window.py:220
 msgid "Error in received dataform"
 msgstr ""
 
 #. No result
-#: ../src/search_window.py:166 ../src/search_window.py:202
+#: ../src/search_window.py:177 ../src/search_window.py:212
 msgid "No result"
 msgstr ""
 
@@ -10000,21 +10307,22 @@ msgstr ""
 msgid "Subject: %s"
 msgstr "主题：%s"
 
-#: ../src/session.py:433 ../src/session.py:468
+#: ../src/session.py:447 ../src/session.py:491
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:435
+#: ../src/session.py:448
 #, python-format
 msgid ""
-"The remote client wants to negotiate an session with these features:\n"
+"The remote client wants '\n"
+"                            'to negotiate an session with these features:\n"
 "\n"
 "%s\n"
 "\n"
 "Are these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:469
+#: ../src/session.py:492
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10024,16 +10332,16 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/statusicon.py:210
+#: ../src/statusicon.py:227
 msgid "_Change Status Message..."
 msgstr "更改状态消息_(C)..."
 
-#: ../src/statusicon.py:322
+#: ../src/statusicon.py:339
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "不在名单中"
 
-#: ../src/statusicon.py:333
+#: ../src/statusicon.py:350
 msgid "Hide this menu"
 msgstr "隐藏本菜单"
 
@@ -10174,70 +10482,107 @@ msgstr ""
 "此服务无法返回详细信息。\n"
 "它可能是继承或损坏的"
 
-#: ../src/vcard.py:251
+#: ../src/vcard.py:265
 msgid "?Client:Unknown"
 msgstr "?Client: 未知"
 
-#: ../src/vcard.py:253
+#: ../src/vcard.py:267
 msgid "?OS:Unknown"
 msgstr "?OS: 未知"
 
-#: ../src/vcard.py:274
+#: ../src/vcard.py:288
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "?Client: 未知"
 
-#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
+#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
 #, python-format
 msgid "since %s"
 msgstr "自 %s"
 
-#: ../src/vcard.py:331
+#: ../src/vcard.py:345
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:349
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>应用</b>"
 
-#: ../src/vcard.py:343
+#: ../src/vcard.py:357
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr "此联系人对您的状态信息感兴趣，但您不关心他/她的状态"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:359
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 msgstr "您对此联系人的状态信息感兴趣，但他/她不关心您的状态"
 
-#: ../src/vcard.py:347
+#: ../src/vcard.py:361
 msgid "You and the contact are interested in each other's presence information"
 msgstr "您与此联系人同时对对方的状态信息感兴趣"
 
 #. None
-#: ../src/vcard.py:349
+#: ../src/vcard.py:363
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "您与他/她互不关心对方的状态信息"
 
-#: ../src/vcard.py:356
+#: ../src/vcard.py:370
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "等待联系人回应您的认证请求"
 
-#: ../src/vcard.py:358
+#: ../src/vcard.py:372
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
+#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
 msgid " resource with priority "
 msgstr "带有优先级的资源"
 
-#~ msgid "_Available"
-#~ msgstr "在线(_A)"
+#~ msgid "_Disable showing event in systray"
+#~ msgstr "禁用在系统托盘显示事件(_D)"
+
+#~ msgid "_Show event in systray"
+#~ msgstr "在系统托盘中显示事件(_S)"
+
+#, fuzzy
+#~ msgid "Autodetect on every Gajim startup"
+#~ msgstr "Gajim 启动时连接(_O)"
+
+#, fuzzy
+#~ msgid "Show systray:"
+#~ msgstr "在系统托盘中显示事件(_S)"
+
+#~ msgid "Nickname not allowed: %s"
+#~ msgstr "昵称不允许： %s "
+
+#, fuzzy
+#~ msgid "Room has been destroyed"
+#~ msgstr "授权被移除"
+
+#~ msgid "I would like to add you to my roster."
+#~ msgstr "我申请添加您到联系人名单"
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr " %s 请求认证"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr " %s 请求解除认证"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "%s 解除了认证"
+
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "JID %s 不识配 RFC，未被加入名单。请使用诸如 http://jru.jabberstudio.org/ "
+#~ "的名单管理工具移除。"
 
 #~ msgid "Account Modification"
 #~ msgstr "帐户修改"
@@ -10330,34 +10675,6 @@ msgstr "带有优先级的资源"
 #~ msgid "gtk-delete"
 #~ msgstr "删除"
 
-#, fuzzy
-#~ msgid "Add this contact to roster (Ctrl+D)"
-#~ msgstr "向名单添加联系人"
-
-#, fuzzy
-#~ msgid "Bookmark this room (Ctrl+B)"
-#~ msgstr "将本房间加入书签(_B)"
-
-#, fuzzy
-#~ msgid "Change your nickname (Ctrl+N)"
-#~ msgstr "更换昵称(_N)"
-
-#, fuzzy
-#~ msgid "Invite contacts to the conversation (Ctrl+G)"
-#~ msgstr "正在专注于聊天"
-
-#, fuzzy
-#~ msgid "Show a list of emoticons (Alt+M)"
-#~ msgstr "点这里插入表情符 (Alt+M)"
-
-#, fuzzy
-#~ msgid "Show a list of formattings"
-#~ msgstr "点这里插入表情符 (Alt+M)"
-
-#, fuzzy
-#~ msgid "Show a menu of advanced functions (Alt+D)"
-#~ msgstr "点这里插入表情符 (Alt+M)"
-
 #~ msgid ""
 #~ "All chat states\n"
 #~ "Composing only\n"
@@ -10396,9 +10713,6 @@ msgstr "带有优先级的资源"
 #~ msgid "gtk-cancel"
 #~ msgstr "删除"
 
-#~ msgid "_Preferences"
-#~ msgstr "首选项(_P)"
-
 #~ msgid "_Quit"
 #~ msgstr "退出(_Q)"
 
@@ -10774,9 +11088,6 @@ msgstr "带有优先级的资源"
 #~ msgid "The auto not available status message"
 #~ msgstr "自动不可用状态消息"
 
-#~ msgid "Use t_rayicon (aka. notification area icon)"
-#~ msgstr "使用托盘图标(aka. 提示区域图表)(_R)"
-
 #~ msgid ""
 #~ "When a new event (message, file transfer request etc..) is received, the "
 #~ "following methods may be used to inform you about it. Please note that "
@@ -10901,13 +11212,6 @@ msgstr "带有优先级的资源"
 #~ msgid "Session Management support not available (missing gnome.ui module)"
 #~ msgstr "会话管理器支持不可用(丢失 gnome.ui 模块)"
 
-#~ msgid ""
-#~ "Usage: %s %s %s \n"
-#~ "\t %s"
-#~ msgstr ""
-#~ "用法： %s %s %s \n"
-#~ "\t %s"
-
 #~ msgid "Private Chat"
 #~ msgstr "私聊"
 
diff --git a/src/gui_interface.py b/src/gui_interface.py
index f4d0199d8197541f64d450aaac947e1d5cad3abc..19f5ec1adf59d289a9803e2c6b40259ce304fae3 100644
--- a/src/gui_interface.py
+++ b/src/gui_interface.py
@@ -283,7 +283,7 @@ class Interface:
             gajim.connections[account].request_vcard(jid)
 
     def handle_gc_error(self, gc_control, pritext, sectext):
-        if gc_control and obj.gc_control.autorejoin is not None:
+        if gc_control and gc_control.autorejoin is not None:
             if gc_control.error_dialog:
                 gc_control.error_dialog.destroy()
             def on_close(dummy):